aboutsummaryrefslogtreecommitdiffstats
path: root/po/en_AU.po
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2003-05-22 02:51:10 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2003-05-22 02:51:10 +0800
commit6d3b09473200276fbb4fbc157b355c84e77c41de (patch)
treee981a6ff4d949938325c85e884620a059759d14c /po/en_AU.po
parentca392b70a1450b5bfaa2626c11c96aa384bd3f45 (diff)
downloadgsoc2013-evolution-6d3b09473200276fbb4fbc157b355c84e77c41de.tar.gz
gsoc2013-evolution-6d3b09473200276fbb4fbc157b355c84e77c41de.tar.zst
gsoc2013-evolution-6d3b09473200276fbb4fbc157b355c84e77c41de.zip
1.3.91.
svn path=/trunk/; revision=21311
Diffstat (limited to 'po/en_AU.po')
-rw-r--r--po/en_AU.po1827
1 files changed, 904 insertions, 923 deletions
diff --git a/po/en_AU.po b/po/en_AU.po
index f9dba130f6..a5e32fec0d 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: 2003-04-29 16:32-0400\n"
+"POT-Creation-Date: 2003-05-21 13:52-0400\n"
"PO-Revision-Date: 2000-10-22 16:19+0100\n"
"Last-Translator: Michael Zucchi <notzed@ximian.com>\n"
"Language-Team: \n"
@@ -57,7 +57,7 @@ msgid "Email"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
msgid "Primary"
msgstr ""
@@ -68,16 +68,15 @@ msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:64
#: addressbook/backend/ebook/e-card-simple.c:94
#: addressbook/backend/ebook/e-card.c:1404
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
msgid "Assistant"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:65
#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1804
msgid "Business"
msgstr ""
@@ -87,12 +86,12 @@ msgid "Bus"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
msgid "Callback"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
msgid "Company"
msgstr ""
@@ -102,9 +101,8 @@ msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:68
#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
msgid "Home"
msgstr ""
@@ -119,19 +117,17 @@ msgid "Org"
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:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
msgid "Mobile"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
msgid "Car"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
msgid "Business Fax"
msgstr ""
@@ -141,13 +137,13 @@ msgid "Bus Fax"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
msgid "Home Fax"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1735
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
msgid "Business 2"
msgstr ""
@@ -156,43 +152,43 @@ msgid "Bus 2"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
msgid "Home 2"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
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:1745
-#: addressbook/gui/contact-editor/e-contact-editor.c:1807
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
msgid "Other"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
msgid "Other Fax"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
msgid "Pager"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
msgid "Radio"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
msgid "Telex"
msgstr ""
@@ -204,14 +200,14 @@ msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:86
#: addressbook/gui/component/e-address-popup.c:488
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1777
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
msgid "Email 2"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:87
#: addressbook/gui/component/e-address-popup.c:498
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
+#: addressbook/gui/contact-editor/e-contact-editor.c:1778
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
msgid "Email 3"
msgstr ""
@@ -359,7 +355,7 @@ msgid "Unnamed List"
msgstr ""
#: addressbook/backend/ebook/e-card.c:1308
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:319
+#: addressbook/gui/contact-editor/fullname.glade.h:4
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
msgid "Full Name"
msgstr ""
@@ -459,7 +455,7 @@ msgid "Could not initialize Bonobo"
msgstr "Could not initialise Bonobo"
#: addressbook/backend/pas/pas-backend-file.c:464
-#: addressbook/backend/pas/pas-backend-ldap.c:3046
+#: addressbook/backend/pas/pas-backend-ldap.c:3047
msgid "Searching..."
msgstr ""
@@ -492,11 +488,11 @@ msgstr ""
msgid "Modifying card from LDAP server..."
msgstr ""
-#: addressbook/backend/pas/pas-backend-ldap.c:2957
+#: addressbook/backend/pas/pas-backend-ldap.c:2958
msgid "Receiving LDAP search results..."
msgstr ""
-#: addressbook/backend/pas/pas-backend-ldap.c:3066
+#: addressbook/backend/pas/pas-backend-ldap.c:3067
msgid "Error performing search"
msgstr ""
@@ -569,7 +565,7 @@ msgid "Evolution Addressbook folder viewer"
msgstr ""
#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:605
+#: addressbook/gui/component/addressbook-component.c:620
#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
msgid "Contacts"
@@ -596,27 +592,27 @@ msgstr "_Other Organiser"
msgid "Public folder containing contact information"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:564
+#: addressbook/gui/component/addressbook-component.c:574
msgid "New Contact"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:564
+#: addressbook/gui/component/addressbook-component.c:574
msgid "_Contact"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-component.c:575
msgid "Create a new contact"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:578
msgid "New Contact List"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:578
msgid "Contact _List"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:569
+#: addressbook/gui/component/addressbook-component.c:579
msgid "Create a new contact list"
msgstr ""
@@ -660,25 +656,25 @@ msgstr ""
msgid "LDAP was not enabled in this build of Evolution"
msgstr ""
-#: addressbook/gui/component/addressbook-storage.c:169
+#: addressbook/gui/component/addressbook-storage.c:178
#, fuzzy
msgid "Other Contacts"
msgstr "_Other Organiser"
-#: addressbook/gui/component/addressbook.c:512
+#: addressbook/gui/component/addressbook.c:502
msgid ""
"We were unable to open this addressbook. Please check that the\n"
"path exists and that you have permission to access it."
msgstr ""
-#: addressbook/gui/component/addressbook.c:522
+#: addressbook/gui/component/addressbook.c:512
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or the LDAP server\n"
"is unreachable."
msgstr ""
-#: addressbook/gui/component/addressbook.c:527
+#: addressbook/gui/component/addressbook.c:517
msgid ""
"This version of Evolution does not have LDAP support\n"
"compiled in to it. If you want to use LDAP in Evolution\n"
@@ -686,56 +682,56 @@ msgid ""
"retrieving OpenLDAP from the link below.\n"
msgstr ""
-#: addressbook/gui/component/addressbook.c:537
+#: addressbook/gui/component/addressbook.c:527
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or the server\n"
"is unreachable."
msgstr ""
-#: addressbook/gui/component/addressbook.c:557
+#: addressbook/gui/component/addressbook.c:547
msgid "Unable to open addressbook"
msgstr ""
-#: addressbook/gui/component/addressbook.c:622
+#: addressbook/gui/component/addressbook.c:607
msgid "Accessing LDAP Server anonymously"
msgstr ""
-#: addressbook/gui/component/addressbook.c:667
+#: addressbook/gui/component/addressbook.c:652
#, fuzzy
msgid "Failed to authenticate.\n"
msgstr "Could not close temporary folder: %s"
-#: addressbook/gui/component/addressbook.c:675
-#: addressbook/gui/component/addressbook.c:678
+#: addressbook/gui/component/addressbook.c:660
+#: addressbook/gui/component/addressbook.c:663
#, c-format
msgid "%sEnter password for %s (user %s)"
msgstr ""
-#: addressbook/gui/component/addressbook.c:813
+#: addressbook/gui/component/addressbook.c:794
msgid "Name begins with"
msgstr ""
-#: addressbook/gui/component/addressbook.c:814
+#: addressbook/gui/component/addressbook.c:795
msgid "Email begins with"
msgstr ""
-#: addressbook/gui/component/addressbook.c:815
+#: addressbook/gui/component/addressbook.c:796
#: calendar/gui/cal-search-bar.c:53
msgid "Category is"
msgstr ""
#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:816
+#: addressbook/gui/component/addressbook.c:797
#: calendar/gui/cal-search-bar.c:49
msgid "Any field contains"
msgstr ""
-#: addressbook/gui/component/addressbook.c:817
+#: addressbook/gui/component/addressbook.c:798
msgid "Advanced..."
msgstr ""
-#: addressbook/gui/component/addressbook.c:987
+#: addressbook/gui/component/addressbook.c:955
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
@@ -743,7 +739,7 @@ msgid ""
"the directory server preferences for this addressbook."
msgstr ""
-#: addressbook/gui/component/addressbook.c:993
+#: addressbook/gui/component/addressbook.c:961
msgid ""
"The time to execute this query exceeded the server limit or the limit\n"
"you have configured for this addressbook. Please make your search\n"
@@ -751,25 +747,25 @@ msgid ""
"preferences for this addressbook."
msgstr ""
-#: addressbook/gui/component/addressbook.c:999
+#: addressbook/gui/component/addressbook.c:967
msgid "The backend for this addressbook was unable to parse this query."
msgstr ""
-#: addressbook/gui/component/addressbook.c:1002
+#: addressbook/gui/component/addressbook.c:970
msgid "The backend for this addressbook refused to perform this query."
msgstr ""
-#: addressbook/gui/component/addressbook.c:1006
+#: addressbook/gui/component/addressbook.c:974
msgid "This query did not complete successfully."
msgstr ""
#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1089
+#: addressbook/gui/component/addressbook.c:1059
#: calendar/gui/cal-search-bar.c:354
msgid "Any Category"
msgstr ""
-#: addressbook/gui/component/addressbook.c:1169
+#: addressbook/gui/component/addressbook.c:1139
msgid "The URI that the Folder Browser will display"
msgstr ""
@@ -783,8 +779,7 @@ msgid "(none)"
msgstr ""
#: addressbook/gui/component/e-address-popup.c:478
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:1777
+#: addressbook/gui/contact-editor/e-contact-editor.c:1776
msgid "Primary Email"
msgstr ""
@@ -817,7 +812,7 @@ msgstr ""
msgid "Add to Contacts"
msgstr ""
-#: addressbook/gui/component/e-address-popup.c:1052
+#: addressbook/gui/component/e-address-popup.c:1053
msgid "Merge E-Mail Address"
msgstr ""
@@ -841,7 +836,7 @@ msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:4
#: addressbook/gui/component/select-names/select-names.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
#: addressbook/gui/contact-editor/fulladdr.glade.h:1
#: addressbook/gui/contact-editor/fullname.glade.h:1
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
@@ -852,6 +847,7 @@ msgstr ""
#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
#: mail/message-tags.glade.h:1
#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
msgid "*"
msgstr ""
@@ -910,49 +906,46 @@ msgid "Connecting"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:20
-msgid "De_lete"
+msgid "Distinguished _name:"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Distinguished _name:"
+msgid "Edit LDAP Server"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:22
-msgid "Edit LDAP Server"
-msgstr ""
+#, fuzzy
+msgid "Email address:"
+msgstr "Chile"
#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Email Address:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:24
msgid "Evolution will use this DN to authenticate you with the server"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
msgid ""
"Evolution will use this email address to authenticate you with the server"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
msgid "Finished"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:27
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
msgid "General"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
msgid "LDAP Configuration Assistant"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:63
+#: mail/mail-config.glade.h:74
msgid "Never"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:29
msgid ""
"Now, you must specify how you want to connect to the LDAP server. The SSL "
"(Secure Sockets Layer)\n"
@@ -962,33 +955,33 @@ msgid ""
"these protocols."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:32
msgid "One"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
msgid "S_earch scope: "
msgstr ""
#. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:35
-#: calendar/gui/calendar-model.c:1982 calendar/gui/e-day-view.c:1666
-#: calendar/gui/e-week-view.c:1237
+#: addressbook/gui/component/ldap-config.glade.h:34
+#: calendar/gui/calendar-model.c:1982 calendar/gui/e-day-view.c:1686
+#: calendar/gui/e-week-view.c:1252
msgid "Searching"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:35
msgid "Selected:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:36
msgid ""
"Selecting this option means that Evolution will only connect to your LDAP "
"server if\n"
"your LDAP server supports SSL or TLS."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:38
msgid ""
"Selecting this option means that Evolution will only try to use SSL/TLS if "
"you are in a \n"
@@ -999,7 +992,7 @@ msgid ""
"secure."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: addressbook/gui/component/ldap-config.glade.h:42
msgid ""
"Selecting this option means that your server does not support either SSL or "
"TLS. This \n"
@@ -1008,44 +1001,44 @@ msgid ""
"exploits. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:45
msgid ""
"Selecting this option will let you change Evolution's default settings for "
"LDAP\n"
"searches, and for creating and editing contacts. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:47
msgid ""
"Specifying a display name is the last required step in configuring an LDAP "
"server."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:48
msgid "Step 1: Server Information"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:49
msgid "Step 2: Connecting to Server"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:50
msgid "Step 3: Searching the Directory"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:51
msgid "Step 4: Display Name"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:52
msgid "Sub"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:53
msgid "Supported Search Bases"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:54
msgid ""
"The first step in configuring an LDAP server is to provide its name, and "
"your log in\n"
@@ -1053,7 +1046,7 @@ msgid ""
"information."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:56
msgid ""
"The options on this page control how many entries should be included in "
"your\n"
@@ -1062,7 +1055,7 @@ msgid ""
"need to change these options."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:59
msgid ""
"The search base is the distinguished name (DN) of the entry where your "
"searches will \n"
@@ -1070,7 +1063,7 @@ msgid ""
"directory tree."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:61
msgid ""
"The search scope defines how deep you would like the search to extend down "
"the \n"
@@ -1080,44 +1073,44 @@ msgid ""
"your base.\n"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:65
msgid ""
"This assistant will help you to access online directory services\n"
"using LDAP (Lightweight Directory Access Protocol) servers. \n"
"\n"
-"Adding a new LDAP server requires some specialized information\n"
-"about the server. Please contact your system administrator if you \n"
-"need help finding this information."
+"Adding a new LDAP server requires some specialized information about the "
+"server. Please contact your system administrator if you need help finding "
+"this information."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:69
msgid ""
"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
"\"."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:70
msgid ""
"This is the maximum number of entries to download. Setting this number to "
"be \n"
"too large will slow down your addressbook."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:72
msgid ""
"This is the method evolution will use to authenticate you. Note that "
"setting this to \"Email Address\" requires anonymous access to your ldap "
"server."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:73
msgid ""
"This is the name for this server that will appear in your Evolution folder "
"list.\n"
"It is for display purposes only. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:75
msgid ""
"This is the port on the LDAP server that Evolution will try to connect to. "
"A \n"
@@ -1125,43 +1118,37 @@ msgid ""
"what port you should specify."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:78
msgid "This option controls how long a search will be run."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:79
msgid "U_se SSL/TLS:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:80
msgid "Using distinguished name (DN)"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:81
msgid "Using email address"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:85 mail/mail-account-gui.c:62
-#: mail/mail-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:62
+#: mail/mail-config.glade.h:128
msgid "Whenever Possible"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:86
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-msgid "_Add"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:83
msgid "_Display name:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:84
msgid "_Download limit:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:89 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
#: ui/evolution-message-composer.xml.h:41
@@ -1170,39 +1157,39 @@ msgstr ""
msgid "_Edit"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:86
msgid "_Log in method:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:87
msgid "_Port number:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:88
msgid "_Search base:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:89
msgid "_Server name:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:90
msgid "_Timeout (minutes):"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:91
msgid "cards"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:92
msgid "connecting-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:93
msgid "general-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:94
msgid "searching-tab"
msgstr ""
@@ -1215,7 +1202,7 @@ msgid "Remove All"
msgstr ""
#: addressbook/gui/component/select-names/e-select-names-popup.c:211
-#: addressbook/gui/component/select-names/e-select-names.c:692
+#: addressbook/gui/component/select-names/e-select-names.c:694
#: composer/e-msg-composer-attachment-bar.c:507
msgid "Remove"
msgstr ""
@@ -1243,11 +1230,11 @@ msgstr ""
msgid "Source"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names.c:505
+#: addressbook/gui/component/select-names/e-select-names.c:509
msgid "Select Contacts from Addressbook"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names.c:648
+#: addressbook/gui/component/select-names/e-select-names.c:650
msgid "Find contact in"
msgstr ""
@@ -1281,109 +1268,132 @@ msgstr ""
msgid "_Folder:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "A_ssistant's name:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+msgid " B_usiness:"
msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "Add_ress..."
-msgstr ""
+#, fuzzy
+msgid "A_ddress..."
+msgstr "Chile"
#: addressbook/gui/contact-editor/contact-editor.glade.h:4
-msgid "Anni_versary:"
+msgid "A_ssistant's name:"
msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+msgid "Anni_versary:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
msgid "Birthda_y:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "Business fa_x:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
msgid "Collaboration"
msgstr ""
#. Construct the app
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1335
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/e-contact-editor.c:1334
msgid "Contact Editor"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
msgid "D_epartment:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
#: calendar/gui/dialogs/task-editor.c:197
msgid "Details"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
msgid "F_ree/Busy URL:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
-msgid "File A_s:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+msgid "File a_s:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
msgid "Full _Name..."
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
msgid ""
"If this person publishes free/busy or other calendar information on the "
"Internet, enter the address\n"
"of that information here."
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
msgid "New phone type"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
msgid "No_tes:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
msgid "Organi_zation:"
msgstr "Organi_sation:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
msgid "P_rofession:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "S_pouse:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+msgid "Primary _email:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "This is the _mailing address"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+msgid "S_pouse:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
msgid "Wants to receive _HTML mail"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: calendar/gui/dialogs/meeting-page.c:715 calendar/gui/e-calendar-table.c:967
-#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3590
-#: mail/folder-browser.c:1783 ui/evolution-addressbook.xml.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+msgid "_Add"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+msgid "_Business:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+msgid "_Categories..."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:968
+#: calendar/gui/e-day-view.c:3729 calendar/gui/e-week-view.c:3616
+#: mail/folder-browser.c:1786 ui/evolution-addressbook.xml.h:32
#: ui/evolution-calendar.xml.h:30 ui/evolution-mail-message.xml.h:97
#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
msgid "_Delete"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+msgid "_Home:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
msgid "_Job title:"
msgstr ""
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+msgid "_Manager's name:"
+msgstr ""
+
#: addressbook/gui/contact-editor/contact-editor.glade.h:32
-msgid "_Manager's Name:"
+msgid "_Mobile:"
msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:33
@@ -1399,6 +1409,10 @@ msgid "_Public Calendar URL:"
msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+msgid "_This is the mailing address"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
msgid "_Web page address:"
msgstr ""
@@ -2466,35 +2480,35 @@ msgstr ""
msgid "Changed"
msgstr "Chile"
-#: addressbook/gui/contact-editor/e-contact-editor.c:828
+#: addressbook/gui/contact-editor/e-contact-editor.c:827
msgid "Category editor not available."
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:836
+#: addressbook/gui/contact-editor/e-contact-editor.c:835
msgid "This contact belongs to these categories:"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:1010
+#: addressbook/gui/contact-editor/e-contact-editor.c:1009
msgid "Save Contact as VCard"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:1056
+#: addressbook/gui/contact-editor/e-contact-editor.c:1055
msgid ""
"Are you sure you want\n"
"to delete these contacts?"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:1059
+#: addressbook/gui/contact-editor/e-contact-editor.c:1058
msgid ""
"Are you sure you want\n"
"to delete this contact?"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
msgid "TTY/TDD"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:2362
+#: addressbook/gui/contact-editor/e-contact-editor.c:2369
#, c-format
msgid "Could not find widget for a field: `%s'"
msgstr ""
@@ -2503,12 +2517,16 @@ msgstr ""
msgid "Contact Quick-Add"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
-msgid "Edit Full"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+msgid "_Edit Full"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:319
+msgid "_Full Name:"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
-msgid "E-mail"
+msgid "E-_mail:"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-save-as.c:66
@@ -2541,20 +2559,20 @@ msgid "Address _2:"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Countr_y:"
+msgid "Ci_ty:"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Countr_y:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
#, fuzzy
msgid "Full Address"
msgstr "Chile"
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
-msgid "_Address:"
-msgstr ""
-
#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "_City:"
+msgid "_Address:"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:7
@@ -2570,14 +2588,10 @@ msgid "_ZIP Code:"
msgstr "_Post Code:"
#: addressbook/gui/contact-editor/fullname.glade.h:2
-msgid "Check Full Name"
-msgstr ""
-
-#: addressbook/gui/contact-editor/fullname.glade.h:3
msgid "Dr."
msgstr ""
-#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:3
msgid "Esq."
msgstr ""
@@ -2638,27 +2652,22 @@ msgid "_Title:"
msgstr ""
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-msgid "List _name:"
+msgid "Members"
msgstr ""
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-msgid "Members"
+msgid "_Hide addresses when sending mail to this list"
msgstr ""
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-msgid "Type an email address or drag a contact into the list below:"
-msgstr ""
-
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
-msgid "_Hide addresses when sending mail to this list"
+msgid "_List name:"
msgstr ""
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-msgid "_Remove"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+msgid "_Type an email address or drag a contact into the list below:"
msgstr ""
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
msgid "contact-list-editor"
msgstr ""
@@ -2681,41 +2690,33 @@ msgid "Contact"
msgstr "_Other Organiser"
#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
-msgid "Add Anyway"
-msgstr ""
-
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
msgid "Duplicate Contact Detected"
msgstr ""
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
msgid "New Contact:"
msgstr ""
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
msgid "Original Contact:"
msgstr ""
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
msgid ""
"The name or email address of this contact already exists\n"
"in this folder. Would you like to add it anyway?"
msgstr ""
#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-msgid "Change Anyway"
-msgstr ""
-
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
msgid "Changed Contact:"
msgstr ""
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
msgid "Conflicting Contact:"
msgstr ""
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
msgid ""
"The changed email or name of this contact already\n"
"exists in this folder. Would you like to add it anyway?"
@@ -2756,7 +2757,7 @@ msgstr ""
msgid "Model"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
#: addressbook/gui/widgets/e-addressbook-util.c:105
#: addressbook/gui/widgets/e-minicard.c:531
msgid "Error modifying card"
@@ -2768,10 +2769,10 @@ msgid "Success"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:37
-#: camel/providers/imap/camel-imap-command.c:309
-#: camel/providers/imap/camel-imap-command.c:406
+#: camel/providers/imap/camel-imap-command.c:306
+#: camel/providers/imap/camel-imap-command.c:403
#: camel/providers/pop3/camel-pop3-store.c:522
-#: camel/providers/pop3/camel-pop3-store.c:529 shell/e-shell.c:2075
+#: camel/providers/pop3/camel-pop3-store.c:529 shell/e-shell.c:2077
#: shell/e-storage.c:598 shell/evolution-shell-component.c:1219
msgid "Unknown error"
msgstr ""
@@ -2800,9 +2801,9 @@ msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:43
#: calendar/gui/calendar-model.c:758 calendar/gui/calendar-model.c:1183
#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:470 calendar/gui/print.c:2319
-#: camel/camel-service.c:737 camel/camel-service.c:779
-#: camel/camel-service.c:849 camel/camel-service.c:892
+#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2319
+#: camel/camel-service.c:737 camel/camel-service.c:780
+#: camel/camel-service.c:850 camel/camel-service.c:894
#: camel/providers/pop3/camel-pop3-store.c:439
#: camel/providers/pop3/camel-pop3-store.c:516
msgid "Cancelled"
@@ -2829,7 +2830,6 @@ msgid "Other error"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:75
-#: calendar/gui/dialogs/save-comp.c:50
msgid "Do you want to save changes?"
msgstr ""
@@ -2991,7 +2991,7 @@ msgid "Delete"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-view.c:904
-#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3555
+#: calendar/gui/e-day-view.c:3689 calendar/gui/e-week-view.c:3581
msgid "Current View"
msgstr ""
@@ -3163,8 +3163,8 @@ msgstr ""
msgid "GTK Tree View"
msgstr ""
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
msgid "Print envelope"
msgstr ""
@@ -3265,7 +3265,7 @@ msgstr ""
msgid "Number of columns:"
msgstr ""
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:79
msgid "Options"
msgstr ""
@@ -3476,27 +3476,27 @@ msgstr ""
#: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:394 mail/message-list.c:752
+#: calendar/gui/e-calendar-table.c:393 mail/message-list.c:752
msgid "High"
msgstr ""
#: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
#: calendar/gui/calendar-model.c:1708
#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:395 mail/message-list.c:751
+#: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
msgid "Normal"
msgstr ""
#: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:396 mail/message-list.c:750
+#: calendar/gui/e-calendar-table.c:395 mail/message-list.c:750
msgid "Low"
msgstr ""
#. An empty string is the same as 'None'.
#: calendar/cal-util/cal-util.c:570
#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:397
+#: calendar/gui/e-calendar-table.c:396
msgid "Undefined"
msgstr ""
@@ -3607,17 +3607,17 @@ msgstr ""
msgid "_Edit appointment"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:778
+#: calendar/gui/alarm-notify/alarm-queue.c:770
msgid "No description available."
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:851
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:843
+#: calendar/gui/alarm-notify/alarm-queue.c:867
#: calendar/gui/tasks-control.c:463 widgets/misc/e-messagebox.c:161
msgid "Warning"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:855
+#: calendar/gui/alarm-notify/alarm-queue.c:847
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -3625,7 +3625,7 @@ msgid ""
"a normal reminder dialog box instead."
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:881
+#: calendar/gui/alarm-notify/alarm-queue.c:873
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3636,7 +3636,7 @@ msgid ""
"Are you sure you want to run this program?"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:895
+#: calendar/gui/alarm-notify/alarm-queue.c:887
msgid "Do not ask me about this program again."
msgstr ""
@@ -3671,7 +3671,7 @@ msgstr ""
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
#: calendar/gui/calendar-commands.c:421 calendar/gui/e-day-view-top-item.c:264
-#: calendar/gui/e-day-view.c:1392 calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view.c:1412 calendar/gui/e-week-view-main-item.c:325
msgid "%a %d %b"
msgstr ""
@@ -3693,14 +3693,14 @@ msgstr "%m/%d/%Y"
msgid "%d %B"
msgstr ""
-#: calendar/gui/calendar-commands.c:844
+#: calendar/gui/calendar-commands.c:848
msgid ""
"Could not create the calendar view. Please check your ORBit and OAF setup."
msgstr ""
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1344
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1352
#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
-#: my-evolution/my-evolution.glade.h:3 shell/e-local-storage.c:177
+#: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
#: shell/e-shortcuts.c:1085
msgid "Calendar"
msgstr ""
@@ -3717,7 +3717,7 @@ msgstr ""
msgid "Public folder containing appointments and events"
msgstr ""
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:736
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:738
#: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:518
#: calendar/importers/icalendar-importer.c:645
#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
@@ -3787,16 +3787,16 @@ msgid "Create a new all-day appointment"
msgstr ""
#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:963
-#: calendar/gui/e-calendar-table.c:373
+#: calendar/gui/e-calendar-table.c:372
msgid "Private"
msgstr ""
#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:965
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:373
msgid "Confidential"
msgstr ""
-#: calendar/gui/calendar-model.c:410 calendar/gui/e-calendar-table.c:372
+#: calendar/gui/calendar-model.c:410 calendar/gui/e-calendar-table.c:371
msgid "Public"
msgstr ""
@@ -3817,32 +3817,32 @@ msgid "W"
msgstr ""
#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1133
-#: calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-calendar-table.c:445
msgid "Free"
msgstr ""
-#: calendar/gui/calendar-model.c:591 calendar/gui/e-calendar-table.c:447
-#: calendar/gui/e-meeting-time-sel.c:407
+#: calendar/gui/calendar-model.c:591 calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-meeting-time-sel.c:406
#: shell/evolution-shell-component.c:1204
msgid "Busy"
msgstr ""
#: calendar/gui/calendar-model.c:749 calendar/gui/calendar-model.c:1177
#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2310
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
msgid "Not Started"
msgstr ""
#: calendar/gui/calendar-model.c:752 calendar/gui/calendar-model.c:1179
#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:468 calendar/gui/print.c:2313
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
msgid "In Progress"
msgstr ""
#: calendar/gui/calendar-model.c:755 calendar/gui/calendar-model.c:1181
#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:469 calendar/gui/e-meeting-model.c:296
-#: calendar/gui/e-meeting-model.c:319 calendar/gui/print.c:2316
+#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:294
+#: calendar/gui/e-meeting-model.c:317 calendar/gui/print.c:2316
msgid "Completed"
msgstr ""
@@ -3856,12 +3856,12 @@ msgstr ""
#. An empty string is the same as 'None'.
#: calendar/gui/calendar-model.c:1175 calendar/gui/dialogs/meeting-page.c:330
#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2054
-#: mail/folder-browser.c:1745 mail/mail-account-gui.c:1253
-#: mail/mail-account-gui.c:1685 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:79
+#: mail/folder-browser.c:1748 mail/mail-account-gui.c:1254
+#: mail/mail-account-gui.c:1686 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:76
#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
-#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:441
+#: widgets/misc/e-dateedit.c:1457 widgets/misc/e-dateedit.c:1572
msgid "None"
msgstr ""
@@ -3873,14 +3873,14 @@ msgstr ""
msgid "Assigned"
msgstr ""
-#: calendar/gui/calendar-model.c:1718 calendar/gui/e-meeting-model.c:268
-#: calendar/gui/e-meeting-model.c:278 calendar/gui/e-meeting-model.c:536
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/calendar-model.c:1718 calendar/gui/e-meeting-model.c:266
+#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
+#: calendar/gui/e-meeting-model.c:784
msgid "Yes"
msgstr ""
-#: calendar/gui/calendar-model.c:1718 calendar/gui/e-meeting-model.c:280
-#: calendar/gui/e-meeting-model.c:836
+#: calendar/gui/calendar-model.c:1718 calendar/gui/e-meeting-model.c:278
+#: calendar/gui/e-meeting-model.c:785
msgid "No"
msgstr ""
@@ -4058,7 +4058,7 @@ msgstr ""
msgid "hour(s)"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:178
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:173
msgid "minute(s)"
msgstr ""
@@ -4239,7 +4239,7 @@ msgid "_Fri"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:147
msgid "_General"
msgstr ""
@@ -4378,60 +4378,60 @@ msgstr ""
msgid "Due "
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:328
+#: calendar/gui/dialogs/comp-editor.c:334
#, fuzzy
msgid "Could not update invalid object"
msgstr "Could not initialise Bonobo"
-#: calendar/gui/dialogs/comp-editor.c:331
+#: calendar/gui/dialogs/comp-editor.c:337
msgid "Object not found, not updated"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:334
+#: calendar/gui/dialogs/comp-editor.c:340
msgid "You don't have permissions to update this object"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:337
+#: calendar/gui/dialogs/comp-editor.c:343
#, fuzzy
msgid "Could not update object"
msgstr "Could not initialise Bonobo"
-#: calendar/gui/dialogs/comp-editor.c:787
+#: calendar/gui/dialogs/comp-editor.c:793
msgid "Edit Appointment"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:792
+#: calendar/gui/dialogs/comp-editor.c:798
#, c-format
msgid "Appointment - %s"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:795
+#: calendar/gui/dialogs/comp-editor.c:801
#, c-format
msgid "Task - %s"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:804
#, c-format
msgid "Journal entry - %s"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:809
+#: calendar/gui/dialogs/comp-editor.c:815
msgid "No summary"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:1230
-#: calendar/gui/e-calendar-table.c:1038 calendar/gui/e-day-view.c:3924
-#: calendar/gui/e-week-view.c:3791 composer/e-msg-composer.c:1162
+#: calendar/gui/dialogs/comp-editor.c:1233
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3947
+#: calendar/gui/e-week-view.c:3817 composer/e-msg-composer.c:1162
msgid "Save as..."
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:1331
-#: calendar/gui/dialogs/comp-editor.c:1355
-#: calendar/gui/dialogs/comp-editor.c:1379
+#: calendar/gui/dialogs/comp-editor.c:1334
+#: calendar/gui/dialogs/comp-editor.c:1358
+#: calendar/gui/dialogs/comp-editor.c:1382
msgid "Changes made to this item may be discarded if an update arrives"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:1406
+#: calendar/gui/dialogs/comp-editor.c:1409
msgid "Unable to obtain current version!"
msgstr ""
@@ -4551,13 +4551,13 @@ msgstr ""
#: calendar/gui/dialogs/event-editor.c:220
#: calendar/gui/dialogs/event-editor.c:292
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:436
msgid "Scheduling"
msgstr ""
#: calendar/gui/dialogs/event-editor.c:227
#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
msgid "Meeting"
msgstr ""
@@ -4585,6 +4585,11 @@ msgstr ""
msgid "B_usy"
msgstr ""
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
+msgid "Ca_tegories..."
+msgstr ""
+
#: calendar/gui/dialogs/event-page.glade.h:5
#: calendar/gui/dialogs/task-page.glade.h:3
#: calendar/gui/e-calendar-table.etspec.h:5
@@ -4653,7 +4658,7 @@ msgstr ""
msgid "That person is already attending the meeting!"
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:711
+#: calendar/gui/dialogs/meeting-page.c:713
msgid "_Delegate To..."
msgstr ""
@@ -4715,7 +4720,7 @@ msgid "_Change Organizer"
msgstr "_Change Organiser"
#: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:425
+#: calendar/gui/e-meeting-time-sel.c:424
msgid "_Invite Others..."
msgstr ""
@@ -4825,6 +4830,10 @@ msgstr ""
msgid "_No recurrence"
msgstr ""
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
+msgid "_Remove"
+msgstr ""
+
#: calendar/gui/dialogs/recurrence-page.glade.h:13
msgid "_Simple recurrence"
msgstr ""
@@ -4853,6 +4862,21 @@ msgstr ""
msgid "year(s)"
msgstr ""
+#: calendar/gui/dialogs/save-comp.c:54
+msgid ""
+"This event has been changed, but has not been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1555
+msgid "_Discard Changes"
+msgstr ""
+
+#: calendar/gui/dialogs/save-comp.c:63
+msgid "Save Event"
+msgstr ""
+
#: calendar/gui/dialogs/send-comp.c:58
msgid "The meeting information has been created. Send it?"
msgstr ""
@@ -4869,7 +4893,7 @@ msgstr ""
msgid "The task information has changed. Send an updated version?"
msgstr ""
-#: calendar/gui/dialogs/task-details-page.c:400
+#: calendar/gui/dialogs/task-details-page.c:401
msgid "Completed date is wrong"
msgstr ""
@@ -4888,7 +4912,6 @@ msgid "Progress"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:584
msgid "URL:"
msgstr ""
@@ -4906,7 +4929,7 @@ msgstr ""
#: calendar/gui/dialogs/task-editor.c:204
#: calendar/gui/dialogs/task-editor.c:252
-#: calendar/gui/dialogs/task-editor.c:390
+#: calendar/gui/dialogs/task-editor.c:387
msgid "Assignment"
msgstr ""
@@ -4916,7 +4939,7 @@ msgstr ""
#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1110
#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
msgid "Description:"
msgstr ""
@@ -5021,131 +5044,120 @@ msgstr ""
msgid "%s for an unknown trigger type"
msgstr ""
-#: calendar/gui/e-calendar-table.c:416
-#, c-format
+#: calendar/gui/e-calendar-table.c:415
msgid "0%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:417
-#, c-format
+#: calendar/gui/e-calendar-table.c:416
msgid "10%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:418
-#, c-format
+#: calendar/gui/e-calendar-table.c:417
msgid "20%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:419
-#, c-format
+#: calendar/gui/e-calendar-table.c:418
msgid "30%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:420
-#, c-format
+#: calendar/gui/e-calendar-table.c:419
msgid "40%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:421
-#, c-format
+#: calendar/gui/e-calendar-table.c:420
msgid "50%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:422
-#, c-format
+#: calendar/gui/e-calendar-table.c:421
msgid "60%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:423
-#, c-format
+#: calendar/gui/e-calendar-table.c:422
msgid "70%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:424
-#, c-format
+#: calendar/gui/e-calendar-table.c:423
msgid "80%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:425
-#, c-format
+#: calendar/gui/e-calendar-table.c:424
msgid "90%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:426
-#, c-format
+#: calendar/gui/e-calendar-table.c:425
msgid "100%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:716 calendar/gui/e-day-view.c:2821
-#: calendar/gui/e-week-view.c:1914
+#: calendar/gui/e-calendar-table.c:717 calendar/gui/e-day-view.c:2841
+#: calendar/gui/e-week-view.c:1929
msgid "Deleting selected objects"
msgstr ""
-#: calendar/gui/e-calendar-table.c:948 calendar/gui/e-day-view.c:3688
-#: calendar/gui/e-week-view.c:3572 mail/folder-browser.c:1756
+#: calendar/gui/e-calendar-table.c:949 calendar/gui/e-day-view.c:3711
+#: calendar/gui/e-week-view.c:3598 mail/folder-browser.c:1759
#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
msgid "_Open"
msgstr ""
-#: calendar/gui/e-calendar-table.c:949
+#: calendar/gui/e-calendar-table.c:950
msgid "_Save as..."
msgstr ""
-#: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3690
-#: calendar/gui/e-week-view.c:3547 calendar/gui/e-week-view.c:3574
+#: calendar/gui/e-calendar-table.c:951 calendar/gui/e-day-view.c:3713
+#: calendar/gui/e-week-view.c:3573 calendar/gui/e-week-view.c:3600
#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:33
#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
msgid "_Print..."
msgstr ""
-#: calendar/gui/e-calendar-table.c:954 calendar/gui/e-day-view.c:3695
-#: calendar/gui/e-week-view.c:3579 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:955 calendar/gui/e-day-view.c:3718
+#: calendar/gui/e-week-view.c:3605 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:955 calendar/gui/e-day-view.c:3696
-#: calendar/gui/e-week-view.c:3580 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3719
+#: calendar/gui/e-week-view.c:3606 ui/evolution-addressbook.xml.h:30
#: ui/evolution-calendar.xml.h:29 ui/evolution-composer-entries.xml.h:7
#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:15
msgid "_Copy"
msgstr ""
-#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3661
-#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3551
-#: calendar/gui/e-week-view.c:3581 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3684
+#: calendar/gui/e-day-view.c:3720 calendar/gui/e-week-view.c:3577
+#: calendar/gui/e-week-view.c:3607 ui/evolution-addressbook.xml.h:37
#: ui/evolution-calendar.xml.h:32 ui/evolution-composer-entries.xml.h:9
#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:19
msgid "_Paste"
msgstr ""
-#: calendar/gui/e-calendar-table.c:960
+#: calendar/gui/e-calendar-table.c:961
msgid "_Assign Task"
msgstr ""
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:962
msgid "_Forward as iCalendar"
msgstr ""
-#: calendar/gui/e-calendar-table.c:962
+#: calendar/gui/e-calendar-table.c:963
msgid "_Mark as Complete"
msgstr ""
-#: calendar/gui/e-calendar-table.c:963
+#: calendar/gui/e-calendar-table.c:964
msgid "_Mark Selected Tasks as Complete"
msgstr ""
-#: calendar/gui/e-calendar-table.c:968
+#: calendar/gui/e-calendar-table.c:969
msgid "_Delete Selected Tasks"
msgstr ""
-#: calendar/gui/e-calendar-table.c:1243 calendar/gui/e-day-view.c:7645
-#: calendar/gui/e-week-view.c:4293
+#: calendar/gui/e-calendar-table.c:1236 calendar/gui/e-day-view.c:7661
+#: calendar/gui/e-week-view.c:4312
msgid "Updating objects"
msgstr ""
-#: calendar/gui/e-calendar-table.c:1326
+#: calendar/gui/e-calendar-table.c:1319
#: calendar/gui/e-calendar-table.etspec.h:6
msgid "Click to add a task"
msgstr ""
@@ -5220,91 +5232,91 @@ msgstr ""
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:260 calendar/gui/e-day-view.c:1375
+#: calendar/gui/e-day-view-top-item.c:260 calendar/gui/e-day-view.c:1395
#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1529
msgid "%A %d %B"
msgstr ""
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:268 calendar/gui/e-day-view.c:1408
+#: calendar/gui/e-day-view-top-item.c:268 calendar/gui/e-day-view.c:1428
#: calendar/gui/e-week-view-main-item.c:339
msgid "%d %b"
msgstr ""
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:344
+#: calendar/gui/e-day-view.c:610 calendar/gui/e-week-view.c:346
#: calendar/gui/print.c:813
msgid "am"
msgstr ""
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:347
+#: calendar/gui/e-day-view.c:613 calendar/gui/e-week-view.c:349
#: calendar/gui/print.c:815
msgid "pm"
msgstr ""
-#: calendar/gui/e-day-view.c:3645
+#: calendar/gui/e-day-view.c:3668
msgid "New _Appointment"
msgstr ""
-#: calendar/gui/e-day-view.c:3647 calendar/gui/e-week-view.c:3541
+#: calendar/gui/e-day-view.c:3670 calendar/gui/e-week-view.c:3567
msgid "New All Day _Event"
msgstr ""
-#: calendar/gui/e-day-view.c:3649 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3672 calendar/gui/e-week-view.c:3568
msgid "New Meeting"
msgstr ""
-#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3543
+#: calendar/gui/e-day-view.c:3674 calendar/gui/e-week-view.c:3569
msgid "New Task"
msgstr ""
-#: calendar/gui/e-day-view.c:3656 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3679 ui/evolution-comp-editor.xml.h:11
msgid "Print..."
msgstr ""
-#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3557
+#: calendar/gui/e-day-view.c:3691 calendar/gui/e-week-view.c:3583
#: ui/evolution-calendar.xml.h:13
msgid "Go to _Today"
msgstr ""
-#: calendar/gui/e-day-view.c:3670 calendar/gui/e-week-view.c:3558
+#: calendar/gui/e-day-view.c:3693 calendar/gui/e-week-view.c:3584
msgid "_Go to Date..."
msgstr ""
-#: calendar/gui/e-day-view.c:3675 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3588
#: ui/evolution-calendar.xml.h:34
msgid "_Publish Free/Busy Information"
msgstr ""
-#: calendar/gui/e-day-view.c:3680 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3703 calendar/gui/e-week-view.c:3592
#: ui/evolution.xml.h:60
msgid "_Settings..."
msgstr ""
-#: calendar/gui/e-day-view.c:3689 calendar/gui/e-week-view.c:3573
-#: mail/folder-browser.c:1758 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3712 calendar/gui/e-week-view.c:3599
+#: mail/folder-browser.c:1761 ui/evolution-mail-message.xml.h:112
msgid "_Save As..."
msgstr ""
-#: calendar/gui/e-day-view.c:3701 calendar/gui/e-week-view.c:3585
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3611
msgid "_Schedule Meeting..."
msgstr ""
-#: calendar/gui/e-day-view.c:3702 calendar/gui/e-week-view.c:3586
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3612
msgid "_Forward as iCalendar..."
msgstr ""
-#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3591
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3617
msgid "Make this Occurrence _Movable"
msgstr ""
-#: calendar/gui/e-day-view.c:3708 calendar/gui/e-week-view.c:3592
+#: calendar/gui/e-day-view.c:3731 calendar/gui/e-week-view.c:3618
msgid "Delete this _Occurrence"
msgstr ""
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3593
+#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3619
msgid "Delete _All Occurrences"
msgstr ""
@@ -5430,8 +5442,8 @@ msgstr "Organisation"
msgid "Status:"
msgstr ""
-#: calendar/gui/e-itip-control.c:1083 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:849
+#: calendar/gui/e-itip-control.c:1083 calendar/gui/e-meeting-model.c:286
+#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
#: calendar/gui/itip-utils.c:414
msgid "Accepted"
msgstr ""
@@ -5440,21 +5452,21 @@ msgstr ""
msgid "Tentatively Accepted"
msgstr ""
-#: calendar/gui/e-itip-control.c:1091 calendar/gui/e-meeting-model.c:290
-#: calendar/gui/e-meeting-model.c:313 calendar/gui/e-meeting-model.c:850
+#: calendar/gui/e-itip-control.c:1091 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
msgid "Declined"
msgstr ""
#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1303
-#: calendar/gui/e-meeting-model.c:224 calendar/gui/e-meeting-model.c:259
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:807
-#: calendar/gui/e-meeting-model.c:823 camel/camel-gpg-context.c:1574
+#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
+#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:634
#: camel/providers/smtp/camel-smtp-transport.c:173
-#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:345
-#: mail/mail-display.c:950 widgets/misc/e-charset-picker.c:60
-#: widgets/misc/e-charset-picker.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:348
+#: mail/mail-display.c:953 widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:546
msgid "Unknown"
msgstr ""
@@ -5471,7 +5483,7 @@ msgstr ""
#: calendar/gui/e-itip-control.c:1152 calendar/gui/e-itip-control.c:1183
#: calendar/gui/e-itip-control.c:1206 calendar/gui/e-itip-control.c:1219
#: calendar/gui/e-itip-control.c:1232 calendar/gui/e-itip-control.c:1245
-#: shell/e-shell.c:2065 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr ""
@@ -5500,7 +5512,7 @@ msgid "Send Latest Information"
msgstr ""
#: calendar/gui/e-itip-control.c:1244 calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:383 mail/mail-send-recv.c:440
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:443
#: shell/evolution-shell-component.c:1182 ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr ""
@@ -5791,92 +5803,92 @@ msgstr ""
msgid "date-start"
msgstr ""
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:79
msgid "Chair Persons"
msgstr ""
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1697
+#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
msgid "Required Participants"
msgstr ""
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:81
msgid "Optional Participants"
msgstr ""
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:82
msgid "Resources"
msgstr ""
-#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:803
+#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
+#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
msgid "Individual"
msgstr ""
-#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
-#: calendar/gui/e-meeting-model.c:804
+#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
+#: calendar/gui/e-meeting-model.c:753
msgid "Group"
msgstr ""
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:805
+#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
+#: calendar/gui/e-meeting-model.c:754
msgid "Resource"
msgstr ""
-#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
-#: calendar/gui/e-meeting-model.c:806
+#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
+#: calendar/gui/e-meeting-model.c:755
msgid "Room"
msgstr ""
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
+#: calendar/gui/e-meeting-model.c:768
msgid "Chair"
msgstr ""
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:820
+#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
msgid "Required Participant"
msgstr ""
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:821
+#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:770
msgid "Optional Participant"
msgstr ""
-#: calendar/gui/e-meeting-model.c:240 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
+#: calendar/gui/e-meeting-model.c:771
msgid "Non-Participant"
msgstr ""
-#: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:309
-#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
msgid "Needs Action"
msgstr ""
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:851 calendar/gui/e-meeting-time-sel.c:406
+#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
+#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
msgid "Tentative"
msgstr ""
-#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
-#: calendar/gui/e-meeting-model.c:852
+#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
+#: calendar/gui/e-meeting-model.c:801
msgid "Delegated"
msgstr ""
-#: calendar/gui/e-meeting-model.c:298 calendar/gui/e-meeting-model.c:321
+#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
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:458
-#: calendar/gui/e-meeting-time-sel.c:2115
+#: calendar/gui/e-meeting-time-sel.c:2097
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:462
-#: calendar/gui/e-meeting-time-sel.c:2148 e-util/e-time-utils.c:189
+#: calendar/gui/e-meeting-time-sel.c:2130 e-util/e-time-utils.c:189
#: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
msgid "%a %m/%d/%Y"
msgstr "%a %d/%m/%Y"
@@ -5884,15 +5896,15 @@ msgstr "%a %d/%m/%Y"
#. This is a strftime() format string %m = month number,
#. %d = month day, %Y = full year.
#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:224
-#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1583
+#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1581
msgid "%m/%d/%Y"
msgstr "%d/%m/%Y"
-#: calendar/gui/e-meeting-time-sel.c:408 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
msgid "Out of Office"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:409
+#: calendar/gui/e-meeting-time-sel.c:408
msgid "No Information"
msgstr ""
@@ -5900,114 +5912,114 @@ msgstr ""
msgid "_Options"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:464
msgid "Show _Only Working Hours"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:481
+#: calendar/gui/e-meeting-time-sel.c:474
msgid "Show _Zoomed Out"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:499
+#: calendar/gui/e-meeting-time-sel.c:489
msgid "_Update Free/Busy"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:517
+#: calendar/gui/e-meeting-time-sel.c:504
msgid "_<<"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:534
+#: calendar/gui/e-meeting-time-sel.c:522
msgid "_Autopick"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:548
+#: calendar/gui/e-meeting-time-sel.c:537
msgid ">_>"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:554
msgid "_All People and Resources"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:580
+#: calendar/gui/e-meeting-time-sel.c:563
msgid "All _People and One Resource"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:593
+#: calendar/gui/e-meeting-time-sel.c:572
msgid "_Required People"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:606
+#: calendar/gui/e-meeting-time-sel.c:581
msgid "Required People and _One Resource"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:629
+#: calendar/gui/e-meeting-time-sel.c:600
msgid "Meeting _start time:"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:648
+#: calendar/gui/e-meeting-time-sel.c:620
msgid "Meeting _end time:"
msgstr ""
-#: calendar/gui/e-tasks.c:358 calendar/gui/gnome-cal.c:1983
-#: calendar/gui/gnome-cal.c:1994
+#: calendar/gui/e-tasks.c:360 calendar/gui/gnome-cal.c:2005
+#: calendar/gui/gnome-cal.c:2016
#, c-format
msgid "Opening tasks at %s"
msgstr ""
-#: calendar/gui/e-tasks.c:387 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:389 calendar/gui/tasks-control.c:199
#, c-format
msgid "Could not load the tasks in `%s'"
msgstr ""
-#: calendar/gui/e-tasks.c:402
+#: calendar/gui/e-tasks.c:404
#, c-format
msgid "The method required to load `%s' is not supported"
msgstr ""
-#: calendar/gui/e-tasks.c:416 calendar/gui/gnome-cal.c:1501
+#: calendar/gui/e-tasks.c:418 calendar/gui/gnome-cal.c:1508
#, 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:484 calendar/gui/gnome-cal.c:1705
+#: calendar/gui/e-tasks.c:486 calendar/gui/gnome-cal.c:1727
#, c-format
msgid ""
"Error on %s:\n"
" %s"
msgstr ""
-#: calendar/gui/e-tasks.c:555
+#: calendar/gui/e-tasks.c:557
msgid "Completing tasks..."
msgstr ""
-#: calendar/gui/e-tasks.c:578
+#: calendar/gui/e-tasks.c:580
msgid "Deleting selected objects..."
msgstr ""
-#: calendar/gui/e-tasks.c:673
+#: calendar/gui/e-tasks.c:675
msgid "Expunging"
msgstr ""
-#: calendar/gui/e-week-view.c:3540
+#: calendar/gui/e-week-view.c:3566
msgid "New _Appointment..."
msgstr ""
-#: calendar/gui/gnome-cal.c:1473
+#: calendar/gui/gnome-cal.c:1480
#, c-format
msgid "Could not open the folder in `%s'"
msgstr ""
-#: calendar/gui/gnome-cal.c:1487
+#: calendar/gui/gnome-cal.c:1494
#, c-format
msgid "The method required to open `%s' is not supported"
msgstr ""
-#: calendar/gui/gnome-cal.c:1533
+#: calendar/gui/gnome-cal.c:1555
#, c-format
msgid "Adding alarms for %s"
msgstr ""
-#: calendar/gui/gnome-cal.c:1725
+#: calendar/gui/gnome-cal.c:1747
#, c-format
msgid ""
"The calendar backend for\n"
@@ -6015,7 +6027,7 @@ msgid ""
" has crashed. You will have to restart Evolution in order to use it again"
msgstr ""
-#: calendar/gui/gnome-cal.c:1734
+#: calendar/gui/gnome-cal.c:1756
#, c-format
msgid ""
"The task backend for\n"
@@ -6023,12 +6035,12 @@ msgid ""
" has crashed. You will have to restart Evolution in order to use it again"
msgstr ""
-#: calendar/gui/gnome-cal.c:1965
+#: calendar/gui/gnome-cal.c:1987
#, c-format
msgid "Opening calendar at %s"
msgstr ""
-#: calendar/gui/gnome-cal.c:2005
+#: calendar/gui/gnome-cal.c:2027
#, fuzzy
msgid "Opening default tasks folder"
msgstr "Synchronising folder"
@@ -6238,8 +6250,8 @@ msgid "Contacts: "
msgstr ""
#: calendar/gui/print.c:2533 calendar/gui/print.c:2619
-#: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2948
-#: my-evolution/e-summary.c:616
+#: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2949
+#: my-evolution/e-summary.c:649
msgid "Print Preview"
msgstr ""
@@ -8177,7 +8189,7 @@ msgstr ""
#: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
#: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:573
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:576
msgid "Cancelled."
msgstr ""
@@ -8596,30 +8608,30 @@ msgstr ""
msgid "Resolving: %s"
msgstr ""
-#: camel/camel-service.c:773 camel/camel-service.c:887
+#: camel/camel-service.c:774 camel/camel-service.c:889
#, c-format
msgid "Failure in name lookup: %s"
msgstr ""
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
#, c-format
msgid "Host lookup failed: %s: host not found"
msgstr ""
-#: camel/camel-service.c:803
+#: camel/camel-service.c:804
#, c-format
msgid "Host lookup failed: %s: unknown reason"
msgstr ""
-#: camel/camel-service.c:853
+#: camel/camel-service.c:854
msgid "Resolving address"
msgstr ""
-#: camel/camel-service.c:915
+#: camel/camel-service.c:917
msgid "Host lookup failed: host not found"
msgstr ""
-#: camel/camel-service.c:918
+#: camel/camel-service.c:920
msgid "Host lookup failed: unknown reason"
msgstr ""
@@ -8913,47 +8925,47 @@ 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/providers/imap/camel-imap-command.c:224
-#: camel/providers/imap/camel-imap-command.c:263
-#: camel/providers/imap/camel-imap-command.c:453
+#: camel/providers/imap/camel-imap-command.c:221
+#: camel/providers/imap/camel-imap-command.c:260
+#: camel/providers/imap/camel-imap-command.c:450
#: camel/providers/imap/camel-imap-store.c:2644
msgid "Operation cancelled"
msgstr ""
-#: camel/providers/imap/camel-imap-command.c:308
+#: camel/providers/imap/camel-imap-command.c:305
#: camel/providers/imap/camel-imap-store.c:2647
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr ""
#. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:326
+#: camel/providers/imap/camel-imap-command.c:323
#, c-format
msgid ""
"Alert from IMAP server %s@%s:\n"
"%s"
msgstr ""
-#: camel/providers/imap/camel-imap-command.c:395
+#: camel/providers/imap/camel-imap-command.c:392
#, c-format
msgid "Unexpected response from IMAP server: %s"
msgstr ""
-#: camel/providers/imap/camel-imap-command.c:405
+#: camel/providers/imap/camel-imap-command.c:402
#, c-format
msgid "IMAP command failed: %s"
msgstr ""
-#: camel/providers/imap/camel-imap-command.c:463
+#: camel/providers/imap/camel-imap-command.c:460
msgid "Server response ended too soon."
msgstr ""
-#: camel/providers/imap/camel-imap-command.c:655
+#: camel/providers/imap/camel-imap-command.c:652
#, c-format
msgid "IMAP server response did not contain %s information"
msgstr ""
-#: camel/providers/imap/camel-imap-command.c:691
+#: camel/providers/imap/camel-imap-command.c:688
#, c-format
msgid "Unexpected OK response from IMAP server: %s"
msgstr ""
@@ -8977,14 +8989,14 @@ msgstr ""
msgid "Scanning for changed messages"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1873
+#: camel/providers/imap/camel-imap-folder.c:1875
#, fuzzy, c-format
msgid "Unable to retrieve message: %s"
msgstr ""
"Can not get message: %s\n"
" %s"
-#: camel/providers/imap/camel-imap-folder.c:1910
+#: camel/providers/imap/camel-imap-folder.c:1912
#: camel/providers/local/camel-maildir-folder.c:212
#: camel/providers/local/camel-maildir-folder.c:225
#: camel/providers/local/camel-maildir-folder.c:234
@@ -9000,24 +9012,24 @@ msgstr ""
"Can not get message: %s\n"
" %s"
-#: camel/providers/imap/camel-imap-folder.c:1910
+#: camel/providers/imap/camel-imap-folder.c:1912
#: camel/providers/local/camel-maildir-folder.c:212
#: camel/providers/local/camel-mbox-folder.c:351
#: camel/providers/local/camel-mh-folder.c:201
msgid "No such message"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1933
-#: camel/providers/imap/camel-imap-folder.c:2529
+#: camel/providers/imap/camel-imap-folder.c:1935
+#: camel/providers/imap/camel-imap-folder.c:2531
msgid "This message is not currently available"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:2193
-#: camel/providers/imap/camel-imap-folder.c:2263
+#: camel/providers/imap/camel-imap-folder.c:2195
+#: camel/providers/imap/camel-imap-folder.c:2265
msgid "Fetching summary information for new messages"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:2567
+#: camel/providers/imap/camel-imap-folder.c:2569
msgid "Could not find message body in FETCH response."
msgstr ""
@@ -9047,7 +9059,7 @@ msgstr ""
msgid "Check for new messages in all folders"
msgstr ""
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1176
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
msgid "Folders"
msgstr ""
@@ -9077,7 +9089,7 @@ 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:86
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:83
msgid "Password"
msgstr ""
@@ -9734,7 +9746,7 @@ msgstr ""
msgid "Delete after %s day(s)"
msgstr ""
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:82
msgid "POP"
msgstr ""
@@ -9814,7 +9826,7 @@ msgid "No such folder `%s'."
msgstr ""
#: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:107
msgid "Sendmail"
msgstr ""
@@ -9866,7 +9878,7 @@ msgstr ""
msgid "Mail delivery via the sendmail program"
msgstr ""
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:99
msgid "SMTP"
msgstr ""
@@ -10046,57 +10058,57 @@ msgstr "Can not encrypt this message: no recipients specified"
msgid "SMTP Greeting"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:926
+#: camel/providers/smtp/camel-smtp-transport.c:927
#, c-format
msgid "HELO request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:948
+#: camel/providers/smtp/camel-smtp-transport.c:949
msgid "HELO response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1014
+#: camel/providers/smtp/camel-smtp-transport.c:1015
msgid "SMTP Authentication"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1020
+#: camel/providers/smtp/camel-smtp-transport.c:1021
msgid "Error creating SASL authentication object."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1037
-#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
#, c-format
msgid "AUTH request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1058
+#: camel/providers/smtp/camel-smtp-transport.c:1059
msgid "AUTH request failed."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1119
+#: camel/providers/smtp/camel-smtp-transport.c:1120
msgid "Bad authentication response from server.\n"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1144
+#: camel/providers/smtp/camel-smtp-transport.c:1145
#, c-format
msgid "MAIL FROM request timed out: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1164
+#: camel/providers/smtp/camel-smtp-transport.c:1165
msgid "MAIL FROM response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1188
+#: camel/providers/smtp/camel-smtp-transport.c:1189
#, c-format
msgid "RCPT TO request timed out: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1210
+#: camel/providers/smtp/camel-smtp-transport.c:1211
#, c-format
msgid "RCPT TO <%s> failed"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1249
+#: camel/providers/smtp/camel-smtp-transport.c:1250
#, c-format
msgid "DATA request timed out: %s: mail not sent"
msgstr ""
@@ -10104,35 +10116,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:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1270
msgid "DATA response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1333
+#: camel/providers/smtp/camel-smtp-transport.c:1311
+#: camel/providers/smtp/camel-smtp-transport.c:1334
#, c-format
msgid "DATA send timed out: message termination: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1353
+#: camel/providers/smtp/camel-smtp-transport.c:1354
msgid "DATA termination response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1376
+#: camel/providers/smtp/camel-smtp-transport.c:1377
#, c-format
msgid "RSET request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1396
+#: camel/providers/smtp/camel-smtp-transport.c:1397
msgid "RSET response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1419
+#: camel/providers/smtp/camel-smtp-transport.c:1420
#, c-format
msgid "QUIT request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1439
+#: camel/providers/smtp/camel-smtp-transport.c:1440
msgid "QUIT response error"
msgstr ""
@@ -10152,7 +10164,7 @@ msgid "%.0fG"
msgstr ""
#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:370 mail/mail-display.c:223
+#: composer/e-msg-composer-attachment-bar.c:370 mail/mail-display.c:227
msgid "attachment"
msgstr ""
@@ -10348,10 +10360,6 @@ msgid ""
"Do you wish to save your changes?"
msgstr ""
-#: composer/e-msg-composer.c:1555
-msgid "_Discard Changes"
-msgstr ""
-
#: composer/e-msg-composer.c:1559
msgid "Warning: Modified Message"
msgstr ""
@@ -10364,22 +10372,22 @@ msgstr ""
msgid "Signature:"
msgstr ""
-#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1254
+#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1255
msgid "Autogenerated"
msgstr ""
-#: composer/e-msg-composer.c:2233 composer/e-msg-composer.c:2871
-#: composer/e-msg-composer.c:2872
+#: composer/e-msg-composer.c:2233 composer/e-msg-composer.c:2900
+#: composer/e-msg-composer.c:2901
msgid "Compose a message"
msgstr ""
-#: composer/e-msg-composer.c:2903
+#: composer/e-msg-composer.c:2932
msgid ""
"Could not create composer window:\n"
"Unable to activate address selector control."
msgstr ""
-#: composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2958
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component.\n"
@@ -10387,13 +10395,13 @@ msgid ""
"of gtkhtml and libgtkhtml installed.\n"
msgstr ""
-#: composer/e-msg-composer.c:2989
+#: composer/e-msg-composer.c:3026
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component."
msgstr ""
-#: composer/e-msg-composer.c:4003
+#: composer/e-msg-composer.c:4040
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
@@ -10559,7 +10567,7 @@ msgid ""
"Overwrite it?"
msgstr ""
-#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:200
msgid "Overwrite file?"
msgstr ""
@@ -10650,13 +10658,13 @@ msgstr ""
#. strptime format for time of day, without seconds,
#. in 12-hour format.
#: e-util/e-time-utils.c:334 e-util/e-time-utils.c:421
-#: widgets/misc/e-dateedit.c:1405 widgets/misc/e-dateedit.c:1618
+#: widgets/misc/e-dateedit.c:1403 widgets/misc/e-dateedit.c:1616
msgid "%I:%M %p"
msgstr ""
#. strptime format for time of day, without seconds 24-hour format.
#: e-util/e-time-utils.c:338 e-util/e-time-utils.c:413
-#: widgets/misc/e-dateedit.c:1402 widgets/misc/e-dateedit.c:1615
+#: widgets/misc/e-dateedit.c:1400 widgets/misc/e-dateedit.c:1613
msgid "%H:%M"
msgstr ""
@@ -10777,7 +10785,7 @@ msgid "You must specify a folder."
msgstr ""
#: filter/filter-folder.c:243 filter/vfolder-rule.c:438
-#: mail/mail-account-gui.c:1503 mail/mail-account-gui.c:1517
+#: mail/mail-account-gui.c:1504 mail/mail-account-gui.c:1518
msgid "Select Folder"
msgstr ""
@@ -10789,30 +10797,30 @@ msgid ""
msgstr ""
#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:68
-#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1404
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1404
msgid "Important"
msgstr ""
#. red
#: filter/filter-label.c:122 mail/mail-config.c:69
-#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1405
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1405
msgid "Work"
msgstr ""
#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:87
+#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:84
#: shell/e-config-upgrade.c:1406
msgid "Personal"
msgstr ""
#. forest green
#: filter/filter-label.c:124 mail/mail-config.c:71
-#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1407
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1407
msgid "To Do"
msgstr ""
#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:68
+#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:66
#: shell/e-config-upgrade.c:1408
msgid "Later"
msgstr ""
@@ -10911,7 +10919,7 @@ msgstr ""
msgid "months"
msgstr ""
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:179
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:174
msgid "seconds"
msgstr ""
@@ -11076,7 +11084,7 @@ msgstr ""
msgid "is not Flagged"
msgstr ""
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1796
msgid "Label"
msgstr ""
@@ -11137,7 +11145,7 @@ msgstr ""
msgid "Score"
msgstr ""
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1819
msgid "Sender"
msgstr ""
@@ -11254,6 +11262,7 @@ msgstr ""
#: importers/pine-importer.c:637 mail/component-factory.c:116
#: mail/folder-browser-ui.c:359 mail/importers/elm-importer.c:526
#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
+#: my-evolution/my-evolution.glade.h:4
msgid "Mail"
msgstr ""
@@ -11377,65 +11386,52 @@ msgid "Configure spell-checking, signatures, and the message composer here"
msgstr ""
#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure the fonts used by Evolution here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
msgid "Configure your email accounts here"
msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
#, fuzzy
msgid "Evolution Mail"
msgstr "Cannot initialise Evolution's mail component."
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
#, fuzzy
msgid "Evolution Mail accounts configuration control"
msgstr "Cannot initialise Evolution's mail component."
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
#, fuzzy
msgid "Evolution Mail component"
msgstr "Cannot initialise Evolution's mail component."
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
#, fuzzy
msgid "Evolution Mail composer"
msgstr "Cannot initialise Evolution's mail component."
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
#, fuzzy
msgid "Evolution Mail composer configuration control"
msgstr "Cannot initialise Evolution's mail component."
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
#, fuzzy
msgid "Evolution Mail configuration interface"
msgstr "Cannot initialise Evolution's mail component."
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
msgid "Evolution Mail folder viewer"
msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-#, fuzzy
-msgid "Evolution Mail font configuration control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
msgid "Evolution Mail preferences control"
msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "Font Preferences"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:16
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
msgid "Mail Accounts"
msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:71
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
msgid "Mail Preferences"
msgstr ""
@@ -11477,44 +11473,44 @@ msgid ""
"order."
msgstr ""
-#: mail/component-factory.c:997
+#: mail/component-factory.c:998
msgid "You have not set a mail transport method"
msgstr ""
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1021
msgid "You have unsent messages, do you wish to quit anyway?"
msgstr ""
-#: mail/component-factory.c:1060
+#: mail/component-factory.c:1061
msgid "New Mail Message"
msgstr ""
-#: mail/component-factory.c:1060
+#: mail/component-factory.c:1061
msgid "_Mail Message"
msgstr ""
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1062
msgid "Compose a new mail message"
msgstr ""
-#: mail/component-factory.c:1069
+#: mail/component-factory.c:1070
msgid "New Message Post"
msgstr ""
-#: mail/component-factory.c:1069
+#: mail/component-factory.c:1070
msgid "_Post Message"
msgstr ""
-#: mail/component-factory.c:1070
+#: mail/component-factory.c:1071
#, fuzzy
msgid "Post a new mail message"
msgstr "Can not open message"
-#: mail/component-factory.c:1353
+#: mail/component-factory.c:1354
msgid "Connecting..."
msgstr ""
-#: mail/component-factory.c:1364
+#: mail/component-factory.c:1365
msgid "Cannot register storage with shell"
msgstr ""
@@ -11527,179 +11523,179 @@ msgstr ""
msgid "Properties"
msgstr ""
-#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:939
+#: mail/folder-browser.c:330 mail/mail-display.c:394 mail/mail-display.c:942
#, c-format
msgid "Could not create temporary directory: %s"
msgstr ""
-#: mail/folder-browser.c:782
+#: mail/folder-browser.c:785
#, c-format
msgid "%d new"
msgstr ""
-#: mail/folder-browser.c:785 mail/folder-browser.c:793
-#: mail/folder-browser.c:796
+#: mail/folder-browser.c:788 mail/folder-browser.c:796
+#: mail/folder-browser.c:799
msgid ", "
msgstr ""
-#: mail/folder-browser.c:787
+#: mail/folder-browser.c:790
#, c-format
msgid "%d hidden"
msgstr ""
-#: mail/folder-browser.c:789
+#: mail/folder-browser.c:792
#, c-format
msgid "%d visible"
msgstr ""
-#: mail/folder-browser.c:794
+#: mail/folder-browser.c:797
#, c-format
msgid "%d selected"
msgstr ""
-#: mail/folder-browser.c:799
+#: mail/folder-browser.c:802
#, c-format
msgid "%d unsent"
msgstr ""
-#: mail/folder-browser.c:801
+#: mail/folder-browser.c:804
#, c-format
msgid "%d sent"
msgstr ""
-#: mail/folder-browser.c:803
+#: mail/folder-browser.c:806
#, c-format
msgid "%d total"
msgstr ""
-#: mail/folder-browser.c:1182
+#: mail/folder-browser.c:1185
msgid "Create _Virtual Folder From Search..."
msgstr ""
-#: mail/folder-browser.c:1729
+#: mail/folder-browser.c:1732
msgid "VFolder on _Subject"
msgstr ""
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1733
msgid "VFolder on Se_nder"
msgstr ""
-#: mail/folder-browser.c:1731
+#: mail/folder-browser.c:1734
msgid "VFolder on _Recipients"
msgstr ""
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1735
msgid "VFolder on Mailing _List"
msgstr ""
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1739
msgid "Filter on Sub_ject"
msgstr ""
-#: mail/folder-browser.c:1737
+#: mail/folder-browser.c:1740
msgid "Filter on Sen_der"
msgstr ""
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
msgid "Filter on Re_cipients"
msgstr ""
-#: mail/folder-browser.c:1739 mail/folder-browser.c:2063
+#: mail/folder-browser.c:1742 mail/folder-browser.c:2066
msgid "Filter on _Mailing List"
msgstr ""
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1760
msgid "_Edit as New Message..."
msgstr ""
-#: mail/folder-browser.c:1759
+#: mail/folder-browser.c:1762
msgid "_Print"
msgstr ""
-#: mail/folder-browser.c:1763 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1766 ui/evolution-mail-message.xml.h:110
msgid "_Reply to Sender"
msgstr ""
-#: mail/folder-browser.c:1764 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1767 ui/evolution-mail-message.xml.h:75
msgid "Reply to _List"
msgstr ""
-#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1768 ui/evolution-mail-message.xml.h:74
msgid "Reply to _All"
msgstr ""
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
msgid "_Forward"
msgstr ""
-#: mail/folder-browser.c:1770
+#: mail/folder-browser.c:1773
msgid "Follo_w Up..."
msgstr ""
-#: mail/folder-browser.c:1771
+#: mail/folder-browser.c:1774
msgid "Fla_g Completed"
msgstr ""
-#: mail/folder-browser.c:1772
+#: mail/folder-browser.c:1775
msgid "Cl_ear Flag"
msgstr ""
#. separator here?
-#: mail/folder-browser.c:1776 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1779 ui/evolution-mail-message.xml.h:43
msgid "Mar_k as Read"
msgstr ""
-#: mail/folder-browser.c:1777
+#: mail/folder-browser.c:1780
msgid "Mark as _Unread"
msgstr ""
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1781
msgid "Mark as _Important"
msgstr ""
-#: mail/folder-browser.c:1779
+#: mail/folder-browser.c:1782
msgid "_Mark as Unimportant"
msgstr ""
-#: mail/folder-browser.c:1784
+#: mail/folder-browser.c:1787
msgid "U_ndelete"
msgstr ""
-#: mail/folder-browser.c:1788
+#: mail/folder-browser.c:1791
msgid "Mo_ve to Folder..."
msgstr ""
-#: mail/folder-browser.c:1789 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1792 ui/evolution-addressbook.xml.h:31
msgid "_Copy to Folder..."
msgstr ""
-#: mail/folder-browser.c:1797
+#: mail/folder-browser.c:1800
msgid "Add Sender to Address_book"
msgstr ""
-#: mail/folder-browser.c:1801
+#: mail/folder-browser.c:1804
msgid "Appl_y Filters"
msgstr ""
-#: mail/folder-browser.c:1805
+#: mail/folder-browser.c:1808
msgid "Crea_te Rule From Message"
msgstr ""
-#: mail/folder-browser.c:2064
+#: mail/folder-browser.c:2067
msgid "VFolder on M_ailing List"
msgstr ""
-#: mail/folder-browser.c:2066
+#: mail/folder-browser.c:2069
#, c-format
msgid "Filter on _Mailing List (%s)"
msgstr ""
-#: mail/folder-browser.c:2067
+#: mail/folder-browser.c:2070
#, c-format
msgid "VFolder on M_ailing List (%s)"
msgstr ""
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:40
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
msgid "Default"
msgstr ""
@@ -11777,19 +11773,19 @@ msgstr ""
msgid "Evolution Account Editor"
msgstr ""
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:154
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:149
msgid "_Host:"
msgstr ""
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:123
msgid "User_name:"
msgstr ""
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:156
msgid "_Path:"
msgstr ""
-#: mail/mail-account-gui.c:1880
+#: mail/mail-account-gui.c:1881
msgid "You may not create two accounts with the same name."
msgstr ""
@@ -11802,12 +11798,14 @@ msgid "Don't delete"
msgstr ""
#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
-#: mail/mail-composer-prefs.c:676 mail/mail-composer-prefs.c:694
+#: mail/mail-composer-prefs.c:675 mail/mail-composer-prefs.c:693
+#: mail/mail-composer-prefs.c:717
msgid "Disable"
msgstr ""
#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
-#: mail/mail-composer-prefs.c:676 mail/mail-composer-prefs.c:694
+#: mail/mail-composer-prefs.c:675 mail/mail-composer-prefs.c:693
+#: mail/mail-composer-prefs.c:717
msgid "Enable"
msgstr ""
@@ -11816,8 +11814,10 @@ msgstr ""
msgid "[Default]"
msgstr ""
+#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
+#. has "activatable" set.
#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:706 mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
msgid "Enabled"
msgstr ""
@@ -11866,11 +11866,11 @@ msgid ""
msgstr ""
#. Add the "Don't show this message again." checkbox
-#: mail/mail-callbacks.c:100 widgets/misc/e-messagebox.c:226
+#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
msgid "Don't show this message again."
msgstr ""
-#: mail/mail-callbacks.c:189
+#: mail/mail-callbacks.c:190
msgid ""
"You have not configured the mail client.\n"
"You need to do this before you can send,\n"
@@ -11878,111 +11878,111 @@ msgid ""
"Would you like to configure it now?"
msgstr ""
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:212
msgid ""
"You need to configure an account\n"
"before you can compose mail."
msgstr ""
-#: mail/mail-callbacks.c:225
+#: mail/mail-callbacks.c:226
msgid ""
"You need to configure an identity\n"
"before you can compose mail."
msgstr ""
-#: mail/mail-callbacks.c:232
+#: mail/mail-callbacks.c:233
msgid ""
"You need to configure a mail transport\n"
"before you can compose mail."
msgstr ""
#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:254
+#: mail/mail-callbacks.c:255
msgid ""
"You are sending an HTML-formatted message. Please make sure that\n"
"the following recipients are willing and able to receive HTML mail:\n"
msgstr ""
-#: mail/mail-callbacks.c:266
+#: mail/mail-callbacks.c:267
msgid "Send anyway?"
msgstr ""
-#: mail/mail-callbacks.c:287
+#: mail/mail-callbacks.c:288
msgid ""
"This message has no subject.\n"
"Really send?"
msgstr ""
-#: mail/mail-callbacks.c:313
+#: mail/mail-callbacks.c:314
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:317
+#: mail/mail-callbacks.c:318
msgid "This message contains only Bcc recipients."
msgstr ""
-#: mail/mail-callbacks.c:322
+#: mail/mail-callbacks.c:323
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:470
+#: mail/mail-callbacks.c:471
msgid "You must specify recipients in order to send this message."
msgstr ""
-#: mail/mail-callbacks.c:722
+#: mail/mail-callbacks.c:723
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:1187
+#: mail/mail-callbacks.c:1188
msgid "an unknown sender"
msgstr ""
-#: mail/mail-callbacks.c:1191
+#: mail/mail-callbacks.c:1192
msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
msgstr ""
-#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
+#: mail/mail-callbacks.c:1699 mail/message-browser.c:123
msgid "Move message(s) to"
msgstr ""
-#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
+#: mail/mail-callbacks.c:1701 mail/message-browser.c:125
msgid "Copy message(s) to"
msgstr ""
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2345
#, c-format
msgid "Are you sure you want to edit all %d messages?"
msgstr ""
-#: mail/mail-callbacks.c:2360
+#: mail/mail-callbacks.c:2361
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
msgstr ""
-#: mail/mail-callbacks.c:2393
+#: mail/mail-callbacks.c:2394
msgid ""
"You may only resend messages\n"
"in the Sent folder."
msgstr ""
-#: mail/mail-callbacks.c:2403
+#: mail/mail-callbacks.c:2404
#, c-format
msgid "Are you sure you want to resend all %d messages?"
msgstr ""
-#: mail/mail-callbacks.c:2424
+#: mail/mail-callbacks.c:2425
msgid "No Message Selected"
msgstr ""
-#: mail/mail-callbacks.c:2465
+#: mail/mail-callbacks.c:2466
#, fuzzy, c-format
msgid ""
"Cannot save to `%s'\n"
@@ -11991,22 +11991,22 @@ msgstr ""
"Can not get message: %s\n"
" %s"
-#: mail/mail-callbacks.c:2470
+#: mail/mail-callbacks.c:2471
#, c-format
msgid ""
"`%s' already exists.\n"
"Overwrite it?"
msgstr ""
-#: mail/mail-callbacks.c:2511
+#: mail/mail-callbacks.c:2512
msgid "Save Message As..."
msgstr ""
-#: mail/mail-callbacks.c:2513
+#: mail/mail-callbacks.c:2514
msgid "Save Messages As..."
msgstr ""
-#: mail/mail-callbacks.c:2687
+#: mail/mail-callbacks.c:2688
msgid ""
"This operation will permanently erase all messages marked as\n"
"deleted. If you continue, you will not be able to recover these messages.\n"
@@ -12014,61 +12014,61 @@ msgid ""
"Really erase these messages?"
msgstr ""
-#: mail/mail-callbacks.c:2782
+#: mail/mail-callbacks.c:2783
#, c-format
msgid ""
"Error loading filter information:\n"
"%s"
msgstr ""
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:2791
msgid "Filters"
msgstr ""
-#: mail/mail-callbacks.c:2831
+#: mail/mail-callbacks.c:2832
#, c-format
msgid "Page %d of %d"
msgstr ""
-#: mail/mail-callbacks.c:2887
+#: mail/mail-callbacks.c:2888
msgid "Print Message"
msgstr ""
-#: mail/mail-callbacks.c:2954
+#: mail/mail-callbacks.c:2955
msgid "Printing of message failed"
msgstr ""
-#: mail/mail-callbacks.c:3147
+#: mail/mail-callbacks.c:3148
#, c-format
msgid "Are you sure you want to open all %d messages in separate windows?"
msgstr ""
-#: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
-#: mail/mail-config.c:1347
+#: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
+#: mail/mail-config.c:1362
msgid "Unnamed"
msgstr ""
-#: mail/mail-composer-prefs.c:335
+#: mail/mail-composer-prefs.c:334
msgid "You must specify a valid script name."
msgstr ""
-#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
+#: mail/mail-composer-prefs.c:392 mail/mail-composer-prefs.c:454
msgid "[script]"
msgstr ""
-#: mail/mail-composer-prefs.c:866
+#: mail/mail-composer-prefs.c:858
msgid "Language(s)"
msgstr ""
-#: mail/mail-composer-prefs.c:908
+#: mail/mail-composer-prefs.c:900
msgid "Add script signature"
msgstr ""
-#: mail/mail-composer-prefs.c:928
+#: mail/mail-composer-prefs.c:920
msgid "Signature(s)"
msgstr ""
-#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
msgid "Identity"
msgstr ""
@@ -12116,11 +12116,11 @@ msgid ""
"purposes only."
msgstr ""
-#: mail/mail-config.c:1051
+#: mail/mail-config.c:1066
msgid "Checking Service"
msgstr ""
-#: mail/mail-config.c:1129 mail/mail-config.c:1133
+#: mail/mail-config.c:1144 mail/mail-config.c:1148
msgid "Connecting to server..."
msgstr ""
@@ -12189,48 +12189,44 @@ msgid "Authentication"
msgstr ""
#: mail/mail-config.glade.h:23
-msgid "Automatically _detect links"
-msgstr ""
-
-#: mail/mail-config.glade.h:24
msgid "Baltic (ISO-8859-13)"
msgstr ""
-#: mail/mail-config.glade.h:25
+#: 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:28
+#: mail/mail-config.glade.h:27
msgid "Check spelling while I _type"
msgstr ""
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
msgid "Checking for New Mail"
msgstr ""
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
#, fuzzy
msgid "Color for _misspelled words:"
msgstr "Colours for display"
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
msgid "Composing Messages"
msgstr ""
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
msgid "Configuration"
msgstr ""
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -12240,468 +12236,452 @@ msgid ""
"Click \"Apply\" to save your settings."
msgstr ""
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:38
msgid "De_fault"
msgstr ""
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
msgid "Default Behavior"
msgstr ""
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
msgid "Default character _encoding:"
msgstr ""
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
msgid "Deleting Mail"
msgstr ""
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
msgid "Digital IDs..."
msgstr ""
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
#, fuzzy
msgid "Do not quote original message"
msgstr "Can not open message"
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
msgid "Don't sign _meeting requests (for Outlook compatibility)"
msgstr ""
-#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:1
msgid "Done"
msgstr ""
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
msgid "Drafts _folder:"
msgstr ""
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
msgid "E_nable"
msgstr ""
-#: mail/mail-config.glade.h:51
-msgid "Emacs"
-msgstr ""
-
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
msgid "Email Accounts"
msgstr ""
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
msgid "Email _address:"
msgstr ""
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
msgid "Empty _trash folders on exit"
msgstr ""
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
msgid "Evolution Account Assistant"
msgstr ""
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
msgid "Execute Command..."
msgstr ""
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
msgid "Fi_xed -width:"
msgstr ""
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
msgid "Font Properties"
msgstr ""
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
msgid "Format messages in _HTML"
msgstr ""
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
msgid "Get Digital ID..."
msgstr ""
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
msgid "Highlight _quotations with"
msgstr ""
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
msgid "IMAPv4 "
msgstr ""
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
msgid "Inline"
msgstr ""
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
msgid "Kerberos "
msgstr ""
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:65
msgid "Labels and Colors"
msgstr ""
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
msgid "Loading Images"
msgstr ""
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
msgid "Mail Configuration"
msgstr ""
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
msgid "Mailbox location"
msgstr ""
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
msgid "Message Composer"
msgstr ""
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
msgid "Message Display"
msgstr ""
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:73
msgid "Message Fonts"
msgstr ""
-#: mail/mail-config.glade.h:76
-msgid "Microsoft"
-msgstr ""
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:75
msgid "New Mail Notification"
msgstr ""
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:77
msgid ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
msgstr ""
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
msgid "Optional Information"
msgstr ""
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:80
#, fuzzy
msgid "Or_ganization:"
msgstr "Organi_sation:"
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
msgid "PGP/GPG _Key ID:"
msgstr ""
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:85
msgid "Pick a color"
msgstr "Pick a colour"
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr ""
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
msgid "Pretty Good Privacy (PGP/GPG)"
msgstr ""
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:88
msgid "Printed Fonts"
msgstr ""
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
msgid "Qmail maildir "
msgstr ""
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
#, fuzzy
msgid "Quote original message"
msgstr "Can not open message"
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
msgid "Quoted"
msgstr ""
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
msgid "Re_member this password"
msgstr ""
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
msgid "Re_ply-To:"
msgstr ""
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
msgid "Receiving Email"
msgstr ""
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:95
msgid "Receiving _Options"
msgstr ""
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
msgid "Remember this _password"
msgstr ""
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
msgid "Required Information"
msgstr ""
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
msgid "Restore Defaults"
msgstr ""
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:100
msgid "S_ecurity"
msgstr ""
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:101
msgid "Secure MIME (S/MIME)"
msgstr ""
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:102
msgid "Select HTML fixed width font"
msgstr ""
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:103
msgid "Select HTML fixed width font for printing"
msgstr ""
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:104
msgid "Select HTML variable width font"
msgstr ""
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:105
msgid "Select HTML variable width font for printing"
msgstr ""
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:106
msgid "Sending Email"
msgstr ""
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:108
msgid "Sent _messages folder:"
msgstr ""
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:109
msgid "Sent and Draft Messages"
msgstr ""
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:110
msgid "Ser_ver requires authentication"
msgstr ""
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
msgid "Server Configuration"
msgstr ""
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
msgid "Server _Type: "
msgstr ""
-#: mail/mail-config.glade.h:116
-msgid "Shortcuts _type:"
-msgstr ""
-
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:113
msgid "Specify _filename:"
msgstr ""
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:114
msgid "Spell _Checking"
msgstr ""
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:115
msgid "Standard Unix mbox"
msgstr ""
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:116
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:123
+#: mail/mail-config.glade.h:119
msgid ""
"This page allows you to configure spell checking behavior and language. The "
"list of languages here reflects only the languages for which you have a "
"dictionary installed."
msgstr ""
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
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:128
+#: mail/mail-config.glade.h:124
msgid "V_ariable-width:"
msgstr ""
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:125
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
"Click \"Forward\" to begin. "
msgstr ""
-#: mail/mail-config.glade.h:134
-msgid "XEmacs"
-msgstr ""
-
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:130
msgid "_Add Signature"
msgstr ""
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:131
msgid "_Always load images off the net"
msgstr ""
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:132
msgid "_Always sign outgoing messages when using this account"
msgstr ""
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:133
msgid "_Authentication Type: "
msgstr ""
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:134
msgid "_Authentication type: "
msgstr ""
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:135
msgid "_Automatically check for new mail every"
msgstr ""
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:136
msgid "_Automatically insert smiley images"
msgstr ""
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:137
msgid "_Beep when new mail arrives"
msgstr ""
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:138
msgid "_Certificate ID:"
msgstr ""
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:139
msgid "_Confirm when expunging a folder"
msgstr ""
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:140
msgid "_Default signature:"
msgstr ""
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:141
msgid "_Defaults"
msgstr ""
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:142
msgid "_Do not notify me when new mail arrives"
msgstr ""
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:144
msgid "_Enable"
msgstr ""
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:145
msgid "_Forward style:"
msgstr ""
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:146
msgid "_Full name:"
msgstr ""
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:148
msgid "_HTML Mail"
msgstr ""
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:150
msgid "_Identity"
msgstr ""
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:151
msgid "_Load images if sender is in addressbook"
msgstr ""
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:152
msgid "_Make this my default account"
msgstr ""
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:153
msgid "_Mark messages as read after"
msgstr ""
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:154 my-evolution/e-summary-preferences.c:575
msgid "_Name:"
msgstr ""
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:155
msgid "_Never load images off the net"
msgstr ""
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:157
msgid "_Play sound file when new mail arrives"
msgstr ""
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:158
msgid "_Prompt when sending HTML messages to contacts that don't want them"
msgstr ""
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:159
msgid "_Prompt when sending messages with an empty subject line"
msgstr ""
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:160
msgid "_Receiving Mail"
msgstr ""
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:161
msgid "_Reply style:"
msgstr ""
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:162
msgid "_Restore defaults"
msgstr ""
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:163
msgid "_Script:"
msgstr ""
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:164
msgid "_Sending Mail"
msgstr ""
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:165
msgid "_Show animated images"
msgstr ""
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:166
msgid "_Signatures"
msgstr ""
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:167
msgid "_Standard Font:"
msgstr ""
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:168
msgid "_Terminal Font:"
msgstr ""
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:169
msgid "_Use secure connection (SSL):"
msgstr ""
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:170
msgid "_Use the same fonts as other applications"
msgstr ""
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:171
#, fuzzy
msgid "color"
msgstr "Colours"
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
msgid "description"
msgstr ""
@@ -12725,78 +12705,78 @@ msgstr ""
msgid "Could not create a S/MIME decode context."
msgstr ""
-#: mail/mail-display.c:193
+#: mail/mail-display.c:197
#, c-format
msgid ""
"File `%s' already exists.\n"
"Overwrite it?"
msgstr ""
-#: mail/mail-display.c:333
+#: mail/mail-display.c:336
msgid "Save Attachment"
msgstr ""
-#: mail/mail-display.c:406
+#: mail/mail-display.c:409
#, fuzzy, c-format
msgid "Could not create temporary file '%s': %s"
msgstr "Could not close temporary folder: %s"
-#: mail/mail-display.c:454
+#: mail/mail-display.c:457
msgid "Save Attachment..."
msgstr ""
-#: mail/mail-display.c:455
+#: mail/mail-display.c:458
msgid "View Inline"
msgstr ""
-#: mail/mail-display.c:456
+#: mail/mail-display.c:459
#, c-format
msgid "Open in %s..."
msgstr ""
-#: mail/mail-display.c:512
+#: mail/mail-display.c:515
#, c-format
msgid "View Inline (via %s)"
msgstr ""
-#: mail/mail-display.c:516
+#: mail/mail-display.c:519
msgid "Hide"
msgstr ""
-#: mail/mail-display.c:536
+#: mail/mail-display.c:539
msgid "External Viewer"
msgstr ""
-#: mail/mail-display.c:1365
+#: mail/mail-display.c:1368
msgid "Downloading images"
msgstr ""
-#: mail/mail-display.c:1542
+#: mail/mail-display.c:1545
msgid "Loading message content"
msgstr ""
-#: mail/mail-display.c:1879
+#: mail/mail-display.c:1887
msgid "Overdue:"
msgstr ""
-#: mail/mail-display.c:1883
+#: mail/mail-display.c:1891
#, fuzzy
msgid "by %B %d, %Y, %l:%M %P"
msgstr "%a %d/%m/%Y %I:%M %p"
-#: mail/mail-display.c:2240
+#: mail/mail-display.c:2256
msgid "Open Link in Browser"
msgstr ""
-#: mail/mail-display.c:2241
+#: mail/mail-display.c:2257
msgid "Copy Link Location"
msgstr ""
-#: mail/mail-display.c:2243
+#: mail/mail-display.c:2259
msgid "Save Link as (FIXME)"
msgstr ""
-#: mail/mail-display.c:2245
+#: mail/mail-display.c:2261
msgid "Save Image as..."
msgstr ""
@@ -12917,23 +12897,23 @@ msgstr ""
msgid "Cannot delete folder metadata %s: %s"
msgstr ""
-#: mail/mail-local.c:1329
+#: mail/mail-local.c:1319
#, c-format
msgid "Changing folder \"%s\" to \"%s\" format"
msgstr ""
-#: mail/mail-local.c:1354
+#: mail/mail-local.c:1344
msgid ""
"If you can no longer open this mailbox, then\n"
"you may need to repair it manually."
msgstr ""
-#: mail/mail-local.c:1454
+#: mail/mail-local.c:1444
#, c-format
msgid "Reconfigure /%s"
msgstr "Synchronising \"%s\""
-#: mail/mail-local.c:1518
+#: mail/mail-local.c:1508
msgid "You cannot change the format of a non-local folder."
msgstr ""
@@ -12982,7 +12962,7 @@ msgstr ""
msgid "Failed on message %d of %d"
msgstr ""
-#: mail/mail-ops.c:750 mail/mail-send-recv.c:577
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:580
msgid "Complete."
msgstr ""
@@ -13033,133 +13013,143 @@ msgstr "Synchronising \"%s\""
msgid "Refreshing folder"
msgstr ""
-#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
msgid "Expunging folder"
msgstr ""
-#: mail/mail-ops.c:1643
+#: mail/mail-ops.c:1642
+#, c-format
+msgid "Emptying trash in '%s'"
+msgstr ""
+
+#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:480
+#: shell/e-local-storage.c:1151
+msgid "Local Folders"
+msgstr ""
+
+#: mail/mail-ops.c:1718
#, c-format
msgid "Retrieving message %s"
msgstr ""
-#: mail/mail-ops.c:1715
+#: mail/mail-ops.c:1790
#, c-format
msgid "Retrieving %d message(s)"
msgstr ""
-#: mail/mail-ops.c:1801
+#: mail/mail-ops.c:1876
#, c-format
msgid "Saving %d messsage(s)"
msgstr ""
-#: mail/mail-ops.c:1849
+#: mail/mail-ops.c:1924
#, c-format
msgid ""
"Unable to create output file: %s\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:1877
+#: mail/mail-ops.c:1952
#, c-format
msgid ""
"Error saving messages to: %s:\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:1951
+#: mail/mail-ops.c:2026
msgid "Saving attachment"
msgstr ""
-#: mail/mail-ops.c:1968
+#: mail/mail-ops.c:2043
#, c-format
msgid ""
"Cannot create output file: %s:\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:1998
+#: mail/mail-ops.c:2073
#, c-format
msgid "Could not write data: %s"
msgstr ""
-#: mail/mail-ops.c:2146
+#: mail/mail-ops.c:2221
#, c-format
msgid "Disconnecting from %s"
msgstr ""
-#: mail/mail-ops.c:2146
+#: mail/mail-ops.c:2221
#, c-format
msgid "Reconnecting to %s"
msgstr ""
-#: mail/mail-search.c:150
+#: mail/mail-search.c:153
msgid "(Untitled Message)"
msgstr ""
-#: mail/mail-search.c:232
+#: mail/mail-search.c:235
msgid "Untitled Message"
msgstr ""
-#: mail/mail-search.c:234
+#: mail/mail-search.c:237
msgid "Empty Message"
msgstr ""
-#: mail/mail-search.c:282
+#: mail/mail-search.c:285
msgid "Find in Message"
msgstr ""
-#: mail/mail-search.c:285
+#: mail/mail-search.c:288
msgid "Search"
msgstr ""
-#: mail/mail-search.c:313
+#: mail/mail-search.c:316
msgid "Case Sensitive"
msgstr ""
-#: mail/mail-search.c:315
+#: mail/mail-search.c:318
msgid "Search Forward"
msgstr ""
-#: mail/mail-search.c:335
+#: mail/mail-search.c:338
msgid "Find:"
msgstr ""
-#: mail/mail-search.c:339
+#: mail/mail-search.c:342
msgid "Matches:"
msgstr ""
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:146
msgid "Cancelling..."
msgstr ""
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:253
#, c-format
msgid "Server: %s, Type: %s"
msgstr ""
-#: mail/mail-send-recv.c:252
+#: mail/mail-send-recv.c:255
#, c-format
msgid "Path: %s, Type: %s"
msgstr ""
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:257
#, c-format
msgid "Type: %s"
msgstr ""
-#: mail/mail-send-recv.c:302
+#: mail/mail-send-recv.c:305
msgid "Send & Receive Mail"
msgstr ""
-#: mail/mail-send-recv.c:303
+#: mail/mail-send-recv.c:306
msgid "Cancel _All"
msgstr ""
-#: mail/mail-send-recv.c:385
+#: mail/mail-send-recv.c:388
msgid "Updating..."
msgstr ""
-#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:445
msgid "Waiting..."
msgstr ""
@@ -13176,11 +13166,11 @@ msgstr ""
msgid "Enter Password"
msgstr ""
-#: mail/mail-session.c:282
+#: mail/mail-session.c:283
msgid "_Remember this password"
msgstr ""
-#: mail/mail-session.c:283
+#: mail/mail-session.c:284
msgid "_Remember this password for the remainder of this session"
msgstr ""
@@ -13212,7 +13202,7 @@ msgstr ""
msgid "Enter a name for this signature."
msgstr ""
-#: mail/mail-signature-editor.c:425 my-evolution/e-summary-preferences.c:577
+#: mail/mail-signature-editor.c:425
msgid "Name:"
msgstr ""
@@ -13338,7 +13328,7 @@ msgstr ""
msgid "%b %d %Y"
msgstr ""
-#: mail/message-list.c:2617
+#: mail/message-list.c:2630
msgid "Generating message list"
msgstr ""
@@ -23342,14 +23332,10 @@ msgstr ""
msgid "No description"
msgstr ""
-#: my-evolution/e-summary-mail.c:188
+#: my-evolution/e-summary-mail.c:189
msgid "Mail summary"
msgstr ""
-#: my-evolution/e-summary-mail.c:443 shell/e-local-storage.c:1151
-msgid "Local Folders"
-msgstr ""
-
#: my-evolution/e-summary-preferences.c:355
msgid "Dictionary.com Word of the Day"
msgstr ""
@@ -23359,18 +23345,18 @@ msgid "Quotes of the Day"
msgstr ""
#: my-evolution/e-summary-preferences.c:565
-msgid "Add a news feed"
+msgid "New News Feed"
msgstr ""
-#: my-evolution/e-summary-preferences.c:573
-msgid "Enter the URL of the news feed you wish to add"
+#: my-evolution/e-summary-preferences.c:581
+msgid "_URL:"
msgstr ""
-#: my-evolution/e-summary-rdf.c:305
+#: my-evolution/e-summary-rdf.c:315
msgid "Error downloading RDF"
msgstr ""
-#: my-evolution/e-summary-rdf.c:443
+#: my-evolution/e-summary-rdf.c:453
msgid "News Feed"
msgstr ""
@@ -23398,7 +23384,7 @@ msgstr ""
msgid "There was an error downloading data for"
msgstr ""
-#: my-evolution/e-summary-weather.c:479
+#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
msgid "Weather"
msgstr ""
@@ -23410,19 +23396,19 @@ msgstr ""
msgid "KBOS"
msgstr ""
-#: my-evolution/e-summary.c:198
+#: my-evolution/e-summary.c:204
msgid "%A, %B %e %Y"
msgstr ""
-#: my-evolution/e-summary.c:523
+#: my-evolution/e-summary.c:531
msgid "Please wait..."
msgstr ""
-#: my-evolution/e-summary.c:589 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:620 ui/my-evolution.xml.h:2
msgid "Print Summary"
msgstr ""
-#: my-evolution/e-summary.c:623
+#: my-evolution/e-summary.c:655
msgid "Printing of Summary failed"
msgstr ""
@@ -24602,62 +24588,54 @@ msgid "Drifting dust whirls"
msgstr ""
#: my-evolution/my-evolution.glade.h:1
-msgid "Add n_ews feed"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:2
msgid "C_elsius"
msgstr ""
-#: my-evolution/my-evolution.glade.h:4
-msgid "Delete news feed"
+#: my-evolution/my-evolution.glade.h:3
+msgid "How many days should the calendar display at once?"
msgstr ""
#: my-evolution/my-evolution.glade.h:5
-msgid "How many days should the calendar display at once?"
+msgid "News Feed Settings"
msgstr ""
#: my-evolution/my-evolution.glade.h:6
-msgid "Ma_x number of items shown:"
+msgid "News Feeds"
msgstr ""
#: my-evolution/my-evolution.glade.h:7
-msgid "News Feed Settings"
+msgid "One mont_h"
msgstr ""
#: my-evolution/my-evolution.glade.h:8
-msgid "One mont_h"
+msgid "One w_eek"
msgstr ""
#: my-evolution/my-evolution.glade.h:9
-msgid "One w_eek"
+msgid "R_efresh time (seconds):"
msgstr ""
#: my-evolution/my-evolution.glade.h:10
-msgid "R_efresh time (seconds):"
+msgid "Refresh _time (seconds):"
msgstr ""
#: my-evolution/my-evolution.glade.h:11
-msgid "Refresh _time (seconds):"
+msgid "Schedule"
msgstr ""
#: my-evolution/my-evolution.glade.h:12
-msgid "S_how full path for folders"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:13
msgid "Show _all tasks"
msgstr ""
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:13
msgid "Show _today's tasks"
msgstr ""
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:14
msgid "Show temperatures in:"
msgstr ""
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:15
msgid "Tasks "
msgstr ""
@@ -24666,32 +24644,34 @@ msgid "Weather Settings"
msgstr ""
#: my-evolution/my-evolution.glade.h:18
-msgid "_Fahrenheit"
+msgid "_Delete Feed"
msgstr ""
#: my-evolution/my-evolution.glade.h:19
-msgid "_Five days"
+msgid "_Fahrenheit"
msgstr ""
#: my-evolution/my-evolution.glade.h:20
-msgid "_Mail"
+msgid "_Five days"
msgstr ""
#: my-evolution/my-evolution.glade.h:21
-msgid "_News Feeds"
+msgid "_Max number of items shown:"
msgstr ""
#: my-evolution/my-evolution.glade.h:22
-msgid "_One day"
-msgstr ""
+#, fuzzy
+msgid "_New Feed"
+msgstr "Synchronising folders"
#: my-evolution/my-evolution.glade.h:23
-msgid "_Schedule"
+msgid "_One day"
msgstr ""
#: my-evolution/my-evolution.glade.h:24
-msgid "_Weather"
-msgstr ""
+#, fuzzy
+msgid "_Show full path for folders"
+msgstr "Could not close temporary folder: %s"
#: shell/GNOME_Evolution_Shell.server.in.in.h:1
msgid "Configure special folders and offline folder behavior here"
@@ -24739,8 +24719,8 @@ msgstr ""
msgid "Drafts"
msgstr ""
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:486
-#: shell/e-shell-view.c:490 shell/e-shortcuts.c:1084
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
+#: shell/e-shortcuts.c:1084
msgid "Inbox"
msgstr ""
@@ -24787,7 +24767,7 @@ msgid ""
"to allow installation of the Evolution user files."
msgstr ""
-#: shell/e-shell-about-box.c:43
+#: shell/e-shell-about-box.c:45
msgid "Brought to you by"
msgstr ""
@@ -24889,7 +24869,7 @@ msgid "Rename Folder"
msgstr "Synchronising folder"
#: shell/e-shell-folder-commands.c:553
-#: shell/e-shell-folder-creation-dialog.c:170
+#: shell/e-shell-folder-creation-dialog.c:180
#, c-format
msgid "The specified folder name is not valid: %s"
msgstr ""
@@ -24905,14 +24885,14 @@ msgid ""
"%s"
msgstr "Can not get folder: %s: %s"
-#: shell/e-shell-folder-creation-dialog.c:127
+#: shell/e-shell-folder-creation-dialog.c:137
#, c-format
msgid ""
"Cannot create the specified folder:\n"
"%s"
msgstr ""
-#: shell/e-shell-folder-creation-dialog.c:308
+#: shell/e-shell-folder-creation-dialog.c:318
msgid "Create New Folder"
msgstr ""
@@ -25077,32 +25057,32 @@ msgstr ""
msgid "Please select a user."
msgstr ""
-#: shell/e-shell-shared-folder-picker-dialog.c:374
+#: shell/e-shell-shared-folder-picker-dialog.c:387
#, fuzzy
msgid "Opening Folder"
msgstr "Synchronising folder"
-#: shell/e-shell-shared-folder-picker-dialog.c:380
+#: shell/e-shell-shared-folder-picker-dialog.c:393
#, fuzzy, c-format
msgid "Opening Folder \"%s\""
msgstr "Synchronising folders"
-#: shell/e-shell-shared-folder-picker-dialog.c:385
+#: shell/e-shell-shared-folder-picker-dialog.c:398
#, c-format
msgid "in \"%s\" ..."
msgstr ""
-#: shell/e-shell-shared-folder-picker-dialog.c:465
+#: shell/e-shell-shared-folder-picker-dialog.c:482
#, fuzzy, c-format
msgid "Could not open shared folder: %s."
msgstr "Could not close temporary folder: %s"
-#: shell/e-shell-shared-folder-picker-dialog.c:518
+#: shell/e-shell-shared-folder-picker-dialog.c:535
msgid "Cannot find the specified shared folder."
msgstr ""
#: shell/e-shell-user-creatable-items-handler.c:586
-#: shell/e-shell-user-creatable-items-handler.c:640
+#: shell/e-shell-user-creatable-items-handler.c:642
#: widgets/misc/e-charset-picker.c:106
msgid "New"
msgstr ""
@@ -25177,29 +25157,29 @@ msgstr ""
msgid "Work Offline"
msgstr ""
-#: shell/e-shell-view.c:262
+#: shell/e-shell-view.c:264
msgid "(No folder displayed)"
msgstr ""
-#: shell/e-shell-view.c:2045
+#: shell/e-shell-view.c:2040
#, c-format
msgid "%s (%d)"
msgstr ""
-#: shell/e-shell-view.c:2047
+#: shell/e-shell-view.c:2042
msgid "(None)"
msgstr ""
-#: shell/e-shell-view.c:2091
+#: shell/e-shell-view.c:2083
msgid ""
"Ximian Evolution is currently online. Click on this button to work offline."
msgstr ""
-#: shell/e-shell-view.c:2098
+#: shell/e-shell-view.c:2090
msgid "Ximian Evolution is in the process of going offline."
msgstr ""
-#: shell/e-shell-view.c:2104
+#: shell/e-shell-view.c:2096
msgid ""
"Ximian Evolution is currently offline. Click on this button to work online."
msgstr ""
@@ -25217,7 +25197,7 @@ msgstr ""
msgid "Cannot set up local storage -- %s"
msgstr ""
-#: shell/e-shell.c:1802
+#: shell/e-shell.c:1804
#, c-format
msgid ""
"The Evolution component that handles folders of type \"%s\"\n"
@@ -25225,19 +25205,19 @@ msgid ""
"in order to access that data again."
msgstr ""
-#: shell/e-shell.c:2067
+#: shell/e-shell.c:2069
msgid "Invalid arguments"
msgstr ""
-#: shell/e-shell.c:2069
+#: shell/e-shell.c:2071
msgid "Cannot register on OAF"
msgstr ""
-#: shell/e-shell.c:2071
+#: shell/e-shell.c:2073
msgid "Configuration Database not found"
msgstr ""
-#: shell/e-shell.c:2073 shell/e-storage.c:568
+#: shell/e-shell.c:2075 shell/e-storage.c:568
msgid "Generic error"
msgstr ""
@@ -25669,7 +25649,7 @@ msgstr ""
msgid "Evolution can import data from the following files:"
msgstr ""
-#: shell/main.c:112 shell/main.c:564
+#: shell/main.c:112 shell/main.c:574
msgid "Evolution"
msgstr ""
@@ -25678,7 +25658,7 @@ msgid "Evolution is now exiting ..."
msgstr ""
#. Preview/Alpha/Beta version warning message
-#: shell/main.c:266
+#: shell/main.c:274
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -25698,51 +25678,47 @@ msgid ""
"eagerly await your contributions!\n"
msgstr ""
-#: shell/main.c:290
+#: shell/main.c:298
#, fuzzy
msgid ""
"Thanks\n"
"The Ximian Evolution Team\n"
msgstr "Can not initialise the Ximian Evolution shell."
-#: shell/main.c:298
+#: shell/main.c:306
msgid "Don't tell me again"
msgstr ""
-#: shell/main.c:387
+#: shell/main.c:401
msgid "Cannot access the Ximian Evolution shell."
msgstr "Can not initialise the Ximian Evolution shell."
-#: shell/main.c:396
+#: shell/main.c:410
#, fuzzy, c-format
msgid "Cannot initialize the Ximian Evolution shell: %s"
msgstr "Can not initialise the Ximian Evolution shell."
-#: shell/main.c:528
+#: shell/main.c:542
msgid "Disable splash screen"
msgstr ""
-#: shell/main.c:530
+#: shell/main.c:544
msgid "Start in offline mode"
msgstr ""
-#: shell/main.c:532
+#: shell/main.c:546
msgid "Start in online mode"
msgstr ""
-#: shell/main.c:535
+#: shell/main.c:549
msgid "Forcibly shut down all evolution components"
msgstr ""
-#: shell/main.c:538
+#: shell/main.c:552
msgid "Send the debugging output of all components to a file."
msgstr ""
-#: shell/main.c:541
-msgid "Force upgrading of configuration files from Evolution 1.0.x"
-msgstr ""
-
-#: shell/main.c:568
+#: shell/main.c:578
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -27290,12 +27266,8 @@ msgstr ""
msgid "UTC"
msgstr ""
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-msgid "Select a Time Zone"
-msgstr ""
-
#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-msgid "Selection:"
+msgid "Select a Time Zone"
msgstr ""
#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
@@ -27306,23 +27278,28 @@ msgstr ""
msgid ""
"Use the left mouse button to zoom in on an area of the map and select a time "
"zone.\n"
-" Use the right mouse button to zoom out."
+"Use the right mouse button to zoom out."
msgstr ""
-#: widgets/menus/gal-view-menus.c:287
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#, fuzzy
+msgid "_Selection:"
+msgstr "Organisation"
+
+#: widgets/menus/gal-view-menus.c:290
msgid "_Current View"
msgstr ""
#. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:349
msgid "Custom View"
msgstr ""
-#: widgets/menus/gal-view-menus.c:355
+#: widgets/menus/gal-view-menus.c:358
msgid "Save Custom View..."
msgstr ""
-#: widgets/menus/gal-view-menus.c:368
+#: widgets/menus/gal-view-menus.c:371
msgid "Define Views..."
msgstr ""
@@ -27337,11 +27314,11 @@ msgstr ""
msgid "%B %Y"
msgstr ""
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:427
msgid "Now"
msgstr ""
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:435
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:433
msgid "Today"
msgstr ""
@@ -27419,16 +27396,16 @@ msgstr ""
msgid "Unknown character set: %s"
msgstr ""
-#: widgets/misc/e-charset-picker.c:228
-msgid "Enter the character set to use"
+#: widgets/misc/e-charset-picker.c:230 widgets/misc/e-charset-picker.c:459
+msgid "Character Encoding"
msgstr ""
-#: widgets/misc/e-charset-picker.c:303
-msgid "Other..."
+#: widgets/misc/e-charset-picker.c:239
+msgid "Enter the character set to use"
msgstr ""
-#: widgets/misc/e-charset-picker.c:423
-msgid "Character Encoding"
+#: widgets/misc/e-charset-picker.c:335
+msgid "Other..."
msgstr ""
#: widgets/misc/e-clipped-label.c:111
@@ -27518,6 +27495,10 @@ msgid "Evolution Addressbook local file backend"
msgstr ""
#, fuzzy
+#~ msgid "Evolution Mail font configuration control"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
#~ msgid "Factory for the Evolution Tasks control"
#~ msgstr "Cannot initialise Evolution's mail component."