aboutsummaryrefslogtreecommitdiffstats
path: root/po/en_GB.po
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-10-10 23:35:32 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-10-10 23:35:32 +0800
commit10a3c7d469724d93bfee30f5c5ff1cba2d83cf70 (patch)
treeb8bd119ad77d9e80624b2522ffab3b1edb20b151 /po/en_GB.po
parentf2f4729383832274398fe63ff0f9463bf9d20ce4 (diff)
downloadgsoc2013-evolution-10a3c7d469724d93bfee30f5c5ff1cba2d83cf70.tar.gz
gsoc2013-evolution-10a3c7d469724d93bfee30f5c5ff1cba2d83cf70.tar.zst
gsoc2013-evolution-10a3c7d469724d93bfee30f5c5ff1cba2d83cf70.zip
0.16.
svn path=/trunk/; revision=13554
Diffstat (limited to 'po/en_GB.po')
-rw-r--r--po/en_GB.po1493
1 files changed, 784 insertions, 709 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index 6d29e5e935..5d339d6a52 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2001-10-01 19:06-0400\n"
+"POT-Creation-Date: 2001-10-10 11:08-0400\n"
"PO-Revision-Date: 2000-10-22 16:19+0100\n"
"Last-Translator: Robert Brady <rwb197@zepler.org>\n"
"Language-Team: \n"
@@ -533,9 +533,9 @@ msgstr ""
#: addressbook/backend/ebook/load-pine-addressbook.c:22
#: addressbook/backend/ebook/test-client-list.c:23
#: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1167
+#: addressbook/conduit/address-conduit.c:1169
#: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1262
+#: calendar/conduits/calendar/calendar-conduit.c:1266
#: calendar/conduits/todo/todo-conduit.c:1034
#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
msgid "Could not initialize Bonobo"
@@ -595,20 +595,20 @@ msgstr ""
msgid "EBook not loaded\n"
msgstr ""
-#: addressbook/conduit/address-conduit.c:731
-#: calendar/conduits/calendar/calendar-conduit.c:837
+#: addressbook/conduit/address-conduit.c:733
+#: calendar/conduits/calendar/calendar-conduit.c:841
#: calendar/conduits/todo/todo-conduit.c:609
msgid "Could not start wombat server"
msgstr ""
-#: addressbook/conduit/address-conduit.c:732
-#: calendar/conduits/calendar/calendar-conduit.c:838
+#: addressbook/conduit/address-conduit.c:734
+#: calendar/conduits/calendar/calendar-conduit.c:842
#: calendar/conduits/todo/todo-conduit.c:610
msgid "Could not start wombat"
msgstr ""
-#: addressbook/conduit/address-conduit.c:762
-#: addressbook/conduit/address-conduit.c:765
+#: addressbook/conduit/address-conduit.c:764
+#: addressbook/conduit/address-conduit.c:767
msgid "Could not read pilot's Address application block"
msgstr ""
@@ -689,7 +689,7 @@ msgstr ""
msgid "New Contact _List"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:188
+#: addressbook/gui/component/addressbook-config.c:186
msgid "Edit Addressbook"
msgstr ""
@@ -718,7 +718,7 @@ msgid "Base"
msgstr ""
#: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:172
+#: calendar/gui/dialogs/task-editor.c:177
msgid "Basic"
msgstr ""
@@ -727,73 +727,82 @@ msgid "De_lete"
msgstr ""
#: addressbook/gui/component/addressbook-config.glade.h:9
-msgid "One"
+msgid "Email Address:"
msgstr ""
#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Search _base:"
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
msgstr ""
#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "Search s_cope: "
+msgid "One"
msgstr ""
#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Server Name"
+msgid "Search _base:"
msgstr ""
#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Sub"
+msgid "Search s_cope: "
msgstr ""
#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid "The information below is required in order to add an addressbook. "
+msgid "Server Name"
msgstr ""
#: addressbook/gui/component/addressbook-config.glade.h:15
-msgid "This information is not required for most ldap servers. "
+msgid "Sub"
msgstr ""
#: addressbook/gui/component/addressbook-config.glade.h:16
+msgid "The information below is required in order to add an addressbook. "
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid "This information is not required for most ldap servers. "
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:18
msgid ""
"This information is used by your ldap server to specify which nodes are used "
"in a search. Contact your server administrator for more information."
msgstr ""
-#: addressbook/gui/component/addressbook-config.glade.h:17
+#: addressbook/gui/component/addressbook-config.glade.h:19
msgid ""
"This is the base node for all your searches on the ldap server. Contact your "
"server administrator for more information."
msgstr ""
-#: addressbook/gui/component/addressbook-config.glade.h:18
+#: addressbook/gui/component/addressbook-config.glade.h:20
msgid "This is the name of the server where your addressbook is located."
msgstr ""
-#: addressbook/gui/component/addressbook-config.glade.h:19
+#: addressbook/gui/component/addressbook-config.glade.h:21
msgid "This is the port that your ldap server uses."
msgstr ""
-#: addressbook/gui/component/addressbook-config.glade.h:20
+#: addressbook/gui/component/addressbook-config.glade.h:22
msgid ""
"This name will be used to identify your account. It is for display purposes "
"only."
msgstr ""
-#: addressbook/gui/component/addressbook-config.glade.h:21
+#: addressbook/gui/component/addressbook-config.glade.h:23
msgid "_Account name:"
msgstr ""
-#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/component/addressbook-config.glade.h:24
#: addressbook/gui/contact-editor/contact-editor.glade.h:19
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:91 my-evolution/my-evolution.glade.h:20
+#: mail/mail-config.glade.h:92 my-evolution/my-evolution.glade.h:21
msgid "_Add"
msgstr ""
-#: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:97
#: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
#: ui/evolution-message-composer.xml.h:47
@@ -802,51 +811,34 @@ msgstr ""
msgid "_Edit"
msgstr ""
-#: addressbook/gui/component/addressbook-config.glade.h:24
+#: addressbook/gui/component/addressbook-config.glade.h:26
msgid "_My server requires authentication"
msgstr ""
-#: addressbook/gui/component/addressbook-config.glade.h:25
+#: addressbook/gui/component/addressbook-config.glade.h:27
msgid "_Port:"
msgstr ""
-#: addressbook/gui/component/addressbook-config.glade.h:26
+#: addressbook/gui/component/addressbook-config.glade.h:28
msgid "_Server name:"
msgstr ""
-#: addressbook/gui/component/addressbook-storage.c:163
+#: addressbook/gui/component/addressbook-storage.c:168
msgid "Other Contacts"
msgstr ""
-#: addressbook/gui/component/addressbook.c:407
-#, c-format
-msgid "Please enter your email address and password for access to %s"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:415
-msgid "LDAP Authentication"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:426
-msgid "Email Address:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:439
-msgid "Password:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:502
+#: addressbook/gui/component/addressbook.c:400
msgid "Unable to open addressbook"
msgstr ""
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:409
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or the LDAP server\n"
"is down"
msgstr ""
-#: addressbook/gui/component/addressbook.c:514
+#: addressbook/gui/component/addressbook.c:414
msgid ""
"This version of Evolution does not have LDAP support\n"
"compiled in to it. If you want to use LDAP in Evolution\n"
@@ -854,43 +846,48 @@ msgid ""
"retrieving OpenLDAP from the link below.\n"
msgstr ""
-#: addressbook/gui/component/addressbook.c:522
+#: addressbook/gui/component/addressbook.c:422
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:663
+#: addressbook/gui/component/addressbook.c:550
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:655
#: calendar/gui/cal-search-bar.c:55
msgid "Any field contains"
msgstr ""
-#: addressbook/gui/component/addressbook.c:664
+#: addressbook/gui/component/addressbook.c:656
msgid "Name contains"
msgstr ""
-#: addressbook/gui/component/addressbook.c:665
+#: addressbook/gui/component/addressbook.c:657
msgid "Email contains"
msgstr ""
-#: addressbook/gui/component/addressbook.c:666
+#: addressbook/gui/component/addressbook.c:658
#: calendar/gui/cal-search-bar.c:59
msgid "Category is"
msgstr ""
#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:667 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:659 widgets/misc/e-filter-bar.h:97
#: widgets/misc/e-filter-bar.h:104
msgid "Advanced..."
msgstr ""
#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:897
+#: addressbook/gui/component/addressbook.c:889
#: calendar/gui/cal-search-bar.c:412
msgid "Any Category"
msgstr ""
-#: addressbook/gui/component/addressbook.c:939
+#: addressbook/gui/component/addressbook.c:929
msgid "The URI that the Folder Browser will display"
msgstr ""
@@ -960,8 +957,8 @@ msgid "Factory for the Addressbook's name selection interface"
msgstr ""
#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:764
-#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:436
+#: addressbook/gui/component/select-names/e-select-names.c:763
+#: composer/e-msg-composer-attachment-bar.c:497 filter/filter-filter.c:436
#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
msgid "Remove"
msgstr ""
@@ -991,7 +988,7 @@ msgstr ""
msgid "Unnamed Contact"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names.c:521
+#: addressbook/gui/component/select-names/e-select-names.c:522
msgid ""
"Evolution is unable to get the addressbook local storage. This may have been "
"caused by the evolution-addressbook component crashing. To help us better "
@@ -1000,7 +997,7 @@ msgid ""
"circumstances under which this error occurred. Thank you."
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names.c:598
+#: addressbook/gui/component/select-names/e-select-names.c:599
msgid "Select Contacts from Addressbook"
msgstr ""
@@ -1065,7 +1062,7 @@ msgid "Contact Editor"
msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:177
+#: calendar/gui/dialogs/task-editor.c:182
msgid "Details"
msgstr ""
@@ -1133,8 +1130,8 @@ msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:25
#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
-#: mail/folder-browser.c:1406 mail/mail-config.glade.h:95
+#: calendar/gui/dialogs/meeting-page.c:841 filter/filter.glade.h:8
+#: mail/folder-browser.c:1422 mail/mail-config.glade.h:96
#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
msgid "_Delete"
@@ -1887,318 +1884,322 @@ msgid "Palau"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:162
-msgid "Panama"
+msgid "Palestinian Territory"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:163
-msgid "Papua New Guinea"
+msgid "Panama"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:164
-msgid "Paraguay"
+msgid "Papua New Guinea"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:165
-msgid "Peru"
+msgid "Paraguay"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:166
-msgid "Philippines"
+msgid "Peru"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:167
-msgid "Pitcairn"
+msgid "Philippines"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:168
-msgid "Poland"
+msgid "Pitcairn"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:169
-msgid "Portugal"
+msgid "Poland"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:170
-msgid "Puerto Rico"
+msgid "Portugal"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:171
-msgid "Qatar"
+msgid "Puerto Rico"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:172
-msgid "Republic Of Korea"
+msgid "Qatar"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:173
-msgid "Republic Of Moldova"
+msgid "Republic Of Korea"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:174
-msgid "Reunion"
+msgid "Republic Of Moldova"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:175
-msgid "Romania"
+msgid "Reunion"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:176
-msgid "Russian Federation"
+msgid "Romania"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:177
-msgid "Rwanda"
+msgid "Russian Federation"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:178
-msgid "Saint Kitts And Nevis"
+msgid "Rwanda"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:179
-msgid "Saint Lucia"
+msgid "Saint Kitts And Nevis"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:180
-msgid "Saint Vincent And The Grena-dines"
+msgid "Saint Lucia"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:181
-msgid "Samoa"
+msgid "Saint Vincent And The Grena-dines"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:182
-msgid "San Marino"
+msgid "Samoa"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:183
-msgid "Sao Tome And Principe"
+msgid "San Marino"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:184
-msgid "Saudi Arabia"
+msgid "Sao Tome And Principe"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:185
-msgid "Senegal"
+msgid "Saudi Arabia"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:186
-msgid "Seychelles"
+msgid "Senegal"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:187
-msgid "Sierra Leone"
+msgid "Seychelles"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:188
-msgid "Singapore"
+msgid "Sierra Leone"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:189
-msgid "Slovakia"
+msgid "Singapore"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:190
-msgid "Slovenia"
+msgid "Slovakia"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:191
-msgid "Solomon Islands"
+msgid "Slovenia"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:192
-msgid "Somalia"
+msgid "Solomon Islands"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:193
-msgid "South Africa"
+msgid "Somalia"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:194
-msgid "South Georgia And The South Sandwich Islands"
+msgid "South Africa"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:195
-msgid "Spain"
+msgid "South Georgia And The South Sandwich Islands"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:196
-msgid "Sri Lanka"
+msgid "Spain"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:197
-msgid "St. Helena"
+msgid "Sri Lanka"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:198
-msgid "St. Pierre And Miquelon"
+msgid "St. Helena"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:199
-msgid "Sudan"
+msgid "St. Pierre And Miquelon"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:200
-msgid "Suriname"
+msgid "Sudan"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:201
-msgid "Svalbard And Jan Mayen Islands"
+msgid "Suriname"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:202
-msgid "Swaziland"
+msgid "Svalbard And Jan Mayen Islands"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:203
-msgid "Sweden"
+msgid "Swaziland"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:204
-msgid "Switzerland"
+msgid "Sweden"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:205
-msgid "Taiwan"
+msgid "Switzerland"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:206
-msgid "Tajikistan"
+msgid "Taiwan"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:207
-msgid "Thailand"
+msgid "Tajikistan"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:208
-msgid "Togo"
+msgid "Thailand"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:209
-msgid "Tokelau"
+msgid "Togo"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:210
-msgid "Tonga"
+msgid "Tokelau"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:211
-msgid "Trinidad And Tobago"
+msgid "Tonga"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:212
-msgid "Tunisia"
+msgid "Trinidad And Tobago"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:213
-msgid "Turkey"
+msgid "Tunisia"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:214
-msgid "Turkmenistan"
+msgid "Turkey"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:215
-msgid "Turks And Caicos Islands"
+msgid "Turkmenistan"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:216
-msgid "Tuvalu"
+msgid "Turks And Caicos Islands"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:217
-msgid "U.S. Virgin Islands"
+msgid "Tuvalu"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:218
-msgid "Uganda"
+msgid "U.S. Virgin Islands"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:219
-msgid "Ukraine"
+msgid "Uganda"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:220
-msgid "United Arab Emirates"
+msgid "Ukraine"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:221
-msgid "United Kingdom"
+msgid "United Arab Emirates"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:222
-msgid "United Republic Of Tanzania"
+msgid "United Kingdom"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:223
-msgid "United States"
+msgid "United Republic Of Tanzania"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:224
-msgid "United States Minor Outlying Islands"
+msgid "United States"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:225
-msgid "Uruguay"
+msgid "United States Minor Outlying Islands"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:226
-msgid "Uzbekistan"
+msgid "Uruguay"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:227
-msgid "Vanuatu"
+msgid "Uzbekistan"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:228
-msgid "Venezuela"
+msgid "Vanuatu"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:229
-msgid "Viet Nam"
+msgid "Venezuela"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:230
-msgid "Wallis And Futuna Islands"
+msgid "Viet Nam"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:231
-msgid "Western Sahara"
+msgid "Wallis And Futuna Islands"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:232
-msgid "Yemen"
+msgid "Western Sahara"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:233
-msgid "Yugoslavia"
+msgid "Yemen"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:234
-msgid "Zambia"
+msgid "Yugoslavia"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:235
-msgid "Zimbabwe"
+msgid "Zambia"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:236
-msgid "_Address:"
+msgid "Zimbabwe"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:237
-msgid "_City:"
+msgid "_Address:"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:238
-msgid "_PO Box:"
+msgid "_City:"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:239
-msgid "_State/Province:"
+msgid "_PO Box:"
msgstr ""
#: addressbook/gui/contact-editor/fulladdr.glade.h:240
+msgid "_State/Province:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:241
msgid "_ZIP Code:"
msgstr "_Post Code:"
@@ -2422,8 +2423,8 @@ msgid "Success"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1702
-#: shell/e-storage.c:520
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1712
+#: shell/e-storage.c:525
msgid "Unknown error"
msgstr ""
@@ -2431,7 +2432,7 @@ msgstr ""
msgid "Repository offline"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:510
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:515
msgid "Permission denied"
msgstr ""
@@ -2450,8 +2451,8 @@ msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:41
#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:598
-#: camel/camel-service.c:634
+#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:603
+#: camel/camel-service.c:639
msgid "Cancelled"
msgstr ""
@@ -2757,20 +2758,20 @@ msgstr ""
#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:652
+#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:651
msgid "High"
msgstr ""
#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
#: calendar/gui/calendar-model.c:1673
#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:650
msgid "Normal"
msgstr ""
#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:649
msgid "Low"
msgstr ""
@@ -2781,13 +2782,13 @@ msgstr ""
msgid "Undefined"
msgstr ""
-#: calendar/conduits/calendar/calendar-conduit.c:793
+#: calendar/conduits/calendar/calendar-conduit.c:797
#: calendar/conduits/todo/todo-conduit.c:564
msgid "Error while communicating with calendar server"
msgstr ""
-#: calendar/conduits/calendar/calendar-conduit.c:896
-#: calendar/conduits/calendar/calendar-conduit.c:899
+#: calendar/conduits/calendar/calendar-conduit.c:900
+#: calendar/conduits/calendar/calendar-conduit.c:903
msgid "Could not read pilot's Calendar application block"
msgstr ""
@@ -2906,11 +2907,11 @@ msgstr ""
msgid "_Edit appointment"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:629
+#: calendar/gui/alarm-notify/alarm-queue.c:658
msgid "No description available."
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:689
+#: calendar/gui/alarm-notify/alarm-queue.c:718
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -2918,7 +2919,7 @@ msgid ""
"a normal reminder dialog box instead."
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:740
+#: calendar/gui/alarm-notify/alarm-queue.c:769
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger.\n"
@@ -2950,7 +2951,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:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1388 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view.c:1389 calendar/gui/e-week-view-main-item.c:334
msgid "%a %d %b"
msgstr ""
@@ -3126,7 +3127,7 @@ msgstr ""
msgid "Comment contains"
msgstr ""
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1054
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1061
msgid "Unmatched"
msgstr ""
@@ -3140,7 +3141,7 @@ msgid "Folder containing appointments and events"
msgstr ""
#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
-#: my-evolution/e-summary-tasks.c:237 my-evolution/e-summary-tasks.c:253
+#: my-evolution/e-summary-tasks.c:235 my-evolution/e-summary-tasks.c:251
#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
#: views/tasks/galview.xml.h:1
msgid "Tasks"
@@ -3154,7 +3155,7 @@ msgstr ""
msgid "Create a new appointment"
msgstr ""
-#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3422
+#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3423
msgid "New _Appointment"
msgstr ""
@@ -3396,7 +3397,7 @@ msgstr ""
msgid "hour(s)"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:116
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:117
msgid "minute(s)"
msgstr ""
@@ -3450,7 +3451,7 @@ msgid "First day of wee_k:"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:956
msgid "Friday"
msgstr ""
@@ -3463,7 +3464,7 @@ msgid "Minutes"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:951
+#: calendar/gui/dialogs/recurrence-page.c:952
msgid "Monday"
msgstr ""
@@ -3472,7 +3473,7 @@ msgid "O_verdue tasks:"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:957
msgid "Saturday"
msgstr ""
@@ -3493,7 +3494,7 @@ msgid "Su_n"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:958
msgid "Sunday"
msgstr ""
@@ -3511,7 +3512,7 @@ msgid "Tas_ks due today:"
msgstr "Colours for display"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:955
msgid "Thursday"
msgstr ""
@@ -3532,12 +3533,12 @@ msgid "Time format:"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:952
+#: calendar/gui/dialogs/recurrence-page.c:953
msgid "Tuesday"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:954
msgid "Wednesday"
msgstr ""
@@ -3709,24 +3710,24 @@ msgstr ""
msgid "No summary"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:952 mail/mail-callbacks.c:1671
+#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1748
#: mail/mail-display.c:100
msgid "Overwrite file?"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:956 mail/mail-callbacks.c:1677
+#: calendar/gui/dialogs/comp-editor.c:958 mail/mail-callbacks.c:1756
#: mail/mail-display.c:104
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:1019 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1021 ui/evolution-comp-editor.xml.h:13
#: widgets/misc/e-filter-bar.h:101
msgid "Save As..."
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:1172
+#: calendar/gui/dialogs/comp-editor.c:1174
msgid "Unable to obtain current version!"
msgstr ""
@@ -3784,25 +3785,25 @@ msgstr ""
msgid "Enter Delegate"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:181
+#: calendar/gui/dialogs/event-editor.c:186
msgid "Appointment"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:191
msgid "Reminder"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:196
msgid "Recurrence"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:198
-#: calendar/gui/dialogs/event-editor.c:345
+#: calendar/gui/dialogs/event-editor.c:203
+#: calendar/gui/dialogs/event-editor.c:353
msgid "Scheduling"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:348
+#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:356
msgid "Meeting"
msgstr ""
@@ -3861,36 +3862,32 @@ msgstr ""
msgid "_Start time:"
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:504
+#: calendar/gui/dialogs/meeting-page.c:510
msgid "That person is already attending the meeting!"
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:548
-#: calendar/gui/dialogs/meeting-page.c:583
+#: calendar/gui/dialogs/meeting-page.c:554
+#: calendar/gui/dialogs/meeting-page.c:589
msgid "Chair Persons"
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:550
-#: calendar/gui/dialogs/meeting-page.c:583
-#: calendar/gui/dialogs/meeting-page.c:703
+#: calendar/gui/dialogs/meeting-page.c:556
+#: calendar/gui/dialogs/meeting-page.c:589
+#: calendar/gui/dialogs/meeting-page.c:710
msgid "Required Participants"
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:552
-#: calendar/gui/dialogs/meeting-page.c:583
+#: calendar/gui/dialogs/meeting-page.c:558
+#: calendar/gui/dialogs/meeting-page.c:589
msgid "Optional Participants"
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:554
-#: calendar/gui/dialogs/meeting-page.c:583
+#: calendar/gui/dialogs/meeting-page.c:560
+#: calendar/gui/dialogs/meeting-page.c:589
msgid "Non-Participants"
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:661
-msgid "Sent By:"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:829
+#: calendar/gui/dialogs/meeting-page.c:836
msgid "_Delegate To..."
msgstr ""
@@ -3948,7 +3945,7 @@ msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:11
#: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:86
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:87
#: shell/glade/e-active-connection-dialog.glade.h:5
msgid "Type"
msgstr ""
@@ -3973,32 +3970,27 @@ msgstr ""
msgid "_Other Organizer"
msgstr "Organisation:"
-#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1855
-#: calendar/gui/print.c:1857 calendar/gui/print.c:1858
-msgid "%a %b %d %Y"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.c:570
+#: calendar/gui/dialogs/recurrence-page.c:571
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:924
+#: calendar/gui/dialogs/recurrence-page.c:925
msgid "on"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:950 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:951 filter/filter-datespec.c:83
msgid "day"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1080
+#: calendar/gui/dialogs/recurrence-page.c:1081
msgid "on the"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1089
msgid "th"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1261
+#: calendar/gui/dialogs/recurrence-page.c:1262
msgid "occurrences"
msgstr ""
@@ -4093,7 +4085,7 @@ msgid "Progress"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:949
+#: my-evolution/e-summary-preferences.c:950
msgid "URL:"
msgstr ""
@@ -4105,8 +4097,8 @@ msgstr ""
msgid "_Status:"
msgstr ""
-#: calendar/gui/dialogs/task-editor.c:184
-#: calendar/gui/dialogs/task-editor.c:285
+#: calendar/gui/dialogs/task-editor.c:189
+#: calendar/gui/dialogs/task-editor.c:293
msgid "Assignment"
msgstr ""
@@ -4183,27 +4175,27 @@ msgstr ""
msgid "100%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3443
-#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1371
+#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3444
+#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1401
#: shell/e-shortcuts-view.c:385
msgid "_Open"
msgstr ""
-#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3453
#: calendar/gui/e-week-view.c:3305 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:920 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3455
#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
#: ui/evolution-tasks.xml.h:14
msgid "_Copy"
msgstr ""
-#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3429
-#: calendar/gui/e-day-view.c:3456 calendar/gui/e-week-view.c:3283
+#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-day-view.c:3457 calendar/gui/e-week-view.c:3283
#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
#: ui/evolution-tasks.xml.h:17
@@ -4268,7 +4260,7 @@ msgstr ""
#. people who won't care about using /Local Folders/Inbox
#: calendar/gui/e-calendar-table.etspec.h:16
#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1420 shell/e-summary-storage.c:80
+#: shell/e-storage-set-view.c:1453 shell/e-summary-storage.c:80
msgid "Summary"
msgstr ""
@@ -4287,56 +4279,56 @@ 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:285 calendar/gui/e-day-view.c:1374
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1375
#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
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:293 calendar/gui/e-day-view.c:1401
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1402
#: calendar/gui/e-week-view-main-item.c:348
msgid "%d %b"
msgstr ""
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:345
+#: calendar/gui/e-day-view.c:609 calendar/gui/e-week-view.c:345
#: calendar/gui/print.c:769
msgid "am"
msgstr ""
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:348
+#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
#: calendar/gui/print.c:771
msgid "pm"
msgstr ""
-#: calendar/gui/e-day-view.c:3424 calendar/gui/e-week-view.c:3278
+#: calendar/gui/e-day-view.c:3425 calendar/gui/e-week-view.c:3278
msgid "New All Day _Event"
msgstr ""
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3288
+#: calendar/gui/e-day-view.c:3435 calendar/gui/e-week-view.c:3288
#: ui/evolution-calendar.xml.h:17
msgid "Go to _Today"
msgstr ""
-#: calendar/gui/e-day-view.c:3436 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3437 calendar/gui/e-week-view.c:3290
msgid "_Go to Date..."
msgstr ""
-#: calendar/gui/e-day-view.c:3445 calendar/gui/e-week-view.c:3298
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3298
msgid "_Delete this Appointment"
msgstr ""
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3323
+#: calendar/gui/e-day-view.c:3465 calendar/gui/e-week-view.c:3323
msgid "Make this Occurrence _Movable"
msgstr ""
-#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3325
+#: calendar/gui/e-day-view.c:3467 calendar/gui/e-week-view.c:3325
msgid "Delete this _Occurrence"
msgstr ""
-#: calendar/gui/e-day-view.c:3468 calendar/gui/e-week-view.c:3327
+#: calendar/gui/e-day-view.c:3469 calendar/gui/e-week-view.c:3327
msgid "Delete _All Occurrences"
msgstr ""
@@ -4530,59 +4522,63 @@ msgstr ""
msgid "Bad Free/Busy Message"
msgstr ""
-#: calendar/gui/e-itip-control.c:916
+#: calendar/gui/e-itip-control.c:917
msgid "The message does not appear to be properly formed"
msgstr ""
-#: calendar/gui/e-itip-control.c:935
+#: calendar/gui/e-itip-control.c:936
msgid "The message contains only unsupported requests."
msgstr ""
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-itip-control.c:969
+#: calendar/gui/e-itip-control.c:964 calendar/gui/e-itip-control.c:970
msgid "The attachment does not contain a valid calendar message"
msgstr ""
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:995
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1094
msgid "Calendar file could not be updated!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1096
msgid "Update complete\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1134
+#: calendar/gui/e-itip-control.c:1141
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1142
+#: calendar/gui/e-itip-control.c:1149
msgid "Attendee status ould not be updated!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1144
+#: calendar/gui/e-itip-control.c:1151
msgid "Attendee status updated\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1153
msgid "Attendee status can not be updated because the item no longer exists"
msgstr ""
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
msgid "I couldn't remove the item from your calendar file!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1183
msgid "Removal Complete"
msgstr ""
-#: calendar/gui/e-itip-control.c:1208 calendar/gui/e-itip-control.c:1242
+#: calendar/gui/e-itip-control.c:1215 calendar/gui/e-itip-control.c:1249
msgid "Item sent!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1210 calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1217 calendar/gui/e-itip-control.c:1253
msgid "The item could not be sent!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1417
msgid "Unable to find any of your identities in the attendees list!\n"
msgstr ""
@@ -4647,7 +4643,7 @@ msgstr ""
#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
#: calendar/gui/e-meeting-model.c:690
#: camel/providers/smtp/camel-smtp-transport.c:224
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:440
msgid "Unknown"
msgstr ""
@@ -4800,12 +4796,12 @@ msgstr ""
msgid "New _Appointment..."
msgstr ""
-#: calendar/gui/gnome-cal.c:1319
+#: calendar/gui/gnome-cal.c:1318
#, c-format
msgid "Could not open the folder in `%s'"
msgstr ""
-#: calendar/gui/gnome-cal.c:1330
+#: calendar/gui/gnome-cal.c:1329
#, c-format
msgid "The method required to open `%s' is not supported"
msgstr ""
@@ -4866,7 +4862,11 @@ msgstr ""
msgid "September"
msgstr ""
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:253
+msgid "Atleast one attendee is necessary"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:283
msgid "An organizer must be set."
msgstr ""
@@ -5040,6 +5040,11 @@ msgstr ""
msgid "%a %d %Y"
msgstr ""
+#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
+#: calendar/gui/print.c:1858
+msgid "%a %b %d %Y"
+msgstr ""
+
#: calendar/gui/print.c:1862
#, c-format
msgid "Selected week (%s - %s)"
@@ -5060,7 +5065,7 @@ msgid "Print Calendar"
msgstr ""
#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2080 my-evolution/e-summary.c:607
+#: mail/mail-callbacks.c:2164 my-evolution/e-summary.c:607
#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
msgid "Print Preview"
msgstr ""
@@ -5109,107 +5114,107 @@ msgstr ""
msgid "SMTWTFS"
msgstr ""
-#: calendar/pcs/query.c:230
+#: calendar/pcs/query.c:231
msgid "time-now expects 0 arguments"
msgstr ""
-#: calendar/pcs/query.c:254
+#: calendar/pcs/query.c:255
msgid "make-time expects 1 argument"
msgstr ""
-#: calendar/pcs/query.c:259
+#: calendar/pcs/query.c:260
msgid "make-time expects argument 1 to be a string"
msgstr ""
-#: calendar/pcs/query.c:267
+#: calendar/pcs/query.c:268
msgid "make-time argument 1 must be an ISO 8601 date/time string"
msgstr ""
-#: calendar/pcs/query.c:296
+#: calendar/pcs/query.c:297
msgid "time-add-day expects 2 arguments"
msgstr ""
-#: calendar/pcs/query.c:301
+#: calendar/pcs/query.c:302
msgid "time-add-day expects argument 1 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:308
+#: calendar/pcs/query.c:309
msgid "time-add-day expects argument 2 to be an integer"
msgstr ""
-#: calendar/pcs/query.c:335
+#: calendar/pcs/query.c:336
msgid "time-day-begin expects 1 argument"
msgstr ""
-#: calendar/pcs/query.c:340
+#: calendar/pcs/query.c:341
msgid "time-day-begin expects argument 1 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:367
+#: calendar/pcs/query.c:368
msgid "time-day-end expects 1 argument"
msgstr ""
-#: calendar/pcs/query.c:372
+#: calendar/pcs/query.c:373
msgid "time-day-end expects argument 1 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:408
+#: calendar/pcs/query.c:409
msgid "get-vtype expects 0 arguments"
msgstr ""
-#: calendar/pcs/query.c:504
+#: calendar/pcs/query.c:505
msgid "occur-in-time-range? expects 2 arguments"
msgstr ""
-#: calendar/pcs/query.c:509
+#: calendar/pcs/query.c:510
msgid "occur-in-time-range? expects argument 1 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:516
+#: calendar/pcs/query.c:517
msgid "occur-in-time-range? expects argument 2 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:646
+#: calendar/pcs/query.c:647
msgid "contains? expects 2 arguments"
msgstr ""
-#: calendar/pcs/query.c:651
+#: calendar/pcs/query.c:652
msgid "contains? expects argument 1 to be a string"
msgstr ""
-#: calendar/pcs/query.c:658
+#: calendar/pcs/query.c:659
msgid "contains? expects argument 2 to be a string"
msgstr ""
-#: calendar/pcs/query.c:675
+#: calendar/pcs/query.c:676
msgid ""
"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
"\""
msgstr ""
-#: calendar/pcs/query.c:717
+#: calendar/pcs/query.c:718
msgid "has-categories? expects at least 1 argument"
msgstr ""
-#: calendar/pcs/query.c:729
+#: calendar/pcs/query.c:730
msgid ""
"has-categories? expects all arguments to be strings or one and only one "
"argument to be a boolean false (#f)"
msgstr ""
-#: calendar/pcs/query.c:817
+#: calendar/pcs/query.c:818
msgid "is-completed? expects 0 arguments"
msgstr ""
-#: calendar/pcs/query.c:862
+#: calendar/pcs/query.c:863
msgid "completed-before? expects 1 argument"
msgstr ""
-#: calendar/pcs/query.c:867
+#: calendar/pcs/query.c:868
msgid "completed-before? expects argument 1 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:1155
+#: calendar/pcs/query.c:1156
msgid "Evaluation of the search expression did not yield a boolean value"
msgstr ""
@@ -5309,22 +5314,27 @@ msgstr ""
msgid "Error executing filter: %s: %s"
msgstr ""
-#: camel/camel-filter-search.c:494 camel/camel-filter-search.c:501
+#: camel/camel-filter-search.c:493 camel/camel-filter-search.c:500
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr ""
-#: camel/camel-folder.c:472
+#: camel/camel-folder.c:478
#, c-format
msgid "Unsupported operation: append message: for %s"
msgstr ""
-#: camel/camel-folder.c:1039
+#: camel/camel-folder.c:1047
#, c-format
msgid "Unsupported operation: search by expression: for %s"
msgstr ""
-#: camel/camel-folder.c:1219
+#: camel/camel-folder.c:1087
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1266
msgid "Moving messages"
msgstr ""
@@ -5706,42 +5716,42 @@ msgstr ""
msgid "POP Before SMTP auth using a non-pop source"
msgstr ""
-#: camel/camel-search-private.c:111
+#: camel/camel-search-private.c:113
#, c-format
msgid "Regular expression compilation failed: %s: %s"
msgstr ""
-#: camel/camel-service.c:157
+#: camel/camel-service.c:158
#, c-format
msgid "URL '%s' needs a username component"
msgstr ""
-#: camel/camel-service.c:165
+#: camel/camel-service.c:166
#, c-format
msgid "URL '%s' needs a host component"
msgstr ""
-#: camel/camel-service.c:173
+#: camel/camel-service.c:174
#, c-format
msgid "URL '%s' needs a path component"
msgstr ""
-#: camel/camel-service.c:602
+#: camel/camel-service.c:607
#, c-format
msgid "Resolving: %s"
msgstr ""
-#: camel/camel-service.c:629
+#: camel/camel-service.c:634
#, c-format
msgid "Failure in name lookup: %s"
msgstr ""
-#: camel/camel-service.c:654
+#: camel/camel-service.c:659
#, c-format
msgid "Host lookup failed: %s: host not found"
msgstr ""
-#: camel/camel-service.c:656
+#: camel/camel-service.c:661
#, c-format
msgid "Host lookup failed: %s: unknown reason"
msgstr ""
@@ -5803,7 +5813,12 @@ msgstr ""
msgid "Failed to verify certificates."
msgstr ""
-#: camel/camel-store.c:273
+#: camel/camel-store.c:218
+#, fuzzy
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr "Synchronising \"%s\""
+
+#: camel/camel-store.c:279
msgid "Cannot create folder: Invalid operation on this store"
msgstr ""
@@ -5842,12 +5857,12 @@ msgstr ""
msgid "Could not parse URL `%s'"
msgstr ""
-#: camel/camel-vee-folder.c:554
+#: camel/camel-vee-folder.c:562
#, c-format
msgid "No such message %s in %s"
msgstr ""
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:702
#, c-format
msgid "No such message: %s"
msgstr ""
@@ -5857,22 +5872,22 @@ msgstr ""
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "Synchronising \"%s\""
-#: camel/camel-vee-store.c:286
+#: camel/camel-vee-store.c:285
#, fuzzy, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "Synchronising \"%s\""
-#: camel/camel-vee-store.c:298
+#: camel/camel-vee-store.c:297
#, fuzzy, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "Synchronising \"%s\""
-#: camel/camel-vee-store.c:326
+#: camel/camel-vee-store.c:325
#, fuzzy, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "Synchronising \"%s\""
-#: camel/camel-vtrash-folder.c:109
+#: camel/camel-vtrash-folder.c:117
msgid "You cannot copy messages from this trash folder."
msgstr ""
@@ -5900,40 +5915,40 @@ msgstr ""
msgid "Unexpected OK response from IMAP server: %s"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:189
+#: camel/providers/imap/camel-imap-folder.c:191
#, c-format
msgid "Could not create directory %s: %s"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:208
+#: camel/providers/imap/camel-imap-folder.c:210
#, c-format
msgid "Could not load summary for %s"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:272
+#: camel/providers/imap/camel-imap-folder.c:274
msgid "Folder was destroyed and recreated on server."
msgstr ""
#. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:434
+#: camel/providers/imap/camel-imap-folder.c:436
msgid "Scanning for changed messages"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1899
+#: camel/providers/imap/camel-imap-folder.c:1537
+#: camel/providers/imap/camel-imap-folder.c:1940
msgid "This message is not currently available"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1633
-#: camel/providers/imap/camel-imap-folder.c:1714
+#: camel/providers/imap/camel-imap-folder.c:1679
+#: camel/providers/imap/camel-imap-folder.c:1760
msgid "Fetching summary information for new messages"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1639
+#: camel/providers/imap/camel-imap-folder.c:1685
msgid "Scanning for new messages"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1936
+#: camel/providers/imap/camel-imap-folder.c:1977
msgid "Could not find message body in FETCH response."
msgstr ""
@@ -5958,7 +5973,7 @@ msgstr ""
msgid "Check for new messages in all folders"
msgstr ""
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:767
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:836
msgid "Folders"
msgstr ""
@@ -6024,43 +6039,43 @@ msgstr ""
msgid "No such folder %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1131
+#: camel/providers/imap/camel-imap-store.c:1150
msgid "The parent folder is not allowed to contain subfolders"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:43
msgid "MH-format mail directories"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:41
+#: camel/providers/local/camel-local-provider.c:44
msgid "For storing local mail in MH-like mail directories."
msgstr ""
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:53
msgid "Local delivery"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:51
+#: camel/providers/local/camel-local-provider.c:54
msgid "For retrieving local mail from standard mbox formated spools."
msgstr ""
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:63
msgid "Apply filters to new messages in INBOX"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:66
+#: camel/providers/local/camel-local-provider.c:69
msgid "Qmail maildir-format mail files"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:67
+#: camel/providers/local/camel-local-provider.c:70
msgid "For storing local mail in qmail maildir directories."
msgstr ""
-#: camel/providers/local/camel-local-provider.c:78
+#: camel/providers/local/camel-local-provider.c:81
msgid "Standard Unix mbox spools"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:79
+#: camel/providers/local/camel-local-provider.c:82
msgid "For reading and storing local mail in standard mbox spool files."
msgstr ""
@@ -6105,7 +6120,12 @@ msgstr ""
msgid "Could not delete folder index file `%s': %s"
msgstr ""
-#: camel/providers/local/camel-local-summary.c:418
+#: camel/providers/local/camel-local-summary.c:367
+#, c-format
+msgid "Could not save summary: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-local-summary.c:423
#: camel/providers/local/camel-spool-summary.c:1158
msgid "Unable to add message to summary: unknown reason"
msgstr ""
@@ -6122,7 +6142,7 @@ msgstr ""
#: camel/providers/local/camel-mh-folder.c:195
#: camel/providers/local/camel-mh-folder.c:204
#: camel/providers/local/camel-mh-folder.c:212
-#: camel/providers/local/camel-spool-folder.c:537
+#: camel/providers/local/camel-spool-folder.c:580
#, c-format
msgid ""
"Cannot get message: %s\n"
@@ -6132,7 +6152,7 @@ msgstr ""
#: camel/providers/local/camel-maildir-folder.c:206
#: camel/providers/local/camel-mbox-folder.c:328
#: camel/providers/local/camel-mh-folder.c:195
-#: camel/providers/local/camel-spool-folder.c:537
+#: camel/providers/local/camel-spool-folder.c:580
msgid "No such message"
msgstr ""
@@ -6192,13 +6212,13 @@ msgid "Cannot open maildir directory path: %s: %s"
msgstr ""
#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:273
+#: camel/providers/local/camel-spool-folder.c:275
#, c-format
msgid "Cannot create folder lock on %s: %s"
msgstr ""
#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:414
+#: camel/providers/local/camel-spool-folder.c:457
#, c-format
msgid "Cannot open mailbox: %s: %s\n"
msgstr ""
@@ -6211,9 +6231,9 @@ msgstr ""
#: camel/providers/local/camel-mbox-folder.c:344
#: camel/providers/local/camel-mbox-folder.c:376
#: camel/providers/local/camel-mbox-folder.c:389
-#: camel/providers/local/camel-spool-folder.c:553
-#: camel/providers/local/camel-spool-folder.c:585
-#: camel/providers/local/camel-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:596
+#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:641
#, c-format
msgid ""
"Cannot get message: %s from folder %s\n"
@@ -6221,12 +6241,12 @@ msgid ""
msgstr ""
#: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:586
+#: camel/providers/local/camel-spool-folder.c:629
msgid "The folder appears to be irrecoverably corrupted."
msgstr ""
#: camel/providers/local/camel-mbox-folder.c:390
-#: camel/providers/local/camel-spool-folder.c:599
+#: camel/providers/local/camel-spool-folder.c:642
msgid "Message construction failed: Corrupt mailbox?"
msgstr ""
@@ -6266,8 +6286,8 @@ msgstr ""
#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
#. it should try and merge the summary info's. This is a bit tricky.
#: camel/providers/local/camel-mbox-summary.c:249
-#: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-mbox-summary.c:499
+#: camel/providers/local/camel-mbox-summary.c:700
#: camel/providers/local/camel-spool-summary.c:644
#: camel/providers/local/camel-spool-summary.c:936
#, fuzzy
@@ -6290,23 +6310,23 @@ msgstr ""
msgid "Cannot check folder: %s: %s"
msgstr "Synchronising \"%s\""
-#: camel/providers/local/camel-mbox-summary.c:507
-#: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-mbox-summary.c:504
+#: camel/providers/local/camel-mbox-summary.c:705
#: camel/providers/local/camel-spool-summary.c:649
#, c-format
msgid "Could not open file: %s: %s"
msgstr ""
-#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-mbox-summary.c:521
#: camel/providers/local/camel-spool-summary.c:673
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr ""
-#: camel/providers/local/camel-mbox-summary.c:549
-#: camel/providers/local/camel-mbox-summary.c:557
-#: camel/providers/local/camel-mbox-summary.c:746
-#: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-mbox-summary.c:546
+#: camel/providers/local/camel-mbox-summary.c:554
+#: camel/providers/local/camel-mbox-summary.c:743
+#: camel/providers/local/camel-mbox-summary.c:751
#: camel/providers/local/camel-spool-summary.c:698
#: camel/providers/local/camel-spool-summary.c:706
#: camel/providers/local/camel-spool-summary.c:979
@@ -6314,36 +6334,36 @@ msgstr ""
msgid "Summary and folder mismatch, even after a sync"
msgstr ""
-#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-mbox-summary.c:597
#: camel/providers/local/camel-spool-summary.c:750
#, c-format
msgid "Error writing to temp mailbox: %s"
msgstr ""
-#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-mbox-summary.c:614
#: camel/providers/local/camel-spool-summary.c:772
#, c-format
msgid "Writing to tmp mailbox failed: %s: %s"
msgstr ""
-#: camel/providers/local/camel-mbox-summary.c:635
-#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-mbox-summary.c:632
+#: camel/providers/local/camel-mbox-summary.c:801
#: camel/providers/local/camel-spool-summary.c:1037
#, c-format
msgid "Could not close source folder %s: %s"
msgstr ""
-#: camel/providers/local/camel-mbox-summary.c:644
+#: camel/providers/local/camel-mbox-summary.c:641
#, c-format
msgid "Could not close temp folder: %s"
msgstr ""
-#: camel/providers/local/camel-mbox-summary.c:655
+#: camel/providers/local/camel-mbox-summary.c:652
#, c-format
msgid "Could not rename folder: %s"
msgstr ""
-#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-mbox-summary.c:875
#: camel/providers/local/camel-spool-summary.c:545
#: camel/providers/local/camel-spool-summary.c:1111
#, c-format
@@ -6365,7 +6385,7 @@ msgstr ""
msgid "Cannot open MH directory path: %s: %s"
msgstr ""
-#: camel/providers/local/camel-spool-folder.c:470
+#: camel/providers/local/camel-spool-folder.c:513
#, c-format
msgid "Cannot append message to spool file: %s: %s"
msgstr ""
@@ -6503,39 +6523,39 @@ msgstr ""
msgid "Unable to open or create .newsrc file for %s: %s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:189
+#: camel/providers/pop3/camel-pop3-folder.c:176
msgid "Retrieving POP summary"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:195
+#: camel/providers/pop3/camel-pop3-folder.c:182
#, c-format
msgid "Could not check POP server for new messages: %s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:242
+#: camel/providers/pop3/camel-pop3-folder.c:229
msgid "Could not open folder: message listing was incomplete."
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:266
+#: camel/providers/pop3/camel-pop3-folder.c:253
msgid "Expunging deleted messages"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:342
+#: camel/providers/pop3/camel-pop3-folder.c:329
#, c-format
msgid "Could not fetch message: %s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:358
+#: camel/providers/pop3/camel-pop3-folder.c:345
#, c-format
msgid "Could not retrieve message from POP server %s: %s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:381
+#: camel/providers/pop3/camel-pop3-folder.c:368
#, c-format
msgid "No message with uid %s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:385
+#: camel/providers/pop3/camel-pop3-folder.c:372
#, c-format
msgid "Retrieving POP message %d"
msgstr ""
@@ -6635,7 +6655,7 @@ msgid "Unexpected response from POP server: %s"
msgstr ""
#: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:74
msgid "Sendmail"
msgstr ""
@@ -6687,7 +6707,7 @@ msgstr ""
msgid "Mail delivery via the sendmail program"
msgstr ""
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:66
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:67
msgid "SMTP"
msgstr ""
@@ -6836,7 +6856,7 @@ msgstr ""
msgid "Cannot send message: sender address not valid."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:553
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:546
msgid "Sending message"
msgstr ""
@@ -6941,47 +6961,58 @@ msgstr ""
msgid "QUIT response error: %s: non-fatal"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
msgid "1 byte"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:101
#, c-format
msgid "%u bytes"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:108
#, c-format
msgid "%.1fK"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:112
#, c-format
msgid "%.1fM"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:116
#, c-format
msgid "%.1fG"
msgstr ""
#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:134
+#: composer/e-msg-composer-attachment-bar.c:357 mail/mail-display.c:134
msgid "attachment"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:478
+#: composer/e-msg-composer-attachment-bar.c:498
msgid "Remove selected items from the attachment list"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:509
+#: composer/e-msg-composer-attachment-bar.c:529
msgid "Add attachment..."
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:510
+#: composer/e-msg-composer-attachment-bar.c:530
msgid "Attach a file to the message"
msgstr ""
+#: composer/e-msg-composer-attachment.c:168
+#: composer/e-msg-composer-attachment.c:184
+#, fuzzy, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "Synchronising \"%s\""
+
+#: composer/e-msg-composer-attachment.c:176
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr ""
+
#: composer/e-msg-composer-attachment.glade.h:1
msgid "Attachment properties"
msgstr ""
@@ -7099,57 +7130,57 @@ msgstr ""
msgid "Unable to retrieve message from editor"
msgstr ""
-#: composer/e-msg-composer.c:1050
+#: composer/e-msg-composer.c:1051
#, c-format
msgid ""
"Unable to seek on file: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1056
+#: composer/e-msg-composer.c:1058
#, c-format
msgid ""
"Unable to truncate file: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1067
#, c-format
msgid ""
"Error autosaving message: %s\n"
" %s"
msgstr ""
-#: composer/e-msg-composer.c:1165
+#: composer/e-msg-composer.c:1169
msgid ""
"Ximian Evolution has found unsaved files from a previous session.\n"
"Would you like to try to recover them?"
msgstr ""
-#: composer/e-msg-composer.c:1313
+#: composer/e-msg-composer.c:1317
msgid ""
"This message has not been sent.\n"
"\n"
"Do you wish to save your changes?"
msgstr ""
-#: composer/e-msg-composer.c:1320
+#: composer/e-msg-composer.c:1324
msgid "Warning: Modified Message"
msgstr ""
-#: composer/e-msg-composer.c:1343
+#: composer/e-msg-composer.c:1347
msgid "Open file"
msgstr ""
-#: composer/e-msg-composer.c:1492
+#: composer/e-msg-composer.c:1496
msgid "Insert File"
msgstr ""
-#: composer/e-msg-composer.c:1868 composer/e-msg-composer.c:2314
+#: composer/e-msg-composer.c:1871 composer/e-msg-composer.c:2317
msgid "Compose a message"
msgstr ""
-#: composer/e-msg-composer.c:2404
+#: composer/e-msg-composer.c:2407
msgid "Could not create composer window."
msgstr ""
@@ -7164,7 +7195,7 @@ msgstr ""
msgid "Cannot initialize Evolution's composer."
msgstr "Cannot initialise Evolution's mail component."
-#: data/evolution.desktop.in.h:1 shell/main.c:76
+#: data/evolution.desktop.in.h:1 shell/main.c:80
msgid "Evolution"
msgstr ""
@@ -7347,11 +7378,11 @@ msgid "seconds"
msgstr ""
#: filter/filter-datespec.c:194
-msgid "Oops. You have forgotten to choose a date."
+msgid "You have forgotten to choose a date."
msgstr ""
#: filter/filter-datespec.c:196
-msgid "Oops. You have chosen an invalid date."
+msgid "You have chosen an invalid date."
msgstr ""
#: filter/filter-datespec.c:271
@@ -7409,7 +7440,7 @@ msgstr ""
msgid "ago"
msgstr ""
-#: filter/filter-datespec.c:711 mail/message-list.c:940
+#: filter/filter-datespec.c:711 mail/message-list.c:939
msgid "%b %d %l:%M %p"
msgstr ""
@@ -7432,7 +7463,7 @@ msgstr ""
#: filter/filter-folder.c:147
msgid ""
-"Oops, you forgot to choose a folder.\n"
+"You forgot to choose a folder.\n"
"Please go back and specify a valid folder to deliver mail to."
msgstr ""
@@ -7685,7 +7716,7 @@ msgstr ""
msgid "Score"
msgstr ""
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1251
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1326
msgid "Sender"
msgstr ""
@@ -7717,7 +7748,7 @@ msgstr ""
msgid "Stop Processing"
msgstr ""
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:926
#: mail/message-list.etspec.h:9
msgid "Subject"
msgstr ""
@@ -7747,7 +7778,7 @@ msgid "Score Rules"
msgstr ""
#: filter/vfolder-rule.c:206
-msgid "Oops. You need to to specify at least one folder as a source."
+msgid "You need to to specify at least one folder as a source."
msgstr ""
#: importers/elm-importer.c:96
@@ -7896,202 +7927,222 @@ msgstr ""
msgid "Virtual Trash folder"
msgstr ""
-#: mail/component-factory.c:114
+#: mail/component-factory.c:125
+#, fuzzy, c-format
+msgid "Cannot connect to store: %s"
+msgstr "Synchronising \"%s\""
+
+#: mail/component-factory.c:146
msgid "This folder cannot contain messages."
msgstr ""
-#: mail/component-factory.c:356
+#: mail/component-factory.c:378
msgid "Properties..."
msgstr ""
-#: mail/component-factory.c:356
+#: mail/component-factory.c:378
msgid "Change this folder's properties"
msgstr ""
-#: mail/component-factory.c:698
+#: mail/component-factory.c:721
msgid ""
"Some of your mail settings seem corrupt, please check that everything is in "
"order."
msgstr ""
-#: mail/component-factory.c:812
+#: mail/component-factory.c:857
msgid "New Mail Message"
msgstr ""
-#: mail/component-factory.c:812
+#: mail/component-factory.c:857
msgid "New _Mail Message"
msgstr ""
-#: mail/component-factory.c:843
+#: mail/component-factory.c:881
msgid "Cannot initialize Evolution's mail component."
msgstr "Cannot initialise Evolution's mail component."
-#: mail/component-factory.c:1032
+#: mail/component-factory.c:890
+#, fuzzy
+msgid "Cannot initialize Evolution's mail config component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/component-factory.c:896
+#, fuzzy
+msgid "Cannot initialize Evolution's folder info component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/component-factory.c:1061
msgid "Cannot register storage with shell"
msgstr ""
-#: mail/folder-browser-ui.c:261
+#: mail/folder-browser-ui.c:267
#, c-format
msgid "Properties for \"%s\""
msgstr ""
-#: mail/folder-browser-ui.c:263
+#: mail/folder-browser-ui.c:269
msgid "Properties"
msgstr ""
-#: mail/folder-browser.c:262 mail/mail-display.c:275
+#: mail/folder-browser.c:261 mail/mail-display.c:300
#, c-format
msgid "Could not create temporary directory: %s"
msgstr ""
-#: mail/folder-browser.c:734
+#: mail/folder-browser.c:733
#, c-format
msgid "%d new"
msgstr ""
-#: mail/folder-browser.c:737 mail/folder-browser.c:742
-#: mail/folder-browser.c:746
+#: mail/folder-browser.c:736 mail/folder-browser.c:741
+#: mail/folder-browser.c:763
msgid ", "
msgstr ""
-#: mail/folder-browser.c:738
+#: mail/folder-browser.c:737
#, c-format
msgid "%d hidden"
msgstr ""
-#: mail/folder-browser.c:743
+#: mail/folder-browser.c:742
#, c-format
msgid "%d selected"
msgstr ""
-#: mail/folder-browser.c:748
+#: mail/folder-browser.c:765
#, c-format
msgid "%d unsent"
msgstr ""
-#: mail/folder-browser.c:750
+#: mail/folder-browser.c:767
+#, c-format
+msgid "%d sent"
+msgstr ""
+
+#: mail/folder-browser.c:769
#, c-format
msgid "%d total"
msgstr ""
-#: mail/folder-browser.c:993
+#: mail/folder-browser.c:1012
msgid "Create vFolder from Search"
msgstr ""
-#: mail/folder-browser.c:1338
+#: mail/folder-browser.c:1384
msgid "VFolder on _Subject"
msgstr ""
-#: mail/folder-browser.c:1341
+#: mail/folder-browser.c:1385
msgid "VFolder on Se_nder"
msgstr ""
-#: mail/folder-browser.c:1344
+#: mail/folder-browser.c:1386
msgid "VFolder on _Recipients"
msgstr ""
-#: mail/folder-browser.c:1347
+#: mail/folder-browser.c:1387
msgid "VFolder on Mailing _List"
msgstr ""
-#: mail/folder-browser.c:1353
+#: mail/folder-browser.c:1391
msgid "Filter on Sub_ject"
msgstr ""
-#: mail/folder-browser.c:1356
+#: mail/folder-browser.c:1392
msgid "Filter on Sen_der"
msgstr ""
-#: mail/folder-browser.c:1359
+#: mail/folder-browser.c:1393
msgid "Filter on Re_cipients"
msgstr ""
-#: mail/folder-browser.c:1362
+#: mail/folder-browser.c:1394
msgid "Filter on _Mailing List"
msgstr ""
-#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1402 ui/evolution-mail-message.xml.h:89
msgid "_Edit as New Message..."
msgstr ""
-#: mail/folder-browser.c:1375 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1403 ui/evolution-mail-message.xml.h:97
msgid "_Save As..."
msgstr ""
-#: mail/folder-browser.c:1377
+#: mail/folder-browser.c:1404
msgid "_Print"
msgstr ""
-#: mail/folder-browser.c:1382 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:96
msgid "_Reply to Sender"
msgstr ""
-#: mail/folder-browser.c:1384 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1409 ui/evolution-mail-message.xml.h:69
msgid "Reply to _List"
msgstr ""
-#: mail/folder-browser.c:1386 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1410 ui/evolution-mail-message.xml.h:68
msgid "Reply to _All"
msgstr ""
-#: mail/folder-browser.c:1388
+#: mail/folder-browser.c:1411
msgid "_Forward"
msgstr ""
-#: mail/folder-browser.c:1391 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1413 ui/evolution-mail-message.xml.h:40
msgid "Mar_k as Read"
msgstr ""
-#: mail/folder-browser.c:1393 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1414 ui/evolution-mail-message.xml.h:42
msgid "Mark as U_nread"
msgstr ""
-#: mail/folder-browser.c:1395
+#: mail/folder-browser.c:1415
msgid "Mark as _Important"
msgstr ""
-#: mail/folder-browser.c:1397
+#: mail/folder-browser.c:1416
msgid "Mark as Unim_portant"
msgstr ""
-#: mail/folder-browser.c:1402
+#: mail/folder-browser.c:1420
msgid "_Move to Folder..."
msgstr ""
-#: mail/folder-browser.c:1404
+#: mail/folder-browser.c:1421
msgid "_Copy to Folder..."
msgstr ""
-#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1423 ui/evolution-mail-message.xml.h:99
msgid "_Undelete"
msgstr ""
-#: mail/folder-browser.c:1413
+#: mail/folder-browser.c:1427
msgid "Add Sender to Address Book"
msgstr ""
-#: mail/folder-browser.c:1418
+#: mail/folder-browser.c:1430
msgid "Apply Filters"
msgstr ""
-#: mail/folder-browser.c:1422
+#: mail/folder-browser.c:1432
msgid "Create Ru_le From Message"
msgstr ""
-#: mail/folder-browser.c:1573
+#: mail/folder-browser.c:1582
msgid "Filter on Mailing List"
msgstr ""
-#: mail/folder-browser.c:1574
+#: mail/folder-browser.c:1583
msgid "VFolder on Mailing List"
msgstr ""
-#: mail/folder-browser.c:1576
+#: mail/folder-browser.c:1585
#, c-format
msgid "Filter on Mailing List (%s)"
msgstr ""
-#: mail/folder-browser.c:1577
+#: mail/folder-browser.c:1586
#, c-format
msgid "VFolder on Mailing List (%s)"
msgstr ""
@@ -8210,7 +8261,7 @@ msgid "Are you sure you want to delete this news account?"
msgstr ""
#. give our dialog an Close button and title
-#: mail/mail-accounts.c:760 mail/mail-config.glade.h:45
+#: mail/mail-accounts.c:769 mail/mail-config.glade.h:45
msgid "Mail Settings"
msgstr ""
@@ -8238,7 +8289,7 @@ msgstr ""
msgid "Add Filter Rule"
msgstr ""
-#: mail/mail-callbacks.c:96
+#: mail/mail-callbacks.c:164
msgid ""
"You have not configured the mail client.\n"
"You need to do this before you can send,\n"
@@ -8246,123 +8297,123 @@ msgid ""
"Would you like to configure it now?"
msgstr ""
-#: mail/mail-callbacks.c:149
+#: mail/mail-callbacks.c:216
msgid ""
"You need to configure an identity\n"
"before you can compose mail."
msgstr ""
-#: mail/mail-callbacks.c:161
+#: mail/mail-callbacks.c:228
msgid ""
"You need to configure a mail transport\n"
"before you can compose mail."
msgstr ""
-#: mail/mail-callbacks.c:185
+#: mail/mail-callbacks.c:252
msgid "You have not set a mail transport method"
msgstr ""
#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:216
+#: mail/mail-callbacks.c:283
msgid ""
"You are sending an HTML-formatted message, but the following recipients do "
"not want HTML-formatted mail:\n"
msgstr ""
-#: mail/mail-callbacks.c:231
+#: mail/mail-callbacks.c:298
msgid "Send anyway?"
msgstr ""
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:340
msgid ""
"This message has no subject.\n"
"Really send?"
msgstr ""
-#: mail/mail-callbacks.c:317
+#: mail/mail-callbacks.c:384
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:321
+#: mail/mail-callbacks.c:388
msgid "This message contains only Bcc recipients."
msgstr ""
-#: mail/mail-callbacks.c:325
+#: mail/mail-callbacks.c:392
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:419
+#: mail/mail-callbacks.c:486
msgid "This message contains invalid recipients:"
msgstr ""
-#: mail/mail-callbacks.c:454
+#: mail/mail-callbacks.c:521
msgid "You must specify recipients in order to send this message."
msgstr ""
-#: mail/mail-callbacks.c:550
+#: mail/mail-callbacks.c:617
msgid "You must configure an account before you can send this email."
msgstr ""
-#: mail/mail-callbacks.c:783
+#: mail/mail-callbacks.c:850
msgid "an unknown sender"
msgstr ""
-#: mail/mail-callbacks.c:788
+#: mail/mail-callbacks.c:855
msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
msgstr ""
-#: mail/mail-callbacks.c:1171
+#: mail/mail-callbacks.c:1244
msgid "Move message(s) to"
msgstr ""
-#: mail/mail-callbacks.c:1173
+#: mail/mail-callbacks.c:1246
msgid "Copy message(s) to"
msgstr ""
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1622
#, c-format
msgid "Are you sure you want to edit all %d messages?"
msgstr ""
-#: mail/mail-callbacks.c:1569
+#: mail/mail-callbacks.c:1644
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
msgstr ""
-#: mail/mail-callbacks.c:1603
+#: mail/mail-callbacks.c:1679
msgid ""
"You may only resend messages\n"
"in the Sent folder."
msgstr ""
-#: mail/mail-callbacks.c:1615
+#: mail/mail-callbacks.c:1692
#, c-format
msgid "Are you sure you want to resend all %d messages?"
msgstr ""
-#: mail/mail-callbacks.c:1636
+#: mail/mail-callbacks.c:1713
msgid "No Message Selected"
msgstr ""
-#: mail/mail-callbacks.c:1721
+#: mail/mail-callbacks.c:1800
msgid "Save Message As..."
msgstr ""
-#: mail/mail-callbacks.c:1723
+#: mail/mail-callbacks.c:1802
msgid "Save Messages As..."
msgstr ""
-#: mail/mail-callbacks.c:1868 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1947 widgets/misc/e-messagebox.c:159
msgid "Warning"
msgstr ""
-#: mail/mail-callbacks.c:1873
+#: mail/mail-callbacks.c:1954
msgid ""
"This operation will permanently erase all messages marked as deleted. If you "
"continue, you will not be able to recover these messages.\n"
@@ -8370,60 +8421,60 @@ msgid ""
"Really erase these messages?"
msgstr ""
-#: mail/mail-callbacks.c:1880
+#: mail/mail-callbacks.c:1961
msgid "Do not ask me again."
msgstr ""
-#: mail/mail-callbacks.c:1985
+#: mail/mail-callbacks.c:2066
#, c-format
msgid ""
"Error loading filter information:\n"
"%s"
msgstr ""
-#: mail/mail-callbacks.c:1995
+#: mail/mail-callbacks.c:2077
msgid "Filters"
msgstr ""
-#: mail/mail-callbacks.c:2041
+#: mail/mail-callbacks.c:2125
msgid "Print Message"
msgstr ""
-#: mail/mail-callbacks.c:2087
+#: mail/mail-callbacks.c:2171
msgid "Printing of message failed"
msgstr ""
-#: mail/mail-callbacks.c:2171
+#: mail/mail-callbacks.c:2260
#, c-format
msgid "Are you sure you want to open all %d messages in separate windows?"
msgstr ""
-#: mail/mail-config-druid.c:135
+#: mail/mail-config-druid.c:146
msgid ""
"Please enter your name and email address below. The \"optional\" fields "
"below do not need to be filled in,\n"
"unless you wish to include this information in email you send."
msgstr ""
-#: mail/mail-config-druid.c:137
+#: mail/mail-config-druid.c:148
msgid ""
"Please enter information about your incoming mail server below. If you are "
"not sure, ask your system\n"
"administrator or Internet Service Provider."
msgstr ""
-#: mail/mail-config-druid.c:139
+#: mail/mail-config-druid.c:150
msgid "Please select among the following options"
msgstr ""
-#: mail/mail-config-druid.c:141
+#: mail/mail-config-druid.c:152
msgid ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system\n"
"administrator or Internet Service Provider."
msgstr ""
-#: mail/mail-config-druid.c:143
+#: mail/mail-config-druid.c:154
msgid ""
"You are almost done with the mail configuration process. The identity, "
"incoming mail server and\n"
@@ -8435,7 +8486,7 @@ msgid ""
msgstr ""
#. set window title
-#: mail/mail-config-druid.c:570
+#: mail/mail-config-druid.c:591
msgid "Evolution Account Assistant"
msgstr ""
@@ -8658,219 +8709,223 @@ msgid "Pretty Good Privacy"
msgstr ""
#: mail/mail-config.glade.h:58
-msgid "Prompt when sending messages with an _empty subject"
+msgid "Prompt when sending HTML messages to contacts that don't want them"
msgstr ""
#: mail/mail-config.glade.h:59
-msgid "Prompt when sending messages with only _Bcc recipients defined"
+msgid "Prompt when sending messages with an _empty subject"
msgstr ""
#: mail/mail-config.glade.h:60
-msgid "Qmail maildir "
+msgid "Prompt when sending messages with only _Bcc recipients defined"
msgstr ""
#: mail/mail-config.glade.h:61
+msgid "Qmail maildir "
+msgstr ""
+
+#: mail/mail-config.glade.h:62
msgid "Quoted"
msgstr ""
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:63 shell/glade/evolution-startup-wizard.glade.h:6
msgid "Receiving Email"
msgstr ""
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
msgid "Receiving Mail"
msgstr ""
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
msgid "Receiving Options"
msgstr ""
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:66
msgid "Required Information"
msgstr ""
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
msgid "Secure MIME"
msgstr ""
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
msgid "Security"
msgstr ""
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
msgid "Select Filter Log file..."
msgstr ""
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:71
msgid "Select PGP binary"
msgstr ""
-#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:7
msgid "Sending Email"
msgstr ""
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
msgid "Sending Mail"
msgstr ""
-#: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:75 mail/message-list.etspec.h:6
#: shell/e-local-storage.c:177
msgid "Sent"
msgstr ""
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
msgid "Sent and Draft Messages"
msgstr ""
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
msgid "Sent messages folder:"
msgstr ""
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
msgid "Server Configuration"
msgstr ""
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
msgid "Server Type: "
msgstr ""
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
msgid "Server requires _authentication"
msgstr ""
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
msgid "Signature file:"
msgstr ""
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
msgid "Source"
msgstr ""
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
msgid "Source Information"
msgstr ""
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
msgid "Sources"
msgstr ""
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
msgid "Special Folders"
msgstr ""
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:86
msgid "Standard Unix mbox"
msgstr ""
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
msgid "Use secure connection (_SSL)"
msgstr ""
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
"Click \"Next\" to begin. "
msgstr ""
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
msgid "_Always load images off the net"
msgstr ""
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
msgid "_Automatically check for new mail every"
msgstr ""
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
msgid "_Check for supported types"
msgstr ""
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
msgid "_Email Address:"
msgstr ""
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
msgid "_Empty trash folders on exit"
msgstr ""
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
msgid "_Full Name:"
msgstr ""
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
msgid "_HTML Signature:"
msgstr ""
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
msgid "_Highlight citations with"
msgstr ""
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
msgid "_Host:"
msgstr ""
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
msgid "_Load images if sender is in addressbook"
msgstr ""
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
msgid "_Log filter actions to:"
msgstr ""
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
msgid "_Mark messages as Read after"
msgstr ""
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
msgid "_Name:"
msgstr ""
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
msgid "_Never load images off the net"
msgstr ""
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
#, fuzzy
msgid "_Organization:"
msgstr "Organisation:"
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
msgid "_PGP binary path:"
msgstr ""
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
msgid "_Path:"
msgstr ""
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
msgid "_Remember this password"
msgstr ""
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
msgid "_Send mail in HTML format by default."
msgstr ""
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
msgid "_Signature file:"
msgstr ""
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
msgid "_Username:"
msgstr ""
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
msgid "description"
msgstr ""
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:118
msgid "newswindow1"
msgstr ""
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:119
msgid "placeholder"
msgstr ""
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:120
msgid "seconds."
msgstr ""
@@ -8910,185 +8965,189 @@ msgstr ""
msgid "Could not create a S/MIME decode context."
msgstr ""
-#: mail/mail-display.c:223
+#: mail/mail-display.c:245
msgid "Save Attachment"
msgstr ""
-#: mail/mail-display.c:327
+#: mail/mail-display.c:352
msgid "Save to Disk..."
msgstr ""
-#: mail/mail-display.c:329
+#: mail/mail-display.c:354
msgid "View Inline"
msgstr ""
-#: mail/mail-display.c:331
+#: mail/mail-display.c:356
#, c-format
msgid "Open in %s..."
msgstr ""
-#: mail/mail-display.c:392
+#: mail/mail-display.c:417
#, c-format
msgid "View Inline (via %s)"
msgstr ""
-#: mail/mail-display.c:396
+#: mail/mail-display.c:421
msgid "Hide"
msgstr ""
-#: mail/mail-display.c:417
+#: mail/mail-display.c:442
msgid "External Viewer"
msgstr ""
-#: mail/mail-display.c:1053
+#: mail/mail-display.c:1107
msgid "Loading message content"
msgstr ""
-#: mail/mail-display.c:1515
+#: mail/mail-display.c:1587
msgid "Open Link in Browser"
msgstr ""
-#: mail/mail-display.c:1517
+#: mail/mail-display.c:1589
msgid "Copy Link Location"
msgstr ""
-#: mail/mail-display.c:1520
+#: mail/mail-display.c:1592
msgid "Save Link as (FIXME)"
msgstr ""
-#: mail/mail-display.c:1523
+#: mail/mail-display.c:1595
msgid "Save Image as..."
msgstr ""
-#: mail/mail-format.c:627
+#: mail/mail-format.c:628
#, c-format
msgid "%s attachment"
msgstr ""
-#: mail/mail-format.c:680
+#: mail/mail-format.c:681
msgid "Could not parse MIME message. Displaying as source."
msgstr ""
-#: mail/mail-format.c:764
+#: mail/mail-format.c:765
msgid "Date"
msgstr ""
-#: mail/mail-format.c:862
+#: mail/mail-format.c:867
msgid "Bad Address"
msgstr ""
-#: mail/mail-format.c:903 mail/message-list.etspec.h:3
+#: mail/mail-format.c:908 mail/message-list.etspec.h:3
msgid "From"
msgstr ""
-#: mail/mail-format.c:906
+#: mail/mail-format.c:911
msgid "Reply-To"
msgstr ""
-#: mail/mail-format.c:910 mail/message-list.etspec.h:10
+#: mail/mail-format.c:915 mail/message-list.etspec.h:10
msgid "To"
msgstr ""
-#: mail/mail-format.c:914
+#: mail/mail-format.c:919
msgid "Cc"
msgstr ""
-#: mail/mail-format.c:1357
+#: mail/mail-format.c:923
+msgid "Bcc"
+msgstr ""
+
+#: mail/mail-format.c:1370
msgid "No GPG/PGP program configured."
msgstr ""
-#: mail/mail-format.c:1373
+#: mail/mail-format.c:1386
msgid "Encrypted message not displayed"
msgstr ""
-#: mail/mail-format.c:1384
+#: mail/mail-format.c:1397
msgid "Encrypted message"
msgstr ""
-#: mail/mail-format.c:1385
+#: mail/mail-format.c:1398
msgid "Click icon to decrypt."
msgstr ""
-#: mail/mail-format.c:1440
+#: mail/mail-format.c:1453
msgid "This message is digitally signed and has been found to be authentic."
msgstr ""
-#: mail/mail-format.c:1451
+#: mail/mail-format.c:1464
msgid "This message is digitally signed but can not be proven to be authentic."
msgstr ""
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:2141
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr ""
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2155
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr ""
-#: mail/mail-format.c:2147
+#: mail/mail-format.c:2160
#, c-format
msgid "Pointer to local file (%s)"
msgstr ""
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2189
#, c-format
msgid "Pointer to remote data (%s)"
msgstr ""
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2197
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr ""
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2202
msgid "Malformed external-body part."
msgstr ""
-#: mail/mail-local.c:563
+#: mail/mail-local.c:582
#, fuzzy
msgid "Reconfiguring folder"
msgstr "Synchronising \"%s\""
-#: mail/mail-local.c:636
+#: mail/mail-local.c:655
#, c-format
msgid ""
"Cannot save folder metainfo; you'll probably find you can't\n"
"open this folder anymore: %s: %s"
msgstr ""
-#: mail/mail-local.c:689
+#: mail/mail-local.c:708
#, c-format
msgid "Cannot save folder metainfo to %s: %s"
msgstr ""
-#: mail/mail-local.c:735
+#: mail/mail-local.c:754
#, c-format
msgid "Cannot delete folder metadata %s: %s"
msgstr ""
-#: mail/mail-local.c:1075
+#: mail/mail-local.c:1119
#, c-format
msgid "Changing folder \"%s\" to \"%s\" format"
msgstr ""
-#: mail/mail-local.c:1090
+#: mail/mail-local.c:1134
#, c-format
msgid "%s may not be reconfigured because it is not a local folder"
msgstr ""
-#: mail/mail-local.c:1112
+#: mail/mail-local.c:1156
msgid ""
"If you can no longer open this mailbox, then\n"
"you may need to repair it manually."
msgstr ""
-#: mail/mail-local.c:1200
+#: mail/mail-local.c:1244
msgid "You cannot change the format of a non-local folder."
msgstr ""
-#: mail/mail-local.c:1209
+#: mail/mail-local.c:1253
#, fuzzy, c-format
msgid "Reconfigure /%s"
msgstr "Synchronising \"%s\""
@@ -9108,24 +9167,24 @@ msgid ""
msgstr ""
#. Remember the password?
-#: mail/mail-mt.c:509
+#: mail/mail-mt.c:506
msgid "Remember this password"
msgstr ""
-#: mail/mail-mt.c:510
+#: mail/mail-mt.c:507
msgid "Remember this password for the remainder of this session"
msgstr ""
-#: mail/mail-mt.c:567
+#: mail/mail-mt.c:564
#, c-format
msgid "Enter Password for %s"
msgstr ""
-#: mail/mail-mt.c:570
+#: mail/mail-mt.c:567
msgid "Enter Password"
msgstr ""
-#: mail/mail-mt.c:886
+#: mail/mail-mt.c:883
msgid "Working"
msgstr ""
@@ -9138,145 +9197,150 @@ msgstr "Synchronising \"%s\""
msgid "Fetching Mail"
msgstr ""
-#: mail/mail-ops.c:482 mail/mail-ops.c:512
+#: mail/mail-ops.c:473 mail/mail-ops.c:505
msgid "However, the message was successfully sent."
msgstr ""
-#: mail/mail-ops.c:549
+#: mail/mail-ops.c:542
#, c-format
msgid "Sending \"%s\""
msgstr ""
-#: mail/mail-ops.c:668
+#: mail/mail-ops.c:661
#, c-format
msgid "Sending message %d of %d"
msgstr ""
-#: mail/mail-ops.c:687
+#: mail/mail-ops.c:680
#, c-format
msgid "Failed on message %d of %d"
msgstr ""
-#: mail/mail-ops.c:689 mail/mail-send-recv.c:522
+#: mail/mail-ops.c:682 mail/mail-send-recv.c:522
msgid "Complete."
msgstr ""
-#: mail/mail-ops.c:782
+#: mail/mail-ops.c:775
msgid "Saving message to folder"
msgstr ""
-#: mail/mail-ops.c:861
+#: mail/mail-ops.c:855
#, c-format
msgid "Moving messages to %s"
msgstr ""
-#: mail/mail-ops.c:861
+#: mail/mail-ops.c:855
#, c-format
msgid "Copying messages to %s"
msgstr ""
-#: mail/mail-ops.c:878
+#: mail/mail-ops.c:877
+#, fuzzy, c-format
+msgid "Cannot copy a folder `%s' to itself"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-ops.c:884
msgid "Moving"
msgstr ""
-#: mail/mail-ops.c:881
+#: mail/mail-ops.c:887
msgid "Copying"
msgstr ""
-#: mail/mail-ops.c:993
+#: mail/mail-ops.c:997
#, c-format
msgid "Scanning folders in \"%s\""
msgstr ""
#. Fill in the new fields
-#: mail/mail-ops.c:1040 shell/e-local-storage.c:179
+#: mail/mail-ops.c:1047 shell/e-local-storage.c:179
msgid "Trash"
msgstr ""
-#: mail/mail-ops.c:1173
+#: mail/mail-ops.c:1180
msgid "Forwarded messages"
msgstr ""
-#: mail/mail-ops.c:1215
+#: mail/mail-ops.c:1223
#, c-format
msgid "Opening folder %s"
msgstr ""
-#: mail/mail-ops.c:1284
+#: mail/mail-ops.c:1295
#, c-format
msgid "Opening store %s"
msgstr ""
-#: mail/mail-ops.c:1353
+#: mail/mail-ops.c:1364
#, fuzzy, c-format
msgid "Removing folder %s"
msgstr "Synchronising \"%s\""
-#: mail/mail-ops.c:1445
+#: mail/mail-ops.c:1458
#, fuzzy, c-format
msgid "Storing folder '%s'"
msgstr "Synchronising \"%s\""
-#: mail/mail-ops.c:1496
+#: mail/mail-ops.c:1509
#, fuzzy
msgid "Refreshing folder"
msgstr "Synchronising \"%s\""
-#: mail/mail-ops.c:1532
+#: mail/mail-ops.c:1545
msgid "Expunging folder"
msgstr ""
-#: mail/mail-ops.c:1581
+#: mail/mail-ops.c:1594
#, c-format
msgid "Retrieving message %s"
msgstr ""
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1661
#, c-format
msgid "Retrieving %d message(s)"
msgstr ""
-#: mail/mail-ops.c:1734
+#: mail/mail-ops.c:1747
#, c-format
msgid "Saving %d messsage(s)"
msgstr ""
-#: mail/mail-ops.c:1846
+#: mail/mail-ops.c:1859
#, c-format
msgid ""
"Unable to create output file: %s\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:1874
+#: mail/mail-ops.c:1887
#, c-format
msgid ""
"Error saving messages to: %s:\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:1948
+#: mail/mail-ops.c:1961
msgid "Saving attachment"
msgstr ""
-#: mail/mail-ops.c:1964
+#: mail/mail-ops.c:1977
#, c-format
msgid ""
"Cannot create output file: %s:\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:1995
+#: mail/mail-ops.c:2008
#, c-format
msgid "Could not write data: %s"
msgstr ""
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:2077
#, c-format
msgid "Disconnecting from %s"
msgstr ""
-#: mail/mail-ops.c:2065
+#: mail/mail-ops.c:2078
#, fuzzy, c-format
msgid "Reconnecting to %s"
msgstr "Synchronise \"%s\""
@@ -9360,35 +9424,30 @@ msgstr ""
msgid "User canceled operation."
msgstr ""
-#: mail/mail-tools.c:133
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr ""
-
-#: mail/mail-tools.c:259
+#: mail/mail-tools.c:241
#, c-format
msgid "Forwarded message - %s"
msgstr ""
-#: mail/mail-tools.c:263
+#: mail/mail-tools.c:245
msgid "Forwarded message"
msgstr ""
-#: mail/mail-tools.c:396
+#: mail/mail-tools.c:378
msgid "Forwarded Message"
msgstr ""
-#: mail/mail-vfolder.c:84
+#: mail/mail-vfolder.c:86
#, fuzzy, c-format
msgid "Setting up vfolder: %s"
msgstr "Synchronising \"%s\""
-#: mail/mail-vfolder.c:201
+#: mail/mail-vfolder.c:203
#, fuzzy, c-format
msgid "Updating vfolders for uri: %s"
msgstr "Synchronising \"%s\""
-#: mail/mail-vfolder.c:414
+#: mail/mail-vfolder.c:416
#, c-format
msgid ""
"The following vFolder(s):\n"
@@ -9397,11 +9456,21 @@ msgid ""
"And have been updated."
msgstr ""
-#: mail/mail-vfolder.c:636
+#: mail/mail-vfolder.c:638
msgid "VFolders"
msgstr ""
-#: mail/mail-vfolder.c:742
+#: mail/mail-vfolder.c:736
+#, fuzzy
+msgid "Edit VFolder"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-vfolder.c:751
+#, c-format
+msgid "Trying to edit a vfolder '%s' which doesn't exist."
+msgstr ""
+
+#: mail/mail-vfolder.c:805
msgid "New VFolder"
msgstr ""
@@ -9414,59 +9483,59 @@ msgstr ""
msgid "%s - Message"
msgstr ""
-#: mail/message-list.c:640
+#: mail/message-list.c:639
msgid "Unseen"
msgstr ""
-#: mail/message-list.c:641
+#: mail/message-list.c:640
msgid "Seen"
msgstr ""
-#: mail/message-list.c:642
+#: mail/message-list.c:641
msgid "Answered"
msgstr ""
-#: mail/message-list.c:643
+#: mail/message-list.c:642
msgid "Multiple Unseen Messages"
msgstr ""
-#: mail/message-list.c:644
+#: mail/message-list.c:643
msgid "Multiple Messages"
msgstr ""
-#: mail/message-list.c:648
+#: mail/message-list.c:647
msgid "Lowest"
msgstr ""
-#: mail/message-list.c:649
+#: mail/message-list.c:648
msgid "Lower"
msgstr ""
-#: mail/message-list.c:653
+#: mail/message-list.c:652
msgid "Higher"
msgstr ""
-#: mail/message-list.c:654
+#: mail/message-list.c:653
msgid "Highest"
msgstr ""
-#: mail/message-list.c:904
+#: mail/message-list.c:903
msgid "?"
msgstr ""
-#: mail/message-list.c:911
+#: mail/message-list.c:910
msgid "Today %l:%M %p"
msgstr ""
-#: mail/message-list.c:920
+#: mail/message-list.c:919
msgid "Yesterday %l:%M %p"
msgstr ""
-#: mail/message-list.c:932
+#: mail/message-list.c:931
msgid "%a %l:%M %p"
msgstr ""
-#: mail/message-list.c:942
+#: mail/message-list.c:941
msgid "%b %d %Y"
msgstr ""
@@ -9566,19 +9635,19 @@ msgstr ""
msgid "Cannot initialize Evolution's Executive Summary component."
msgstr "Cannot initialise Evolution's mail component."
-#: my-evolution/e-summary-calendar.c:263 my-evolution/e-summary-calendar.c:281
+#: my-evolution/e-summary-calendar.c:326 my-evolution/e-summary-calendar.c:344
msgid "Appointments"
msgstr ""
-#: my-evolution/e-summary-calendar.c:264
+#: my-evolution/e-summary-calendar.c:327
msgid "No appointments"
msgstr ""
-#: my-evolution/e-summary-calendar.c:301
+#: my-evolution/e-summary-calendar.c:364
msgid "%k%M %d %B"
msgstr ""
-#: my-evolution/e-summary-calendar.c:303
+#: my-evolution/e-summary-calendar.c:366
msgid "%l:%M %d %B"
msgstr ""
@@ -9591,7 +9660,6 @@ msgstr ""
#. stations and their codes in Evolution sources
#. (evolution/my-evolution/Locations)
#: my-evolution/e-summary-preferences.c:80
-#: my-evolution/e-summary-weather.c:630
msgid "KBOS:ZSAM:EGAA"
msgstr ""
@@ -9599,23 +9667,23 @@ msgstr ""
msgid "Dictionary.com Word of the Day"
msgstr ""
-#: my-evolution/e-summary-preferences.c:463
+#: my-evolution/e-summary-preferences.c:464
msgid "Quotes of the Day"
msgstr ""
-#: my-evolution/e-summary-preferences.c:929
+#: my-evolution/e-summary-preferences.c:930
msgid "Add a news feed"
msgstr ""
-#: my-evolution/e-summary-preferences.c:937
+#: my-evolution/e-summary-preferences.c:938
msgid "Enter the URL of the news feed you wish to add"
msgstr ""
-#: my-evolution/e-summary-preferences.c:941
+#: my-evolution/e-summary-preferences.c:942
msgid "Name:"
msgstr ""
-#: my-evolution/e-summary-preferences.c:1486
+#: my-evolution/e-summary-preferences.c:1487
msgid "Summary Settings"
msgstr ""
@@ -9628,11 +9696,11 @@ msgstr ""
msgid "News Feed"
msgstr ""
-#: my-evolution/e-summary-tasks.c:238
+#: my-evolution/e-summary-tasks.c:236
msgid "No tasks"
msgstr ""
-#: my-evolution/e-summary-tasks.c:277
+#: my-evolution/e-summary-tasks.c:275
msgid "(No Description)"
msgstr ""
@@ -9648,6 +9716,14 @@ msgstr ""
msgid "Weather"
msgstr ""
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:630
+msgid "KBOS:EGAA:RJTT"
+msgstr ""
+
#: my-evolution/e-summary-weather.c:691
msgid "Regions"
msgstr ""
@@ -10877,96 +10953,96 @@ msgid "How many days should the calendar display at once?"
msgstr ""
#: my-evolution/my-evolution.glade.h:8
-msgid "Ma_x number of items shown:"
+msgid "M_etric"
msgstr ""
#: my-evolution/my-evolution.glade.h:9
-msgid "News Feed Settings"
+msgid "Ma_x number of items shown:"
msgstr ""
#: my-evolution/my-evolution.glade.h:10
-msgid "One mont_h"
+msgid "News Feed Settings"
msgstr ""
#: my-evolution/my-evolution.glade.h:11
-msgid "One w_eek"
+msgid "One mont_h"
msgstr ""
#: my-evolution/my-evolution.glade.h:12
-msgid "R_efresh time (seconds):"
+msgid "One w_eek"
msgstr ""
#: my-evolution/my-evolution.glade.h:13
-msgid "Refresh _time (seconds):"
+msgid "R_efresh time (seconds):"
msgstr ""
#: my-evolution/my-evolution.glade.h:14
-msgid "S_how full path for folders"
+msgid "Refresh _time (seconds):"
msgstr ""
#: my-evolution/my-evolution.glade.h:15
-msgid "Show _all tasks"
+msgid "S_how full path for folders"
msgstr ""
#: my-evolution/my-evolution.glade.h:16
-msgid "Show _today's tasks"
+msgid "Show _all tasks"
msgstr ""
#: my-evolution/my-evolution.glade.h:17
-msgid "Tasks "
+msgid "Show _today's tasks"
msgstr ""
#: my-evolution/my-evolution.glade.h:18
-msgid "Units: "
+msgid "Tasks "
msgstr ""
#: my-evolution/my-evolution.glade.h:19
+msgid "Units: "
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:20
msgid "Weather settings"
msgstr ""
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
#, fuzzy
msgid "_Display folders:"
msgstr "Synchronising \"%s\""
-#: my-evolution/my-evolution.glade.h:22
-msgid "_Display stations:"
-msgstr ""
-
#: my-evolution/my-evolution.glade.h:23
-msgid "_Displayed feeds:"
+msgid "_Display stations:"
msgstr ""
#: my-evolution/my-evolution.glade.h:24
-msgid "_Five days"
+msgid "_Displayed feeds:"
msgstr ""
#: my-evolution/my-evolution.glade.h:25
-msgid "_Mail"
+msgid "_Five days"
msgstr ""
#: my-evolution/my-evolution.glade.h:26
-msgid "_News Feeds"
+msgid "_Imperial"
msgstr ""
#: my-evolution/my-evolution.glade.h:27
-msgid "_One day"
+msgid "_Mail"
msgstr ""
#: my-evolution/my-evolution.glade.h:28
-msgid "_Schedule"
+msgid "_News Feeds"
msgstr ""
#: my-evolution/my-evolution.glade.h:29
-msgid "_Weather"
+msgid "_One day"
msgstr ""
#: my-evolution/my-evolution.glade.h:30
-msgid "_imperial"
+msgid "_Schedule"
msgstr ""
#: my-evolution/my-evolution.glade.h:31
-msgid "m_etric"
+msgid "_Weather"
msgstr ""
#: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -11064,56 +11140,56 @@ msgstr ""
msgid "Cannot move a folder into one of its descendants."
msgstr ""
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:308
#, c-format
msgid "Specify a folder to copy folder \"%s\" into:"
msgstr ""
-#: shell/e-shell-folder-commands.c:317
+#: shell/e-shell-folder-commands.c:313
#, fuzzy
msgid "Copy folder"
msgstr "Synchronising \"%s\""
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:355
#, c-format
msgid "Specify a folder to move folder \"%s\" into:"
msgstr ""
-#: shell/e-shell-folder-commands.c:364
+#: shell/e-shell-folder-commands.c:360
msgid "Move folder"
msgstr ""
-#: shell/e-shell-folder-commands.c:390
+#: shell/e-shell-folder-commands.c:386
#, c-format
msgid ""
"Cannot delete folder:\n"
"%s"
msgstr ""
-#: shell/e-shell-folder-commands.c:406
+#: shell/e-shell-folder-commands.c:402
#, c-format
msgid "Delete \"%s\""
msgstr ""
#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:416
+#: shell/e-shell-folder-commands.c:412
#, c-format
msgid "Are you sure you want to remove the \"%s\" folder?"
msgstr ""
-#: shell/e-shell-folder-commands.c:470
+#: shell/e-shell-folder-commands.c:457
#, fuzzy, c-format
msgid ""
"Cannot rename folder:\n"
"%s"
msgstr "Synchronising \"%s\""
-#: shell/e-shell-folder-commands.c:503
+#: shell/e-shell-folder-commands.c:490
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr ""
-#: shell/e-shell-folder-commands.c:506
+#: shell/e-shell-folder-commands.c:493
#, fuzzy
msgid "Rename folder"
msgstr "Synchronising \"%s\""
@@ -11378,68 +11454,69 @@ msgstr ""
msgid "(No folder displayed)"
msgstr ""
-#: shell/e-shell-view.c:1512
+#: shell/e-shell-view.c:1584
#, c-format
msgid "%s (%d)"
msgstr ""
-#: shell/e-shell-view.c:1514
+#: shell/e-shell-view.c:1586
msgid "(None)"
msgstr ""
-#: shell/e-shell-view.c:1519
+#: shell/e-shell-view.c:1591
#, c-format
msgid "%s - Ximian Evolution %s"
msgstr ""
-#: shell/e-shell-view.c:1521
+#: shell/e-shell-view.c:1593
#, c-format
msgid "%s - Ximian Evolution %s [%s]"
msgstr ""
-#: shell/e-shell-view.c:1561
+#: shell/e-shell-view.c:1633
msgid ""
"Ximian Evolution is currently online. Click on this button to work offline."
msgstr ""
-#: shell/e-shell-view.c:1568
+#: shell/e-shell-view.c:1640
msgid "Ximian Evolution is in the process of going offline."
msgstr ""
-#: shell/e-shell-view.c:1574
+#: shell/e-shell-view.c:1646
msgid ""
"Ximian Evolution is currently offline. Click on this button to work online."
msgstr ""
-#: shell/e-shell.c:562
+#: shell/e-shell.c:563
#, c-format
msgid "Cannot set up local storage -- %s"
msgstr ""
-#: shell/e-shell.c:1488
+#: shell/e-shell.c:1497
#, c-format
msgid ""
-"Ooops! The views for `%s' have died unexpectedly. :-(\n"
-"This probably means that the %s component has crashed."
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
msgstr ""
-#: shell/e-shell.c:1692 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1702 widgets/misc/e-cell-date-edit.c:248
msgid "OK"
msgstr ""
-#: shell/e-shell.c:1694
+#: shell/e-shell.c:1704
msgid "Invalid arguments"
msgstr ""
-#: shell/e-shell.c:1696
+#: shell/e-shell.c:1706
msgid "Cannot register on OAF"
msgstr ""
-#: shell/e-shell.c:1698
+#: shell/e-shell.c:1708
msgid "Configuration Database not found"
msgstr ""
-#: shell/e-shell.c:1700 shell/e-storage.c:496
+#: shell/e-shell.c:1710 shell/e-storage.c:501
msgid "Generic error"
msgstr ""
@@ -11573,47 +11650,47 @@ msgstr "Synchronising \"%s\""
msgid "(No name)"
msgstr ""
-#: shell/e-storage.c:494
+#: shell/e-storage.c:499
msgid "No error"
msgstr ""
-#: shell/e-storage.c:498
+#: shell/e-storage.c:503
msgid "A folder with the same name already exists"
msgstr ""
-#: shell/e-storage.c:500
+#: shell/e-storage.c:505
msgid "The specified folder type is not valid"
msgstr ""
-#: shell/e-storage.c:502
+#: shell/e-storage.c:507
msgid "I/O error"
msgstr ""
-#: shell/e-storage.c:504
+#: shell/e-storage.c:509
msgid "Not enough space to create the folder"
msgstr ""
-#: shell/e-storage.c:506
+#: shell/e-storage.c:511
msgid "The specified folder was not found"
msgstr ""
-#: shell/e-storage.c:508
+#: shell/e-storage.c:513
msgid "Function not implemented in this storage"
msgstr ""
-#: shell/e-storage.c:512
+#: shell/e-storage.c:517
msgid "Operation not supported"
msgstr ""
-#: shell/e-storage.c:514
+#: shell/e-storage.c:519
msgid "The specified type is not supported in this storage"
msgstr ""
-#: shell/e-storage.c:516
+#: shell/e-storage.c:521
msgid "The specified folder cannot be modified or removed"
msgstr ""
-#: shell/e-storage.c:518
+#: shell/e-storage.c:523
msgid "Cannot make a folder a child of one of its descendants"
msgstr ""
@@ -11733,11 +11810,11 @@ msgstr ""
msgid "Evolution can import data from the following files:"
msgstr ""
-#: shell/main.c:82
+#: shell/main.c:86
msgid "Evolution is now exiting ..."
msgstr ""
-#: shell/main.c:153
+#: shell/main.c:162
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -11754,31 +11831,31 @@ msgid ""
"eagerly await your contributions!\n"
msgstr ""
-#: shell/main.c:174
+#: shell/main.c:183
msgid ""
"Thanks\n"
"The Ximian Evolution Team\n"
msgstr ""
-#: shell/main.c:231
+#: shell/main.c:236
#, fuzzy
msgid "Cannot access the Ximian Evolution shell."
msgstr "Cannot initialise the Evolution shell."
-#: shell/main.c:242
+#: shell/main.c:245
#, fuzzy, c-format
msgid "Cannot initialize the Ximian Evolution shell: %s"
msgstr "Cannot initialise the Evolution shell."
-#: shell/main.c:286
+#: shell/main.c:301
msgid "Disable splash screen"
msgstr ""
-#: shell/main.c:287
+#: shell/main.c:302
msgid "Send the debugging output of all components to a file."
msgstr ""
-#: shell/main.c:329
+#: shell/main.c:344
msgid "Cannot initialize the Bonobo component system."
msgstr "Cannot initialise the Bonobo component system."
@@ -13238,7 +13315,7 @@ msgstr ""
msgid "Today"
msgstr ""
-#: widgets/misc/e-cell-date-edit.c:732
+#: widgets/misc/e-cell-date-edit.c:738
#, c-format
msgid "The time must be in the format: %s"
msgstr ""
@@ -13313,7 +13390,7 @@ msgstr ""
msgid "Other..."
msgstr ""
-#: widgets/misc/e-charset-picker.c:394
+#: widgets/misc/e-charset-picker.c:396
msgid "Character Encoding"
msgstr ""
@@ -13371,11 +13448,13 @@ msgstr ""
msgid "Find Now"
msgstr ""
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
+#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
+#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
msgid "The Personal Addressbook Server"
msgstr ""
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
+#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
+#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
msgid "The Personal Calendar Server; calendar factory"
msgstr ""
@@ -13437,10 +13516,6 @@ msgstr "Could not initialise Bonobo"
#~ msgid "Factory for the test component."
#~ msgstr "Cannot initialise Evolution's mail component."
-#, fuzzy
-#~ msgid "Cannot initialize Evolution's notes component."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
#~ msgid "Synchronize"
#~ msgstr "Synchronise"