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
author: JP Rosevear <jpr@ximian.com> 2002-05-08 21:37:33 +0800
committer: JP Rosevear <jpr@src.gnome.org> 2002-05-08 21:37:33 +0800
commit: b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06 (patch)
tree: 5cb241d8ec2ea0a75d38ad395bd3578089e3250c /po/en_AU.po
parent: d02b29d95446c200856d69d0bf0abe856ed7a96f (diff)
download: gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar
gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.gz
gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.bz2
gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.lz
gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.xz
gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.zst
gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.zip
1 files changed, 15638 insertions, 3499 deletions
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\""
author	JP Rosevear <jpr@ximian.com>	2002-05-08 21:37:33 +0800
committer	JP Rosevear <jpr@src.gnome.org>	2002-05-08 21:37:33 +0800
commit	b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06 (patch)
tree	5cb241d8ec2ea0a75d38ad395bd3578089e3250c /po/en_AU.po
parent	d02b29d95446c200856d69d0bf0abe856ed7a96f (diff)
download	gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.gz gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.bz2 gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.lz gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.xz gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.zst gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.zip