aboutsummaryrefslogtreecommitdiffstats
path: root/po/en_AU.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/en_AU.po')
-rw-r--r--po/en_AU.po7124
1 files changed, 4002 insertions, 3122 deletions
diff --git a/po/en_AU.po b/po/en_AU.po
index c2a3b38a34..18ba28ad56 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
"PO-Revision-Date: 2000-10-22 16:19+0100\n"
"Last-Translator: Michael Zucchi <notzed@ximian.com>\n"
"Language-Team: \n"
@@ -34,7 +34,7 @@ msgstr ""
msgid "File As"
msgstr ""
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
#: my-evolution/e-summary-table.c:59
msgid "Name"
msgstr ""
@@ -45,7 +45,7 @@ msgid "Email"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
msgid "Primary"
msgstr ""
@@ -55,7 +55,7 @@ msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:64
#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
#: addressbook/gui/widgets/e-addressbook-view.c:369
msgid "Assistant"
msgstr ""
@@ -63,8 +63,8 @@ msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:65
#: addressbook/backend/ebook/e-card-simple.c:70
#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
msgid "Business"
msgstr ""
@@ -74,12 +74,12 @@ msgid "Bus"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
msgid "Callback"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
msgid "Company"
msgstr ""
@@ -90,8 +90,8 @@ msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:68
#: addressbook/backend/ebook/e-card-simple.c:71
#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
msgid "Home"
msgstr ""
@@ -106,18 +106,18 @@ msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:72
#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
msgid "Mobile"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
msgid "Car"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:74
#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
#: addressbook/gui/widgets/e-addressbook-view.c:349
msgid "Business Fax"
msgstr ""
@@ -127,13 +127,13 @@ msgid "Bus Fax"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
#: addressbook/gui/widgets/e-addressbook-view.c:350
msgid "Home Fax"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
msgid "Business 2"
msgstr ""
@@ -142,43 +142,43 @@ msgid "Bus 2"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
msgid "Home 2"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
#: addressbook/gui/widgets/e-addressbook-view.c:353
msgid "ISDN"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:79
#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
msgid "Other"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
#: addressbook/gui/widgets/e-addressbook-view.c:355
msgid "Other Fax"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
#: addressbook/gui/widgets/e-addressbook-view.c:356
msgid "Pager"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
#: addressbook/gui/widgets/e-addressbook-view.c:357
msgid "Radio"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
#: addressbook/gui/widgets/e-addressbook-view.c:358
msgid "Telex"
msgstr ""
@@ -190,14 +190,14 @@ msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:86
#: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
#: addressbook/gui/widgets/e-addressbook-view.c:361
msgid "Email 2"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:87
#: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
#: addressbook/gui/widgets/e-addressbook-view.c:362
msgid "Email 3"
msgstr ""
@@ -335,7 +335,7 @@ msgstr ""
#: addressbook/gui/component/addressbook-factory.c:50
#: calendar/conduits/calendar/calendar-conduit.c:1727
#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
#: tools/evolution-addressbook-abuse.c:132
#: tools/evolution-addressbook-export.c:60
#: tools/evolution-addressbook-import.c:86
@@ -343,7 +343,7 @@ msgid "Could not initialize Bonobo"
msgstr "Could not initialise Bonobo"
#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
msgid "Searching..."
msgstr ""
@@ -356,31 +356,31 @@ msgstr ""
msgid "Error in search expression."
msgstr ""
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
msgid "Adding card to LDAP server..."
msgstr ""
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
msgid "Removing card from LDAP server..."
msgstr ""
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
msgid "Modifying card from LDAP server..."
msgstr ""
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
msgid "Restarting search."
msgstr ""
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
msgid "Receiving LDAP search results..."
msgstr ""
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
msgid "Error performing search"
msgstr ""
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
msgid "Could not parse query string"
msgstr ""
@@ -426,102 +426,129 @@ msgid "A sample Bonobo control which displays an addressbook."
msgstr ""
#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
msgid "Configuration control for the Evolution Addressbook Storages."
msgstr ""
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
msgid "Control that displays an Evolution addressbook minicard."
msgstr ""
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
msgid "Directory Servers"
msgstr ""
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
msgid "Evolution Addressbook minicard viewer"
msgstr ""
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
msgid "Evolution component for handling contacts."
msgstr ""
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
msgid "Factory for the Addressbook Minicard control"
msgstr ""
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
msgid "Factory for the Addressbook's address displayer"
msgstr ""
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
msgid "Factory for the Addressbook's address popup"
msgstr ""
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
msgid "Factory for the configuration controls for the Evolution Addressbook."
msgstr ""
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
msgid "Factory for the sample Addressbook control"
msgstr ""
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
msgid "This page can be used to configure access to LDAP directory servers"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
#: calendar/gui/dialogs/comp-editor-util.c:310
#: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
msgid "Contacts"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
msgid "Folder containing contact information"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
msgid "LDAP Server"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
msgid "LDAP server containing contact information"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:581
msgid "New Contact"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
#: ui/evolution-addressbook.xml.h:32
msgid "_Contact"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
+#: addressbook/gui/component/addressbook-config.c:197
+msgid "Failed to connect to LDAP server"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "Contact _List"
+#: addressbook/gui/component/addressbook-config.c:216
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+msgid "This server does not support LDAPv3 schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1174
+msgid "Error retrieving schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1182
+msgid "Server did not respond with valid schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1638
+msgid "LDAP was not enabled in this build of Evolution"
msgstr ""
#: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
msgid "Could not initialize gnome-vfs"
msgstr "Could not initialise gnome-vfs"
+#: addressbook/gui/component/addressbook-storage.c:168
+#, fuzzy
+msgid "Other Contacts"
+msgstr "_Other Organiser"
+
#: addressbook/gui/component/addressbook.c:516
msgid "Unable to open addressbook"
msgstr ""
@@ -547,48 +574,57 @@ msgid ""
"path exists and that you have permission to access it."
msgstr ""
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
#, c-format
msgid "Enter password for %s (user %s)"
msgstr ""
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
msgid "Name begins with"
msgstr ""
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
msgid "Email is"
msgstr ""
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
#: calendar/gui/cal-search-bar.c:53
msgid "Category is"
msgstr ""
#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
#: calendar/gui/cal-search-bar.c:49
msgid "Any field contains"
msgstr ""
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
msgid "Advanced..."
msgstr ""
#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
#: calendar/gui/cal-search-bar.c:382
msgid "Any Category"
msgstr ""
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
msgid "The URI that the Folder Browser will display"
msgstr ""
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr ""
+
#: addressbook/gui/component/e-address-popup.c:474
#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
msgid "Primary Email"
msgstr ""
@@ -634,88 +670,52 @@ msgstr ""
msgid "Enable Queries (Dangerous!)"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:197
-msgid "Failed to connect to LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:215
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-msgid "Could not query for schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1169
-msgid "Server did not respond with valid schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1613
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1689
-msgid "Extra Completion folders"
-msgstr ""
-
#: addressbook/gui/component/ldap-config.glade.h:1
msgid " S_how Supported Bases "
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:2
-msgid "<< Fewer Options"
+msgid "1234"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:3
-msgid "<- _Remove"
+msgid "1:00"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1234"
+msgid "2:30"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:5
-msgid "1:00"
+msgid "3268"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:6
-msgid "2:30"
+msgid "380"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:7
-msgid "3268"
+msgid "389"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "380"
+msgid "5:00"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:9
-msgid "389"
+msgid "636"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:10
-msgid "5:00"
+msgid "666"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:11
-msgid "636"
+msgid "<- _Remove"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:12
-msgid "666"
+msgid "<< Fewer Options"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:13
@@ -726,8 +726,8 @@ msgstr ""
msgid "Addressbook Sources"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
msgid "Always"
msgstr ""
@@ -810,8 +810,8 @@ msgstr ""
msgid "Mappings"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
msgid "Never"
msgstr ""
@@ -985,14 +985,14 @@ msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:87
msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:88
msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
"too large will slow down your addressbook."
msgstr ""
@@ -1012,8 +1012,8 @@ msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:93
msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
"list of standard ports has been provided. Ask your system administrator\n"
"what port you should specify."
msgstr ""
@@ -1044,7 +1044,7 @@ msgid "Using email address"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
msgid "Whenever Possible"
msgstr ""
@@ -1052,7 +1052,7 @@ msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:30
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
msgid "_Add"
msgstr ""
@@ -1093,7 +1093,7 @@ msgid "_Download limit:"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
#: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
#: ui/evolution-mail-messagedisplay.xml.h:6
#: ui/evolution-message-composer.xml.h:47
@@ -1198,10 +1198,12 @@ msgstr ""
msgid "Factory for the Addressbook's name selection interface"
msgstr ""
+#. Fixme: Ditto
#: addressbook/gui/component/select-names/e-select-names-popup.c:163
#: addressbook/gui/component/select-names/e-select-names.c:980
#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
msgid "Remove"
msgstr ""
@@ -1318,7 +1320,7 @@ msgstr ""
#. Construct the app
#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
msgid "Contact Editor"
msgstr ""
@@ -1327,7 +1329,7 @@ msgid "D_epartment:"
msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
msgid "Details"
msgstr ""
@@ -1384,11 +1386,12 @@ msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:31
#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
msgid "_Delete"
msgstr ""
@@ -1417,7 +1420,7 @@ msgid "_Web page address:"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
msgid "United States"
msgstr ""
@@ -1922,12 +1925,11 @@ msgid "Laos"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
msgid "Latvia"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
msgid "Lebanon"
msgstr ""
@@ -1936,7 +1938,7 @@ msgid "Lesotho"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
msgid "Liberia"
msgstr ""
@@ -1945,12 +1947,12 @@ msgid "Liechtenstein"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
msgid "Lithuania"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
msgid "Luxembourg"
msgstr ""
@@ -1983,7 +1985,7 @@ msgid "Mali"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
msgid "Malta"
msgstr ""
@@ -2008,7 +2010,7 @@ msgid "Mayotte"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
msgid "Mexico"
msgstr ""
@@ -2033,7 +2035,7 @@ msgid "Montserrat"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
msgid "Morocco"
msgstr ""
@@ -2058,7 +2060,7 @@ msgid "Nepal"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
msgid "Netherlands"
msgstr ""
@@ -2071,12 +2073,12 @@ msgid "New Caledonia"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
msgid "New Zealand"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
msgid "Nicaragua"
msgstr ""
@@ -2093,7 +2095,7 @@ msgid "Niue"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
msgid "Norfolk Island"
msgstr ""
@@ -2102,17 +2104,17 @@ msgid "Northern Mariana Islands"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
msgid "Norway"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
msgid "Oman"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
msgid "Pakistan"
msgstr ""
@@ -2125,7 +2127,7 @@ msgid "Palestinian Territory"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
msgid "Panama"
msgstr ""
@@ -2134,12 +2136,12 @@ msgid "Papua New Guinea"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
msgid "Paraguay"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
msgid "Peru"
msgstr ""
@@ -2152,22 +2154,22 @@ msgid "Pitcairn"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
msgid "Poland"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
msgid "Portugal"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
msgid "Puerto Rico"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
msgid "Qatar"
msgstr ""
@@ -2176,7 +2178,7 @@ msgid "Reunion"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
msgid "Romania"
msgstr ""
@@ -2213,7 +2215,7 @@ msgid "Sao Tome And Principe"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
msgid "Saudi Arabia"
msgstr ""
@@ -2230,17 +2232,17 @@ msgid "Sierra Leone"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
msgid "Singapore"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
msgid "Slovakia"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
msgid "Slovenia"
msgstr ""
@@ -2253,7 +2255,7 @@ msgid "Somalia"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
msgid "South Africa"
msgstr ""
@@ -2262,7 +2264,7 @@ msgid "South Georgia And The South Sandwich Islands"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
msgid "Spain"
msgstr ""
@@ -2283,7 +2285,7 @@ msgid "Sudan"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
msgid "Suriname"
msgstr ""
@@ -2296,17 +2298,17 @@ msgid "Swaziland"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
msgid "Sweden"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
msgid "Switzerland"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
msgid "Taiwan"
msgstr ""
@@ -2343,7 +2345,7 @@ msgid "Tunisia"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
msgid "Turkey"
msgstr ""
@@ -2364,7 +2366,7 @@ msgid "Uganda"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
msgid "Ukraine"
msgstr ""
@@ -2373,7 +2375,7 @@ msgid "United Arab Emirates"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
msgid "United Kingdom"
msgstr ""
@@ -2382,7 +2384,7 @@ msgid "United States Minor Outlying Islands"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
msgid "Uruguay"
msgstr ""
@@ -2395,12 +2397,12 @@ msgid "Vanuatu"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
msgid "Venezuela"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
msgid "Viet Nam"
msgstr ""
@@ -2421,12 +2423,12 @@ msgid "Western Sahara"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
msgid "Yemen"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
msgid "Yugoslavia"
msgstr ""
@@ -2439,26 +2441,32 @@ msgid "Zimbabwe"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
msgid "Delete Contact?"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
msgid "Category editor not available."
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
msgid "This contact belongs to these categories:"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
msgid "Save Contact as VCard"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
msgid "TTY/TDD"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
#, c-format
msgid "Could not find widget for a field: `%s'"
msgstr ""
@@ -2485,11 +2493,11 @@ msgstr ""
msgid "card.vcf"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
msgid "list"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
#, c-format
msgid ""
"%s already exists\n"
@@ -2622,11 +2630,11 @@ msgid "contact-list-editor"
msgstr ""
#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
msgid "Contact List Editor"
msgstr ""
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
msgid "Save List as VCard"
msgstr ""
@@ -2699,21 +2707,21 @@ msgid "Error getting book view"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
#: addressbook/gui/widgets/e-minicard.c:475
msgid "Error modifying card"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
msgid "Success"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
msgid "Unknown error"
msgstr ""
@@ -2722,7 +2730,7 @@ msgid "Repository offline"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
msgid "Permission denied"
msgstr ""
@@ -2740,53 +2748,66 @@ msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:42
#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
msgid "Cancelled"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:43
+msgid "Authentication Failed"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+msgid "Authentication Required"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
msgid "Other error"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
#: calendar/gui/dialogs/save-comp.c:50
msgid "Do you want to save changes?"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
msgid "Error adding list"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
msgid "Error adding card"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
msgid "Error modifying list"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
msgid "Error removing list"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
msgid "Error removing card"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
msgid "Display Cards?"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
msgid "Display Cards"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
#, c-format
msgid ""
"You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2794,19 +2815,19 @@ msgid ""
"displayed on your screen. Do you really want to display all of these cards?"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
msgid "Move card to"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
msgid "Copy card to"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
msgid "Move cards to"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
msgid "Copy cards to"
msgstr ""
@@ -2870,93 +2891,99 @@ msgstr ""
msgid "Other Address"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
#: ui/evolution-addressbook.xml.h:21
msgid "Save as VCard"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
msgid "New Contact..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
msgid "New Contact List..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
msgid "Go to Folder..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
msgid "Import..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
msgid "Search for Contacts..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
msgid "Addressbook Sources..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
msgid "Pilot Settings..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
#: ui/evolution-addressbook.xml.h:12
msgid "Forward Contact"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
msgid "Send Message to Contact"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
#: ui/my-evolution.xml.h:1
msgid "Print"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
msgid "Print Envelope"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
msgid "Copy to folder..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
msgid "Move to folder..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
#: ui/evolution-tasks.xml.h:2
msgid "Copy"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
msgid "Paste"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
msgid "Delete"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
msgid "Current View"
msgstr ""
@@ -2965,7 +2992,7 @@ msgstr ""
#. Translators: put here a list of labels you want to see on buttons in
#. addressbook. You may use any character to separate labels but it must
#. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
msgstr ""
@@ -2973,7 +3000,7 @@ msgstr ""
#. in addressbook. You may use any character to separate labels but it
#. must also be placed at the begining ot the string.
#. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
msgstr ""
@@ -3113,7 +3140,7 @@ msgstr ""
msgid "Number of columns:"
msgstr ""
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
msgid "Options"
msgstr ""
@@ -3123,7 +3150,7 @@ msgid "Orientation"
msgstr ""
#: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
msgid "Page"
msgstr ""
@@ -3197,29 +3224,33 @@ msgstr ""
msgid "_Font..."
msgstr ""
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
msgid "Untitled appointment"
msgstr ""
#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
msgid "High"
msgstr ""
#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
msgid "Normal"
msgstr ""
#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
msgid "Low"
msgstr ""
#. An empty string is the same as 'None'.
#: calendar/cal-util/cal-util.c:520
#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
msgid "Undefined"
msgstr ""
@@ -3259,43 +3290,35 @@ msgid "Configuration control for the Evolution Calendar."
msgstr ""
#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
msgid "Evolution calendar iTip/iMip viewer"
msgstr ""
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
msgid "Evolution component for handling the calendar."
msgstr ""
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
#, fuzzy
msgid "Factory for the Evolution Tasks control"
msgstr "Cannot initialise Evolution's mail component."
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
msgid "Factory for the calendar iTip view control"
msgstr ""
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
msgid "Factory for the sample Calendar control"
msgstr ""
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
msgid "Factory to centralize calendar component editor dialogs"
msgstr ""
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
msgid "Factory to create a component editor factory"
msgstr ""
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
msgid "This page can be used to configure Calendar and Task preferences"
msgstr ""
@@ -3307,10 +3330,23 @@ msgstr ""
msgid "Factory for the alarm notification service"
msgstr ""
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+msgid "Starting:"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr ""
+
#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
msgid "invalid time"
msgstr ""
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Cannot initialise Evolution's mail component."
+
#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
#, c-format
msgid "Alarm on %s"
@@ -3346,7 +3382,7 @@ msgid ""
msgstr ""
#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
#: widgets/misc/e-messagebox.c:159
msgid "Warning"
msgstr ""
@@ -3366,15 +3402,15 @@ msgstr ""
msgid "Do not ask me about this program again."
msgstr ""
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
msgid "Could not initialize GNOME"
msgstr "Could not initialise GNOME"
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
msgid "Could not create the alarm notify service"
msgstr ""
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
msgid "Could not create the alarm notify service factory"
msgstr ""
@@ -3390,7 +3426,7 @@ msgstr ""
msgid "Comment contains"
msgstr ""
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
msgid "Unmatched"
msgstr ""
@@ -3429,14 +3465,16 @@ msgid ""
msgstr ""
#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
msgid "Private"
msgstr ""
#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
msgid "Confidential"
msgstr ""
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
msgid "Public"
msgstr ""
@@ -3457,27 +3495,32 @@ msgid "W"
msgstr ""
#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
msgid "Free"
msgstr ""
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
msgid "Busy"
msgstr ""
#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
msgid "Not Started"
msgstr ""
#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
msgid "In Progress"
msgstr ""
#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
msgid "Completed"
msgstr ""
@@ -3489,11 +3532,12 @@ msgid ""
msgstr ""
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
#: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
#: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3508,12 +3552,14 @@ msgstr ""
msgid "Assigned"
msgstr ""
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
msgid "Yes"
msgstr ""
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
msgid "No"
msgstr ""
@@ -3533,56 +3579,58 @@ msgstr ""
msgid "Month View"
msgstr ""
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
msgid "Calendar"
msgstr ""
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
msgid "Folder containing appointments and events"
msgstr ""
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
#: calendar/importers/icalendar-importer.c:645
#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
msgid "Tasks"
msgstr ""
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
msgid "Folder containing to-do items"
msgstr ""
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
msgid "New meeting"
msgstr ""
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
msgid "_Meeting"
msgstr ""
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
msgid "New task"
msgstr ""
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
msgid "_Task"
msgstr ""
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
msgid "New All Day Appointment"
msgstr ""
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
msgid "All _Day Appointment"
msgstr ""
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
msgid "New appointment"
msgstr ""
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
msgid "_Appointment"
msgstr ""
@@ -3789,7 +3837,7 @@ msgstr ""
#: calendar/gui/dialogs/alarm-page.glade.h:7
#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr ""
@@ -3818,7 +3866,7 @@ msgstr ""
msgid "hour(s)"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
msgid "minute(s)"
msgstr ""
@@ -3846,77 +3894,77 @@ msgstr ""
msgid "60 minutes"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Calendar and Tasks Settings"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+msgid "Alerts"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "Color for overdue tasks"
+msgid "Calendar and Tasks Settings"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Color for tasks due today"
-msgstr "Colours for display"
+msgid "Color for overdue tasks"
+msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Days"
-msgstr ""
+msgid "Color for tasks due today"
+msgstr "Colours for display"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/dialogs/recurrence-page.c:1125
-msgid "Friday"
+msgid "Day _ends:"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Hours"
+msgid "Days"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Minutes"
+#: calendar/gui/dialogs/recurrence-page.c:1125
+msgid "Friday"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.c:1121
-msgid "Monday"
+msgid "Hours"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/dialogs/recurrence-page.c:1126
-msgid "Saturday"
+msgid "Minutes"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/recurrence-page.c:1121
+msgid "Monday"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Show week _numbers in date navigator"
+msgid "S_un"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
+#: calendar/gui/dialogs/recurrence-page.c:1126
+msgid "Saturday"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
+msgid "Sh_ow a reminder"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+msgid "Show week _numbers in date navigator"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
#: calendar/gui/dialogs/recurrence-page.c:1127
msgid "Sunday"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
#, fuzzy
msgid "T_asks due today:"
msgstr "Colours for display"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "T_hu"
-msgstr ""
-
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
+msgid "T_hu"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
@@ -3946,78 +3994,90 @@ msgid "Tuesday"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/dialogs/recurrence-page.c:1123
-msgid "Wednesday"
+msgid "W_eek starts:"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: ui/evolution-calendar.xml.h:24
-msgid "Work Week"
+#: calendar/gui/dialogs/recurrence-page.c:1123
+msgid "Wednesday"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "_12 hour (AM/PM)"
+#: ui/evolution-calendar.xml.h:24
+msgid "Work Week"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "_24 hour"
+msgid "Work days:"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "_Ask for confirmation when deleting items"
+msgid "_12 hour (AM/PM)"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "_Compress weekends in month view"
+msgid "_24 hour"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "_Display"
+msgid "_Ask for confirmation when deleting items"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
+msgid "_Compress weekends in month view"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "_Fri"
+msgid "_Day begins:"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
-msgid "_General"
+msgid "_Display"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "_Hide completed tasks after"
+msgid "_Fri"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Mon"
+#: mail/mail-config.glade.h:161
+msgid "_General"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "_Overdue tasks:"
+msgid "_Hide completed tasks after"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Sat"
+msgid "_Mon"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "_Show appointment end times in week and month views"
+msgid "_Overdue tasks:"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Time divisions:"
+msgid "_Sat"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "_Wed"
+msgid "_Show appointment end times in week and month views"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
+msgid "_Time divisions:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+msgid "_Tue"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+msgid "_Wed"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+msgid "before every appointment"
msgstr ""
#: calendar/gui/dialogs/cancel-comp.c:51
@@ -4100,40 +4160,61 @@ msgstr ""
msgid "Due "
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:322
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "Could not initialise Bonobo"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
+msgstr "Could not initialise Bonobo"
+
+#: calendar/gui/dialogs/comp-editor.c:797
msgid "Edit Appointment"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
#, c-format
msgid "Appointment - %s"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
#, c-format
msgid "Task - %s"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
#, c-format
msgid "Journal entry - %s"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
msgid "No summary"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
msgid "Save as..."
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
msgid "Unable to obtain current version!"
msgstr ""
@@ -4191,27 +4272,27 @@ msgstr ""
msgid "Enter Delegate"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
msgid "Appointment"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
msgid "Reminder"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
msgid "Recurrence"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
msgid "Scheduling"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
msgid "Meeting"
msgstr ""
@@ -4258,7 +4339,7 @@ msgid "Pu_blic"
msgstr ""
#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
msgid "Show Time As"
msgstr ""
@@ -4280,19 +4361,19 @@ msgstr ""
msgid "_Start time:"
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
msgid "An organizer is required."
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
msgid "At least one attendee is required."
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
msgid "That person is already attending the meeting!"
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
msgid "_Delegate To..."
msgstr ""
@@ -4303,49 +4384,55 @@ msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:2
#: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
+msgid "Click here to add an attendee"
msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:3
#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
+msgid "Common Name"
msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:4
#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
+msgid "Delegated From"
msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:5
#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
+msgid "Delegated To"
msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:6
#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
+msgid "Language"
msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:7
#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
+msgid "Member"
msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "Role"
+msgid "RSVP"
msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
-msgid "Status"
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
#: shell/glade/e-active-connection-dialog.glade.h:5
msgid "Type"
msgstr ""
@@ -4360,14 +4447,10 @@ msgid "_Change Organizer"
msgstr "_Change Organiser"
#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
msgid "_Invite Others..."
msgstr ""
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "_Other Organiser"
-
#: calendar/gui/dialogs/recurrence-page.c:126
#: calendar/gui/dialogs/recurrence-page.c:146
#: calendar/gui/dialogs/recurrence-page.c:156
@@ -4547,7 +4630,7 @@ msgid "Progress"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
msgid "URL:"
msgstr ""
@@ -4559,19 +4642,19 @@ msgstr ""
msgid "_Status:"
msgstr ""
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
msgid "Basic"
msgstr ""
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
msgid "Assignment"
msgstr ""
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
msgid "Description:"
msgstr ""
@@ -4583,22 +4666,77 @@ msgstr ""
msgid "_Due Date:"
msgstr ""
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:450
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
#: calendar/gui/e-week-view.c:1853
msgid "Deleting selected objects"
msgstr ""
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
msgid "_Open"
msgstr ""
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
msgid "_Save as..."
msgstr ""
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4606,20 +4744,20 @@ msgstr ""
msgid "_Print..."
msgstr ""
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr ""
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
#: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
#: ui/evolution-tasks.xml.h:15
msgid "_Copy"
msgstr ""
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
#: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4627,32 +4765,33 @@ msgstr ""
msgid "_Paste"
msgstr ""
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
msgid "_Assign Task"
msgstr ""
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
msgid "_Forward as iCalendar"
msgstr ""
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
msgid "_Mark as Complete"
msgstr ""
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
msgid "_Mark Selected Tasks as Complete"
msgstr ""
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
msgid "_Delete Selected Tasks"
msgstr ""
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
#: calendar/gui/e-week-view.c:4194
msgid "Updating objects"
msgstr ""
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
msgid "Click to add a task"
msgstr ""
@@ -4660,47 +4799,48 @@ msgstr ""
msgid "Alarms"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
msgid "Complete"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
msgid "Completion Date"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
msgid "Due Date"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
msgid "End Date"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
msgid "Geographical Position"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
msgid "Priority"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
msgid "Start Date"
msgstr ""
#. FIXME: Inbox shortcut should point to something else for
#. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
msgid "Summary"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
msgid "Task sort"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
msgid "URL"
msgstr ""
@@ -4745,11 +4885,13 @@ msgstr ""
#. String to use in 12-hour time format for times in the morning.
#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
msgid "am"
msgstr ""
#. String to use in 12-hour time format for times in the afternoon.
#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
msgid "pm"
msgstr ""
@@ -4788,7 +4930,7 @@ msgid "_Publish Free/Busy Information"
msgstr ""
#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
msgid "_Configure..."
msgstr ""
@@ -4797,7 +4939,7 @@ msgid "_Configure Pilot..."
msgstr ""
#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
msgid "_Save As..."
msgstr ""
@@ -4822,71 +4964,383 @@ msgid "Delete _All Occurrences"
msgstr ""
#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
msgid "The GNOME Pilot tools do not appear to be installed on this system."
msgstr ""
#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
#, c-format
msgid "Error executing %s."
msgstr ""
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:683
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:688
+msgid "Free/Busy info begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:692
+msgid "Begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:704
+msgid "Meeting ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:707
+msgid "Free/Busy info ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:711
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:725
+msgid "Task Completed: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:735
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+msgid "iCalendar Information"
+msgstr ""
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+msgid "iCalendar Error"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+msgid "An unknown person"
+msgstr ""
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:903
+msgid "Status:"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
#: widgets/misc/e-charset-picker.c:444
msgid "Unknown"
msgstr ""
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+msgid "Choose an action:"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:972
+msgid "Update"
msgstr ""
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1000
+msgid "Accept"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1001
+msgid "Tentatively accept"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1002
+msgid "Decline"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1026
+msgid "Send Free/Busy Information"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1052
+msgid "Send Latest Information"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1117
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1118
+msgid "Meeting Information"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1123
+msgid "Meeting Proposal"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1127
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1128
+msgid "Meeting Update"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1132
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1133
+msgid "Meeting Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1156
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1157
+msgid "Meeting Reply"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1161
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1162
+msgid "Meeting Cancellation"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1167
+msgid "Bad Meeting Message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1189
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1190
+msgid "Task Information"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1199
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1200
+msgid "Task Update"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1204
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1230
+msgid "Task Reply"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1235
+msgid "Task Cancellation"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1240
+msgid "Bad Task Message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1259
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1260
+msgid "Free/Busy Information"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1264
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1265
+msgid "Free/Busy Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1269
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1270
+msgid "Free/Busy Reply"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1275
+msgid "Bad Free/Busy Message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1354
+msgid "The message does not appear to be properly formed"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+msgid "There was an error on the CORBA system\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+msgid "Object could not be found\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
msgid "Update complete\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
msgid "Attendee status can not be updated because the item no longer exists"
msgstr ""
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr ""
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1638
-msgid "Attendee status could not be updated!\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
msgid "Attendee status updated\n"
msgstr ""
#: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1709
msgid "Removal Complete"
msgstr ""
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
msgid "Item sent!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
msgid "The item could not be sent!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
msgid "Select Calendar Folder"
msgstr ""
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
msgid "Select Tasks Folder"
msgstr ""
@@ -4927,93 +5381,92 @@ msgstr ""
msgid "date-start"
msgstr ""
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
msgid "Chair Persons"
msgstr ""
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
msgid "Required Participants"
msgstr ""
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
msgid "Optional Participants"
msgstr ""
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
msgid "Non-Participants"
msgstr ""
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
msgid "Individual"
msgstr ""
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
msgid "Group"
msgstr ""
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
msgid "Resource"
msgstr ""
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
msgid "Room"
msgstr ""
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
msgid "Chair"
msgstr ""
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
msgid "Required Participant"
msgstr ""
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
msgid "Optional Participant"
msgstr ""
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
msgid "Non-Participant"
msgstr ""
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
-msgid "Needs Action"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr ""
-
#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
+msgid "Needs Action"
msgstr ""
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
msgid "Tentative"
msgstr ""
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
msgid "Delegated"
msgstr ""
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
msgid "In Process"
msgstr ""
#. This is a strftime() format string %A = full weekday name,
#. %B = full month name, %d = month day, %Y = full year.
#: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
msgid "%A, %B %d, %Y"
msgstr ""
#. This is a strftime() format string %a = abbreviated weekday
#. name, %m = month number, %d = month day, %Y = full year.
#: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
msgid "%a %m/%d/%Y"
msgstr "%a %d/%m/%Y"
@@ -5025,63 +5478,63 @@ msgstr "%a %d/%m/%Y"
msgid "%m/%d/%Y"
msgstr "%d/%m/%Y"
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
msgid "Out of Office"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
msgid "No Information"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
msgid "_Options"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
msgid "Show _Only Working Hours"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
msgid "Show _Zoomed Out"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
msgid "_Update Free/Busy"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
msgid "_<<"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
msgid "_Autopick"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
msgid ">_>"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
msgid "_All People and Resources"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
msgid "All _People and One Resource"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
msgid "_Required People"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
msgid "Required People and _One Resource"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
msgid "Meeting _start time:"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
msgid "Meeting _end time:"
msgstr ""
@@ -5100,15 +5553,20 @@ msgstr ""
msgid "The method required to load `%s' is not supported"
msgstr ""
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "Could not close temporary folder: %s"
+
+#: calendar/gui/e-tasks.c:558
msgid "Completing tasks..."
msgstr ""
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
msgid "Deleting selected objects..."
msgstr ""
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
msgid "Expunging"
msgstr ""
@@ -5120,17 +5578,17 @@ msgstr ""
msgid "_Delete this Appointment"
msgstr ""
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
#, c-format
msgid "Could not open the folder in `%s'"
msgstr ""
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
#, c-format
msgid "The method required to open `%s' is not supported"
msgstr ""
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
#, c-format
msgid "Opening calendar at %s"
msgstr ""
@@ -5191,19 +5649,51 @@ msgstr ""
msgid "September"
msgstr ""
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
msgid "At least one attendee is necessary"
msgstr ""
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
msgid "An organizer must be set."
msgstr ""
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+msgid "Event information"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:356
+msgid "Task information"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:358
+msgid "Journal information"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:360
+msgid "Free/Busy information"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:362
+msgid "Calendar information"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:398
+msgid "Updated"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:406
+msgid "Refresh"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
msgid "You must be an attendee of the event."
msgstr ""
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
msgid "Could not create the component editor factory"
msgstr ""
@@ -5392,12 +5882,45 @@ msgstr ""
msgid "Selected year (%Y)"
msgstr ""
+#: calendar/gui/print.c:2249
+msgid "Task"
+msgstr ""
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "Status: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2324
+#, c-format
+msgid "Priority: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2338
+#, c-format
+msgid "Percent Complete: %i"
+msgstr ""
+
+#: calendar/gui/print.c:2350
+#, c-format
+msgid "URL: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2364
+#, c-format
+msgid "Categories: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2375
+msgid "Contacts: "
+msgstr ""
+
#: calendar/gui/print.c:2430
msgid "Print Calendar"
msgstr ""
#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
#: ui/evolution-mail-message.xml.h:66
msgid "Print Preview"
@@ -5428,8 +5951,8 @@ msgid ""
"Really erase these tasks?"
msgstr ""
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
msgid "Do not ask me again."
msgstr ""
@@ -5481,6 +6004,10 @@ msgstr ""
msgid "Imports vCalendar files into Evolution"
msgstr ""
+#: calendar/importers/icalendar-importer.c:424
+msgid "Reminder!!"
+msgstr ""
+
#: calendar/importers/icalendar-importer.c:638
msgid "Calendar Events"
msgstr ""
@@ -5569,8 +6096,8 @@ msgstr ""
#: calendar/pcs/query.c:693
msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
msgstr ""
#: calendar/pcs/query.c:735
@@ -6497,639 +7024,651 @@ msgid "Asia/Macao"
msgstr ""
#: calendar/zones.h:230
-msgid "Asia/Magadan"
+msgid "Asia/Macau"
msgstr ""
#: calendar/zones.h:231
-msgid "Asia/Manila"
+msgid "Asia/Magadan"
msgstr ""
#: calendar/zones.h:232
-msgid "Asia/Muscat"
+msgid "Asia/Makassar"
msgstr ""
#: calendar/zones.h:233
-msgid "Asia/Nicosia"
+msgid "Asia/Manila"
msgstr ""
#: calendar/zones.h:234
-msgid "Asia/Novosibirsk"
+msgid "Asia/Muscat"
msgstr ""
#: calendar/zones.h:235
-msgid "Asia/Omsk"
+msgid "Asia/Nicosia"
msgstr ""
#: calendar/zones.h:236
-msgid "Asia/Phnom_Penh"
+msgid "Asia/Novosibirsk"
msgstr ""
#: calendar/zones.h:237
-msgid "Asia/Pontianak"
+msgid "Asia/Omsk"
msgstr ""
#: calendar/zones.h:238
-msgid "Asia/Pyongyang"
+msgid "Asia/Oral"
msgstr ""
#: calendar/zones.h:239
-msgid "Asia/Qatar"
+msgid "Asia/Phnom_Penh"
msgstr ""
#: calendar/zones.h:240
-msgid "Asia/Rangoon"
+msgid "Asia/Pontianak"
msgstr ""
#: calendar/zones.h:241
-msgid "Asia/Riyadh"
+msgid "Asia/Pyongyang"
msgstr ""
#: calendar/zones.h:242
-msgid "Asia/Saigon"
+msgid "Asia/Qatar"
msgstr ""
#: calendar/zones.h:243
-msgid "Asia/Sakhalin"
+msgid "Asia/Qyzylorda"
msgstr ""
#: calendar/zones.h:244
-msgid "Asia/Samarkand"
+msgid "Asia/Rangoon"
msgstr ""
#: calendar/zones.h:245
-msgid "Asia/Seoul"
+msgid "Asia/Riyadh"
msgstr ""
#: calendar/zones.h:246
-msgid "Asia/Shanghai"
+msgid "Asia/Saigon"
msgstr ""
#: calendar/zones.h:247
-msgid "Asia/Singapore"
+msgid "Asia/Sakhalin"
msgstr ""
#: calendar/zones.h:248
-msgid "Asia/Taipei"
+msgid "Asia/Samarkand"
msgstr ""
#: calendar/zones.h:249
-msgid "Asia/Tashkent"
+msgid "Asia/Seoul"
msgstr ""
#: calendar/zones.h:250
-msgid "Asia/Tbilisi"
+msgid "Asia/Shanghai"
msgstr ""
#: calendar/zones.h:251
-msgid "Asia/Tehran"
+msgid "Asia/Singapore"
msgstr ""
#: calendar/zones.h:252
-msgid "Asia/Thimphu"
+msgid "Asia/Taipei"
msgstr ""
#: calendar/zones.h:253
-msgid "Asia/Tokyo"
+msgid "Asia/Tashkent"
msgstr ""
#: calendar/zones.h:254
-msgid "Asia/Ujung_Pandang"
+msgid "Asia/Tbilisi"
msgstr ""
#: calendar/zones.h:255
-msgid "Asia/Ulaanbaatar"
+msgid "Asia/Tehran"
msgstr ""
#: calendar/zones.h:256
-msgid "Asia/Urumqi"
+msgid "Asia/Thimphu"
msgstr ""
#: calendar/zones.h:257
-msgid "Asia/Vientiane"
+msgid "Asia/Tokyo"
msgstr ""
#: calendar/zones.h:258
-msgid "Asia/Vladivostok"
+msgid "Asia/Ujung_Pandang"
msgstr ""
#: calendar/zones.h:259
-msgid "Asia/Yakutsk"
+msgid "Asia/Ulaanbaatar"
msgstr ""
#: calendar/zones.h:260
-msgid "Asia/Yekaterinburg"
+msgid "Asia/Urumqi"
msgstr ""
#: calendar/zones.h:261
-msgid "Asia/Yerevan"
+msgid "Asia/Vientiane"
msgstr ""
#: calendar/zones.h:262
-msgid "Atlantic/Azores"
+msgid "Asia/Vladivostok"
msgstr ""
#: calendar/zones.h:263
-msgid "Atlantic/Bermuda"
+msgid "Asia/Yakutsk"
msgstr ""
#: calendar/zones.h:264
-msgid "Atlantic/Canary"
+msgid "Asia/Yekaterinburg"
msgstr ""
#: calendar/zones.h:265
-msgid "Atlantic/Cape_Verde"
+msgid "Asia/Yerevan"
msgstr ""
#: calendar/zones.h:266
-msgid "Atlantic/Faeroe"
+msgid "Atlantic/Azores"
msgstr ""
#: calendar/zones.h:267
-msgid "Atlantic/Jan_Mayen"
+msgid "Atlantic/Bermuda"
msgstr ""
#: calendar/zones.h:268
-msgid "Atlantic/Madeira"
+msgid "Atlantic/Canary"
msgstr ""
#: calendar/zones.h:269
-msgid "Atlantic/Reykjavik"
+msgid "Atlantic/Cape_Verde"
msgstr ""
#: calendar/zones.h:270
-msgid "Atlantic/South_Georgia"
+msgid "Atlantic/Faeroe"
msgstr ""
#: calendar/zones.h:271
-msgid "Atlantic/St_Helena"
+msgid "Atlantic/Jan_Mayen"
msgstr ""
#: calendar/zones.h:272
-msgid "Atlantic/Stanley"
+msgid "Atlantic/Madeira"
msgstr ""
#: calendar/zones.h:273
-msgid "Australia/Adelaide"
+msgid "Atlantic/Reykjavik"
msgstr ""
#: calendar/zones.h:274
-msgid "Australia/Brisbane"
+msgid "Atlantic/South_Georgia"
msgstr ""
#: calendar/zones.h:275
-msgid "Australia/Broken_Hill"
+msgid "Atlantic/St_Helena"
msgstr ""
#: calendar/zones.h:276
-msgid "Australia/Darwin"
+msgid "Atlantic/Stanley"
msgstr ""
#: calendar/zones.h:277
-msgid "Australia/Hobart"
+msgid "Australia/Adelaide"
msgstr ""
#: calendar/zones.h:278
-msgid "Australia/Lindeman"
+msgid "Australia/Brisbane"
msgstr ""
#: calendar/zones.h:279
-msgid "Australia/Lord_Howe"
+msgid "Australia/Broken_Hill"
msgstr ""
#: calendar/zones.h:280
-msgid "Australia/Melbourne"
+msgid "Australia/Darwin"
msgstr ""
#: calendar/zones.h:281
-msgid "Australia/Perth"
+msgid "Australia/Hobart"
msgstr ""
#: calendar/zones.h:282
-msgid "Australia/Sydney"
+msgid "Australia/Lindeman"
msgstr ""
#: calendar/zones.h:283
-msgid "Europe/Amsterdam"
+msgid "Australia/Lord_Howe"
msgstr ""
#: calendar/zones.h:284
-msgid "Europe/Andorra"
+msgid "Australia/Melbourne"
msgstr ""
#: calendar/zones.h:285
-msgid "Europe/Athens"
+msgid "Australia/Perth"
msgstr ""
#: calendar/zones.h:286
-msgid "Europe/Belfast"
+msgid "Australia/Sydney"
msgstr ""
#: calendar/zones.h:287
-msgid "Europe/Belgrade"
+msgid "Europe/Amsterdam"
msgstr ""
#: calendar/zones.h:288
-msgid "Europe/Berlin"
+msgid "Europe/Andorra"
msgstr ""
#: calendar/zones.h:289
-msgid "Europe/Bratislava"
+msgid "Europe/Athens"
msgstr ""
#: calendar/zones.h:290
-msgid "Europe/Brussels"
+msgid "Europe/Belfast"
msgstr ""
#: calendar/zones.h:291
-msgid "Europe/Bucharest"
+msgid "Europe/Belgrade"
msgstr ""
#: calendar/zones.h:292
-msgid "Europe/Budapest"
+msgid "Europe/Berlin"
msgstr ""
#: calendar/zones.h:293
-msgid "Europe/Chisinau"
+msgid "Europe/Bratislava"
msgstr ""
#: calendar/zones.h:294
-msgid "Europe/Copenhagen"
+msgid "Europe/Brussels"
msgstr ""
#: calendar/zones.h:295
-msgid "Europe/Dublin"
+msgid "Europe/Bucharest"
msgstr ""
#: calendar/zones.h:296
-msgid "Europe/Gibraltar"
+msgid "Europe/Budapest"
msgstr ""
#: calendar/zones.h:297
-msgid "Europe/Helsinki"
+msgid "Europe/Chisinau"
msgstr ""
#: calendar/zones.h:298
-msgid "Europe/Istanbul"
+msgid "Europe/Copenhagen"
msgstr ""
#: calendar/zones.h:299
-msgid "Europe/Kaliningrad"
+msgid "Europe/Dublin"
msgstr ""
#: calendar/zones.h:300
-msgid "Europe/Kiev"
+msgid "Europe/Gibraltar"
msgstr ""
#: calendar/zones.h:301
-msgid "Europe/Lisbon"
+msgid "Europe/Helsinki"
msgstr ""
#: calendar/zones.h:302
-msgid "Europe/Ljubljana"
+msgid "Europe/Istanbul"
msgstr ""
#: calendar/zones.h:303
-msgid "Europe/London"
+msgid "Europe/Kaliningrad"
msgstr ""
#: calendar/zones.h:304
-msgid "Europe/Luxembourg"
+msgid "Europe/Kiev"
msgstr ""
#: calendar/zones.h:305
-msgid "Europe/Madrid"
+msgid "Europe/Lisbon"
msgstr ""
#: calendar/zones.h:306
-msgid "Europe/Malta"
+msgid "Europe/Ljubljana"
msgstr ""
#: calendar/zones.h:307
-msgid "Europe/Minsk"
+msgid "Europe/London"
msgstr ""
#: calendar/zones.h:308
-msgid "Europe/Monaco"
+msgid "Europe/Luxembourg"
msgstr ""
#: calendar/zones.h:309
-msgid "Europe/Moscow"
+msgid "Europe/Madrid"
msgstr ""
#: calendar/zones.h:310
-msgid "Europe/Nicosia"
+msgid "Europe/Malta"
msgstr ""
#: calendar/zones.h:311
-msgid "Europe/Oslo"
+msgid "Europe/Minsk"
msgstr ""
#: calendar/zones.h:312
-msgid "Europe/Paris"
+msgid "Europe/Monaco"
msgstr ""
#: calendar/zones.h:313
-msgid "Europe/Prague"
+msgid "Europe/Moscow"
msgstr ""
#: calendar/zones.h:314
-msgid "Europe/Riga"
+msgid "Europe/Nicosia"
msgstr ""
#: calendar/zones.h:315
-msgid "Europe/Rome"
+msgid "Europe/Oslo"
msgstr ""
#: calendar/zones.h:316
-msgid "Europe/Samara"
+msgid "Europe/Paris"
msgstr ""
#: calendar/zones.h:317
-msgid "Europe/San_Marino"
+msgid "Europe/Prague"
msgstr ""
#: calendar/zones.h:318
-msgid "Europe/Sarajevo"
+msgid "Europe/Riga"
msgstr ""
#: calendar/zones.h:319
-msgid "Europe/Simferopol"
+msgid "Europe/Rome"
msgstr ""
#: calendar/zones.h:320
-msgid "Europe/Skopje"
+msgid "Europe/Samara"
msgstr ""
#: calendar/zones.h:321
-msgid "Europe/Sofia"
+msgid "Europe/San_Marino"
msgstr ""
#: calendar/zones.h:322
-msgid "Europe/Stockholm"
+msgid "Europe/Sarajevo"
msgstr ""
#: calendar/zones.h:323
-msgid "Europe/Tallinn"
+msgid "Europe/Simferopol"
msgstr ""
#: calendar/zones.h:324
-msgid "Europe/Tirane"
+msgid "Europe/Skopje"
msgstr ""
#: calendar/zones.h:325
-msgid "Europe/Uzhgorod"
+msgid "Europe/Sofia"
msgstr ""
#: calendar/zones.h:326
-msgid "Europe/Vaduz"
+msgid "Europe/Stockholm"
msgstr ""
#: calendar/zones.h:327
-msgid "Europe/Vatican"
+msgid "Europe/Tallinn"
msgstr ""
#: calendar/zones.h:328
-msgid "Europe/Vienna"
+msgid "Europe/Tirane"
msgstr ""
#: calendar/zones.h:329
-msgid "Europe/Vilnius"
+msgid "Europe/Uzhgorod"
msgstr ""
#: calendar/zones.h:330
-msgid "Europe/Warsaw"
+msgid "Europe/Vaduz"
msgstr ""
#: calendar/zones.h:331
-msgid "Europe/Zagreb"
+msgid "Europe/Vatican"
msgstr ""
#: calendar/zones.h:332
-msgid "Europe/Zaporozhye"
+msgid "Europe/Vienna"
msgstr ""
#: calendar/zones.h:333
-msgid "Europe/Zurich"
+msgid "Europe/Vilnius"
msgstr ""
#: calendar/zones.h:334
-msgid "Indian/Antananarivo"
+msgid "Europe/Warsaw"
msgstr ""
#: calendar/zones.h:335
-msgid "Indian/Chagos"
+msgid "Europe/Zagreb"
msgstr ""
#: calendar/zones.h:336
-msgid "Indian/Christmas"
+msgid "Europe/Zaporozhye"
msgstr ""
#: calendar/zones.h:337
-msgid "Indian/Cocos"
+msgid "Europe/Zurich"
msgstr ""
#: calendar/zones.h:338
+msgid "Indian/Antananarivo"
+msgstr ""
+
+#: calendar/zones.h:339
+msgid "Indian/Chagos"
+msgstr ""
+
+#: calendar/zones.h:340
+msgid "Indian/Christmas"
+msgstr ""
+
+#: calendar/zones.h:341
+msgid "Indian/Cocos"
+msgstr ""
+
+#: calendar/zones.h:342
#, fuzzy
msgid "Indian/Comoro"
msgstr "Comoros"
-#: calendar/zones.h:339
+#: calendar/zones.h:343
msgid "Indian/Kerguelen"
msgstr ""
-#: calendar/zones.h:340
+#: calendar/zones.h:344
msgid "Indian/Mahe"
msgstr ""
-#: calendar/zones.h:341
+#: calendar/zones.h:345
msgid "Indian/Maldives"
msgstr ""
-#: calendar/zones.h:342
+#: calendar/zones.h:346
msgid "Indian/Mauritius"
msgstr ""
-#: calendar/zones.h:343
+#: calendar/zones.h:347
msgid "Indian/Mayotte"
msgstr ""
-#: calendar/zones.h:344
+#: calendar/zones.h:348
msgid "Indian/Reunion"
msgstr ""
-#: calendar/zones.h:345
+#: calendar/zones.h:349
msgid "Pacific/Apia"
msgstr ""
-#: calendar/zones.h:346
+#: calendar/zones.h:350
msgid "Pacific/Auckland"
msgstr ""
-#: calendar/zones.h:347
+#: calendar/zones.h:351
msgid "Pacific/Chatham"
msgstr ""
-#: calendar/zones.h:348
+#: calendar/zones.h:352
msgid "Pacific/Easter"
msgstr ""
-#: calendar/zones.h:349
+#: calendar/zones.h:353
msgid "Pacific/Efate"
msgstr ""
-#: calendar/zones.h:350
+#: calendar/zones.h:354
msgid "Pacific/Enderbury"
msgstr ""
-#: calendar/zones.h:351
+#: calendar/zones.h:355
msgid "Pacific/Fakaofo"
msgstr ""
-#: calendar/zones.h:352
+#: calendar/zones.h:356
msgid "Pacific/Fiji"
msgstr ""
-#: calendar/zones.h:353
+#: calendar/zones.h:357
msgid "Pacific/Funafuti"
msgstr ""
-#: calendar/zones.h:354
+#: calendar/zones.h:358
msgid "Pacific/Galapagos"
msgstr ""
-#: calendar/zones.h:355
+#: calendar/zones.h:359
msgid "Pacific/Gambier"
msgstr ""
-#: calendar/zones.h:356
+#: calendar/zones.h:360
msgid "Pacific/Guadalcanal"
msgstr ""
-#: calendar/zones.h:357
+#: calendar/zones.h:361
msgid "Pacific/Guam"
msgstr ""
-#: calendar/zones.h:358
+#: calendar/zones.h:362
msgid "Pacific/Honolulu"
msgstr ""
-#: calendar/zones.h:359
+#: calendar/zones.h:363
msgid "Pacific/Johnston"
msgstr ""
-#: calendar/zones.h:360
+#: calendar/zones.h:364
msgid "Pacific/Kiritimati"
msgstr ""
-#: calendar/zones.h:361
+#: calendar/zones.h:365
msgid "Pacific/Kosrae"
msgstr ""
-#: calendar/zones.h:362
+#: calendar/zones.h:366
msgid "Pacific/Kwajalein"
msgstr ""
-#: calendar/zones.h:363
+#: calendar/zones.h:367
msgid "Pacific/Majuro"
msgstr ""
-#: calendar/zones.h:364
+#: calendar/zones.h:368
msgid "Pacific/Marquesas"
msgstr ""
-#: calendar/zones.h:365
+#: calendar/zones.h:369
msgid "Pacific/Midway"
msgstr ""
-#: calendar/zones.h:366
+#: calendar/zones.h:370
msgid "Pacific/Nauru"
msgstr ""
-#: calendar/zones.h:367
+#: calendar/zones.h:371
msgid "Pacific/Niue"
msgstr ""
-#: calendar/zones.h:368
+#: calendar/zones.h:372
msgid "Pacific/Norfolk"
msgstr ""
-#: calendar/zones.h:369
+#: calendar/zones.h:373
msgid "Pacific/Noumea"
msgstr ""
-#: calendar/zones.h:370
+#: calendar/zones.h:374
msgid "Pacific/Pago_Pago"
msgstr ""
-#: calendar/zones.h:371
+#: calendar/zones.h:375
msgid "Pacific/Palau"
msgstr ""
-#: calendar/zones.h:372
+#: calendar/zones.h:376
msgid "Pacific/Pitcairn"
msgstr ""
-#: calendar/zones.h:373
+#: calendar/zones.h:377
msgid "Pacific/Ponape"
msgstr ""
-#: calendar/zones.h:374
+#: calendar/zones.h:378
msgid "Pacific/Port_Moresby"
msgstr ""
-#: calendar/zones.h:375
+#: calendar/zones.h:379
msgid "Pacific/Rarotonga"
msgstr ""
-#: calendar/zones.h:376
+#: calendar/zones.h:380
msgid "Pacific/Saipan"
msgstr ""
-#: calendar/zones.h:377
+#: calendar/zones.h:381
msgid "Pacific/Tahiti"
msgstr ""
-#: calendar/zones.h:378
+#: calendar/zones.h:382
msgid "Pacific/Tarawa"
msgstr ""
-#: calendar/zones.h:379
+#: calendar/zones.h:383
msgid "Pacific/Tongatapu"
msgstr ""
-#: calendar/zones.h:380
+#: calendar/zones.h:384
msgid "Pacific/Truk"
msgstr ""
-#: calendar/zones.h:381
+#: calendar/zones.h:385
msgid "Pacific/Wake"
msgstr ""
-#: calendar/zones.h:382
+#: calendar/zones.h:386
msgid "Pacific/Wallis"
msgstr ""
-#: calendar/zones.h:383
+#: calendar/zones.h:387
msgid "Pacific/Yap"
msgstr ""
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
msgid "Signing is not supported by this cipher"
msgstr ""
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr ""
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
msgid "Verifying is not supported by this cipher"
msgstr ""
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
msgid "Encryption is not supported by this cipher"
msgstr ""
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
msgid "Decryption is not supported by this cipher"
msgstr ""
@@ -7137,12 +7676,12 @@ msgstr ""
msgid "Unable to create cache path"
msgstr ""
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
#, fuzzy, c-format
msgid "Could not remove cache entry: %s: %s"
msgstr "Could not close temporary folder: %s"
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
#, c-format
msgid ""
"Could not write log entry: %s\n"
@@ -7150,7 +7689,7 @@ msgid ""
"reconnect to the network."
msgstr ""
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
#, c-format
msgid ""
"Could not open `%s':\n"
@@ -7158,11 +7697,16 @@ msgid ""
"Changes made to this folder will not be resynchronized."
msgstr ""
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
msgid "Resynchronizing with server"
msgstr ""
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Synchronising \"%s\""
+
+#: camel/camel-disco-store.c:367
msgid "You must be working online to complete this operation"
msgstr ""
@@ -7170,56 +7714,67 @@ msgstr ""
msgid "Syncing folders"
msgstr "Synchronising folders"
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr ""
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
#, c-format
msgid "Error executing filter: %s: %s"
msgstr ""
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
msgid "Unable to open spool folder"
msgstr ""
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
msgid "Unable to process spool folder"
msgstr ""
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
msgid "Getting message %d (%d%%)"
msgstr ""
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
msgid "Cannot open message"
msgstr "Can not open message"
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
#, c-format
msgid "Failed on message %d"
msgstr ""
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
msgid "Syncing folder"
msgstr "Synchronising folder"
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
#, c-format
msgid "Getting message %d of %d"
msgstr ""
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
#, c-format
msgid "Failed at message %d of %d"
msgstr ""
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
msgid "Failed to retrieve message"
msgstr ""
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr ""
@@ -7249,25 +7804,100 @@ msgstr ""
msgid "Performing query on unknown header: %s"
msgstr ""
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
#, c-format
msgid "Unsupported operation: append message: for %s"
msgstr ""
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
#, c-format
msgid "Unsupported operation: search by expression: for %s"
msgstr ""
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
#, c-format
msgid "Unsupported operation: search by uids: for %s"
msgstr ""
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
msgid "Moving messages"
msgstr ""
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "Can not open message"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr ""
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:782
+msgid "No data provided"
+msgstr ""
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Can not encrypt this message: no recipients specified"
+
+#: camel/camel-gpg-context.c:1077
+#, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:1083
+#, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr ""
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+msgid "Failed to execute gpg."
+msgstr ""
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "Can not verify this message: could not create temporary file: %s"
+
#: camel/camel-lock-client.c:111
#, c-format
msgid "Cannot build locking helper pipe: %s"
@@ -7363,81 +7993,22 @@ msgstr ""
msgid "Error copying mail temp file: %s"
msgstr ""
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
msgstr ""
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
msgstr ""
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Can not sign this message: no plaintext to sign"
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr "Can not sign this message: no password provided"
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Can not sign this message: could not create pipe to GPGP/PGP: %s"
-
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "Can not sign this message: no plaintext to clearsign"
-
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "Can not verify this message: no plaintext to verify"
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Can not verify this message: could not create pipe to GPGP/PGP: %s"
-
-#: camel/camel-pgp-context.c:1004
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr "Can not verify this message: could not create temporary file: %s"
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "Can not encrypt this message: no plaintext to encrypt"
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Can not encrypt this message: no password provided"
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Can not encrypt this message: could not create pipe to GPGP/PGP: %s"
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "Can not encrypt this message: no recipients specified"
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr "Can not decrypt this message: no ciphertext to decrypt"
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr "Can not decrypt this message: no password provided"
-
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Can not decrypt this message: could not create pipe to GPGP/PGP: %s"
-
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
msgid "This is a digitally signed message part"
msgstr ""
+#: camel/camel-multipart-signed.c:678
+msgid "parse error"
+msgstr ""
+
#: camel/camel-provider.c:131
#, c-format
msgid "Could not load %s: Module loading not supported on this system."
@@ -7453,43 +8024,6 @@ msgstr ""
msgid "Could not load %s: No initialization code in module."
msgstr ""
-#: camel/camel-remote-store.c:199
-#, c-format
-msgid "%s server %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr ""
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:258
-msgid "(unknown host)"
-msgstr ""
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr ""
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr ""
-
#: camel/camel-sasl-anonymous.c:33
msgid "Anonymous"
msgstr ""
@@ -7583,7 +8117,7 @@ msgid ""
msgstr ""
#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
msgid "Bad authentication response from server."
msgstr ""
@@ -7609,10 +8143,8 @@ msgid ""
"Password Authentication."
msgstr ""
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
msgstr ""
#: camel/camel-sasl-popb4smtp.c:34
@@ -7640,50 +8172,50 @@ msgstr ""
msgid "Regular expression compilation failed: %s: %s"
msgstr ""
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
#, c-format
msgid "URL '%s' needs a username component"
msgstr ""
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
#, c-format
msgid "URL '%s' needs a host component"
msgstr ""
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
#, c-format
msgid "URL '%s' needs a path component"
msgstr ""
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
#, c-format
msgid "Resolving: %s"
msgstr ""
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
#, c-format
msgid "Failure in name lookup: %s"
msgstr ""
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
#, c-format
msgid "Host lookup failed: %s: host not found"
msgstr ""
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
#, c-format
msgid "Host lookup failed: %s: unknown reason"
msgstr ""
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
msgid "Resolving address"
msgstr ""
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
msgid "Host lookup failed: host not found"
msgstr ""
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
msgid "Host lookup failed: unknown reason"
msgstr ""
@@ -7744,11 +8276,11 @@ msgstr ""
msgid "Failed to verify certificates."
msgstr ""
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
msgid "Cannot get folder: Invalid operation on this store"
msgstr "Can not get folder: Invalid operation on this store"
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
msgid "Cannot create folder: Invalid operation on this store"
msgstr "Can not create folder: Invalid operation on this store"
@@ -7771,7 +8303,7 @@ msgstr ""
#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
#, c-format
msgid ""
"Issuer: %s\n"
@@ -7780,16 +8312,16 @@ msgid ""
"Signature: %s"
msgstr ""
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
msgid "GOOD"
msgstr ""
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
msgid "BAD"
msgstr ""
#. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -7804,15 +8336,15 @@ msgstr ""
msgid "Could not parse URL `%s'"
msgstr ""
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
#, c-format
msgid "No such message %s in %s"
msgstr ""
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr ""
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "You can not copy messages from this rubbish bin."
#: camel/camel-vee-store.c:262
#, c-format
@@ -7834,68 +8366,77 @@ msgstr "Can not rename folder: %s: Invalid operation"
msgid "Cannot rename folder: %s: No such folder"
msgstr "Can not rename folder: %s: No such folder"
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "You can not copy messages from this rubbish bin."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr ""
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:382
#, c-format
msgid "Unexpected response from IMAP server: %s"
msgstr ""
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
#, c-format
msgid "IMAP command failed: %s"
msgstr ""
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
msgid "Server response ended too soon."
msgstr ""
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
#, c-format
msgid "IMAP server response did not contain %s information"
msgstr ""
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
#, c-format
msgid "Unexpected OK response from IMAP server: %s"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
#, c-format
msgid "Could not create directory %s: %s"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
#, c-format
msgid "Could not load summary for %s"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
msgid "Folder was destroyed and recreated on server."
msgstr ""
#. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
msgid "Scanning for changed messages"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
msgid "This message is not currently available"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
msgid "Fetching summary information for new messages"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
msgid "Scanning for new messages"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
msgid "Could not find message body in FETCH response."
msgstr ""
@@ -7948,32 +8489,79 @@ msgstr ""
msgid "For reading and storing mail on IMAP servers."
msgstr ""
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr ""
+
#: camel/providers/imap/camel-imap-provider.c:82
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, c-format
+msgid "IMAP server %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+msgid "SSL/TLS extension not supported."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+msgid "SSL negotiations failed"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:869
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
#, c-format
msgid "No support for authentication type %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
msgid "You didn't enter a password."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -7981,68 +8569,85 @@ msgid ""
"\n"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
#, c-format
msgid "No such folder %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
msgid "The parent folder is not allowed to contain subfolders"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:48
-msgid "MH-format mail directories"
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, c-format
+msgid "~%s (%s)"
+msgstr ""
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "Can not open mailbox: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, c-format
+msgid "%s (%s)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
msgstr ""
#: camel/providers/local/camel-local-provider.c:49
+msgid "MH-format mail directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:50
msgid "For storing local mail in MH-like mail directories."
msgstr ""
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
msgid "Local delivery"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
msgid "For retrieving local mail from standard mbox formated spools."
msgstr ""
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
#: camel/providers/local/camel-local-provider.c:94
msgid "Apply filters to new messages in INBOX"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
msgid "Maildir-format mail directories"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
msgid "For storing local mail in maildir directories."
msgstr ""
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
msgstr ""
#: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
+msgid "Standard Unix mbox spool or directory"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
msgstr ""
#: camel/providers/local/camel-local-store.c:139
#: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
#, c-format
msgid "Store root %s is not an absolute path"
msgstr ""
@@ -8068,7 +8673,7 @@ msgstr ""
msgid "Local mail file %s"
msgstr ""
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr ""
@@ -8088,33 +8693,31 @@ msgstr ""
msgid "Could not delete folder index file `%s': %s"
msgstr ""
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
#, c-format
msgid "Could not save summary: %s: %s"
msgstr ""
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
msgid "Unable to add message to summary: unknown reason"
msgstr ""
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
msgid "Maildir append message cancelled"
msgstr ""
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
#, c-format
msgid "Cannot append message to maildir folder: %s: %s"
msgstr "Can not append message to maildir folder: %s: %s"
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
#, c-format
msgid ""
"Cannot get message: %s\n"
@@ -8123,20 +8726,19 @@ msgstr ""
"Can not get message: %s\n"
" %s"
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
msgid "No such message"
msgstr ""
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
msgid "Invalid message contents"
msgstr ""
#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
#, c-format
msgid ""
"Could not open folder `%s':\n"
@@ -8145,13 +8747,13 @@ msgstr ""
#: camel/providers/local/camel-maildir-store.c:110
#: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
#, c-format
msgid "Folder `%s' does not exist."
msgstr ""
#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
#, c-format
msgid ""
"Could not create folder `%s':\n"
@@ -8165,7 +8767,7 @@ msgstr ""
#: camel/providers/local/camel-maildir-store.c:167
#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
#, c-format
msgid "Could not delete folder `%s': %s"
msgstr ""
@@ -8174,8 +8776,8 @@ msgstr ""
msgid "not a maildir directory"
msgstr ""
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
#, c-format
msgid "Could not scan folder `%s': %s"
msgstr ""
@@ -8194,45 +8796,37 @@ msgstr ""
msgid "Checking for new messages"
msgstr ""
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's. This is a bit tricky.
#: camel/providers/local/camel-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
msgid "Storing folder"
msgstr "Synchronising folder"
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
#, c-format
msgid "Cannot create folder lock on %s: %s"
msgstr "Can not create folder lock on %s: %s"
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
#, c-format
msgid "Cannot open mailbox: %s: %s\n"
msgstr "Can not open mailbox: %s: %s\n"
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
msgid "Mail append cancelled"
msgstr ""
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
#, c-format
msgid "Cannot append message to mbox file: %s: %s"
msgstr "Can not append message to mbox file: %s: %s"
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
#, c-format
msgid ""
"Cannot get message: %s from folder %s\n"
@@ -8241,13 +8835,11 @@ msgstr ""
"Can not get message: %s from folder %s\n"
" %s"
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
msgid "The folder appears to be irrecoverably corrupted."
msgstr ""
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
msgid "Message construction failed: Corrupt mailbox?"
msgstr ""
@@ -8284,174 +8876,155 @@ msgstr ""
msgid "Folder `%s' is not empty. Not deleted."
msgstr ""
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
#, c-format
msgid "Could not open folder: %s: %s"
msgstr ""
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
#, c-format
msgid "Fatal mail parser error near position %ld in folder %s"
msgstr ""
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
#, c-format
msgid "Cannot check folder: %s: %s"
msgstr "Synchronising folder failed: %s: %s"
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
#, c-format
msgid "Could not open file: %s: %s"
msgstr ""
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr ""
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Error writing to temporary mailbox: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Writing to temporary mailbox failed: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
#, c-format
msgid "Could not close source folder %s: %s"
msgstr ""
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
#, c-format
msgid "Could not close temp folder: %s"
msgstr "Could not close temporary folder: %s"
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
#, c-format
msgid "Could not rename folder: %s"
msgstr ""
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
#, c-format
msgid "Unknown error: %s"
msgstr ""
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Error writing to temporary mailbox: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Writing to temporary mailbox failed: %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
msgid "MH append message cancelled"
msgstr ""
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
#, c-format
msgid "Cannot append message to mh folder: %s: %s"
msgstr "Can not append message to mh folder: %s: %s"
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
#, c-format
msgid "`%s' is not a directory."
msgstr ""
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
#, c-format
msgid "Cannot open MH directory path: %s: %s"
msgstr "Can not open MH directory path: %s: %s"
-#: camel/providers/local/camel-spool-folder.c:515
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "Can not append message to spool file: %s: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Spool folders can not be deleted"
-#: camel/providers/local/camel-spool-store.c:115
+#: camel/providers/local/camel-spool-store.c:128
#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
+msgid "Spool `%s' is not a regular file or directory"
msgstr ""
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
#, c-format
msgid "Folder `%s/%s' does not exist."
msgstr ""
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
#, c-format
msgid "Spool mail file %s"
msgstr ""
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Spool folders can not be deleted"
+
+#: camel/providers/local/camel-spool-store.c:182
msgid "Spool folders cannot be renamed"
msgstr ""
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
msgid "Spool folders cannot be deleted"
msgstr "Spool folders can not be deleted"
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
#, c-format
msgid "Could not sync temporary folder %s: %s"
msgstr ""
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
#, c-format
msgid "Could not sync spool folder %s: %s"
msgstr ""
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
#, c-format
msgid ""
"Could not sync spool folder %s: %s\n"
"Folder may be corrupt, copy saved in `%s'"
msgstr ""
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, c-format
-msgid "Mail tree %s"
-msgstr ""
-
#: camel/providers/nntp/camel-nntp-provider.c:41
msgid "USENET news"
msgstr ""
@@ -8460,12 +9033,22 @@ msgstr ""
msgid "This is a provider for reading from and posting toUSENET newsgroups."
msgstr ""
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
#, c-format
msgid "USENET News via %s"
msgstr ""
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
msgid ""
"This option will authenticate with the NNTP server using a plaintext "
"password."
@@ -8565,7 +9148,7 @@ msgstr ""
msgid "Delete after %s day(s)"
msgstr ""
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
msgid "POP"
msgstr ""
@@ -8586,67 +9169,59 @@ msgid ""
"claim to support it."
msgstr ""
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
#, c-format
msgid "Failed to connect to POP server %s in secure mode: %s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-store.c:210
-msgid "SSL/TLS extension not supported."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-msgid "SSL negotiations failed"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
#, fuzzy, c-format
msgid "Could not connect to POP server on %s"
msgstr "Could not close temporary folder: %s"
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
msgid ""
"Unable to connect to POP server.\n"
"No support for requested authentication mechanism."
msgstr ""
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
#, c-format
msgid "SASL `%s' Login failed: %s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
msgid "SASL Protocol error"
msgstr ""
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
#, c-format
msgid "I/O Error: %s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
#, c-format
msgid "%sPlease enter the POP password for %s@%s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
#, c-format
msgid ""
"Unable to connect to POP server.\n"
"Error sending password: %s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
#, c-format
msgid "No such folder `%s'."
msgstr ""
#: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
msgid "Sendmail"
msgstr ""
@@ -8806,41 +9381,41 @@ msgstr ""
msgid "Authentication required"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
#, c-format
msgid "Welcome response error: %s: possibly non-fatal"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
#, c-format
msgid "Failed to connect to SMTP server %s in secure mode: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
msgid "server does not appear to support SSL"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
#, c-format
msgid "STARTTLS request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
msgid "STARTTLS response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:458
+#: camel/providers/smtp/camel-smtp-transport.c:461
#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+msgid "SMTP server %s does not support requested authentication type %s."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
#, c-format
msgid "%sPlease enter the SMTP password for %s@%s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
#, c-format
msgid ""
"Unable to authenticate to SMTP server.\n"
@@ -8848,89 +9423,89 @@ msgid ""
"\n"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
#, c-format
msgid "SMTP server %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
#, c-format
msgid "SMTP mail delivery via %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
msgid "Cannot send message: sender address not valid."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
msgid "Sending message"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
msgid "Cannot send message: no recipients defined."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
#, fuzzy
msgid "Cannot send message: one or more invalid recipients"
msgstr "Can not encrypt this message: no recipients specified"
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
msgid "SMTP Greeting"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
#, c-format
msgid "HELO request timed out: %s: non-fatal"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
#, c-format
msgid "HELO response error: %s: non-fatal"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
msgid "SMTP Authentication"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
msgid "Error creating SASL authentication object."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
#, c-format
msgid "AUTH request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
msgid "AUTH request failed."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
msgid "Bad authentication response from server.\n"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
#, c-format
msgid "MAIL FROM request timed out: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
msgid "MAIL FROM response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
#, c-format
msgid "RCPT TO request timed out: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
#, c-format
msgid "RCPT TO <%s> failed"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
#, c-format
msgid "DATA request timed out: %s: mail not sent"
msgstr ""
@@ -8938,35 +9513,35 @@ msgstr ""
#. we should have gotten instructions on how to use the DATA command:
#. * 354 Enter mail, end with "." on a line by itself
#.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
msgid "DATA response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
#, c-format
msgid "DATA send timed out: message termination: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
msgid "DATA termination response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
#, c-format
msgid "RSET request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
msgid "RSET response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
#, c-format
msgid "QUIT request timed out: %s: non-fatal"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
msgid "QUIT response error"
msgstr ""
@@ -9039,52 +9614,52 @@ msgstr ""
msgid "Suggest automatic display of attachment"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
msgid "Click here for the address book"
msgstr ""
#.
#. * From:
#.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
msgid "From:"
msgstr ""
#.
#. * Reply-To:
#.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
msgid "Reply-To:"
msgstr ""
#.
#. * Subject:
#.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
msgid "Subject:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
msgid "To:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
msgid "Enter the recipients of the message"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
msgid "Cc:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
msgid "Bcc:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -9095,102 +9670,131 @@ msgstr ""
msgid "Attach a file"
msgstr ""
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "Could not close temporary folder: %s"
+
+#: composer/e-msg-composer.c:774
#, c-format
msgid ""
"Error while reading file %s:\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
msgid "Warning!"
msgstr ""
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
msgid "File exists, overwrite?"
msgstr ""
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
#, c-format
msgid "Error saving file: %s"
msgstr ""
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
#, c-format
msgid "Error loading file: %s"
msgstr ""
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
#, c-format
msgid "Error accessing file: %s"
msgstr ""
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
msgid "Unable to retrieve message from editor"
msgstr ""
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
#, c-format
msgid ""
"Unable to seek on file: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
#, c-format
msgid ""
"Unable to truncate file: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
#, c-format
msgid ""
"Error autosaving message: %s\n"
" %s"
msgstr ""
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
msgid ""
"Ximian Evolution has found unsaved files from a previous session.\n"
"Would you like to try to recover them?"
msgstr ""
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
msgid ""
"This message has not been sent.\n"
"\n"
"Do you wish to save your changes?"
msgstr ""
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
msgid "Warning: Modified Message"
msgstr ""
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
msgid "Open file"
msgstr ""
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
msgid "Insert File"
msgstr ""
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+msgid "Signature:"
+msgstr ""
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+msgid "Set as default"
+msgstr ""
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
msgid "Compose a message"
msgstr ""
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
msgid ""
"Could not create composer window:\n"
"Unable to activate address selector control."
msgstr ""
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component."
msgstr ""
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
#: composer/evolution-composer.c:376
msgid ""
"Could not create composer window, because you have not yet\n"
@@ -9250,7 +9854,7 @@ msgstr ""
msgid "Subject does not contain"
msgstr ""
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
#: mail/mail-display.c:122
msgid ""
"A file by that name already exists.\n"
@@ -9392,7 +9996,7 @@ msgstr ""
msgid "minute"
msgstr ""
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
msgid "seconds"
msgstr ""
@@ -9459,7 +10063,7 @@ msgstr ""
msgid "ago"
msgstr ""
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
msgid "%b %d %l:%M %p"
msgstr ""
@@ -9471,6 +10075,19 @@ msgstr ""
msgid "Filter Rules"
msgstr ""
+#: filter/filter-file.c:176
+msgid "You must specify a file name"
+msgstr ""
+
+#: filter/filter-file.c:186
+#, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr ""
+
+#: filter/filter-file.c:286
+msgid "Choose a file"
+msgstr ""
+
#. and now for the action area
#: filter/filter-filter.c:488
msgid "Then"
@@ -9487,7 +10104,7 @@ msgid ""
msgstr ""
#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
msgid "Select Folder"
msgstr ""
@@ -9498,7 +10115,11 @@ msgid ""
"%s"
msgstr ""
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
msgid "Test"
msgstr ""
@@ -9527,7 +10148,7 @@ msgid "if all criteria are met"
msgstr ""
#: filter/filter-rule.c:769
-msgid "if any criterion are met"
+msgid "if any criteria are met"
msgstr ""
#: filter/filter-rule.c:780
@@ -9604,189 +10225,197 @@ msgid "Beep"
msgstr ""
#: filter/libfilter-i18n.h:7
-msgid "contains"
+msgid "Command"
msgstr ""
#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
+msgid "contains"
msgstr ""
#: filter/libfilter-i18n.h:9
-msgid "Date received"
+msgid "Copy to Folder"
msgstr ""
#: filter/libfilter-i18n.h:10
+msgid "Date received"
+msgstr ""
+
+#: filter/libfilter-i18n.h:11
msgid "Date sent"
msgstr ""
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
msgid "Deleted"
msgstr ""
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
msgid "does not contain"
msgstr ""
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
msgid "does not end with"
msgstr ""
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
msgid "does not exist"
msgstr ""
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
msgid "does not sound like"
msgstr ""
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
msgid "does not start with"
msgstr ""
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
msgid "Do Not Exist"
msgstr ""
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
msgid "Draft"
msgstr ""
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
msgid "ends with"
msgstr ""
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
msgid "Execute Shell Command"
msgstr ""
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
msgid "Exist"
msgstr ""
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
msgid "exists"
msgstr ""
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
msgid "Expression"
msgstr ""
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
msgid "Follow Up"
msgstr ""
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
#: mail/mail-config.glade.h:62
msgid "Important"
msgstr ""
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
msgid "is"
msgstr ""
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
msgid "is after"
msgstr ""
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
msgid "is before"
msgstr ""
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
msgid "is Flagged"
msgstr ""
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
msgid "is greater than"
msgstr ""
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
msgid "is less than"
msgstr ""
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
msgid "is not"
msgstr ""
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
msgid "is not Flagged"
msgstr ""
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+msgid "Label"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
msgid "Mailing list"
msgstr ""
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
msgid "Message Body"
msgstr ""
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
msgid "Message Header"
msgstr ""
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
msgid "Move to Folder"
msgstr ""
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
msgid "Play Sound"
msgstr ""
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
msgid "Read"
msgstr ""
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
msgid "Recipients"
msgstr ""
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
msgid "Regex Match"
msgstr ""
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
msgid "Replied to"
msgstr ""
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
msgid "Score"
msgstr ""
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
msgid "Sender"
msgstr ""
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
msgid "Set Status"
msgstr ""
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
msgid "Size (kB)"
msgstr ""
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
msgid "sounds like"
msgstr ""
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
msgid "Source Account"
msgstr ""
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
msgid "Specific header"
msgstr ""
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
msgid "starts with"
msgstr ""
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
msgid "Stop Processing"
msgstr ""
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
msgid "Subject"
msgstr ""
@@ -9841,7 +10470,8 @@ msgid "Scanning %s"
msgstr ""
#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
msgid "Mail"
msgstr ""
@@ -9855,10 +10485,6 @@ msgstr ""
msgid "Elm"
msgstr ""
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr ""
-
#: importers/evolution-gnomecard-importer.c:246
msgid ""
"Evolution has found GnomeCard files.\n"
@@ -9906,7 +10532,9 @@ msgstr ""
msgid "Evolution is importing your old Netscape data"
msgstr ""
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
msgid "Trash"
msgstr ""
@@ -10033,254 +10661,263 @@ msgstr ""
msgid "This page can be used to configure the Composer"
msgstr ""
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
msgid "Folder containing mail"
msgstr ""
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
msgid "Virtual Trash"
msgstr ""
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
msgid "Virtual Trash folder"
msgstr ""
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
msgid "This folder cannot contain messages."
msgstr ""
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
msgid "Properties..."
msgstr ""
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
msgid "Change this folder's properties"
msgstr ""
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
msgid ""
"Some of your mail settings seem corrupt, please check that everything is in "
"order."
msgstr ""
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
msgid "You have not set a mail transport method"
msgstr ""
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Can not open message"
+
+#: mail/component-factory.c:998
msgid "New Mail Message"
msgstr ""
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
msgid "_Mail Message"
msgstr ""
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
msgid "Cannot initialize Evolution's mail component."
msgstr "Cannot initialise Evolution's mail component."
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
msgid "Cannot initialize Evolution's mail config component."
msgstr "Cannot initialise Evolution's mail config component."
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
msgid "Cannot initialize Evolution's folder info component."
msgstr "Cannot initialise Evolution's folder info component."
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
msgid "Connecting..."
msgstr ""
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
msgid "Cannot register storage with shell"
msgstr ""
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
#, c-format
msgid "Properties for \"%s\""
msgstr ""
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
msgid "Properties"
msgstr ""
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
#, c-format
msgid "Could not create temporary directory: %s"
msgstr ""
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
#, c-format
msgid "%d new"
msgstr ""
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
msgid ", "
msgstr ""
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
#, c-format
msgid "%d hidden"
msgstr ""
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
#, c-format
msgid "%d visible"
msgstr ""
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
#, c-format
msgid "%d selected"
msgstr ""
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
#, c-format
msgid "%d unsent"
msgstr ""
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
#, c-format
msgid "%d sent"
msgstr ""
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
#, c-format
msgid "%d total"
msgstr ""
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
msgid "Create _Virtual Folder From Search..."
msgstr ""
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
msgid "VFolder on _Subject"
msgstr ""
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
msgid "VFolder on Se_nder"
msgstr ""
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
msgid "VFolder on _Recipients"
msgstr ""
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
msgid "VFolder on Mailing _List"
msgstr ""
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
msgid "Filter on Sub_ject"
msgstr ""
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
msgid "Filter on Sen_der"
msgstr ""
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
msgid "Filter on Re_cipients"
msgstr ""
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
msgid "Filter on _Mailing List"
msgstr ""
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
msgid "_Edit as New Message..."
msgstr ""
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
msgid "_Print"
msgstr ""
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
msgid "_Reply to Sender"
msgstr ""
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
msgid "Reply to _List"
msgstr ""
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
msgid "Reply to _All"
msgstr ""
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
msgid "_Forward"
msgstr ""
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
msgid "Follo_w Up..."
msgstr ""
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
msgid "Fla_g Completed"
msgstr ""
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
msgid "Cl_ear Flag"
msgstr ""
#. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
msgid "Mar_k as Read"
msgstr ""
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
msgid "Mark as _Unread"
msgstr ""
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
msgid "Mark as _Important"
msgstr ""
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
msgid "_Mark as Unimportant"
msgstr ""
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
msgid "U_ndelete"
msgstr ""
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
msgid "Mo_ve to Folder..."
msgstr ""
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
msgid "_Copy to Folder..."
msgstr ""
-#: mail/folder-browser.c:1645
-msgid "Label"
-msgstr ""
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
msgid "Add Sender to Address_book"
msgstr ""
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
msgid "Appl_y Filters"
msgstr ""
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
msgid "Crea_te Rule From Message"
msgstr ""
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
msgid "VFolder on M_ailing List"
msgstr ""
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
#, c-format
msgid "Filter on _Mailing List (%s)"
msgstr ""
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
#, c-format
msgid "VFolder on M_ailing List (%s)"
msgstr ""
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+msgid "Default"
+msgstr ""
+
+#: mail/folder-info.c:71
msgid "Getting Folder Information"
msgstr ""
@@ -10331,7 +10968,7 @@ msgstr ""
msgid "mh"
msgstr ""
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
msgid "You have not filled in all of the required information."
msgstr ""
@@ -10341,79 +10978,104 @@ msgid "Evolution News Editor"
msgstr ""
#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
msgid "Evolution Account Editor"
msgstr ""
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
msgid "_Host:"
msgstr ""
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
msgid "User_name:"
msgstr ""
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
msgid "_Path:"
msgstr ""
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-msgid "Random"
-msgstr ""
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
msgid "You may not create two accounts with the same name."
msgstr ""
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
msgid "Are you sure you want to delete this account?"
msgstr ""
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
msgid "Don't delete"
msgstr ""
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
msgid "Really delete account?"
msgstr ""
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
msgid "Disable"
msgstr ""
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
msgid "Enable"
msgstr ""
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
msgid "Are you sure you want to delete this news account?"
msgstr ""
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
msgid "Enabled"
msgstr ""
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
msgid "Account name"
msgstr ""
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
msgid "Protocol"
msgstr ""
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, c-format
+msgid "Mail to %s"
+msgstr ""
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr ""
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr ""
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr ""
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
msgid "Add Filter Rule"
msgstr ""
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, c-format
+msgid ""
+"Used the removed folder:\n"
+" '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-callbacks.c:95
msgid ""
"You have not configured the mail client.\n"
"You need to do this before you can send,\n"
@@ -10421,131 +11083,131 @@ msgid ""
"Would you like to configure it now?"
msgstr ""
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
msgid ""
"You need to configure an identity\n"
"before you can compose mail."
msgstr ""
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
msgid ""
"You need to configure a mail transport\n"
"before you can compose mail."
msgstr ""
#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
msgid ""
"You are sending an HTML-formatted message, but the following recipients do "
"not want HTML-formatted mail:\n"
msgstr ""
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
msgid "Send anyway?"
msgstr ""
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
msgid ""
"This message has no subject.\n"
"Really send?"
msgstr ""
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
msgid ""
"Since the contact list you are sending to is configured to hide the list's "
"addresses, this message will contain only Bcc recipients."
msgstr ""
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
msgid "This message contains only Bcc recipients."
msgstr ""
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
msgid ""
"It is possible that the mail server may reveal the recipients by adding an "
"Apparently-To header.\n"
"Send anyway?"
msgstr ""
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
msgid "You must specify recipients in order to send this message."
msgstr ""
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
msgid "You must configure an account before you can send this email."
msgstr ""
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
msgid ""
"Unable to open the drafts folder for this account.\n"
"Would you like to use the default drafts folder?"
msgstr ""
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
msgid "an unknown sender"
msgstr ""
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
msgstr ""
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
msgid "Move message(s) to"
msgstr ""
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
msgid "Copy message(s) to"
msgstr ""
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
#, c-format
msgid "Are you sure you want to edit all %d messages?"
msgstr ""
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
msgstr ""
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
msgid ""
"You may only resend messages\n"
"in the Sent folder."
msgstr ""
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
#, c-format
msgid "Are you sure you want to resend all %d messages?"
msgstr ""
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
msgid "No Message Selected"
msgstr ""
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
msgid "Overwrite file?"
msgstr ""
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
msgid "Save Message As..."
msgstr ""
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
msgid "Save Messages As..."
msgstr ""
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
msgid "Go to next folder with unread messages?"
msgstr ""
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
msgid ""
"There are no more new messages in this folder.\n"
"Would you like to go to the next folder?"
msgstr ""
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
msgid ""
"This operation will permanently erase all messages marked as deleted. If you "
"continue, you will not be able to recover these messages.\n"
@@ -10553,39 +11215,70 @@ msgid ""
"Really erase these messages?"
msgstr ""
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
#, c-format
msgid ""
"Error loading filter information:\n"
"%s"
msgstr ""
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
msgid "Filters"
msgstr ""
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
#, c-format
msgid "Page %d of %d"
msgstr ""
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
msgid "Print Message"
msgstr ""
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
msgid "US-Letter"
msgstr ""
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
msgid "Printing of message failed"
msgstr ""
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
#, c-format
msgid "Are you sure you want to open all %d messages in separate windows?"
msgstr ""
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+msgid " [script]"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+msgid "Unnamed"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:555
+msgid "en"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:861
+msgid "Add script signature"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:862
+msgid "Add Signature"
+msgstr ""
+
#: mail/mail-config-druid.c:146
msgid ""
"Please enter your name and email address below. The \"optional\" fields "
@@ -10623,172 +11316,162 @@ msgid ""
msgstr ""
#. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
msgid "Evolution Account Assistant"
msgstr ""
#. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
msgid "Work"
msgstr ""
#. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
msgid "Personal"
msgstr ""
#. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
msgid "To Do"
msgstr ""
#. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
msgid "Later"
msgstr ""
-#: mail/mail-config.c:2458
+#: mail/mail-config.c:625
#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
+msgid "Account %d"
msgstr ""
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
msgid "Checking Service"
msgstr ""
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
msgid "Connecting to server..."
msgstr ""
-#: mail/mail-config.c:2999
-msgid "Unnamed"
-msgstr ""
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
#: mail/mail-config.glade.h:1
msgid " "
msgstr ""
#: mail/mail-config.glade.h:2
-msgid " Edit "
+msgid " _Check for supported types "
msgstr ""
#: mail/mail-config.glade.h:3
-msgid " New "
+msgid "(SSL is not supported in this build of Evolution)"
msgstr ""
#: mail/mail-config.glade.h:4
-msgid " _Check for supported types "
+msgid "(SSL is not supported in this build of evolution)"
msgstr ""
#: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of Evolution)"
+msgid "A_lways encrypt to myself when sending encrypted mail"
msgstr ""
#: mail/mail-config.glade.h:6
-msgid "(SSL is not supported in this build of evolution)"
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
msgstr ""
#: mail/mail-config.glade.h:7
-msgid "A_lways encrypt to myself when sending encrypted mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:8
msgid "Account Editor"
msgstr ""
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
msgid "Account Information"
msgstr ""
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
msgid "Account Management"
msgstr ""
-#: mail/mail-config.glade.h:11
-msgid "Advanced Options"
+#: mail/mail-config.glade.h:10
+msgid "Add Sc_ript"
msgstr ""
-#: mail/mail-config.glade.h:12
-msgid "Afrikaans"
+#: mail/mail-config.glade.h:11
+msgid "Add new signature..."
msgstr ""
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
msgid "Al_ways encrypt to myself when sending encrypted mail"
msgstr ""
#: mail/mail-config.glade.h:14
-msgid "Alerts"
-msgstr ""
-
-#: mail/mail-config.glade.h:15
msgid "Alwa_ys sign outgoing messages when using this account"
msgstr ""
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
msgid "Always _blind carbon-copy (Bcc) to:"
msgstr ""
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
msgid "Always _carbon-copy (Cc) to:"
msgstr ""
-#: mail/mail-config.glade.h:19
-msgid "Arabic"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
msgstr ""
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
msgid "Attach original message"
msgstr ""
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
msgid "Attachment"
msgstr ""
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
msgid "Authentication"
msgstr ""
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
msgid "Automatically _detect links"
msgstr ""
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
msgid "Baltic (ISO-8859-13)"
msgstr ""
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
msgid "Baltic (ISO-8859-4)"
msgstr ""
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
msgid "C_haracter set:"
msgstr ""
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
#, fuzzy
msgid "C_olors"
msgstr "C_lose"
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
#: mail/mail-config.glade.h:28
msgid "Checking for New Mail"
msgstr ""
#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Colours for display"
+
+#: mail/mail-config.glade.h:30
msgid "Composing Messages"
msgstr ""
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
msgid "Configuration"
msgstr ""
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -10798,49 +11481,41 @@ msgid ""
"Click \"Finish\" to save your settings."
msgstr ""
-#: mail/mail-config.glade.h:37
-msgid "Dari"
-msgstr ""
-
#: mail/mail-config.glade.h:38
msgid "De_fault"
msgstr ""
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
msgid "Default Behavior"
msgstr ""
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
msgid "Default character _encoding:"
msgstr ""
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
msgid "Deleting Mail"
msgstr ""
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
msgid "Digital IDs..."
msgstr ""
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
#, fuzzy
msgid "Do not quote original message"
msgstr "Can not open message"
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
msgid "Done"
msgstr ""
-#: mail/mail-config.glade.h:46
-msgid "Drafts _folder:"
-msgstr ""
-
#: mail/mail-config.glade.h:47
-msgid "E_nable"
+msgid "Drafts _folder:"
msgstr ""
#: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
+msgid "E_nable"
msgstr ""
#: mail/mail-config.glade.h:49
@@ -10859,32 +11534,28 @@ msgstr ""
msgid "Empty _trash folders on exit"
msgstr ""
-#: mail/mail-config.glade.h:53
-msgid "Execute Command..."
-msgstr ""
-
#: mail/mail-config.glade.h:54
-msgid "Fi_xed -width:"
+msgid "Execute Command..."
msgstr ""
#: mail/mail-config.glade.h:55
-msgid "Font Properties"
+msgid "Fi_xed -width:"
msgstr ""
#: mail/mail-config.glade.h:56
-msgid "Format messages in _HTML"
+msgid "Font Properties"
msgstr ""
#: mail/mail-config.glade.h:57
-msgid "Get Digital ID..."
+msgid "Format messages in _HTML"
msgstr ""
#: mail/mail-config.glade.h:58
-msgid "Highlight _quotations with"
+msgid "Get Digital ID..."
msgstr ""
#: mail/mail-config.glade.h:59
-msgid "Hulu"
+msgid "Highlight _quotations with"
msgstr ""
#: mail/mail-config.glade.h:60
@@ -10935,62 +11606,58 @@ msgstr ""
msgid "NNTP Server:"
msgstr ""
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
msgid "New Mail Notification"
msgstr ""
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
msgid "News Servers"
msgstr ""
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
msgid "On Screen fonts"
msgstr ""
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
msgid "Optional Information"
msgstr ""
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
#, fuzzy
msgid "Or_ganization:"
msgstr "Organi_sation:"
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
msgid "PGP/GPG _Key ID:"
msgstr ""
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
msgid "Pick a color"
msgstr "Pick a colour"
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr ""
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
msgid "Pretty Good Privacy (PGP/GPG)"
msgstr ""
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
msgid "Printed Fonts"
msgstr ""
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
msgid "Qmail maildir "
msgstr ""
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
#, fuzzy
msgid "Quote original message"
msgstr "Can not open message"
-#: mail/mail-config.glade.h:93
-msgid "Quoted"
-msgstr ""
-
#: mail/mail-config.glade.h:95
-msgid "Randomized"
+msgid "Quoted"
msgstr ""
#: mail/mail-config.glade.h:96
@@ -11022,236 +11689,234 @@ msgid "S_ecurity"
msgstr ""
#: mail/mail-config.glade.h:104
-msgid "Same as text"
-msgstr ""
-
-#: mail/mail-config.glade.h:105
msgid "Secure MIME (S/MIME)"
msgstr ""
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
msgid "Select HTML fixed width font"
msgstr ""
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
msgid "Select HTML fixed width font for printing"
msgstr ""
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
msgid "Select HTML variable width font"
msgstr ""
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
msgid "Select HTML variable width font for printing"
msgstr ""
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
msgid "Select PGP program"
msgstr ""
-#: mail/mail-config.glade.h:111
-msgid "Select a signature file"
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
msgstr ""
#: mail/mail-config.glade.h:112
-msgid "Select a signature script"
+msgid "Sent _messages folder:"
msgstr ""
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
+#: mail/mail-config.glade.h:113
+msgid "Sent and Draft Messages"
+msgstr ""
+
+#: mail/mail-config.glade.h:114
+msgid "Ser_ver requires authentication"
msgstr ""
#: mail/mail-config.glade.h:115
-msgid "Sent _messages folder:"
+msgid "Server Configuration"
msgstr ""
#: mail/mail-config.glade.h:116
-msgid "Sent and Draft Messages"
+msgid "Server _Type: "
msgstr ""
#: mail/mail-config.glade.h:117
-msgid "Ser_ver requires authentication"
+msgid "Shortcuts _type:"
msgstr ""
#: mail/mail-config.glade.h:118
-msgid "Server Configuration"
+msgid "Signature #1"
msgstr ""
#: mail/mail-config.glade.h:119
-msgid "Server _Type: "
+msgid "Signature #2"
msgstr ""
#: mail/mail-config.glade.h:120
-msgid "Shortcuts _type:"
+msgid "Source"
msgstr ""
#: mail/mail-config.glade.h:121
-msgid "Signature"
+msgid "Source Information"
msgstr ""
#: mail/mail-config.glade.h:122
-msgid "Source"
+msgid "Specify _filename:"
msgstr ""
#: mail/mail-config.glade.h:123
-msgid "Source Information"
+msgid "Spell Checking Language"
msgstr ""
#: mail/mail-config.glade.h:124
-msgid "Specify _filename:"
+msgid "Spell _Checking"
msgstr ""
#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+msgid "Standard Unix mbox"
msgstr ""
#: mail/mail-config.glade.h:126
-msgid "Standard Unix mbox"
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
msgstr ""
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:129
msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example: \"Work\" or \"Personal\""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
msgstr ""
-#: mail/mail-config.glade.h:130
-msgid "Use _HTML for this signature"
+#: mail/mail-config.glade.h:131
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
msgstr ""
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
msgid "V_ariable-width:"
msgstr ""
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
"Click \"Next\" to begin. "
msgstr ""
-#: mail/mail-config.glade.h:138
-msgid "XEmacs"
-msgstr ""
-
#: mail/mail-config.glade.h:140
-msgid "_Always load images off the net"
-msgstr ""
-
-#: mail/mail-config.glade.h:141
-msgid "_Always sign outgoing messages when using this account"
+msgid "XEmacs"
msgstr ""
#: mail/mail-config.glade.h:142
-msgid "_Authentication Type: "
+msgid "_Add Signature"
msgstr ""
#: mail/mail-config.glade.h:143
-msgid "_Authentication type: "
+msgid "_Always load images off the net"
msgstr ""
#: mail/mail-config.glade.h:144
-msgid "_Automatically check for new mail"
+msgid "_Always sign outgoing messages when using this account"
msgstr ""
#: mail/mail-config.glade.h:145
-msgid "_Beep when new mail arrives"
+msgid "_Authentication Type: "
msgstr ""
#: mail/mail-config.glade.h:146
-msgid "_Certificate ID:"
+msgid "_Authentication type: "
msgstr ""
#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
+msgid "_Automatically check for new mail"
msgstr ""
#: mail/mail-config.glade.h:148
-msgid "_Confirm when expunging a folder"
+msgid "_Automatically insert smiley images"
msgstr ""
#: mail/mail-config.glade.h:149
-msgid "_Defaults"
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:150
+msgid "_Certificate ID:"
msgstr ""
#: mail/mail-config.glade.h:151
-msgid "_Do not notify me when new mail arrives"
+msgid "_Confirm when expunging a folder"
msgstr ""
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
+#: mail/mail-config.glade.h:152
+msgid "_Default signature:"
msgstr ""
-#: mail/mail-config.glade.h:154
-msgid "_Filename:"
+#: mail/mail-config.glade.h:153
+msgid "_Defaults"
msgstr ""
#: mail/mail-config.glade.h:155
-msgid "_Fixed-width:"
+msgid "_Do not notify me when new mail arrives"
msgstr ""
-#: mail/mail-config.glade.h:156
-msgid "_Forward style:"
+#: mail/mail-config.glade.h:157
+msgid "_Enable"
msgstr ""
-#: mail/mail-config.glade.h:157
-msgid "_Full name:"
+#: mail/mail-config.glade.h:158
+msgid "_Fixed-width:"
msgstr ""
#: mail/mail-config.glade.h:159
-msgid "_HTML Mail"
+msgid "_Forward style:"
msgstr ""
#: mail/mail-config.glade.h:160
-msgid "_HTML Signature:"
+msgid "_Full name:"
msgstr ""
#: mail/mail-config.glade.h:162
-msgid "_Identity"
-msgstr ""
-
-#: mail/mail-config.glade.h:163
-msgid "_Language:"
+msgid "_HTML Mail"
msgstr ""
#: mail/mail-config.glade.h:164
-msgid "_Load images if sender is in addressbook"
+msgid "_Identity"
msgstr ""
#: mail/mail-config.glade.h:165
-msgid "_Make this my default account"
+msgid "_Load images if sender is in addressbook"
msgstr ""
#: mail/mail-config.glade.h:166
-msgid "_Mark messages as read after"
+msgid "_Make this my default account"
msgstr ""
#: mail/mail-config.glade.h:167
-msgid "_Name:"
+msgid "_Mark messages as read after"
msgstr ""
#: mail/mail-config.glade.h:168
-msgid "_Never load images off the net"
+msgid "_Name:"
msgstr ""
#: mail/mail-config.glade.h:169
-msgid "_PGP binary path:"
+msgid "_Never load images off the net"
msgstr ""
-#: mail/mail-config.glade.h:171
-msgid "_Play sound file when new mail arrives"
+#: mail/mail-config.glade.h:170
+msgid "_PGP binary path:"
msgstr ""
#: mail/mail-config.glade.h:172
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgid "_Play sound file when new mail arrives"
msgstr ""
#: mail/mail-config.glade.h:173
-msgid "_Prompt when sending messages with an empty subject line"
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
msgstr ""
#: mail/mail-config.glade.h:174
-msgid "_Random"
+msgid "_Prompt when sending messages with an empty subject line"
msgstr ""
#: mail/mail-config.glade.h:175
@@ -11287,67 +11952,51 @@ msgid "_Signatures"
msgstr ""
#: mail/mail-config.glade.h:183
-msgid "_Text Signature:"
-msgstr ""
-
-#: mail/mail-config.glade.h:184
msgid "_Use secure connection (SSL):"
msgstr ""
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
msgid "_Variable-width:"
msgstr ""
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
msgid "_every"
msgstr ""
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
#, fuzzy
msgid "color"
msgstr "Colours"
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
msgid "description"
msgstr ""
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
msgid "newswindow1"
msgstr ""
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
msgstr ""
#: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr ""
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr ""
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr ""
-
-#: mail/mail-crypto.c:173
msgid "Could not create a S/MIME signature context."
msgstr ""
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
msgid "Could not create a S/MIME certsonly context."
msgstr ""
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
msgid "Could not create a S/MIME encryption context."
msgstr ""
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
msgid "Could not create a S/MIME envelope context."
msgstr ""
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
msgid "Could not create a S/MIME decode context."
msgstr ""
@@ -11390,134 +12039,165 @@ msgstr ""
msgid "Loading message content"
msgstr ""
-#: mail/mail-display.c:1832
-msgid "Open Link in Browser"
+#: mail/mail-display.c:1553
+msgid "Overdue:"
msgstr ""
#: mail/mail-display.c:1833
+msgid "Open Link in Browser"
+msgstr ""
+
+#: mail/mail-display.c:1834
msgid "Copy Link Location"
msgstr ""
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
msgid "Save Link as (FIXME)"
msgstr ""
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
msgid "Save Image as..."
msgstr ""
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
#, c-format
msgid "%s attachment"
msgstr ""
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
msgid "Could not parse MIME message. Displaying as source."
msgstr ""
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
msgid "Date"
msgstr ""
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
msgid "Bad Address"
msgstr ""
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
msgid "From"
msgstr ""
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
msgid "Reply-To"
msgstr ""
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
msgid "To"
msgstr ""
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
msgid "Cc"
msgstr ""
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
msgid "Bcc"
msgstr ""
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
msgid "Mailer"
msgstr ""
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+msgid "View messages..."
+msgstr ""
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Could not close temporary folder: %s"
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:2126
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr ""
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr ""
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
#, c-format
msgid "Pointer to local file (%s)"
msgstr ""
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
#, c-format
msgid "Pointer to remote data (%s)"
msgstr ""
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr ""
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
msgid "Malformed external-body part."
msgstr ""
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Synchronising folder failed: %s: %s"
+
+#: mail/mail-local.c:670
msgid "Reconfiguring folder"
msgstr "Synchronising folder"
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
#, c-format
msgid ""
"Cannot save folder metainfo; you'll probably find you can't\n"
"open this folder anymore: %s: %s"
msgstr ""
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
#, c-format
msgid "Cannot save folder metainfo to %s: %s"
msgstr ""
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
#, c-format
msgid "Cannot delete folder metadata %s: %s"
msgstr ""
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
#, c-format
msgid "Changing folder \"%s\" to \"%s\" format"
msgstr ""
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
#, c-format
msgid "%s may not be reconfigured because it is not a local folder"
msgstr ""
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
msgid ""
"If you can no longer open this mailbox, then\n"
"you may need to repair it manually."
msgstr ""
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
msgid "You cannot change the format of a non-local folder."
msgstr ""
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
#, c-format
msgid "Reconfigure /%s"
msgstr "Synchronising \"%s\""
@@ -11571,126 +12251,118 @@ msgstr ""
msgid "Complete."
msgstr ""
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
msgid "Saving message to folder"
msgstr ""
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
#, c-format
msgid "Moving messages to %s"
msgstr ""
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
#, c-format
msgid "Copying messages to %s"
msgstr ""
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr ""
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr ""
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
#, c-format
msgid "Scanning folders in \"%s\""
msgstr ""
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
msgid "Forwarded messages"
msgstr ""
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
#, c-format
msgid "Opening folder %s"
msgstr ""
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
#, c-format
msgid "Opening store %s"
msgstr ""
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
#, c-format
msgid "Removing folder %s"
msgstr ""
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
#, c-format
msgid "Storing folder '%s'"
msgstr "Synchronising \"%s\""
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
msgid "Refreshing folder"
msgstr ""
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
msgid "Expunging folder"
msgstr ""
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
#, c-format
msgid "Retrieving message %s"
msgstr ""
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
#, c-format
msgid "Retrieving %d message(s)"
msgstr ""
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
#, c-format
msgid "Saving %d messsage(s)"
msgstr ""
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
#, c-format
msgid ""
"Unable to create output file: %s\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
#, c-format
msgid ""
"Error saving messages to: %s:\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
msgid "Saving attachment"
msgstr ""
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
#, c-format
msgid ""
"Cannot create output file: %s:\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
#, c-format
msgid "Could not write data: %s"
msgstr ""
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
#, c-format
msgid "Disconnecting from %s"
msgstr ""
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
#, c-format
msgid "Reconnecting to %s"
msgstr ""
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
#, c-format
msgid "Executing shell command: %s"
msgstr ""
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
msgid "_Search"
msgstr ""
@@ -11761,10 +12433,6 @@ msgstr ""
msgid "Waiting..."
msgstr ""
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr ""
-
#: mail/mail-session.c:222
msgid "User canceled operation."
msgstr ""
@@ -11778,24 +12446,43 @@ msgstr ""
msgid "Enter Password"
msgstr ""
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
#, fuzzy, c-format
msgid "Could not save signature file: %s"
msgstr "Could not close temporary folder: %s"
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
msgid "Save signature"
msgstr ""
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
msgid ""
"This signature has been changed, but hasn't been saved.\n"
"\n"
"Do you wish to save your changes?"
msgstr ""
-#: mail/mail-signature-editor.c:357
-msgid "Signature name:"
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr ""
+
+#: mail/mail-signature-editor.c:397
+msgid "Signature hint"
+msgstr ""
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+msgid "Hide signature hint"
msgstr ""
#: mail/mail-tools.c:257
@@ -11811,17 +12498,17 @@ msgstr ""
msgid "Forwarded Message"
msgstr ""
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
#, c-format
msgid "Setting up vfolder: %s"
msgstr ""
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
#, c-format
msgid "Updating vfolders for uri: %s"
msgstr ""
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
#, c-format
msgid ""
"The following vFolder(s):\n"
@@ -11830,89 +12517,94 @@ msgid ""
"And have been updated."
msgstr ""
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr ""
+
+#: mail/mail-vfolder.c:784
msgid "vFolders"
msgstr ""
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
msgid "Edit VFolder"
msgstr ""
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
#, c-format
msgid "Trying to edit a vfolder '%s' which doesn't exist."
msgstr ""
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
msgid "New VFolder"
msgstr ""
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
msgid "(No subject)"
msgstr ""
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
#, c-format
msgid "%s - Message"
msgstr ""
-#: mail/message-list.c:672
+#: mail/message-list.c:720
msgid "Unseen"
msgstr ""
-#: mail/message-list.c:673
+#: mail/message-list.c:721
msgid "Seen"
msgstr ""
-#: mail/message-list.c:674
+#: mail/message-list.c:722
msgid "Answered"
msgstr ""
-#: mail/message-list.c:675
+#: mail/message-list.c:723
msgid "Multiple Unseen Messages"
msgstr ""
-#: mail/message-list.c:676
+#: mail/message-list.c:724
msgid "Multiple Messages"
msgstr ""
-#: mail/message-list.c:680
+#: mail/message-list.c:728
msgid "Lowest"
msgstr ""
-#: mail/message-list.c:681
+#: mail/message-list.c:729
msgid "Lower"
msgstr ""
-#: mail/message-list.c:685
+#: mail/message-list.c:733
msgid "Higher"
msgstr ""
-#: mail/message-list.c:686
+#: mail/message-list.c:734
msgid "Highest"
msgstr ""
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
msgid "?"
msgstr ""
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
msgid "Today %l:%M %p"
msgstr ""
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
msgid "Yesterday %l:%M %p"
msgstr ""
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
msgid "%a %l:%M %p"
msgstr ""
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
msgid "%b %d %Y"
msgstr ""
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
msgid "Generating message list"
msgstr ""
@@ -11933,10 +12625,15 @@ msgid "Follow Up Flag"
msgstr ""
#: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Organisation"
+
+#: mail/message-list.etspec.h:9
msgid "Received"
msgstr ""
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
msgid "Size"
msgstr ""
@@ -16657,5234 +17354,5230 @@ msgstr ""
msgid "Latrobe"
msgstr ""
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
msgid "Laughlin"
msgstr ""
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
msgid "Laurel"
msgstr ""
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
msgid "La Verne"
msgstr ""
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
msgid "Lawrence"
msgstr ""
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
msgid "Lawton"
msgstr ""
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
msgid "Leadville"
msgstr ""
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
msgid "Learmouth"
msgstr ""
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
msgid "Lecce"
msgstr ""
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
msgid "Leeds and Bradford"
msgstr ""
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
msgid "Leesburg"
msgstr ""
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
msgid "Leeuwarden"
msgstr ""
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
msgid "Le Havre-Octeville"
msgstr ""
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
msgid "Leipzig-Schkeuditz"
msgstr ""
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
msgid "Leknes"
msgstr ""
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
msgid "Le Mans"
msgstr ""
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
msgid "Le Marine"
msgstr ""
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
msgid "Lemmon"
msgstr ""
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
msgid "Lemoore"
msgstr ""
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
msgid "Leticia/Vasquez Cobo"
msgstr ""
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
msgid "Le Touquet"
msgstr ""
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
msgid "Leuchars"
msgstr ""
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
msgid "Lewisburg"
msgstr ""
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
msgid "Lewiston"
msgstr ""
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
msgid "Lewistown"
msgstr ""
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
msgid "Lexington"
msgstr ""
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
msgid "Liberal"
msgstr ""
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
msgid "Libya"
msgstr ""
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
msgid "Lichtenburg"
msgstr ""
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
msgid "Lidgerwood"
msgstr ""
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
msgid "Liege"
msgstr ""
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
msgid "Lihue"
msgstr ""
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
msgid "Lille-Lesquin"
msgstr ""
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
msgid "Lima-Callao"
msgstr ""
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
msgid "Limnos"
msgstr ""
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
msgid "Limoges"
msgstr ""
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
msgid "Limon"
msgstr ""
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
msgid "Lincoln"
msgstr ""
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
msgid "Linz"
msgstr ""
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
msgid "Lisboa"
msgstr ""
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
msgid "Lista"
msgstr ""
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
msgid "Litchfield"
msgstr ""
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
msgid "Little Rock"
msgstr ""
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
msgid "Little Rock AFB"
msgstr ""
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
msgid "Livermore"
msgstr ""
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
msgid "Liverpool"
msgstr ""
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
msgid "Livingston"
msgstr ""
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
msgid "Ljubljana"
msgstr ""
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
msgid "Logan"
msgstr ""
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
msgid "Lolland Falster"
msgstr ""
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
msgid "Lompoc"
msgstr ""
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
msgid "London"
msgstr ""
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
msgid "London/City"
msgstr ""
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
msgid "London/Gatwick"
msgstr ""
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
msgid "London/Heathrow"
msgstr ""
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
msgid "London/Stansted"
msgstr ""
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
msgid "Londrina"
msgstr ""
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
msgid "Lone Rock"
msgstr ""
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
msgid "Long Beach"
msgstr ""
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
msgid "Longview"
msgstr ""
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
msgid "Lorient-Lann-Bihoue"
msgstr ""
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
msgid "Los Alamos"
msgstr ""
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
msgid "Los Angeles"
msgstr ""
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
msgid "Los Mochis"
msgstr ""
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
msgid "Lossiemouth"
msgstr ""
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
msgid "Louisville"
msgstr ""
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
msgid "Louisville-Standiford Field"
msgstr ""
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
msgid "Lousiana"
msgstr ""
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
msgid "Lovelock"
msgstr ""
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
msgid "Lubbock"
msgstr ""
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
msgid "Lubeck-Blankensee"
msgstr ""
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
msgid "Lufkin"
msgstr ""
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
msgid "Lugano"
msgstr ""
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
msgid "Luqa"
msgstr ""
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
msgid "Luton"
msgstr ""
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
msgid "Luxeuil"
msgstr ""
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
msgid "Luxor"
msgstr ""
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
msgid "Lviv"
msgstr ""
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
msgid "Lynchburg"
msgstr ""
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
msgid "Lyneham"
msgstr ""
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
msgid "Lyon-Bron"
msgstr ""
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
msgid "Lyon-Satolas"
msgstr ""
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
msgid "Maastricht"
msgstr ""
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
msgid "Macae"
msgstr ""
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
msgid "Macapa"
msgstr ""
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
msgid "Maceio"
msgstr ""
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
msgid "Macon"
msgstr ""
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
msgid "Madinah"
msgstr ""
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
msgid "Madison"
msgstr ""
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
msgid "Madras/Minambakkam"
msgstr ""
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
msgid "Madrid (Barajas)"
msgstr ""
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
msgid "Madrid (Cuatro Vientos)"
msgstr ""
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
msgid "Magadan"
msgstr ""
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
msgid "Magdalena"
msgstr ""
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
msgid "Maine"
msgstr ""
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
msgid "Makhachkala"
msgstr ""
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
msgid "Makkah"
msgstr ""
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
msgid "Makung"
msgstr ""
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
msgid "Malad City"
msgstr ""
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
msgid "Malaga"
msgstr ""
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
msgid "Malatya"
msgstr ""
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
msgid "Maldonado/Punta Est"
msgstr ""
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
msgid "Malmo/Sturup"
msgstr ""
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
msgid "Mammoth Lakes"
msgstr ""
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
msgid "Managua"
msgstr ""
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
msgid "Manassas"
msgstr ""
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
msgid "Manaus"
msgstr ""
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
msgid "Manchester"
msgstr ""
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
msgid "Mangilsan Ab"
msgstr ""
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
msgid "Manhattan"
msgstr ""
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
msgid "Manisa"
msgstr ""
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
msgid "Manistee"
msgstr ""
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
msgid "Manitoba"
msgstr ""
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
msgid "Manitowoc"
msgstr ""
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
msgid "Mankato"
msgstr ""
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
msgid "Mansfield"
msgstr ""
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
msgid "Manta"
msgstr ""
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
msgid "Manzanillo"
msgstr ""
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
msgid "Maraba"
msgstr ""
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
msgid "Maracaibo-La Chinita"
msgstr ""
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
msgid "Maracay-B.A.Sucre"
msgstr ""
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
msgid "Marathon"
msgstr ""
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
msgid "Mar Del Plata"
msgstr ""
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
msgid "Margarita"
msgstr ""
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
msgid "Marianna"
msgstr ""
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
msgid "Marib"
msgstr ""
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
msgid "Maribor"
msgstr ""
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
msgid "Marietta"
msgstr ""
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
msgid "Marino di Ravenna"
msgstr ""
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
msgid "Marion"
msgstr ""
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
msgid "Marion-Wytheville"
msgstr ""
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
msgid "Marquette"
msgstr ""
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
msgid "Marseille-Provence"
msgstr ""
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
msgid "Marseilles"
msgstr ""
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
msgid "Marshall"
msgstr ""
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
msgid "Marshalltown"
msgstr ""
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
msgid "Marshfield"
msgstr ""
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
msgid "Marte"
msgstr ""
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
msgid "Marthas Vineyard"
msgstr ""
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
msgid "Martinsburg"
msgstr ""
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
msgid "Martinsville"
msgstr ""
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
msgid "Maryland"
msgstr ""
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
msgid "Marysville"
msgstr ""
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
msgid "Marysville-Beale AFB"
msgstr ""
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
msgid "Mashhad"
msgstr ""
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
msgid "Masirah"
msgstr ""
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
msgid "Mason City"
msgstr ""
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
msgid "Massachusetts"
msgstr ""
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
msgid "Massena"
msgstr ""
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
#, fuzzy
msgid "Matamoros"
msgstr "Comoros"
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
msgid "Matsumoto Airport"
msgstr ""
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
msgid "Matsushima Ab"
msgstr ""
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
msgid "Matsuyama Airport"
msgstr ""
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
msgid "Mattoon"
msgstr ""
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
msgid "Mayaguez"
msgstr ""
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
msgid "Mayport"
msgstr ""
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
msgid "Mazatlan"
msgstr ""
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
msgid "Mazu"
msgstr ""
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
msgid "McAlester"
msgstr ""
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
msgid "McAllen"
msgstr ""
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
msgid "McCall"
msgstr ""
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
msgid "McCarthy"
msgstr ""
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
msgid "McClellan"
msgstr ""
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
msgid "McComb"
msgstr ""
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
msgid "McCook"
msgstr ""
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
msgid "McGrath"
msgstr ""
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
msgid "Mc Gregor"
msgstr ""
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
msgid "Meacham"
msgstr ""
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
msgid "Medford"
msgstr ""
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
msgid "Medicine Lodge"
msgstr ""
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
msgid "Mehamn"
msgstr ""
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
msgid "Mekoryuk"
msgstr ""
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
msgid "Melbourne"
msgstr ""
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
msgid "Melfa"
msgstr ""
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
msgid "Melilla"
msgstr ""
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
msgid "Memambetsu Airport"
msgstr ""
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
msgid "Memphis"
msgstr ""
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
msgid "Memphis-NAS"
msgstr ""
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
msgid "Mendoza"
msgstr ""
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
msgid "Mene Grande"
msgstr ""
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
msgid "Menominee"
msgstr ""
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
msgid "Menorca"
msgstr ""
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
msgid "Merced"
msgstr ""
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
msgid "Merida"
msgstr ""
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
msgid "Meridian"
msgstr ""
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
msgid "Meridian-Lauderdale"
msgstr ""
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
msgid "Merril Field"
msgstr ""
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
msgid "Mersa Matruh"
msgstr ""
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
msgid "Mesa-Falcon Field"
msgstr ""
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
msgid "Metabaru Ab"
msgstr ""
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
msgid "Metz-Frescaty"
msgstr ""
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
msgid "Mexicali"
msgstr ""
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
msgid "Miami"
msgstr ""
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
msgid "Miami-Kendall"
msgstr ""
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
msgid "Miami-Opa Locka"
msgstr ""
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
msgid "Michigan"
msgstr ""
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
msgid "Middle East"
msgstr ""
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
msgid "Middleton Island"
msgstr ""
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
msgid "Middletown"
msgstr ""
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
msgid "Midland"
msgstr ""
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
msgid "Miho Ab"
msgstr ""
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
msgid "Milano/Linate"
msgstr ""
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
msgid "Milano/Malpensa"
msgstr ""
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
msgid "Miles City"
msgstr ""
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
msgid "Milford"
msgstr ""
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
msgid "Millinocket"
msgstr ""
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
msgid "Millville"
msgstr ""
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
msgid "Milton"
msgstr ""
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
msgid "Milwaukee"
msgstr ""
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
msgid "Milwaukee-Timmerman"
msgstr ""
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
msgid "Minamitorishima"
msgstr ""
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
msgid "Minatitlan"
msgstr ""
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
msgid "Minchumina"
msgstr ""
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
msgid "Mineralnye Vody"
msgstr ""
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
msgid "Mineral Wells"
msgstr ""
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
msgid "Minneapolis"
msgstr ""
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
msgid "Minneapolis [2]"
msgstr ""
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
msgid "Minneapolis [3]"
msgstr ""
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
msgid "Minnesota"
msgstr ""
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
msgid "Minocqua"
msgstr ""
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
msgid "Minot"
msgstr ""
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
msgid "Minot AFB"
msgstr ""
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
msgid "Misawa Ab"
msgstr ""
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
msgid "Mississippi"
msgstr ""
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
msgid "Missoula"
msgstr ""
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
msgid "Missouri"
msgstr ""
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
msgid "Mitchell"
msgstr ""
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
msgid "Mitilini"
msgstr ""
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
msgid "Miyakejima Airport"
msgstr ""
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
msgid "Miyazaki Airport"
msgstr ""
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
msgid "Moa"
msgstr ""
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
msgid "Mobile Downtown"
msgstr ""
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
msgid "Mobile Regional Airport"
msgstr ""
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
msgid "Mobridge"
msgstr ""
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
msgid "Modesto"
msgstr ""
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
msgid "Mo I Rana"
msgstr ""
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
msgid "Mojave"
msgstr ""
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
msgid "Molde"
msgstr ""
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
msgid "Moldova"
msgstr ""
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
msgid "Moline-Quad Cities"
msgstr ""
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
msgid "Molokai"
msgstr ""
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
msgid "Mombetsu Airport"
msgstr ""
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
msgid "Monchengladbach"
msgstr ""
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
msgid "Monclova"
msgstr ""
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
msgid "Moncton"
msgstr ""
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
msgid "Monida"
msgstr ""
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
msgid "Monpellier-Mediterrannee"
msgstr ""
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
msgid "Monroe"
msgstr ""
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
msgid "Montague"
msgstr ""
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
msgid "Montana"
msgstr ""
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
msgid "Mont-de-Marsan"
msgstr ""
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
msgid "Monte Argentario"
msgstr ""
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
msgid "Monte Bisbino"
msgstr ""
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
msgid "Monte Calamita"
msgstr ""
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
msgid "Monte Cimone"
msgstr ""
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
msgid "Montego Bay"
msgstr ""
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
msgid "Monte Malanotte"
msgstr ""
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
msgid "Monterey"
msgstr ""
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
msgid "Monterrey"
msgstr ""
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
msgid "Monte Scuro"
msgstr ""
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
msgid "Monte Terminillo"
msgstr ""
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
msgid "Montevideo/Carrasco"
msgstr ""
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
msgid "Montgomery"
msgstr ""
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
msgid "Montgomery-Maxwell AFB"
msgstr ""
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
msgid "Monticello"
msgstr ""
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
msgid "Montpelier"
msgstr ""
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
msgid "Montreal Dorval"
msgstr ""
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
msgid "Montreal Mirabel"
msgstr ""
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
msgid "Montreal Saint-Hubert"
msgstr ""
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
msgid "Montrose"
msgstr ""
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
msgid "Montrose (2)"
msgstr ""
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
msgid "Morelia"
msgstr ""
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
#, fuzzy
msgid "Morgantown"
msgstr "Organisation"
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
msgid "Moriarty"
msgstr ""
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
msgid "Morristown"
msgstr ""
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
msgid "Moscow Domodedovo"
msgstr ""
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
msgid "Moscow Sheremetyevo"
msgstr ""
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
msgid "Moses Lake"
msgstr ""
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
msgid "Mosinee"
msgstr ""
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
msgid "Mosjoen"
msgstr ""
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
msgid "Moultrie"
msgstr ""
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
msgid "Mountain Home"
msgstr ""
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
msgid "Mountain View"
msgstr ""
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
msgid "Mount Clemens"
msgstr ""
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
msgid "Mount Holly"
msgstr ""
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
msgid "Mount Shasta"
msgstr ""
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
msgid "Mount Vernon"
msgstr ""
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
msgid "Mount Wilson"
msgstr ""
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
msgid "Mt Washington"
msgstr ""
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
msgid "Mugla/Dalaman"
msgstr ""
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
msgid "Muir"
msgstr ""
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
msgid "Mullan"
msgstr ""
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
msgid "Mullen"
msgstr ""
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
msgid "Munchen"
msgstr ""
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
msgid "Muncie"
msgstr ""
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
msgid "Munster/Osnabruck"
msgstr ""
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
msgid "Murcia"
msgstr ""
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
msgid "Murmansk"
msgstr ""
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
msgid "Mus"
msgstr ""
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
msgid "Muscatine"
msgstr ""
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
msgid "Muscle Shoals"
msgstr ""
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
msgid "Muskegon"
msgstr ""
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
msgid "Mykonos"
msgstr ""
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
msgid "Myrtle Beach"
msgstr ""
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
msgid "Nabesna/Devil Mt."
msgstr ""
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
msgid "Nacogdoches"
msgstr ""
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
msgid "Nagasaki Airport"
msgstr ""
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
msgid "Nagoya Airport"
msgstr ""
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
msgid "Nagpur Sonegaon"
msgstr ""
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
msgid "Naha Airport"
msgstr ""
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
msgid "Najran"
msgstr ""
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
msgid "Nakashibetsu Airport"
msgstr ""
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
msgid "Nalchik"
msgstr ""
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
msgid "Namsos"
msgstr ""
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
msgid "Nancy-Essey"
msgstr ""
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
msgid "Nancy-Ochey"
msgstr ""
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
msgid "Nankishirahama Airport"
msgstr ""
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
msgid "Nanning"
msgstr ""
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
msgid "Nantes Adlantique"
msgstr ""
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
msgid "Nantucket"
msgstr ""
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
msgid "Napa"
msgstr ""
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
msgid "Naples"
msgstr ""
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
msgid "Napoli"
msgstr ""
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
msgid "Narvik"
msgstr ""
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
msgid "Nasa Shuttle"
msgstr ""
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
msgid "Nashua"
msgstr ""
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
msgid "Nashville"
msgstr ""
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
msgid "Nassau"
msgstr ""
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
msgid "Natal"
msgstr ""
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
msgid "Natchez"
msgstr ""
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
msgid "Nawabshah"
msgstr ""
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
msgid "Nebraska"
msgstr ""
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
msgid "Needles"
msgstr ""
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
msgid "Nenana"
msgstr ""
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
msgid "Neuquen"
msgstr ""
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
msgid "Nevada"
msgstr ""
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
msgid "Newark"
msgstr ""
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
msgid "New Bedford"
msgstr ""
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
msgid "New Bern"
msgstr ""
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
msgid "New Braunfels"
msgstr ""
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
msgid "New Brunswick"
msgstr ""
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
msgid "Newburgh"
msgstr ""
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
msgid "Newcastle"
msgstr ""
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
msgid "New Delhi/Palam"
msgstr ""
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
msgid "Newfoundland"
msgstr ""
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
msgid "New Hampshire"
msgstr ""
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
msgid "New Haven"
msgstr ""
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
msgid "New Iberia"
msgstr ""
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
msgid "New Jersey"
msgstr ""
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
msgid "New Mexico"
msgstr ""
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
msgid "New Orleans"
msgstr ""
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
msgid "New Orleans-Lakefront"
msgstr ""
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
msgid "New Orleans NAS"
msgstr ""
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
msgid "Newport"
msgstr ""
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
msgid "Newport News"
msgstr ""
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
msgid "New Port Richey"
msgstr ""
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
msgid "New River"
msgstr ""
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
msgid "New Tokyo International Airport"
msgstr ""
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
msgid "Newton"
msgstr ""
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
msgid "New York"
msgstr ""
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
msgid "New York-JFK Arpt"
msgstr ""
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
msgid "New York-La Guardia"
msgstr ""
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
msgid "Niagara Falls"
msgstr ""
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
msgid "Nice-Cote d'Azur"
msgstr ""
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
msgid "Niigata Airport"
msgstr ""
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
msgid "Nimes-Garons"
msgstr ""
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
msgid "Nipawin"
msgstr ""
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
msgid "Nis"
msgstr ""
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
msgid "Nizhny Novgorod"
msgstr ""
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
msgid "N Las Vegas"
msgstr ""
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
msgid "N Myrtle Beach"
msgstr ""
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
msgid "Nogales"
msgstr ""
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
msgid "Nome"
msgstr ""
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
msgid "Norfolk"
msgstr ""
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
msgid "Norfolk NAS"
msgstr ""
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
msgid "Norrkoping"
msgstr ""
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
msgid "North Adams"
msgstr ""
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
msgid "North Bend"
msgstr ""
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
msgid "North Carolina"
msgstr ""
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
msgid "North Conway"
msgstr ""
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
msgid "North Dakota"
msgstr ""
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
msgid "Northeast Philadelphia"
msgstr ""
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
msgid "North Kingstown"
msgstr ""
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
msgid "North Platte"
msgstr ""
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
msgid "Northway"
msgstr ""
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
msgid "Northwest Territories"
msgstr ""
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
msgid "Norwich"
msgstr ""
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
msgid "Norwood"
msgstr ""
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
msgid "Notodden"
msgstr ""
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
msgid "Novara/Cameri"
msgstr ""
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
msgid "Nova Scotia"
msgstr ""
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
msgid "Novosibirsk"
msgstr ""
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
msgid "Nueva Gerona"
msgstr ""
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
msgid "Nueva Ocotepeque"
msgstr ""
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
msgid "Nuevo Laredo"
msgstr ""
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
msgid "Nurnberg"
msgstr ""
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
msgid "Nyutabaru Ab"
msgstr ""
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
msgid "Oahu"
msgstr ""
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
msgid "Oak Harbor"
msgstr ""
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
msgid "Oakland"
msgstr ""
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
msgid "Oaxaca"
msgstr ""
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
msgid "Oberpfaffenhofen"
msgstr ""
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
msgid "Obihiro Airport"
msgstr ""
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
msgid "Ocala"
msgstr ""
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
msgid "Oceanside"
msgstr ""
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
msgid "Odense"
msgstr ""
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
msgid "Odesa"
msgstr ""
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
msgid "Oelwen"
msgstr ""
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
msgid "Ogden"
msgstr ""
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
msgid "Ogden-Hill AFB"
msgstr ""
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
msgid "Ogdensburg"
msgstr ""
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
msgid "Ohio"
msgstr ""
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
msgid "Ohrid"
msgstr ""
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
msgid "Oita Airport"
msgstr ""
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
msgid "Ojika Island"
msgstr ""
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
msgid "Okayama Airport"
msgstr ""
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
msgid "Oki Airport"
msgstr ""
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
msgid "Okinoerabu"
msgstr ""
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
msgid "Oklahoma"
msgstr ""
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
msgid "Oklahoma City"
msgstr ""
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
msgid "Oklahoma City-Bethany"
msgstr ""
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
msgid "Oklahoma City-Midwest City"
msgstr ""
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
msgid "Okushiri Island"
msgstr ""
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
msgid "Olathe"
msgstr ""
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
msgid "Olathe/Ind."
msgstr ""
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
msgid "Olbia"
msgstr ""
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
msgid "Olympia"
msgstr ""
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
msgid "Omaha"
msgstr ""
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
msgid "Omaha-Bellevue"
msgstr ""
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
msgid "Omak"
msgstr ""
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
msgid "Ominato Ab"
msgstr ""
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
msgid "Omsk"
msgstr ""
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
msgid "O'Neill"
msgstr ""
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
msgid "Ontario"
msgstr ""
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
msgid "Oostende"
msgstr ""
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
msgid "Oran"
msgstr ""
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
msgid "Oran/Es Senia"
msgstr ""
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
#, fuzzy
msgid "Orange"
msgstr "Organiser:"
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
msgid "Orange City"
msgstr ""
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
msgid "Ord-Sharp"
msgstr ""
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
msgid "Oregon"
msgstr ""
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
msgid "Orenburg"
msgstr ""
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
msgid "Orland"
msgstr ""
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
msgid "Orlando"
msgstr ""
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
msgid "Orlando (Orlando International)"
msgstr ""
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
msgid "Orsta-Volda"
msgstr ""
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
msgid "Oruro"
msgstr ""
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
msgid "Osaka International Airport"
msgstr ""
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
msgid "Osan Ab"
msgstr ""
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
msgid "Oscoda"
msgstr ""
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
msgid "Oseberg A"
msgstr ""
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
msgid "Oshima Airport"
msgstr ""
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
msgid "Oshkosh"
msgstr ""
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
msgid "Oslo/Gardenmoen"
msgstr ""
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
msgid "Ostrava"
msgstr ""
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
msgid "Ottawa"
msgstr ""
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
msgid "Ottumwa"
msgstr ""
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
msgid "Owensboro"
msgstr ""
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
msgid "Owyhee"
msgstr ""
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
msgid "Oxford"
msgstr ""
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
msgid "Oxnard"
msgstr ""
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
msgid "Ozark"
msgstr ""
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
msgid "Ozuki Ab"
msgstr ""
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
msgid "Paderborn-Haxterberg"
msgstr ""
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
msgid "Padova"
msgstr ""
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
msgid "Paducah"
msgstr ""
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
msgid "Paekado"
msgstr ""
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
msgid "Paengnyongdo Ab"
msgstr ""
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
msgid "Paganella"
msgstr ""
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
msgid "Pa Kuei/Bakuai"
msgstr ""
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
msgid "Palacios"
msgstr ""
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
msgid "Palermo"
msgstr ""
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
msgid "Palma de Mallorca"
msgstr ""
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
msgid "Palmdale"
msgstr ""
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
msgid "Palmer"
msgstr ""
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
msgid "Palm Springs"
msgstr ""
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
msgid "Palo Alto"
msgstr ""
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
msgid "Pamplona"
msgstr ""
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
msgid "Panama City"
msgstr ""
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
msgid "Pantelleria"
msgstr ""
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
msgid "Papa"
msgstr ""
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
msgid "Paphos"
msgstr ""
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
msgid "Paris"
msgstr ""
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
msgid "Paris/Charles De Gaulle"
msgstr ""
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
msgid "Paris/Le Bourget"
msgstr ""
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
msgid "Paris/Orly"
msgstr ""
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
msgid "Parkersburg"
msgstr ""
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
msgid "Pasco"
msgstr ""
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
msgid "Paso De Los Libres"
msgstr ""
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
msgid "Paso Robles"
msgstr ""
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
msgid "Passo dei Giovi"
msgstr ""
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
msgid "Passo della Cisa"
msgstr ""
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
msgid "Passo Resia"
msgstr ""
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
msgid "Passo Rolle"
msgstr ""
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
msgid "Patna"
msgstr ""
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
msgid "Patterson"
msgstr ""
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
msgid "Patuxent River"
msgstr ""
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
msgid "Pau/Pyrenees"
msgstr ""
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
msgid "Paxson"
msgstr ""
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
msgid "Paysandu"
msgstr ""
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
msgid "Payson"
msgstr ""
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
msgid "Pellston"
msgstr ""
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
msgid "Pelotas"
msgstr ""
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
msgid "Pendleton"
msgstr ""
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
msgid "Pennsylvania"
msgstr ""
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
msgid "Penn Yan"
msgstr ""
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
msgid "Pensacola"
msgstr ""
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
msgid "Pensacola NAS"
msgstr ""
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
msgid "People's Republic of China"
msgstr ""
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
msgid "Peoria"
msgstr ""
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
msgid "Pequot Lakes"
msgstr ""
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
msgid "Pereira/Matecana"
msgstr ""
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
msgid "Perm"
msgstr ""
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
msgid "Perpignan-Rivesaltes"
msgstr ""
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
msgid "Perry-Foley"
msgstr ""
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
msgid "Perth"
msgstr ""
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
msgid "Perugia"
msgstr ""
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
msgid "Pescara"
msgstr ""
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
msgid "Petersburg"
msgstr ""
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
msgid "Petropavlovsk-Kamchatsky"
msgstr ""
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
msgid "Petrozavodsk"
msgstr ""
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
msgid "Philadelphia"
msgstr ""
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
msgid "Philip"
msgstr ""
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
msgid "Philipsburg"
msgstr ""
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
msgid "Phillips"
msgstr ""
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
msgid "Phoenix"
msgstr ""
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
msgid "Phoenix-Deer Valley"
msgstr ""
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
msgid "Phoenix-Goodyear"
msgstr ""
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
msgid "Phoenix-Luke AFB"
msgstr ""
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
msgid "Piacenza"
msgstr ""
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
msgid "Pian Rosa"
msgstr ""
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
msgid "Piedras Negras"
msgstr ""
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
msgid "Pierre"
msgstr ""
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
msgid "Pietersburg"
msgstr ""
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
msgid "Pikeville"
msgstr ""
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
msgid "Pine Bluff"
msgstr ""
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
msgid "Pingtung North"
msgstr ""
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
msgid "Pingtung South"
msgstr ""
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
msgid "Pirassununga"
msgstr ""
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
msgid "Pisa"
msgstr ""
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
msgid "Pisco"
msgstr ""
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
msgid "Pittsburgh"
msgstr ""
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
msgid "Pittsburgh-West Mifflin"
msgstr ""
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
msgid "Plattsburg"
msgstr ""
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
msgid "Plovdiv"
msgstr ""
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
msgid "Plymouth"
msgstr ""
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
msgid "Pocatello"
msgstr ""
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
msgid "Pocos De Caldas"
msgstr ""
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
msgid "Podgorica"
msgstr ""
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
msgid "Podgorica Titograd"
msgstr ""
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
msgid "Pohang Ab"
msgstr ""
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
msgid "Point Hope"
msgstr ""
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
msgid "Point Lay"
msgstr ""
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
msgid "Point Mugu"
msgstr ""
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
msgid "Point Piedras Blanca"
msgstr ""
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
msgid "Poitiers"
msgstr ""
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
msgid "Pompano Beach"
msgstr ""
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
msgid "Ponca City"
msgstr ""
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
msgid "Ponce"
msgstr ""
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
msgid "Ponta Pora"
msgstr ""
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
msgid "Pontiac"
msgstr ""
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
msgid "Pope AFB"
msgstr ""
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
msgid "Poplar Bluff"
msgstr ""
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
msgid "Poprad"
msgstr ""
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
msgid "Port Alexander"
msgstr ""
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
msgid "Port Alsworth"
msgstr ""
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
msgid "Port Angeles"
msgstr ""
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
msgid "Port-Au-Prince"
msgstr ""
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
msgid "Port Elizabeth"
msgstr ""
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
msgid "Porterville"
msgstr ""
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
msgid "Port Hardy"
msgstr ""
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
msgid "Port Hedland"
msgstr ""
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
msgid "Port Heiden"
msgstr ""
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
msgid "Portland"
msgstr ""
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
msgid "Porto"
msgstr ""
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
msgid "Porto Alegre"
msgstr ""
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
msgid "Porto Alegre Apt"
msgstr ""
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
msgid "Portoroz"
msgstr ""
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
msgid "Porto Santo"
msgstr ""
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
msgid "Porto Velho"
msgstr ""
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
msgid "Port Said"
msgstr ""
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
msgid "Portsmouth"
msgstr ""
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
msgid "Posadas"
msgstr ""
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
msgid "Potosi"
msgstr ""
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
msgid "Poughkeepsie"
msgstr ""
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
msgid "Pownal"
msgstr ""
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
msgid "Poza Rica"
msgstr ""
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
msgid "Poznan"
msgstr ""
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
msgid "Praha"
msgstr ""
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
msgid "Pratica di Mare"
msgstr ""
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
msgid "Prescott"
msgstr ""
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
msgid "Presidente Prudente"
msgstr ""
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
msgid "Presque Isle"
msgstr ""
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
msgid "Prestwick"
msgstr ""
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
msgid "Pretoria"
msgstr ""
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
msgid "Preveza"
msgstr ""
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
msgid "Price-Carbon"
msgstr ""
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
msgid "Pristina"
msgstr ""
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
msgid "Providence"
msgstr ""
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
msgid "Provincetown"
msgstr ""
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
msgid "Provo"
msgstr ""
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
msgid "Pskov"
msgstr ""
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
msgid "Pucallpa"
msgstr ""
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
msgid "Pudahuel"
msgstr ""
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
msgid "Puebla"
msgstr ""
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
msgid "Pueblo"
msgstr ""
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
msgid "Puerto Barrios"
msgstr ""
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
msgid "Puerto Cabezas"
msgstr ""
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
msgid "Puerto Escondido"
msgstr ""
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
msgid "Puerto Lempira"
msgstr ""
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
msgid "Puerto Limon"
msgstr ""
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
msgid "Puerto Maldonado"
msgstr ""
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
msgid "Puerto Montt"
msgstr ""
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
msgid "Puerto Plata"
msgstr ""
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
msgid "Puerto Suarez"
msgstr ""
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
msgid "Puerto Vallarta"
msgstr ""
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
msgid "Pula"
msgstr ""
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
msgid "Pullman"
msgstr ""
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
msgid "Punta Arenas"
msgstr ""
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
msgid "Punta Cana"
msgstr ""
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
msgid "Punta Gorda"
msgstr ""
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
msgid "Puntilla Lake"
msgstr ""
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
msgid "Pusan/Kimhae"
msgstr ""
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
msgid "Pyongtaek Ab"
msgstr ""
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
msgid "Pyongyang"
msgstr ""
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
msgid "Quantico"
msgstr ""
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
msgid "Quebec"
msgstr ""
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
msgid "Quebec City"
msgstr ""
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
msgid "Queretaro"
msgstr ""
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
msgid "Quillayute"
msgstr ""
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
msgid "Quimper"
msgstr ""
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
msgid "Quincy"
msgstr ""
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
msgid "Quito/Mariscal Sucre"
msgstr ""
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
msgid "Rabat"
msgstr ""
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
msgid "Raduzhny"
msgstr ""
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
msgid "Rafha"
msgstr ""
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
msgid "Raleigh-Durham"
msgstr ""
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
msgid "Randolph AFB"
msgstr ""
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
msgid "Rapid City"
msgstr ""
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
msgid "Rapid City-Ellsworth AFB"
msgstr ""
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
msgid "Ras Al Khaimah"
msgstr ""
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
msgid "Rawlins"
msgstr ""
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
msgid "Reading"
msgstr ""
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
msgid "Rebun Island"
msgstr ""
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
msgid "Recife"
msgstr ""
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
msgid "Red Bluff"
msgstr ""
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
msgid "Redding"
msgstr ""
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
msgid "Redig"
msgstr ""
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
msgid "Redmond"
msgstr ""
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
msgid "Red Oak"
msgstr ""
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
msgid "Redwood Falls"
msgstr ""
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
msgid "Reggio Calabria"
msgstr ""
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
msgid "Regina"
msgstr ""
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
msgid "Reims-Champagne"
msgstr ""
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
msgid "Rennes"
msgstr ""
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
msgid "Reno"
msgstr ""
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
msgid "Renton"
msgstr ""
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
msgid "Resistencia"
msgstr ""
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
msgid "Reus"
msgstr ""
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
msgid "Reyes"
msgstr ""
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
msgid "Reykjavik"
msgstr ""
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
msgid "Reynosa"
msgstr ""
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
msgid "Rhinelander"
msgstr ""
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
msgid "Rhode Island"
msgstr ""
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
msgid "Riberalta"
msgstr ""
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
msgid "Richmond"
msgstr ""
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
msgid "Rickenbacker"
msgstr ""
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
msgid "Rieti"
msgstr ""
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
#, fuzzy
msgid "Rifle"
msgstr "Chile"
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr ""
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
msgid "Rijeka"
msgstr ""
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
msgid "Rimini"
msgstr ""
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
msgid "Rio De Janeiro"
msgstr ""
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
msgid "Rio Gallegos"
msgstr ""
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
msgid "Rio Grande"
msgstr ""
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
msgid "Rioja"
msgstr ""
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
msgid "Rio / Jacarepagua"
msgstr ""
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
msgid "Rionegro/J.M.Cordova"
msgstr ""
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
msgid "Rishiri Island"
msgstr ""
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
msgid "Rivas"
msgstr ""
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
msgid "Rivera"
msgstr ""
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
msgid "Riverside"
msgstr ""
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
msgid "Riverside/March AFB"
msgstr ""
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
msgid "Riverton"
msgstr ""
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
msgid "Rivne"
msgstr ""
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
msgid "Rivolto"
msgstr ""
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
msgid "Riyadh"
msgstr ""
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
msgid "Roanoke"
msgstr ""
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
msgid "Roatan"
msgstr ""
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
msgid "Robore"
msgstr ""
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
msgid "Rochester"
msgstr ""
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
msgid "Rockford"
msgstr ""
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
msgid "Rockland"
msgstr ""
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
msgid "Rockport"
msgstr ""
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
msgid "Rock Springs"
msgstr ""
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
msgid "Rocky Mount"
msgstr ""
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
msgid "Rodos"
msgstr ""
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
msgid "Rogers"
msgstr ""
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
msgid "Roma/Ciampino"
msgstr ""
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
msgid "Roma/Fiumicino"
msgstr ""
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
msgid "Roma/Urbe"
msgstr ""
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
msgid "Rome-Russell"
msgstr ""
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
msgid "Ronchi de' Legionari"
msgstr ""
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
msgid "Ronneby"
msgstr ""
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
msgid "Roosevelt"
msgstr ""
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
#, fuzzy
msgid "Roros"
msgstr "Comoros"
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
msgid "Rorvik/Ryum"
msgstr ""
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
msgid "Rosario"
msgstr ""
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
msgid "Roseburg"
msgstr ""
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
msgid "Roseglen"
msgstr ""
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
msgid "Rost"
msgstr ""
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
msgid "Rostov-Na-Donu"
msgstr ""
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
msgid "Roswell"
msgstr ""
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
msgid "Rotterdam"
msgstr ""
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
msgid "Rouen-Valle de Seine"
msgstr ""
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
msgid "Ruidoso-Sierra Blanca"
msgstr ""
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
msgid "Rurrenabaque"
msgstr ""
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
msgid "Russell"
msgstr ""
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
msgid "Russia"
msgstr ""
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
msgid "Rutland"
msgstr ""
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
msgid "Rygge"
msgstr ""
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
msgid "Rzeszow"
msgstr ""
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
msgid "Saarbrucken"
msgstr ""
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
msgid "Sabine Pass"
msgstr ""
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
msgid "Sacramento"
msgstr ""
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
msgid "Sacramento-Woodland"
msgstr ""
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
msgid "Safford-Municipal Airport"
msgstr ""
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
msgid "Saginaw"
msgstr ""
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
msgid "Saint Anthony"
msgstr ""
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
msgid "Saint-Brieuc-Armor"
msgstr ""
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
msgid "Saint-Dizier-Robinson"
msgstr ""
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
msgid "Saint-Etienne-Boutheon"
msgstr ""
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
msgid "Saint Mary's"
msgstr ""
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
msgid "Saint Mawgan"
msgstr ""
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
msgid "Saint-Nazaire-Montoir"
msgstr ""
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
msgid "Saint Paul"
msgstr ""
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
msgid "Saiq"
msgstr ""
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
msgid "Salalah"
msgstr ""
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
msgid "Salem"
msgstr ""
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
msgid "Salida"
msgstr ""
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
msgid "Salida-Harriet"
msgstr ""
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
msgid "Salina"
msgstr ""
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
msgid "Salinas"
msgstr ""
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
msgid "Salisbury"
msgstr ""
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
msgid "Salmon"
msgstr ""
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
msgid "Salmon (2)"
msgstr ""
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
msgid "Salta"
msgstr ""
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
msgid "Saltillo"
msgstr ""
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
msgid "Salt Lake City"
msgstr ""
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
msgid "Salto"
msgstr ""
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
msgid "Salt point"
msgstr ""
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
msgid "Salvador"
msgstr ""
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
msgid "Salzburg"
msgstr ""
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
msgid "Samara"
msgstr ""
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
msgid "Samos"
msgstr ""
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
msgid "Samsun"
msgstr ""
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
msgid "Sana'A"
msgstr ""
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
msgid "San Andres Isla/Sesquicentenario"
msgstr ""
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
msgid "San Angelo"
msgstr ""
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
msgid "San Antonio"
msgstr ""
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
msgid "San Antonio Del Tachira"
msgstr ""
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
msgid "San Antonio-Kelly AFB"
msgstr ""
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
msgid "San Antonio-Stinson"
msgstr ""
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
msgid "San Carlos"
msgstr ""
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
msgid "Sandane"
msgstr ""
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
msgid "Sandberg"
msgstr ""
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
msgid "Sanderson"
msgstr ""
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
msgid "San Diego"
msgstr ""
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
msgid "San Diego-Brown"
msgstr ""
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
msgid "San Diego-Miramar"
msgstr ""
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
msgid "San Diego-Montgomery"
msgstr ""
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
msgid "San Diego-North Island"
msgstr ""
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
msgid "San Diego-Santee"
msgstr ""
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
msgid "Sandnessjoen/Stokka"
msgstr ""
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
msgid "Sand Point"
msgstr ""
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
msgid "San Fernando De Apure"
msgstr ""
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
msgid "Sanford"
msgstr ""
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
msgid "San Francisco"
msgstr ""
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
msgid "Sangju"
msgstr ""
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
msgid "San Ignacio De Velasco"
msgstr ""
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
msgid "San Joaquin"
msgstr ""
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
msgid "San Jose"
msgstr ""
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
msgid "San Jose De Chiquitos"
msgstr ""
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
msgid "San Jose del Cabo"
msgstr ""
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
msgid "San Jose-Santa Clara"
msgstr ""
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
msgid "San Juan"
msgstr ""
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
msgid "Sankt-Peterburg"
msgstr ""
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
msgid "Sanliurfa"
msgstr ""
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
msgid "San Luis Obispo"
msgstr ""
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
msgid "San Luis Potosi"
msgstr ""
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
msgid "San Miguel"
msgstr ""
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
msgid "San Nicholas Island"
msgstr ""
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
msgid "San Salvador"
msgstr ""
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
msgid "San Sebastian"
msgstr ""
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
msgid "Santa Ana"
msgstr ""
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
msgid "Santa Barbara"
msgstr ""
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
msgid "Santa Cruz"
msgstr ""
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
msgid "Santa Fe"
msgstr ""
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
msgid "Santa Maria"
msgstr ""
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
msgid "Santa Marta/Simon Bolivar"
msgstr ""
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
msgid "Santa Monica"
msgstr ""
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
msgid "Santander"
msgstr ""
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
msgid "Santarem"
msgstr ""
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
msgid "Santa Rosa"
msgstr ""
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
msgid "Santa Rosa de Copan"
msgstr ""
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
msgid "Santiago"
msgstr ""
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
msgid "Santiago de Cuba"
msgstr ""
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
msgid "Santiago Del Estero"
msgstr ""
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
msgid "Santorini"
msgstr ""
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
msgid "Santos"
msgstr ""
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
msgid "Sao Jose Dos Campo"
msgstr ""
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
msgid "Sao Luiz"
msgstr ""
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
msgid "Sao Paulo"
msgstr ""
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
msgid "Sapporo Ab"
msgstr ""
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
msgid "Sarajevo"
msgstr ""
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
msgid "Saranac Lake"
msgstr ""
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
msgid "Sarasota"
msgstr ""
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
msgid "Saratov"
msgstr ""
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
msgid "Sarzana"
msgstr ""
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
msgid "Saskatchewan"
msgstr ""
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
msgid "Saskatoon"
msgstr ""
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
msgid "Sauce Viejo"
msgstr ""
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
msgid "Sault Ste Marie"
msgstr ""
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
msgid "Savannah"
msgstr ""
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
msgid "Savannah-Hunter AAF"
msgstr ""
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
msgid "Sawyer AFB"
msgstr ""
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
msgid "Sayun"
msgstr ""
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
msgid "Scatsta"
msgstr ""
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
msgid "Schaffen"
msgstr ""
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
msgid "Schenectady"
msgstr ""
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
msgid "Scilly Isles"
msgstr ""
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
msgid "Scottsbluff"
msgstr ""
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
msgid "Scottsdale"
msgstr ""
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
#, fuzzy
msgid "Scranton"
msgstr "Organisation"
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
msgid "Seattle"
msgstr ""
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
msgid "Seattle-Boeing"
msgstr ""
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
msgid "Sedalia"
msgstr ""
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
msgid "Seeb"
msgstr ""
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
msgid "Selanik"
msgstr ""
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
msgid "Sendai Airport"
msgstr ""
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
msgid "Seoul E Ab"
msgstr ""
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
msgid "Seoul/Kimp'O International Airport"
msgstr ""
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
msgid "Seoul/Yongdungp'O Rokaf Wc"
msgstr ""
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
msgid "Sept-Iles"
msgstr ""
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
msgid "Seul Choix Pt"
msgstr ""
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
msgid "Sevilla"
msgstr ""
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
msgid "Seward"
msgstr ""
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
msgid "Sexton Summit"
msgstr ""
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
msgid "Shanghai"
msgstr ""
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
msgid "Shannon"
msgstr ""
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
msgid "Sharjah"
msgstr ""
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
msgid "Sharm El Sheikhintl"
msgstr ""
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
msgid "Sharurah"
msgstr ""
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
msgid "Shawbury"
msgstr ""
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
msgid "Shearwater"
msgstr ""
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
msgid "Sheboygan"
msgstr ""
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
msgid "Sheldon"
msgstr ""
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
msgid "Shelter Cove"
msgstr ""
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
msgid "Shelton"
msgstr ""
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
msgid "Shenandoah"
msgstr ""
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
msgid "Sheridan"
msgstr ""
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
msgid "Sherman-Denison"
msgstr ""
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
msgid "Shimofusa Ab"
msgstr ""
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
msgid "Shingle Point"
msgstr ""
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
msgid "Shiraz"
msgstr ""
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
msgid "Shishmaref"
msgstr ""
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
msgid "Shizuhama Ab"
msgstr ""
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
msgid "Shoreham"
msgstr ""
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
msgid "Show Low"
msgstr ""
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
msgid "Shreveport Downtown"
msgstr ""
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
msgid "Shreveport Regional"
msgstr ""
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
msgid "Sidney"
msgstr ""
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
msgid "Sigonella"
msgstr ""
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
msgid "Siloam Springs"
msgstr ""
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
msgid "Silver City"
msgstr ""
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
msgid "Sindal"
msgstr ""
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
msgid "Sioux City"
msgstr ""
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
msgid "Sioux Falls"
msgstr ""
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
msgid "Sitka"
msgstr ""
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
msgid "Sivas"
msgstr ""
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
msgid "Sivrihisar"
msgstr ""
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
msgid "Skagway"
msgstr ""
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
msgid "Skiathos"
msgstr ""
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
msgid "Skien/Geiteryggen"
msgstr ""
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
msgid "Skive"
msgstr ""
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
msgid "Skopje"
msgstr ""
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
msgid "Skwentna"
msgstr ""
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
msgid "Slana"
msgstr ""
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
msgid "Smithers"
msgstr ""
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
msgid "Smyrna"
msgstr ""
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
msgid "Snowshoe Lake"
msgstr ""
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
msgid "Sochi"
msgstr ""
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
msgid "Socorro"
msgstr ""
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
msgid "Socotra"
msgstr ""
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
msgid "Soda Springs"
msgstr ""
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
msgid "Sofia"
msgstr ""
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
msgid "Sogndal"
msgstr ""
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
msgid "Soldotna"
msgstr ""
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
msgid "Somerset"
msgstr ""
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
msgid "Sonderborg"
msgstr ""
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
msgid "Songmu Ab"
msgstr ""
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
msgid "Sorkjosen"
msgstr ""
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
msgid "Southampton"
msgstr ""
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
msgid "South Bend"
msgstr ""
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
msgid "South Carolina"
msgstr ""
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
msgid "South Dakota"
msgstr ""
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
msgid "Southend"
msgstr ""
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
msgid "South Marsh Island"
msgstr ""
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
msgid "South Timbalier"
msgstr ""
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
msgid "Sparrevohn"
msgstr ""
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
msgid "Spencer"
msgstr ""
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
msgid "Spickard"
msgstr ""
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
msgid "Split"
msgstr ""
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
msgid "Spokane"
msgstr ""
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
msgid "Spokane-Parkwater"
msgstr ""
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
msgid "Springbok"
msgstr ""
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
#, fuzzy
msgid "Springfield"
msgstr "Synchronising folder"
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
msgid "Stampede Pass"
msgstr ""
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
msgid "State College"
msgstr ""
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
msgid "Stauning"
msgstr ""
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
msgid "Staunton"
msgstr ""
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
msgid "Stavanger/Sola"
msgstr ""
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
msgid "Staverton"
msgstr ""
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
msgid "Stavropol"
msgstr ""
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
msgid "St Cloud"
msgstr ""
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
msgid "Steamboat Springs"
msgstr ""
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
msgid "Stephenville"
msgstr ""
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
msgid "St. George"
msgstr ""
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
msgid "Stillwater"
msgstr ""
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
msgid "St. John's"
msgstr ""
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
msgid "St Johnsbury"
msgstr ""
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
msgid "St Joseph"
msgstr ""
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
msgid "St Louis"
msgstr ""
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
msgid "St Louis-Spirit"
msgstr ""
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
msgid "Stockholm (Arlanda)"
msgstr ""
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
msgid "Stockholm (Bromma)"
msgstr ""
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
msgid "Stockton"
msgstr ""
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
msgid "Stokmarknes/Skagen"
msgstr ""
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
msgid "Stord/Sorstokken"
msgstr ""
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
msgid "Storm Lake"
msgstr ""
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
msgid "Stornoway"
msgstr ""
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
msgid "St Paul"
msgstr ""
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
msgid "St Petersburg"
msgstr ""
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
msgid "St Petersburg / Clearwater"
msgstr ""
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
msgid "Strasbourg"
msgstr ""
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
msgid "Strevell"
msgstr ""
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
msgid "St Simon's Island"
msgstr ""
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
msgid "Stumpy Point"
msgstr ""
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
msgid "Sturgeon Bay"
msgstr ""
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
msgid "Stuttgart"
msgstr ""
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
msgid "Sucre"
msgstr ""
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
msgid "Sumburgh"
msgstr ""
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
msgid "Sumter"
msgstr ""
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
msgid "Sumter (2)"
msgstr ""
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
msgid "Sundsvall-Harnosand"
msgstr ""
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
msgid "Sungshan/Taipei"
msgstr ""
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
msgid "Superior"
msgstr ""
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
msgid "Sutton"
msgstr ""
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
msgid "Suwon Ab"
msgstr ""
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
msgid "Svalbard"
msgstr ""
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
msgid "Svolvaer/Helle"
msgstr ""
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
msgid "Swift Current"
msgstr ""
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
msgid "Sydney"
msgstr ""
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
msgid "Syktyvkar"
msgstr ""
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
msgid "Sympheropol"
msgstr ""
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
msgid "Syracuse"
msgstr ""
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
msgid "Szczecin"
msgstr ""
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
msgid "Szombathely"
msgstr ""
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
msgid "Tabatinga"
msgstr ""
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
msgid "Tabriz"
msgstr ""
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
msgid "Tabuk"
msgstr ""
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
msgid "Tachikawa Ab"
msgstr ""
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
msgid "Tacna"
msgstr ""
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
msgid "Tacoma"
msgstr ""
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
msgid "Tacoma-Lakewood"
msgstr ""
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
msgid "Tacuarembo"
msgstr ""
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
msgid "Taegu"
msgstr ""
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
msgid "Taegu Ab"
msgstr ""
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
msgid "Taejon"
msgstr ""
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
msgid "Tahoe Valley"
msgstr ""
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
msgid "Taichung"
msgstr ""
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
msgid "Taif"
msgstr ""
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
msgid "Tainan"
msgstr ""
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
msgid "Taiyuan"
msgstr ""
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
msgid "Taiz"
msgstr ""
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
msgid "Tajima"
msgstr ""
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
msgid "Takamatsu Airport"
msgstr ""
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
msgid "Talara"
msgstr ""
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr ""
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
msgid "Talkeetna"
msgstr ""
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
msgid "Tallahassee"
msgstr ""
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+msgid "Tallinn"
+msgstr ""
+
+#: my-evolution/Locations.h:2212
msgid "Tamanrasset"
msgstr ""
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
msgid "Tamanrasset/Aguenna"
msgstr ""
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
msgid "Tampa"
msgstr ""
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
msgid "Tampa-Macdill AFB"
msgstr ""
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
msgid "Tampere"
msgstr ""
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
msgid "Tampico"
msgstr ""
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
msgid "Tanana"
msgstr ""
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
msgid "Tanegashima Airport"
msgstr ""
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
msgid "Taos"
msgstr ""
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
msgid "Taoyuan"
msgstr ""
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
msgid "Tapachula"
msgstr ""
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
msgid "Taranto"
msgstr ""
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
msgid "Tarbes"
msgstr ""
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
msgid "Tarija"
msgstr ""
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
msgid "Tarvisio"
msgstr ""
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
msgid "Tatalina"
msgstr ""
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
msgid "Tateyama Ab"
msgstr ""
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
msgid "Taunton"
msgstr ""
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
msgid "Tebessa"
msgstr ""
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
msgid "Tees-Side"
msgstr ""
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
msgid "Tegucigalpa"
msgstr ""
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
msgid "Tehran-Mehrabad"
msgstr ""
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
msgid "Tela"
msgstr ""
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
msgid "Temple"
msgstr ""
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
msgid "Tennessee"
msgstr ""
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
msgid "Tepic"
msgstr ""
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
msgid "Teresina"
msgstr ""
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
msgid "Terre Haute"
msgstr ""
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
msgid "Terrell"
msgstr ""
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
msgid "Teterboro"
msgstr ""
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
msgid "Texarkana"
msgstr ""
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
msgid "Texas"
msgstr ""
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
msgid "The Dalles"
msgstr ""
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
msgid "Thessaloniki"
msgstr ""
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
msgid "Thief River Falls"
msgstr ""
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
msgid "Thiruvananthapuram"
msgstr ""
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
msgid "Thisted"
msgstr ""
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
msgid "Thompson Falls"
msgstr ""
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
msgid "Thumrait"
msgstr ""
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
msgid "Tianjin"
msgstr ""
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
msgid "Tijuana"
msgstr ""
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
msgid "Timisoara"
msgstr ""
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
msgid "Tin City"
msgstr ""
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
msgid "Tirana"
msgstr ""
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
msgid "Tiree"
msgstr ""
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
msgid "Tirgu Mures"
msgstr ""
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
msgid "Tiruchchirapalli"
msgstr ""
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
msgid "Titusville"
msgstr ""
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
msgid "Tivat"
msgstr ""
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
msgid "Tlemcen Zenata"
msgstr ""
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
msgid "Tobias Bolanos"
msgstr ""
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
msgid "Tocumen"
msgstr ""
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
msgid "Togiak Village"
msgstr ""
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
msgid "Tokachi GSDF"
msgstr ""
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
msgid "Tokunoshima Island"
msgstr ""
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
msgid "Tokushima Ab"
msgstr ""
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
msgid "Tokyo Heliport"
msgstr ""
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
msgid "Tokyo International Airport"
msgstr ""
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
msgid "Tokyo New International Airport"
msgstr ""
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
msgid "Toledo"
msgstr ""
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
msgid "Toluca"
msgstr ""
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
msgid "Tonopah"
msgstr ""
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
msgid "Topeka"
msgstr ""
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
msgid "Topeka-Forbes Field"
msgstr ""
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
msgid "Torino/Bric Della Croce"
msgstr ""
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
msgid "Torino/Caselle"
msgstr ""
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
msgid "Toronto"
msgstr ""
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
msgid "Torp"
msgstr ""
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
msgid "Torrance"
msgstr ""
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
msgid "Torreon"
msgstr ""
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
msgid "Tottori Airport"
msgstr ""
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
msgid "Toulouse"
msgstr ""
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
msgid "Toul-Rosieres"
msgstr ""
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
msgid "Tours-St-Symphorien"
msgstr ""
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
msgid "Toussus-Le Noble"
msgstr ""
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
msgid "Townsville"
msgstr ""
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
msgid "Toyama Airport"
msgstr ""
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
msgid "Trabzon"
msgstr ""
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
msgid "Trapani"
msgstr ""
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
msgid "Traverse City"
msgstr ""
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
msgid "Trelew"
msgstr ""
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
msgid "Trenton"
msgstr ""
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
msgid "Trevico"
msgstr ""
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
msgid "Treviso/Istrana"
msgstr ""
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
msgid "Treviso/S.Angelo"
msgstr ""
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
msgid "Trieste"
msgstr ""
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
msgid "Trinidad"
msgstr ""
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
msgid "Tripoli"
msgstr ""
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
msgid "Tromso/Langnes"
msgstr ""
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
msgid "Trondheim/Vaernes"
msgstr ""
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
msgid "Troutdale"
msgstr ""
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
msgid "Troyes/Barberey"
msgstr ""
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
msgid "Truckee"
msgstr ""
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
msgid "Truth or Consequences"
msgstr ""
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
msgid "Tsuiki Ab"
msgstr ""
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
msgid "Tsushima Airport"
msgstr ""
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
msgid "Tucson"
msgstr ""
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
msgid "Tucson-Davis AFB"
msgstr ""
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
msgid "Tucuman"
msgstr ""
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
msgid "Tucumcari"
msgstr ""
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
msgid "Tucurui"
msgstr ""
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
msgid "Tulancingo"
msgstr ""
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
msgid "Tulcea"
msgstr ""
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
msgid "Tulsa"
msgstr ""
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
msgid "Tupelo"
msgstr ""
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
msgid "Turaif"
msgstr ""
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
msgid "Turin"
msgstr ""
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
msgid "Turku"
msgstr ""
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
msgid "Tuscaloosa"
msgstr ""
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
msgid "Tuxtla Gutierrez"
msgstr ""
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
msgid "Twenthe"
msgstr ""
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
msgid "Twentynine Palms"
msgstr ""
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
msgid "Twin Falls"
msgstr ""
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
msgid "Tyler"
msgstr ""
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
msgid "Tyndall AFB"
msgstr ""
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
msgid "Tyumen"
msgstr ""
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
msgid "Uberaba"
msgstr ""
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
msgid "Ufa"
msgstr ""
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
msgid "Ukiah"
msgstr ""
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
msgid "Ulan-Ude"
msgstr ""
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
msgid "Ulsan"
msgstr ""
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
msgid "Ulyanovsk"
msgstr ""
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
msgid "Umea"
msgstr ""
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
msgid "Umiat"
msgstr ""
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
msgid "Unalakleet"
msgstr ""
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
msgid "United Arab Emirates "
msgstr ""
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
msgid "Unst"
msgstr ""
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
msgid "Upington"
msgstr ""
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
msgid "Uruapan"
msgstr ""
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
msgid "Uruguaiana"
msgstr ""
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
msgid "Urumqi"
msgstr ""
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
msgid "Utah"
msgstr ""
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
msgid "Utica"
msgstr ""
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
msgid "Utrecht/Soesterberg"
msgstr ""
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
msgid "Utsunomiya Ab"
msgstr ""
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
msgid "Uzhgorod"
msgstr ""
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
msgid "Vadso"
msgstr ""
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
msgid "Vaerlose"
msgstr ""
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
msgid "Vagar"
msgstr ""
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
msgid "Valdez 2"
msgstr ""
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
msgid "Valdosta"
msgstr ""
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
msgid "Valdosta-Moody AFB"
msgstr ""
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
msgid "Valencia"
msgstr ""
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
msgid "Valentine"
msgstr ""
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
msgid "Valera*"
msgstr ""
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
msgid "Valkenburg"
msgstr ""
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
msgid "Valley"
msgstr ""
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
msgid "Valparaiso"
msgstr ""
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
msgid "Valparaiso-Eglin AFB"
msgstr ""
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
msgid "Van"
msgstr ""
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
msgid "Vancouver"
msgstr ""
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
msgid "Vandel"
msgstr ""
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
msgid "Vandenberg AFB"
msgstr ""
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
msgid "Vandenberg Range"
msgstr ""
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
msgid "Van Nuys"
msgstr ""
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
msgid "Varadero"
msgstr ""
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
msgid "Varanasi/Babatpur"
msgstr ""
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
msgid "Varna"
msgstr ""
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
msgid "Vasteras"
msgstr ""
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
msgid "Vaxjo"
msgstr ""
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
msgid "Venezia"
msgstr ""
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
msgid "Venice"
msgstr ""
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
msgid "Veracruz"
msgstr ""
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
msgid "Vermillion"
msgstr ""
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
msgid "Vermont"
msgstr ""
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
msgid "Vernal"
msgstr ""
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
msgid "Vero Beach"
msgstr ""
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
msgid "Vicenza"
msgstr ""
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
msgid "Vichy-Charmeil"
msgstr ""
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
msgid "Vichy-Rolla"
msgstr ""
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
msgid "Vicksburg"
msgstr ""
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
msgid "Victoria"
msgstr ""
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
msgid "Vigo"
msgstr ""
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
msgid "Vilhena"
msgstr ""
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
msgid "Villacoublay"
msgstr ""
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
msgid "Villafranca"
msgstr ""
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
msgid "Villahermosa"
msgstr ""
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
msgid "Villamontes"
msgstr ""
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
msgid "Villa Reynolds"
msgstr ""
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
msgid "Vilnius"
msgstr ""
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
msgid "Virginia"
msgstr ""
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
msgid "Virginia Beach"
msgstr ""
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
msgid "Virginia Tech Airport"
msgstr ""
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
msgid "Viru-Viru"
msgstr ""
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
msgid "Visalia"
msgstr ""
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
msgid "Visby"
msgstr ""
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
msgid "Viterbo"
msgstr ""
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
msgid "Vitoria"
msgstr ""
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
msgid "Vladikavkaz"
msgstr ""
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
msgid "Vladivostok"
msgstr ""
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
msgid "Vlieland"
msgstr ""
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
msgid "Vojens/Skrydstrup"
msgstr ""
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
msgid "Volgograd"
msgstr ""
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
msgid "Volkel"
msgstr ""
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
msgid "Volk Field"
msgstr ""
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
msgid "Voronezh"
msgstr ""
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
msgid "Voslau"
msgstr ""
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
msgid "Waco"
msgstr ""
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
msgid "Wadi Al Dawasser Airport"
msgstr ""
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
msgid "Wainwright"
msgstr ""
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
msgid "Wakefield"
msgstr ""
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
msgid "Wakkanai Airport"
msgstr ""
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
msgid "Walla Walla"
msgstr ""
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
msgid "Wallops Island"
msgstr ""
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
msgid "Walnut Ridge"
msgstr ""
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
msgid "Warner Robins"
msgstr ""
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
msgid "Warroad"
msgstr ""
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
msgid "Warszawa"
msgstr ""
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
msgid "Washington"
msgstr ""
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
msgid "Washington/Dulles"
msgstr ""
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
msgid "Waterbury"
msgstr ""
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
msgid "Waterloo"
msgstr ""
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
msgid "Watertown"
msgstr ""
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
msgid "Waterville"
msgstr ""
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
msgid "Waukesha"
msgstr ""
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
msgid "Wausau"
msgstr ""
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
msgid "Waycross"
msgstr ""
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
msgid "Waynesboro"
msgstr ""
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
msgid "Webster City"
msgstr ""
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
msgid "Wejh"
msgstr ""
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
msgid "Wellington"
msgstr ""
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
msgid "Wenatchee"
msgstr ""
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
msgid "Wendover"
msgstr ""
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
msgid "West Atlanta"
msgstr ""
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
msgid "West Burke"
msgstr ""
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
msgid "Westerland"
msgstr ""
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
msgid "Westfield"
msgstr ""
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
msgid "Westhampton"
msgstr ""
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
msgid "West Palm Beach"
msgstr ""
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
msgid "West Virginia"
msgstr ""
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
msgid "West Yellowstone"
msgstr ""
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
msgid "West Yellowstone (2)"
msgstr ""
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
msgid "Wheeling"
msgstr ""
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
msgid "Whidbey Island"
msgstr ""
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
msgid "Whitefield"
msgstr ""
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
msgid "White Plains"
msgstr ""
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
msgid "White Sulphur"
msgstr ""
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
msgid "Whittier"
msgstr ""
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
msgid "Wichita"
msgstr ""
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
msgid "Wichita Falls"
msgstr ""
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
msgid "Wichita-Jabara"
msgstr ""
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
msgid "Wichita-McConnell AFB"
msgstr ""
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
msgid "Wick"
msgstr ""
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
msgid "Wien"
msgstr ""
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
msgid "Wildwood"
msgstr ""
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
msgid "Wilkes - Barre"
msgstr ""
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
msgid "Williams Field"
msgstr ""
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
msgid "Williamsport"
msgstr ""
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
msgid "Williston"
msgstr ""
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
msgid "Willoughby"
msgstr ""
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
msgid "Willow Airport"
msgstr ""
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
msgid "Wilmington"
msgstr ""
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
msgid "Winchester"
msgstr ""
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
msgid "Windsor"
msgstr ""
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
msgid "Windsor Locks"
msgstr ""
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
msgid "Wink"
msgstr ""
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
msgid "Winnemucca"
msgstr ""
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
msgid "Winnipeg"
msgstr ""
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
msgid "Winslow"
msgstr ""
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
msgid "Winston-Salem"
msgstr ""
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
msgid "Winter Haven"
msgstr ""
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
msgid "Winter Park"
msgstr ""
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
msgid "Wiscasset"
msgstr ""
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
msgid "Wisconsin"
msgstr ""
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
msgid "Wisconsin Rapids"
msgstr ""
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
msgid "Wise"
msgstr ""
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
msgid "Woensdrecht"
msgstr ""
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
msgid "Wolf Point"
msgstr ""
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
msgid "Woong Cheon"
msgstr ""
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
msgid "Wooster"
msgstr ""
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
msgid "Worcester"
msgstr ""
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
msgid "Worland"
msgstr ""
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
msgid "Worthington"
msgstr ""
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
msgid "Wrangell"
msgstr ""
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
msgid "Wrightstown / Mcguire AFB"
msgstr ""
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
msgid "Wuchia Observatory"
msgstr ""
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
msgid "Wyoming"
msgstr ""
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
msgid "Xiamen"
msgstr ""
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
msgid "Yacuiba"
msgstr ""
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
msgid "Yakima"
msgstr ""
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
msgid "Yakushima"
msgstr ""
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
msgid "Yakutat"
msgstr ""
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
msgid "Yakutsk"
msgstr ""
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
msgid "Yamagata Airport"
msgstr ""
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
msgid "Yamaguchi Ube Airport"
msgstr ""
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
msgid "Yankton"
msgstr ""
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
msgid "Yao Airport"
msgstr ""
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
msgid "Yechon Ab"
msgstr ""
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
msgid "Yekaterinburg"
msgstr ""
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
msgid "Yellowknife"
msgstr ""
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
msgid "Yellowstone"
msgstr ""
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
msgid "Yenbo"
msgstr ""
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
msgid "Yeoju Range"
msgstr ""
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
msgid "Yeonpyeungdo"
msgstr ""
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
msgid "Yeovilton"
msgstr ""
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
msgid "Yokosuka Fwf"
msgstr ""
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
msgid "Yokota Ab"
msgstr ""
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
msgid "Yongsan/H-208 Hp"
msgstr ""
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
msgid "Yoro"
msgstr ""
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
msgid "Yosu"
msgstr ""
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
msgid "Youngstown"
msgstr ""
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
msgid "Ypsilanti"
msgstr ""
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
msgid "Yukon"
msgstr ""
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
msgid "Yuma MCAS"
msgstr ""
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
msgid "Yurimaguas"
msgstr ""
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
msgid "Yuzhno-Sakhalinsk"
msgstr ""
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
msgid "Zacatecas"
msgstr ""
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
msgid "Zadar"
msgstr ""
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
msgid "Zagreb"
msgstr ""
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
msgid "Zakinthos"
msgstr ""
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
msgid "Zama Airfield"
msgstr ""
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
msgid "Zanesville"
msgstr ""
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
msgid "Zaragoza"
msgstr ""
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
msgid "Zell Am See"
msgstr ""
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
msgid "Zuni Pueblo"
msgstr ""
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
msgid "Zurich"
msgstr ""
@@ -21912,17 +22605,12 @@ msgstr ""
msgid "No description"
msgstr ""
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
msgid "Mail summary"
msgstr ""
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr ""
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
msgid "Local Folders"
msgstr ""
@@ -21931,54 +22619,45 @@ msgstr ""
#. stations and their codes in Evolution sources.
#. (evolution/my-evolution/Locations)
#. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
#: my-evolution/e-summary-weather.c:603
msgid "KBOS"
msgstr ""
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
msgid "Dictionary.com Word of the Day"
msgstr ""
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
msgid "Quotes of the Day"
msgstr ""
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
msgid "Add a news feed"
msgstr ""
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
msgid "Enter the URL of the news feed you wish to add"
msgstr ""
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr ""
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
msgid "Error downloading RDF"
msgstr ""
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
msgid "News Feed"
msgstr ""
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
msgid "All"
msgstr ""
#. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
-msgid "Add ->"
+#: my-evolution/e-summary-shown.c:545
+msgid "Add"
msgstr ""
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-msgid "<- Remove"
-msgstr ""
-
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
msgid "Shown"
msgstr ""
@@ -22018,10 +22697,43 @@ msgstr ""
msgid "Printing of Summary failed"
msgstr ""
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
msgid "Executive summary component could not initialize Bonobo.\n"
msgstr "Could not initialise Bonobo.\n"
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr ""
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr ""
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "Chile"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr ""
+
#: my-evolution/metar.c:44
msgid "Clear sky"
msgstr ""
@@ -23173,91 +23885,96 @@ msgid "C_elsius"
msgstr ""
#: my-evolution/my-evolution.glade.h:4
-msgid "How many days should the calendar display at once?"
+msgid "Delete news feed"
msgstr ""
#: my-evolution/my-evolution.glade.h:5
-msgid "Ma_x number of items shown:"
+msgid "How many days should the calendar display at once?"
msgstr ""
#: my-evolution/my-evolution.glade.h:6
-msgid "News Feed Settings"
+msgid "Ma_x number of items shown:"
msgstr ""
#: my-evolution/my-evolution.glade.h:7
-msgid "One mont_h"
+msgid "News Feed Settings"
msgstr ""
#: my-evolution/my-evolution.glade.h:8
-msgid "One w_eek"
+msgid "One mont_h"
msgstr ""
#: my-evolution/my-evolution.glade.h:9
-msgid "R_efresh time (seconds):"
+msgid "One w_eek"
msgstr ""
#: my-evolution/my-evolution.glade.h:10
-msgid "Refresh _time (seconds):"
+msgid "R_efresh time (seconds):"
msgstr ""
#: my-evolution/my-evolution.glade.h:11
-msgid "S_how full path for folders"
+msgid "Refresh _time (seconds):"
msgstr ""
#: my-evolution/my-evolution.glade.h:12
-msgid "Show _all tasks"
+msgid "S_how full path for folders"
msgstr ""
#: my-evolution/my-evolution.glade.h:13
-msgid "Show _today's tasks"
+msgid "Show _all tasks"
msgstr ""
#: my-evolution/my-evolution.glade.h:14
-msgid "Show temperatures in:"
+msgid "Show _today's tasks"
msgstr ""
#: my-evolution/my-evolution.glade.h:15
-msgid "Tasks "
+msgid "Show temperatures in:"
msgstr ""
#: my-evolution/my-evolution.glade.h:16
-msgid "Weather settings"
+msgid "Tasks "
msgstr ""
#: my-evolution/my-evolution.glade.h:17
-msgid "_Fahrenheit"
+msgid "Weather settings"
msgstr ""
#: my-evolution/my-evolution.glade.h:18
-msgid "_Five days"
+msgid "_Fahrenheit"
msgstr ""
#: my-evolution/my-evolution.glade.h:19
-msgid "_Mail"
+msgid "_Five days"
msgstr ""
#: my-evolution/my-evolution.glade.h:20
-msgid "_News Feeds"
+msgid "_Mail"
msgstr ""
#: my-evolution/my-evolution.glade.h:21
-msgid "_One day"
+msgid "_News Feeds"
msgstr ""
#: my-evolution/my-evolution.glade.h:22
-msgid "_Schedule"
+msgid "_One day"
msgstr ""
#: my-evolution/my-evolution.glade.h:23
+msgid "_Schedule"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:24
msgid "_Weather"
msgstr ""
#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "Cannot initialise Evolution's mail component."
#: shell/GNOME_Evolution_Shell.oaf.in.h:2
-msgid "Default Folders"
+msgid "Folder Settings"
msgstr ""
#: shell/GNOME_Evolution_Shell.oaf.in.h:3
@@ -23265,7 +23982,7 @@ msgid "The Evolution shell."
msgstr ""
#: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
msgstr ""
#: shell/e-activity-handler.c:162
@@ -23276,6 +23993,34 @@ msgstr ""
msgid "Cancel Operation"
msgstr ""
+#: shell/e-folder-dnd-bridge.c:52
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr "Can not get folder: %s: %s"
+
+#: shell/e-folder-list.c:312
+msgid "Add a Folder"
+msgstr ""
+
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr ""
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr ""
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr ""
+
+#: shell/e-local-storage.c:177
+msgid "Sent"
+msgstr ""
+
#: shell/e-setup.c:126
msgid "Evolution installation"
msgstr ""
@@ -23362,6 +24107,27 @@ msgstr ""
msgid "Brought to you by"
msgstr ""
+#: shell/e-shell-config-autocompletion.c:106
+msgid "Extra Completion folders"
+msgstr ""
+
+#: shell/e-shell-config-default-folders.c:133
+msgid "Select Default Folder"
+msgstr ""
+
+#: shell/e-shell-config-folder-settings.c:71
+msgid "Default Folders"
+msgstr ""
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Synchronising folders"
+
+#: shell/e-shell-config-folder-settings.c:77
+msgid "Autocompletion Folders"
+msgstr ""
+
#: shell/e-shell-folder-commands.c:140
#, fuzzy, c-format
msgid "Cannot copy folder: %s"
@@ -23389,54 +24155,53 @@ msgstr ""
msgid "Specify a folder to copy folder \"%s\" into:"
msgstr ""
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
msgid "Copy folder"
msgstr ""
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
#, c-format
msgid "Specify a folder to move folder \"%s\" into:"
msgstr ""
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
msgid "Move folder"
msgstr ""
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
#, c-format
msgid ""
"Cannot delete folder:\n"
"%s"
msgstr ""
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
#, c-format
msgid "Delete \"%s\""
msgstr ""
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
+#: shell/e-shell-folder-commands.c:407
#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
+msgid "Really delete folder \"%s\"?"
msgstr ""
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
#, c-format
msgid ""
"Cannot rename folder:\n"
"%s"
msgstr ""
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr ""
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
msgid "Rename folder"
msgstr ""
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
#: shell/e-shell-folder-creation-dialog.c:168
#, c-format
msgid "The specified folder name is not valid: %s"
@@ -23453,13 +24218,13 @@ msgstr ""
msgid "Evolution - Create new folder"
msgstr ""
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
msgid ""
"The type of the selected folder is not valid for\n"
"the requested operation."
msgstr ""
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
msgid "New..."
msgstr ""
@@ -23501,110 +24266,155 @@ msgid ""
"Importing item %d."
msgstr ""
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+msgid "Select importer"
+msgstr ""
+
+#: shell/e-shell-importer.c:498
#, c-format
msgid "File %s does not exist"
msgstr ""
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
msgid "Evolution Error"
msgstr ""
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
msgid "You may only import to local folders"
msgstr ""
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
#, c-format
msgid ""
"There is no importer that is able to handle\n"
"%s"
msgstr ""
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
msgid "Importing"
msgstr ""
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
#, c-format
msgid ""
"Importing %s.\n"
"Starting %s"
msgstr ""
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
#, c-format
msgid "Error starting %s"
msgstr ""
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
#, c-format
msgid "Error loading %s"
msgstr ""
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
#, c-format
msgid ""
"Importing %s\n"
"Importing item 1."
msgstr ""
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
msgid "Automatic"
msgstr ""
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
msgid "Filename:"
msgstr ""
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
msgid "Select a file"
msgstr ""
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
msgid "File type:"
msgstr ""
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
msgid "Import data and settings from older programs"
msgstr ""
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
msgid "Import a single file"
msgstr ""
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
msgid ""
"Please wait...\n"
"Scanning for existing setups"
msgstr ""
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
msgid "Starting Intelligent Importers"
msgstr ""
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
#, c-format
msgid "From %s:"
msgstr ""
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
msgid "Select folder"
msgstr ""
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
msgid "Select a destination folder for importing this data"
msgstr ""
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
msgid "Import"
msgstr ""
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
msgid "Closing connections..."
msgstr ""
+#: shell/e-shell-offline-sync.c:161
+#, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Synchronising folder"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, fuzzy, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr "Synchronising folder"
+
+#: shell/e-shell-settings-dialog.c:290
+msgid "Evolution Settings"
+msgstr ""
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Synchronising folder"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Synchronising folders"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, c-format
+msgid "in \"%s\" ..."
+msgstr ""
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+
#: shell/e-shell-startup-wizard.c:159
#, fuzzy, c-format
msgid ""
@@ -23617,8 +24427,8 @@ msgstr "Cannot initialise Evolution's Mail Wizard interface"
msgid "Could not start the Evolution Mailer Assistant interface\n"
msgstr "Cannot initialise Evolution's Mail Wizard interface"
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
#: widgets/misc/e-charset-picker.c:104
msgid "New"
msgstr ""
@@ -23639,44 +24449,44 @@ msgstr ""
msgid "'.' and '..' are reserved folder names."
msgstr ""
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
msgid "Bug buddy was not found in your $PATH."
msgstr ""
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
msgid "Bug buddy could not be run."
msgstr ""
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
#, fuzzy
msgid "About Ximian Evolution"
msgstr "Can not initialise the Ximian Evolution shell."
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
msgid "Go to folder..."
msgstr ""
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
msgid "Select the folder that you want to open"
msgstr ""
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
msgid "Create a new shortcut"
msgstr ""
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
msgid "Select the folder you want the shortcut to point to:"
msgstr ""
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
msgid "_Work Online"
msgstr ""
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
msgid "_Work Offline"
msgstr ""
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
msgid "Work Offline"
msgstr ""
@@ -23707,7 +24517,7 @@ msgid ""
"Ximian Evolution is currently offline. Click on this button to work online."
msgstr ""
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
#, c-format
msgid ""
"Cannot activate component %s :\n"
@@ -23715,12 +24525,12 @@ msgid ""
"%s"
msgstr ""
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
#, c-format
msgid "Cannot set up local storage -- %s"
msgstr ""
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
#, c-format
msgid ""
"The Evolution component that handles folders of type \"%s\"\n"
@@ -23728,23 +24538,19 @@ msgid ""
"in order to access that data again."
msgstr ""
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr ""
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
msgid "Invalid arguments"
msgstr ""
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
msgid "Cannot register on OAF"
msgstr ""
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
msgid "Configuration Database not found"
msgstr ""
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
msgid "Generic error"
msgstr ""
@@ -23767,95 +24573,95 @@ msgstr ""
msgid "Don't remove"
msgstr ""
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
msgid "Rename Shortcut Group"
msgstr ""
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
msgid "Rename selected shortcut group to:"
msgstr ""
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
msgid "_Small Icons"
msgstr ""
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
msgid "Show the shortcuts as small icons"
msgstr ""
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
msgid "_Large Icons"
msgstr ""
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
msgid "Show the shortcuts as large icons"
msgstr ""
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
msgid "_New Group..."
msgstr ""
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
msgid "Create a new shortcut group"
msgstr ""
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
msgid "_Remove this Group..."
msgstr ""
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
msgid "Remove this shortcut group"
msgstr ""
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
msgid "Re_name this Group..."
msgstr ""
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
msgid "Rename this shortcut group"
msgstr ""
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
msgid "_Hide the Shortcut Bar"
msgstr ""
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
msgid "Hide the shortcut bar"
msgstr ""
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
msgid "Rename shortcut"
msgstr ""
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
msgid "Rename selected shortcut to:"
msgstr ""
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
msgid "Open the folder linked to this shortcut"
msgstr ""
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
msgid "Open in New _Window"
msgstr ""
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
msgid "Open the folder linked to this shortcut in a new window"
msgstr ""
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
msgid "_Rename"
msgstr ""
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
msgid "Rename this shortcut"
msgstr ""
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
msgid "Re_move"
msgstr ""
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
msgid "Remove this shortcut from the shortcut bar"
msgstr ""
@@ -23867,10 +24673,6 @@ msgstr ""
msgid "Shortcuts"
msgstr ""
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr ""
-
#: shell/e-storage-set-view.etspec.h:1
msgid "Checkbox"
msgstr ""
@@ -23934,10 +24736,11 @@ msgid "%s (...)"
msgstr ""
#: shell/e-task-widget.c:196
+#, c-format
msgid "%s (%d%% complete)"
msgstr ""
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
msgid "<click here to select a folder>"
msgstr ""
@@ -23967,67 +24770,67 @@ msgid ""
"%s"
msgstr ""
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
msgid "CORBA error"
msgstr ""
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
msgid "Interrupted"
msgstr ""
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
msgid "Invalid argument"
msgstr ""
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
msgid "Already has an owner"
msgstr ""
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
msgid "No owner"
msgstr ""
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
msgid "Not found"
msgstr ""
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
msgid "Unsupported type"
msgstr ""
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
msgid "Unsupported schema"
msgstr ""
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
msgid "Unsupported operation"
msgstr ""
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
msgid "Internal error"
msgstr ""
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
msgid "Exists"
msgstr ""
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
msgid "Invalid URI"
msgstr ""
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
msgid "Has subfolders"
msgstr ""
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
msgid "No space left"
msgstr ""
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
msgid "Old owner has died"
msgstr ""
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
msgid "Test type"
msgstr ""
@@ -24143,47 +24946,78 @@ msgstr ""
msgid "Evolution can import data from the following files:"
msgstr ""
-#: shell/main.c:89
+#: shell/main.c:91
msgid "Evolution"
msgstr ""
-#: shell/main.c:95
+#: shell/main.c:97
msgid "Evolution is now exiting ..."
msgstr ""
-#: shell/main.c:227
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi. Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Can not initialise the Ximian Evolution shell."
+
+#: shell/main.c:254
+msgid "Don't tell me again"
+msgstr ""
+
+#: shell/main.c:347
msgid "Cannot access the Ximian Evolution shell."
msgstr "Can not initialise the Ximian Evolution shell."
-#: shell/main.c:236
+#: shell/main.c:356
#, c-format
msgid "Cannot initialize the Ximian Evolution shell: %s"
msgstr "Can not initialise the Ximian Evolution shell."
-#: shell/main.c:317
+#: shell/main.c:437
msgid "Disable splash screen"
msgstr ""
-#: shell/main.c:318
+#: shell/main.c:438
msgid "Start in offline mode"
msgstr ""
-#: shell/main.c:319
+#: shell/main.c:439
msgid "Start in online mode"
msgstr ""
-#: shell/main.c:320
+#: shell/main.c:440
msgid "Send the debugging output of all components to a file."
msgstr ""
-#: shell/main.c:338
+#: shell/main.c:458
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
" Use %s --help for more information.\n"
msgstr ""
-#: shell/main.c:368
+#: shell/main.c:488
msgid "Cannot initialize the Bonobo component system."
msgstr "Can not initialise the Bonobo component system."
@@ -24292,11 +25126,11 @@ msgstr ""
#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
msgid "_Actions"
msgstr ""
@@ -24417,8 +25251,8 @@ msgstr ""
msgid "Delete this item"
msgstr ""
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
msgid "Main toolbar"
msgstr ""
@@ -24458,7 +25292,7 @@ msgstr ""
#: ui/evolution-mail-messagedisplay.xml.h:7
#: ui/evolution-message-composer.xml.h:48
#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
msgid "_File"
msgstr ""
@@ -24523,19 +25357,19 @@ msgstr ""
msgid "Forward this item via email"
msgstr ""
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
msgid "Obtain the latest meeting information"
msgstr ""
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
msgid "Re_fresh Meeting"
msgstr ""
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
msgid "Schedule _Meeting"
msgstr ""
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
msgid "Schedule a meeting for this item"
msgstr ""
@@ -24543,10 +25377,6 @@ msgstr ""
msgid "Customise My Evolution"
msgstr ""
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr ""
-
#: ui/evolution-mail-global.xml.h:2
msgid "Cancel the current mail operation"
msgstr ""
@@ -24700,7 +25530,7 @@ msgstr ""
msgid "_Expunge"
msgstr ""
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
msgid "_Folder"
msgstr ""
@@ -25092,7 +25922,7 @@ msgstr ""
msgid "_Quoted"
msgstr ""
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
msgid "_Tools"
msgstr ""
@@ -25107,12 +25937,12 @@ msgstr ""
#: ui/evolution-mail-messagedisplay.xml.h:5
#: ui/evolution-message-composer.xml.h:45
#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
msgid "_Close"
msgstr ""
#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
msgid "_View"
msgstr ""
@@ -25299,7 +26129,7 @@ msgstr ""
msgid "_Reply-To Field"
msgstr ""
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
msgid "_Help"
msgstr ""
@@ -25444,110 +26274,118 @@ msgid "Move this folder to another place"
msgstr ""
#: ui/evolution.xml.h:18
-msgid "Open in New Window"
+msgid "Open Other _User's Folder..."
+msgstr ""
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
msgstr ""
#: ui/evolution.xml.h:20
+msgid "Open in New Window"
+msgstr ""
+
+#: ui/evolution.xml.h:22
msgid "Open this folder in an other window"
msgstr ""
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
msgid "Send / Receive"
msgstr ""
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
msgid "Send queued items and retrieve new items"
msgstr ""
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
msgid "Show information about Ximian Evolution"
msgstr ""
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
msgid "Submit Bug Report"
msgstr ""
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
msgid "Submit _Bug Report"
msgstr ""
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
msgid "Submit a bug report using Bug Buddy"
msgstr ""
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
msgid "Toggle"
msgstr ""
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
msgid "Toggle whether to show the folder bar"
msgstr ""
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
msgid "Toggle whether to show the shortcut bar"
msgstr ""
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
msgid "Toggle whether we are working offline."
msgstr ""
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
msgid "View the selected folder"
msgstr ""
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
msgid "Ximian Evolution _FAQ"
msgstr ""
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
msgid "_About Ximian Evolution..."
msgstr ""
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
msgid "_Copy..."
msgstr ""
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
msgid "_Folder Bar"
msgstr ""
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
msgid "_Go to Folder..."
msgstr ""
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
msgid "_Import..."
msgstr ""
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
msgid "_Move..."
msgstr ""
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
msgid "_New"
msgstr ""
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
msgid "_New Folder"
msgstr ""
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
msgid "_Pilot Settings..."
msgstr ""
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
msgid "_Rename..."
msgstr ""
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
msgid "_Send / Receive"
msgstr ""
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
msgid "_Shortcut"
msgstr ""
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
msgid "_Shortcut Bar"
msgstr ""
@@ -25628,20 +26466,20 @@ msgid ""
" Use the right mouse button to zoom out."
msgstr ""
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
msgid "_Current View"
msgstr ""
#. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
msgid "Custom View"
msgstr ""
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
msgid "Save Custom View"
msgstr ""
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
msgid "Define Views"
msgstr ""
@@ -25762,14 +26600,18 @@ msgstr ""
msgid "Save Search"
msgstr ""
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
msgid "_Save Search..."
msgstr ""
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
msgid "_Edit Saved Searches..."
msgstr ""
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+msgid "_Advanced..."
+msgstr ""
+
#: widgets/misc/e-messagebox.c:152
msgid "Information"
msgstr ""
@@ -25791,19 +26633,19 @@ msgstr ""
msgid "Don't show this message again."
msgstr ""
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
msgid "_Find Now"
msgstr ""
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
msgid "_Clear"
msgstr ""
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
msgid "Clear"
msgstr ""
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
msgid "Find Now"
msgstr ""
@@ -25829,6 +26671,48 @@ msgstr "Could not initialise GNOME"
msgid "init_bonobo(): could not initialize Bonobo"
msgstr "Could not initialise Bonobo"
+#~ msgid "_Other Organizer"
+#~ msgstr "_Other Organiser"
+
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Can not sign this message: no plaintext to sign"
+
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Can not sign this message: no password provided"
+
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Can not sign this message: could not create pipe to GPGP/PGP: %s"
+
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr "Can not sign this message: no plaintext to clearsign"
+
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "Can not verify this message: no plaintext to verify"
+
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Can not verify this message: could not create pipe to GPGP/PGP: %s"
+
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "Can not encrypt this message: no plaintext to encrypt"
+
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Can not encrypt this message: no password provided"
+
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Can not encrypt this message: could not create pipe to GPGP/PGP: %s"
+
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr "Can not decrypt this message: no ciphertext to decrypt"
+
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "Can not decrypt this message: no password provided"
+
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Can not decrypt this message: could not create pipe to GPGP/PGP: %s"
+
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "Can not append message to spool file: %s: %s"
+
#~ msgid ""
#~ "EMail: %s\n"
#~ "Common Name: %s\n"
@@ -25862,10 +26746,6 @@ msgstr "Could not initialise Bonobo"
#~ msgid "KBOS:EGAA:RJTT"
#~ msgstr "YPAD:YBBN:YSCB:YMML:YPPH:YSSY"
-#, fuzzy
-#~ msgid "Synchronizing folder"
-#~ msgstr "Synchronising folder"
-
#~ msgid "%d/%m/%Y"
#~ msgstr "%m/%d/%Y"
@@ -25906,13 +26786,13 @@ msgstr "Could not initialise Bonobo"
#~ "Rev\n"
#~ msgid ""
-#~ "Enter your name and email address to be used in outgoing mail. You may also, "
-#~ "optionally, enter the name of your organization, and the name of a file to "
-#~ "read your signature from."
+#~ "Enter your name and email address to be used in outgoing mail. You may "
+#~ "also, optionally, enter the name of your organization, and the name of a "
+#~ "file to read your signature from."
#~ msgstr ""
-#~ "Enter your name and email address to be used in outgoing mail. You may also, "
-#~ "optionally, enter the name of your organisation, and the name of a file to "
-#~ "read your signature from."
+#~ "Enter your name and email address to be used in outgoing mail. You may "
+#~ "also, optionally, enter the name of your organisation, and the name of a "
+#~ "file to read your signature from."
#~ msgid "Querying authorization capabilities of \"%s\""
#~ msgstr "Querying authorisation capabilities of \"%s\""