[evolution] Update British English translation
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Update British English translation
- Date: Sat, 28 Aug 2010 14:55:40 +0000 (UTC)
commit 78e2008b55d5c27b454d08207d42f697aa6f72bd
Author: Philip Withnall <philip tecnocode co uk>
Date: Sat Aug 28 13:33:57 2010 +0100
Update British English translation
po/en_GB.po | 8046 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 4348 insertions(+), 3698 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 0264e16..5af7fda 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,19 +3,19 @@
# Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004.
# Bruce Cowan <bcowan fastmail co uk>, 2009, 2010.
# Philip Withnall <philip tecnocode co uk>, 2010.
-#: ../shell/main.c:456
+#: ../shell/main.c:533
msgid ""
msgstr ""
"Project-Id-Version: evolution\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-13 08:49+0100\n"
+"POT-Creation-Date: 2010-08-28 09:35+0100\n"
"PO-Revision-Date: 2010-03-17 22:43+0100\n"
"Last-Translator: Philip Withnall <philip tecnocode co uk>\n"
"Language-Team: British English <en li org>\n"
+"Language: en_GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Virtaal 0.5.2\n"
@@ -85,43 +85,48 @@ msgid "Delete address book '{0}'?"
msgstr "Delete address book '{0}'?"
#: ../addressbook/addressbook.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+msgid "Do _Not Delete"
+msgstr "Do _Not Delete"
+
+#: ../addressbook/addressbook.error.xml.h:14
msgid "Error saving {0} to {1}: {2}"
msgstr "Error saving {0} to {1}: {2}"
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:15
msgid "Failed to authenticate with LDAP server."
msgstr "Failed to authenticate with LDAP server."
#. Unknown error
-#: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1267
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
msgid "Failed to delete contact"
msgstr "Failed to delete contact"
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:17
msgid "GroupWise Address book creation:"
msgstr "GroupWise Address book creation:"
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:18
msgid "LDAP server did not respond with valid schema information."
msgstr "LDAP server did not respond with valid schema information."
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:19
msgid "Some features may not work properly with your current server"
msgstr "Some features may not work properly with your current server"
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:20
msgid "The Evolution address book has quit unexpectedly."
msgstr "The Evolution address book has quit unexpectedly."
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:21
msgid ""
"The image you have selected is large. Do you want to resize and store it?"
msgstr ""
"The image you have selected is large. Do you want to resize and store it?"
# addressbook:ldap-search-base secondary
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:22
msgid ""
"This LDAP server may use an older version of LDAP, which does not support "
"this functionality or it may be misconfigured. Ask your administrator for "
@@ -131,15 +136,15 @@ msgstr ""
"this functionality or it may be misconfigured. Ask your administrator for "
"supported search bases."
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
msgid "This address book could not be opened."
msgstr "This address book could not be opened."
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
msgid "This address book server does not have any suggested search bases."
msgstr "This address book server does not have any suggested search bases."
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:25
msgid ""
"This address book server might be unreachable or the server name may be "
"misspelled or your network connection could be down."
@@ -147,31 +152,31 @@ msgstr ""
"This address book server might be unreachable, the server name may be "
"misspelt, or your network connection could be down."
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:26
msgid "This address book will be removed permanently."
msgstr "This address book will be removed permanently."
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
msgid "This server does not support LDAPv3 schema information."
msgstr "This server does not support LDAPv3 schema information."
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
msgid "Unable to open address book"
msgstr "Unable to open address book"
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
msgid "Unable to perform search."
msgstr "Unable to perform search."
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
msgid "Unable to save {0}."
msgstr "Unable to save {0}."
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:31
msgid "Would you like to save your changes?"
msgstr "Would you like to save your changes?"
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:32
msgid ""
"You are attempting to move a contact from one address book to another but it "
"cannot be removed from the source. Do you want to save a copy instead?"
@@ -179,7 +184,7 @@ msgstr ""
"You are attempting to move a contact from one address book to another but it "
"cannot be removed from the source. Do you want to save a copy instead?"
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:33
msgid ""
"You are connecting to an unsupported GroupWise server and may encounter "
"problems using Evolution. For best results the server should be upgraded to "
@@ -189,11 +194,11 @@ msgstr ""
"problems using Evolution. For best results the server should be upgraded to "
"a supported version"
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:34
msgid "You do not have permission to delete contacts in this address book."
msgstr "You do not have permission to delete contacts in this address book."
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:35
msgid ""
"You have made modifications to this contact. Do you want to save these "
"changes?"
@@ -201,52 +206,38 @@ msgstr ""
"You have made modifications to this contact. Do you want to save these "
"changes?"
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:36
msgid ""
"Your contacts for {0} will not be available until Evolution is restarted."
msgstr ""
"Your contacts for {0} will not be available until Evolution is restarted."
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:521
+#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:525
#: ../plugins/groupwise-features/junk-settings.ui.h:4
#: ../plugins/groupwise-features/properties.ui.h:10
#: ../widgets/table/e-table-config.ui.h:18
msgid "_Add"
msgstr "_Add"
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:38
msgid "_Discard"
msgstr "_Discard"
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
msgid "_Do not save"
msgstr "_Do not save"
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
msgid "_Resize"
msgstr "_Resize"
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
msgid "_Use as it is"
msgstr "_Use as it is"
-#: ../addressbook/conduit/address-conduit.c:597
-msgid "Default Sync Address:"
-msgstr "Default Sync Address:"
-
-#: ../addressbook/conduit/address-conduit.c:1631
-#: ../addressbook/conduit/address-conduit.c:1632
-msgid "Could not load address book"
-msgstr "Could not load address book"
-
-#: ../addressbook/conduit/address-conduit.c:1709
-#: ../addressbook/conduit/address-conduit.c:1712
-msgid "Could not read pilot's Address application block"
-msgstr "Could not read pilot's Address application block"
-
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:2005
+#: ../calendar/gui/e-calendar-view.c:2022
msgid "Anniversary"
msgstr "Anniversary"
@@ -257,8 +248,8 @@ msgstr "Anniversary"
#. * the directory components.
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
#: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:2004 ../capplet/anjal-settings-main.c:118
-#: ../shell/main.c:107
+#: ../calendar/gui/e-calendar-view.c:2021 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:123
msgid "Birthday"
msgstr "Birthday"
@@ -268,7 +259,7 @@ msgid "Blog:"
msgstr "Blog:"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/event-page.ui.h:4
#: ../calendar/gui/dialogs/memo-page.ui.h:1
msgid "Ca_tegories..."
msgstr "Ca_tegoriesâ?¦"
@@ -278,23 +269,24 @@ msgid "Calendar:"
msgstr "Calendar:"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/importers/evolution-vcard-importer.c:934
msgid "Contact"
msgstr "Contact"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:590
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2567
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:589
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:604
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2583
msgid "Contact Editor"
msgstr "Contact Editor"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:291
+#: ../addressbook/gui/merging/eab-contact-merging.c:295
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
#: ../addressbook/gui/widgets/eab-contact-display.c:517
#: ../addressbook/gui/widgets/eab-contact-display.c:525
#: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:823
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:832
msgid "Email"
msgstr "E-mail"
@@ -307,7 +299,7 @@ msgid "Full _Name..."
msgstr "Full _Nameâ?¦"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
#: ../addressbook/gui/widgets/eab-contact-display.c:70
msgid "Home"
msgstr "Home"
@@ -350,10 +342,10 @@ msgid "Notes"
msgstr "Notes"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
#: ../addressbook/gui/widgets/eab-contact-display.c:71
#: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1725
msgid "Other"
msgstr "Other"
@@ -374,181 +366,185 @@ msgid "Web Addresses"
msgstr "Web Addresses"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+msgid "Web addresses"
+msgstr "Web addresses"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
#: ../addressbook/gui/widgets/eab-contact-display.c:69
#: ../addressbook/gui/widgets/eab-contact-display.c:569
msgid "Work"
msgstr "Work"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
msgid "_Address:"
msgstr "_Address:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
msgid "_Anniversary:"
msgstr "_Anniversary:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
msgid "_Assistant:"
msgstr "_Assistant:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
msgid "_Birthday:"
msgstr "_Birthday:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
msgid "_Blog:"
msgstr "_Blog:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.ui.h:14
-#: ../plugins/itip-formatter/itip-view.c:1905
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../plugins/itip-formatter/itip-view.c:1921
msgid "_Calendar:"
msgstr "_Calendar:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
msgid "_City:"
msgstr "_City:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
msgid "_Company:"
msgstr "_Company:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
msgid "_Country:"
msgstr "_Country:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
msgid "_Department:"
msgstr "_Department:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
msgid "_File under:"
msgstr "_File under:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
msgid "_Free/Busy:"
msgstr "_Free/Busy:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
msgid "_Home Page:"
msgstr "_Home Page:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
msgid "_Manager:"
msgstr "_Manager:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
msgid "_Office:"
msgstr "_Office:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
msgid "_PO Box:"
msgstr "_PO Box:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
msgid "_Profession:"
msgstr "_Profession:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
msgid "_Spouse:"
msgstr "_Spouse:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
msgid "_State/Province:"
msgstr "_State/Province/County:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
#: ../addressbook/gui/contact-editor/fullname.ui.h:17
msgid "_Title:"
msgstr "_Title:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
msgid "_Video Chat:"
msgstr "_Video Chat:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
msgid "_Wants to receive HTML mail"
msgstr "_Wants to receive HTML mail"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
msgid "_Where:"
msgstr "_Where:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
msgid "_Zip/Postal Code:"
msgstr "_Zip/Postal Code:"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
#: ../addressbook/gui/widgets/eab-contact-display.c:539
msgid "AIM"
msgstr "AIM"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
#: ../addressbook/gui/widgets/eab-contact-display.c:542
msgid "Jabber"
msgstr "Jabber"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
#: ../addressbook/gui/widgets/eab-contact-display.c:544
msgid "Yahoo"
msgstr "Yahoo"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
#: ../addressbook/gui/widgets/eab-contact-display.c:545
msgid "Gadu-Gadu"
msgstr "Gadu-Gadu"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
#: ../addressbook/gui/widgets/eab-contact-display.c:543
msgid "MSN"
msgstr "MSN"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
#: ../addressbook/gui/widgets/eab-contact-display.c:541
msgid "ICQ"
msgstr "ICQ"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
#: ../addressbook/gui/widgets/eab-contact-display.c:540
msgid "GroupWise"
msgstr "GroupWise"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
#: ../addressbook/gui/widgets/eab-contact-display.c:546
msgid "Skype"
msgstr "Skype"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:352
msgid "Error adding contact"
msgstr "Error adding contact"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:222
msgid "Error modifying contact"
msgstr "Error modifying contact"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:236
msgid "Error removing contact"
msgstr "Error removing contact"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2562
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:599
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2578
#, c-format
msgid "Contact Editor - %s"
msgstr "Contact Editor â?? %s"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2970
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3001
msgid "Please select an image for this contact"
msgstr "Please select an image for this contact"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2971
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3002
msgid "_No image"
msgstr "_No image"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3244
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3275
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -556,23 +552,23 @@ msgstr ""
"The contact data is invalid:\n"
"\n"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3248
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3279
#, c-format
msgid "'%s' has an invalid format"
msgstr "'%s' has an invalid format"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3255
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3286
#, c-format
msgid "%s'%s' has an invalid format"
msgstr "%s'%s' has an invalid format"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3270
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3281
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
#, c-format
msgid "%s'%s' is empty"
msgstr "%s'%s' is empty"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3295
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3326
msgid "Invalid contact."
msgstr "Invalid contact."
@@ -662,7 +658,7 @@ msgid "_Suffix:"
msgstr "_Suffix:"
#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:674
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:657
msgid "Contact List Editor"
msgstr "Contact List Editor"
@@ -679,7 +675,7 @@ msgid "_List name:"
msgstr "_List name:"
#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:173
msgid "_Select..."
msgstr "_Selectâ?¦"
@@ -687,24 +683,24 @@ msgstr "_Selectâ?¦"
msgid "_Type an email address or drag a contact into the list below:"
msgstr "_Type an e-mail address or drag a contact into the list below:"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:767
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:751
msgid "Contact List Members"
msgstr "Contact List Members"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:915
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1331
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:905
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1320
msgid "_Members"
msgstr "_Members"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1170
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
msgid "Error adding list"
msgstr "Error adding list"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1184
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
msgid "Error modifying list"
msgstr "Error modifying list"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1198
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
msgid "Error removing list"
msgstr "Error removing list"
@@ -726,8 +722,8 @@ msgid ""
"The name or email of this contact already exists in this folder. Would you "
"like to add it anyway?"
msgstr ""
-"The name or e-mail address of this contact already exists in this folder. Would you "
-"like to add it anyway?"
+"The name or e-mail address of this contact already exists in this folder. "
+"Would you like to add it anyway?"
#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
msgid "New Contact:"
@@ -746,50 +742,56 @@ msgstr ""
"in this folder. Would you like to add it anyway?"
#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:237
+#: ../addressbook/gui/merging/eab-contact-merging.c:241
msgid "_Merge"
msgstr "_Merge"
-#: ../addressbook/gui/merging/eab-contact-merging.c:220
+#: ../addressbook/gui/merging/eab-contact-merging.c:166
+#: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
+#, c-format
+msgid "Cancelled"
+msgstr "Cancelled"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:224
msgid "Merge Contact"
msgstr "Merge Contact"
#: ../addressbook/gui/widgets/addresstypes.xml.h:1
#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
#: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:904
-#: ../modules/calendar/e-cal-shell-view-actions.c:1653
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:920
+#: ../modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../modules/calendar/e-memo-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:967
msgid "Any field contains"
msgstr "Any field contains"
#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:911
+#: ../modules/addressbook/e-book-shell-view-actions.c:927
msgid "Email begins with"
msgstr "E-mail begins with"
#: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:918
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
msgid "Name contains"
msgstr "Name contains"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:142
+#: ../addressbook/gui/widgets/e-addressbook-model.c:143
msgid "No contacts"
msgstr "No contacts"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:146
+#: ../addressbook/gui/widgets/e-addressbook-model.c:147
#, c-format
msgid "%d contact"
msgid_plural "%d contacts"
msgstr[0] "%d contact"
msgstr[1] "%d contacts"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:307
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
msgid "Error getting book view"
msgstr "Error getting book view"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:706
+#: ../addressbook/gui/widgets/e-addressbook-model.c:716
msgid "Search Interrupted"
msgstr "Search Interrupted"
@@ -797,54 +799,54 @@ msgstr "Search Interrupted"
msgid "Error modifying card"
msgstr "Error modifying card"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:618
+#: ../addressbook/gui/widgets/e-addressbook-view.c:626
msgid "Cut selected contacts to the clipboard"
msgstr "Cut selected contacts to the clipboard"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:624
+#: ../addressbook/gui/widgets/e-addressbook-view.c:632
msgid "Copy selected contacts to the clipboard"
msgstr "Copy selected contacts to the clipboard"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:630
+#: ../addressbook/gui/widgets/e-addressbook-view.c:638
msgid "Paste contacts from the clipboard"
msgstr "Paste contacts from the clipboard"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:636
-#: ../modules/addressbook/e-book-shell-view-actions.c:729
+#: ../addressbook/gui/widgets/e-addressbook-view.c:644
+#: ../modules/addressbook/e-book-shell-view-actions.c:745
msgid "Delete selected contacts"
msgstr "Delete selected contacts"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:642
+#: ../addressbook/gui/widgets/e-addressbook-view.c:650
msgid "Select all visible contacts"
msgstr "Select all visible contacts"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1285
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
msgid "Are you sure you want to delete these contact lists?"
msgstr "Are you sure you want to delete these contact lists?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1289
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
msgid "Are you sure you want to delete this contact list?"
msgstr "Are you sure you want to delete this contact list?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1293
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
#, c-format
msgid "Are you sure you want to delete this contact list (%s)?"
msgstr "Are you sure you want to delete this contact list (%s)?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
msgid "Are you sure you want to delete these contacts?"
msgstr "Are you sure you want to delete these contacts?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
msgid "Are you sure you want to delete this contact?"
msgstr "Are you sure you want to delete this contact?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1307
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
#, c-format
msgid "Are you sure you want to delete this contact (%s)?"
msgstr "Are you sure you want to delete this contact (%s)?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1462
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1472
#, c-format
msgid ""
"Opening %d contacts will open %d new windows as well.\n"
@@ -853,11 +855,11 @@ msgstr ""
"Opening %d contacts will open %d new windows as well.\n"
"Do you really want to display all of these contacts?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1467
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
msgid "_Don't Display"
msgstr "_Don't Display"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1468
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1478
msgid "Display _All Contacts"
msgstr "Display _All Contacts"
@@ -891,7 +893,7 @@ msgid "Car Phone"
msgstr "Car Phone"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:5
#: ../calendar/gui/e-cal-list-view.etspec.h:1
#: ../calendar/gui/e-calendar-table.etspec.h:3
#: ../calendar/gui/e-memo-table.etspec.h:1
@@ -992,7 +994,7 @@ msgid "Radio"
msgstr "Radio"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:569
#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
msgid "Role"
msgstr "Role"
@@ -1095,13 +1097,13 @@ msgid "Home Email"
msgstr "Home E-mail"
#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:805
+#: ../addressbook/gui/widgets/e-minicard.c:807
msgid "Other Email"
msgstr "Other E-mail"
#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+#: ../addressbook/gui/widgets/ea-minicard-view.c:184
msgid "evolution address book"
msgstr "evolution address book"
@@ -1113,7 +1115,7 @@ msgstr "New Contact"
msgid "New Contact List"
msgstr "New Contact List"
-#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#: ../addressbook/gui/widgets/ea-minicard-view.c:167
#, c-format
msgid "current address book folder %s has %d card"
msgid_plural "current address book folder %s has %d cards"
@@ -1141,17 +1143,17 @@ msgid "Copy _Email Address"
msgstr "Copy _E-mail Address"
#: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:381
+#: ../widgets/misc/e-web-view.c:396
msgid "Copy the email address to the clipboard"
msgstr "Copy the e-mail address to the clipboard"
#: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:386
+#: ../widgets/misc/e-web-view.c:401
msgid "_Send New Message To..."
msgstr "_Send New Message Toâ?¦"
#: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:388
+#: ../widgets/misc/e-web-view.c:403
msgid "Send a mail message to this address"
msgstr "Send a mail message to this address"
@@ -1187,21 +1189,22 @@ msgid "Video Chat"
msgstr "Video Chat"
#: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:370
#: ../modules/calendar/e-cal-shell-view-actions.c:218
#: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:495
+#: ../modules/calendar/e-cal-shell-view.c:488
#: ../plugins/groupwise-features/camel-gw-listener.c:421
#: ../plugins/groupwise-features/camel-gw-listener.c:446
#: ../plugins/groupwise-features/camel-gw-listener.c:561
#: ../plugins/publish-calendar/publish-calendar.ui.h:1
-#: ../widgets/misc/e-send-options.c:498
+#: ../widgets/misc/e-send-options.c:499
msgid "Calendar"
msgstr "Calendar"
#: ../addressbook/gui/widgets/eab-contact-display.c:563
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../calendar/gui/dialogs/event-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:355
#: ../plugins/publish-calendar/publish-calendar.ui.h:6
msgid "Free/Busy"
msgstr "Free/Busy"
@@ -1233,15 +1236,15 @@ msgstr "Web Log"
#. Create the default Person memo list
#. Create the default Person task list
#: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:346
-#: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:134
-#: ../modules/calendar/e-cal-shell-backend.c:171
+#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../modules/addressbook/e-book-shell-backend.c:116
+#: ../modules/addressbook/e-book-shell-migrate.c:138
+#: ../modules/calendar/e-cal-shell-backend.c:127
#: ../modules/calendar/e-cal-shell-migrate.c:151
-#: ../modules/calendar/e-memo-shell-backend.c:154
+#: ../modules/calendar/e-memo-shell-backend.c:112
#: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:119
+#: ../modules/calendar/e-task-shell-backend.c:112
+#: ../modules/calendar/e-task-shell-migrate.c:121
#: ../plugins/email-custom-header/email-custom-header.c:320
msgid "Personal"
msgstr "Personal"
@@ -1259,118 +1262,12 @@ msgid "Blog"
msgstr "Blog"
#: ../addressbook/gui/widgets/eab-contact-display.c:1011
-#: ../widgets/misc/e-web-view.c:838
+#: ../widgets/misc/e-web-view.c:853
#, c-format
msgid "Click to mail %s"
msgstr "Click to mail %s"
-#. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Success"
-msgstr "Success"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
-msgid "Backend busy"
-msgstr "Backend busy"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Repository offline"
-msgstr "Repository offline"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Address Book does not exist"
-msgstr "Address Book does not exist"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
-msgid "No Self Contact defined"
-msgstr "No Self Contact defined"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Permission denied"
-msgstr "Permission denied"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Contact not found"
-msgstr "Contact not found"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Contact ID already exists"
-msgstr "Contact ID already exists"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Protocol not supported"
-msgstr "Protocol not supported"
-
-#. E_BOOK_ERROR_CANCELLED
-#. To Translators: This is task status
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:294
-#: ../calendar/gui/e-cal-model-tasks.c:443
-#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:587
-#: ../calendar/gui/print.c:2659
-msgid "Canceled"
-msgstr "Cancelled"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
-msgid "Could not cancel"
-msgstr "Could not cancel"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Authentication Failed"
-msgstr "Authentication Failed"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Authentication Required"
-msgstr "Authentication Required"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
-msgid "TLS not Available"
-msgstr "TLS not Available"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
#: ../addressbook/gui/widgets/eab-gui-util.c:71
-msgid "No such source"
-msgstr "No such source"
-
-#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
-msgid "Not available in offline mode"
-msgstr "Not available in offline mode"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
-msgid "Other error"
-msgstr "Other error"
-
-#. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
-msgid "Invalid server version"
-msgstr "Invalid server version"
-
-#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
-msgid "Unsupported authentication method"
-msgstr "Unsupported authentication method"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:107
msgid ""
"This address book cannot be opened. This either means this book is not "
"marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1380,7 +1277,7 @@ msgstr ""
"marked for offline usage or not yet downloaded for offline usage. Please "
"load the address book once in online mode to download its contents."
-#: ../addressbook/gui/widgets/eab-gui-util.c:116
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
#, c-format
msgid ""
"This address book cannot be opened. Please check that the path %s exists "
@@ -1389,7 +1286,7 @@ msgstr ""
"This address book cannot be opened. Please check that the path %s exists "
"and that permissions are set to access it."
-#: ../addressbook/gui/widgets/eab-gui-util.c:128
+#: ../addressbook/gui/widgets/eab-gui-util.c:92
msgid ""
"This version of Evolution does not have LDAP support compiled in to it. To "
"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1397,7 +1294,7 @@ msgstr ""
"This version of Evolution does not have LDAP support compiled into it. To "
"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:101
msgid ""
"This address book cannot be opened. This either means that an incorrect URI "
"was entered, or the server is unreachable."
@@ -1405,11 +1302,11 @@ msgstr ""
"This address book cannot be opened. This either means that an incorrect URI "
"was entered, or the server is unreachable."
-#: ../addressbook/gui/widgets/eab-gui-util.c:145
+#: ../addressbook/gui/widgets/eab-gui-util.c:109
msgid "Detailed error message:"
msgstr "Detailed error message:"
-#: ../addressbook/gui/widgets/eab-gui-util.c:168
+#: ../addressbook/gui/widgets/eab-gui-util.c:133
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
@@ -1421,7 +1318,7 @@ msgstr ""
"Please make your search more specific or raise the result limit in\n"
"the directory server preferences for this address book."
-#: ../addressbook/gui/widgets/eab-gui-util.c:174
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
msgid ""
"The time to execute this query exceeded the server limit or the limit\n"
"configured for this address book. Please make your search\n"
@@ -1433,44 +1330,50 @@ msgstr ""
"more specific or raise the time limit in the directory server\n"
"preferences for this address book."
-#: ../addressbook/gui/widgets/eab-gui-util.c:180
-msgid "The backend for this address book was unable to parse this query."
-msgstr "The backend for this address book was unable to parse this query."
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#, c-format
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr "The backend for this address book was unable to parse this query. %s"
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
-msgid "The backend for this address book refused to perform this query."
-msgstr "The backend for this address book refused to perform this query."
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr "The backend for this address book refused to perform this query. %s"
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
-msgid "This query did not complete successfully."
-msgstr "This query did not complete successfully."
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#, c-format
+msgid "This query did not complete successfully. %s"
+msgstr "This query did not complete successfully. %s"
#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
msgid "card.vcf"
msgstr "card.vcf"
-#: ../addressbook/gui/widgets/eab-gui-util.c:248
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
msgid "Select Address Book"
msgstr "Select Address Book"
-#: ../addressbook/gui/widgets/eab-gui-util.c:311
+#: ../addressbook/gui/widgets/eab-gui-util.c:286
msgid "list"
msgstr "list"
-#: ../addressbook/gui/widgets/eab-gui-util.c:438
+#: ../addressbook/gui/widgets/eab-gui-util.c:425
msgid "Move contact to"
msgstr "Move contact to"
-#: ../addressbook/gui/widgets/eab-gui-util.c:440
+#: ../addressbook/gui/widgets/eab-gui-util.c:427
msgid "Copy contact to"
msgstr "Copy contact to"
-#: ../addressbook/gui/widgets/eab-gui-util.c:443
+#: ../addressbook/gui/widgets/eab-gui-util.c:430
msgid "Move contacts to"
msgstr "Move contacts to"
-#: ../addressbook/gui/widgets/eab-gui-util.c:445
+#: ../addressbook/gui/widgets/eab-gui-util.c:432
msgid "Copy contacts to"
msgstr "Copy contacts to"
@@ -1478,54 +1381,61 @@ msgstr "Copy contacts to"
msgid "Card View"
msgstr "Card View"
-#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-csv-importer.c:720
#: ../addressbook/importers/evolution-ldif-importer.c:516
-#: ../addressbook/importers/evolution-vcard-importer.c:253
-#: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-vcard-importer.c:264
+#: ../calendar/importers/icalendar-importer.c:325
+#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
msgid "Importing..."
msgstr "Importingâ?¦"
-#: ../addressbook/importers/evolution-csv-importer.c:858
+#: ../addressbook/importers/evolution-csv-importer.c:1008
msgid "Outlook CSV or Tab (.csv, .tab)"
msgstr "Outlook CSV or Tab (.csv, .tab)"
-#: ../addressbook/importers/evolution-csv-importer.c:859
+#: ../addressbook/importers/evolution-csv-importer.c:1009
msgid "Outlook CSV and Tab Importer"
msgstr "Outlook CSV and Tab Importer"
-#: ../addressbook/importers/evolution-csv-importer.c:867
+#: ../addressbook/importers/evolution-csv-importer.c:1017
msgid "Mozilla CSV or Tab (.csv, .tab)"
msgstr "Mozilla CSV or Tab (.csv, .tab)"
-#: ../addressbook/importers/evolution-csv-importer.c:868
+#: ../addressbook/importers/evolution-csv-importer.c:1018
msgid "Mozilla CSV and Tab Importer"
msgstr "Mozilla CSV and Tab Importer"
-#: ../addressbook/importers/evolution-csv-importer.c:876
+#: ../addressbook/importers/evolution-csv-importer.c:1026
msgid "Evolution CSV or Tab (.csv, .tab)"
msgstr "Evolution CSV or Tab (.csv, .tab)"
-#: ../addressbook/importers/evolution-csv-importer.c:877
+#: ../addressbook/importers/evolution-csv-importer.c:1027
msgid "Evolution CSV and Tab Importer"
msgstr "Evolution CSV and Tab Importer"
-#: ../addressbook/importers/evolution-ldif-importer.c:689
+#: ../addressbook/importers/evolution-ldif-importer.c:742
msgid "LDAP Data Interchange Format (.ldif)"
msgstr "LDAP Data Interchange Format (.ldif)"
-#: ../addressbook/importers/evolution-ldif-importer.c:690
+#: ../addressbook/importers/evolution-ldif-importer.c:743
msgid "Evolution LDIF importer"
msgstr "Evolution LDIF importer"
-#: ../addressbook/importers/evolution-vcard-importer.c:556
+#: ../addressbook/importers/evolution-vcard-importer.c:623
msgid "vCard (.vcf, .gcrd)"
msgstr "vCard (.vcf, .gcrd)"
-#: ../addressbook/importers/evolution-vcard-importer.c:557
+#: ../addressbook/importers/evolution-vcard-importer.c:624
msgid "Evolution vCard Importer"
msgstr "Evolution vCard Importer"
+#. Uncomment next if it is successful to get total number if pages in list view
+#. * g_object_get (operation, "n-pages", &n_pages, NULL)
+#: ../addressbook/printing/e-contact-print.c:746
+#, c-format
+msgid "Page %d"
+msgstr "Page %d"
+
#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
@@ -1602,21 +1512,21 @@ msgstr "Unhandled error"
msgid "Accessing LDAP Server anonymously"
msgstr "Accessing LDAP Server anonymously"
-#: ../addressbook/util/addressbook.c:210
+#: ../addressbook/util/addressbook.c:215
#: ../plugins/groupwise-features/camel-gw-listener.c:526
msgid "Failed to authenticate.\n"
msgstr "Failed to authenticate.\n"
-#: ../addressbook/util/addressbook.c:217
+#: ../addressbook/util/addressbook.c:222
#: ../plugins/groupwise-features/camel-gw-listener.c:506
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "Enter password for %s (user %s)"
-#: ../addressbook/util/addressbook.c:225
-#: ../calendar/common/authentication.c:51
-#: ../plugins/caldav/caldav-browse-server.c:808
-#: ../plugins/google-account-setup/google-source.c:440
+#: ../addressbook/util/addressbook.c:230
+#: ../calendar/common/authentication.c:53
+#: ../plugins/caldav/caldav-browse-server.c:813
+#: ../plugins/google-account-setup/google-source.c:438
#: ../plugins/publish-calendar/publish-calendar.c:328
#: ../smime/gui/component.c:49
msgid "Enter password"
@@ -1642,19 +1552,19 @@ msgstr ""
#: ../calendar/calendar.error.xml.h:5
msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
msgstr ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
#: ../calendar/calendar.error.xml.h:6
msgid ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
msgstr ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
#: ../calendar/calendar.error.xml.h:7
msgid "All information in these memos will be deleted and can not be restored."
@@ -1749,16 +1659,16 @@ msgid "Are you sure you want to delete this task?"
msgstr "Are you sure you want to delete this task?"
#: ../calendar/calendar.error.xml.h:26
-msgid "Are you sure you want to save the memo without a summary?"
-msgstr "Are you sure you want to save the memo without a summary?"
+msgid "Are you sure you want to save the appointment without a summary?"
+msgstr "Are you sure you want to save the appointment without a summary?"
#: ../calendar/calendar.error.xml.h:27
-msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "Are you sure you want to send the appointment without a summary?"
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "Are you sure you want to save the memo without a summary?"
#: ../calendar/calendar.error.xml.h:28
-msgid "Are you sure you want to send the task without a summary?"
-msgstr "Are you sure you want to send the task without a summary?"
+msgid "Are you sure you want to save the task without a summary?"
+msgstr "Are you sure you want to save the task without a summary?"
#: ../calendar/calendar.error.xml.h:29
msgid "Cannot create a new event"
@@ -1780,23 +1690,23 @@ msgstr "Delete memo list '{0}'?"
msgid "Delete task list '{0}'?"
msgstr "Delete task list '{0}'?"
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
msgid "Do _not Send"
msgstr "Do _not Send"
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
msgid "Download in progress. Do you want to save the appointment?"
msgstr "Download in progress. Do you want to save the appointment?"
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
msgid "Download in progress. Do you want to save the task?"
msgstr "Download in progress. Do you want to save the task?"
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
msgid "Editor could not be loaded."
msgstr "Editor could not be loaded."
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
msgid ""
"Email invitations will be sent to all participants and allow them to accept "
"this task."
@@ -1804,25 +1714,25 @@ msgstr ""
"E-mail invitations will be sent to all participants and allow them to accept "
"this task."
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
msgid ""
"Email invitations will be sent to all participants and allow them to reply."
msgstr ""
"E-mail invitations will be sent to all participants and allow them to reply."
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
msgid "Error loading calendar"
msgstr "Error loading calendar"
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
msgid "Error loading memo list"
msgstr "Error loading memo list"
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:43
msgid "Error loading task list"
msgstr "Error loading task list"
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:44
msgid ""
"If you do not send a cancelation notice, the other participants may not know "
"the meeting is canceled."
@@ -1830,7 +1740,7 @@ msgstr ""
"If you do not send a cancellation notice, the other participants may not "
"know the meeting is cancelled."
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:45
msgid ""
"If you do not send a cancelation notice, the other participants may not know "
"the memo has been deleted."
@@ -1838,7 +1748,7 @@ msgstr ""
"If you do not send a cancellation notice, the other participants may not "
"know the memo has been deleted."
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:46
msgid ""
"If you do not send a cancelation notice, the other participants may not know "
"the task has been deleted."
@@ -1846,7 +1756,7 @@ msgstr ""
"If you do not send a cancellation notice, the other participants may not "
"know the task has been deleted."
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:47
msgid ""
"Sending updated information allows other participants to keep their "
"calendars up to date."
@@ -1854,7 +1764,7 @@ msgstr ""
"Sending updated information allows other participants to keep their "
"calendars up to date."
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:48
msgid ""
"Sending updated information allows other participants to keep their task "
"lists up to date."
@@ -1862,7 +1772,7 @@ msgstr ""
"Sending updated information allows other participants to keep their task "
"lists up to date."
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:49
msgid ""
"Some attachments are being downloaded. Saving the appointment would result "
"in the loss of these attachments."
@@ -1870,7 +1780,7 @@ msgstr ""
"Some attachments are being downloaded. Saving the appointment would result "
"in the loss of these attachments."
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:50
msgid ""
"Some attachments are being downloaded. Saving the task would result in the "
"loss of these attachments."
@@ -1878,94 +1788,94 @@ msgstr ""
"Some attachments are being downloaded. Saving the task would result in the "
"loss of these attachments."
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:51
msgid "Some features may not work properly with your current server."
msgstr "Some features may not work properly with your current server."
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:52
msgid "The Evolution calendar has quit unexpectedly."
msgstr "The Evolution calendar has quit unexpectedly."
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:53
msgid "The Evolution calendars have quit unexpectedly."
msgstr "The Evolution calendars have quit unexpectedly."
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:54
msgid "The Evolution memo has quit unexpectedly."
msgstr "The Evolution memo has quit unexpectedly."
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:55
msgid "The Evolution tasks have quit unexpectedly."
msgstr "The Evolution tasks have quit unexpectedly."
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:56
msgid "The calendar is not marked for offline usage."
msgstr "The calendar is not marked for offline usage."
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:57
msgid "The memo list is not marked for offline usage."
msgstr "The memo list is not marked for offline usage."
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:58
msgid "The task list is not marked for offline usage."
msgstr "The task list is not marked for offline usage."
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:59
msgid "This calendar will be removed permanently."
msgstr "This calendar will be removed permanently."
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:60
msgid "This memo list will be removed permanently."
msgstr "This memo list will be removed permanently."
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:61
msgid "This task list will be removed permanently."
msgstr "This task list will be removed permanently."
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:62
msgid "Would you like to save your changes to this appointment?"
msgstr "Would you like to save your changes to this appointment?"
# calendar:prompt-save-task primary
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:63
msgid "Would you like to save your changes to this meeting?"
msgstr "Would you like to save your changes to this meeting?"
# calendar:prompt-save-task primary
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:64
msgid "Would you like to save your changes to this memo?"
msgstr "Would you like to save your changes to this memo?"
# calendar:prompt-save-task primary
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:65
msgid "Would you like to save your changes to this task?"
msgstr "Would you like to save your changes to this task?"
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:66
msgid "Would you like to send a cancelation notice for this memo?"
msgstr "Would you like to send a cancellation notice for this memo?"
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:67
msgid "Would you like to send all the participants a cancelation notice?"
msgstr "Would you like to send all the participants a cancellation notice?"
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:68
msgid "Would you like to send meeting invitations to participants?"
msgstr "Would you like to send meeting invitations to participants?"
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:69
msgid "Would you like to send this task to participants?"
msgstr "Would you like to send this task to participants?"
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:70
msgid "Would you like to send updated meeting information to participants?"
msgstr "Would you like to send updated meeting information to participants?"
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:71
msgid "Would you like to send updated task information to participants?"
msgstr "Would you like to send updated task information to participants?"
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:72
msgid ""
"You are connecting to an unsupported GroupWise server and may encounter "
"problems using Evolution. For best results, the server should be upgraded to "
@@ -1975,102 +1885,60 @@ msgstr ""
"problems using Evolution. For best results, the server should be upgraded to "
"a supported version."
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:73
msgid "You have changed this appointment, but not yet saved it."
msgstr "You have changed this appointment, but not yet saved it."
# calendar:prompt-save-task secondary
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:74
msgid "You have changed this meeting, but not yet saved it."
msgstr "You have changed this meeting, but not yet saved it."
# calendar:prompt-save-task secondary
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:75
msgid "You have changed this task, but not yet saved it."
msgstr "You have changed this task, but not yet saved it."
# calendar:prompt-save-task secondary
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:76
msgid "You have made changes to this memo, but not yet saved them."
msgstr "You have made changes to this memo, but not yet saved them."
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:77
msgid "Your calendars will not be available until Evolution is restarted."
msgstr "Your calendars will not be available until Evolution is restarted."
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:78
msgid "Your memos will not be available until Evolution is restarted."
msgstr "Your memos will not be available until Evolution is restarted."
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:79
msgid "Your tasks will not be available until Evolution is restarted."
msgstr "Your tasks will not be available until Evolution is restarted."
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:80
#: ../composer/mail-composer.error.xml.h:24
msgid "_Discard Changes"
msgstr "_Discard Changes"
-#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:309
+#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:271
msgid "_Save"
msgstr "_Save"
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:82
msgid "_Save Changes"
msgstr "_Save Changes"
-#: ../calendar/calendar.error.xml.h:82
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:133
+#: ../calendar/calendar.error.xml.h:83
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:141
#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
msgid "_Send"
msgstr "_Send"
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:84
msgid "_Send Notice"
msgstr "_Send Notice"
-#: ../calendar/conduits/calendar/calendar-conduit.c:252
-msgid "Split Multi-Day Events:"
-msgstr "Split Multi-Day Events:"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1532
-#: ../calendar/conduits/calendar/calendar-conduit.c:1533
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1022
-#: ../calendar/conduits/todo/todo-conduit.c:1023
-msgid "Could not start evolution-data-server"
-msgstr "Could not start evolution-data-server"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1640
-#: ../calendar/conduits/calendar/calendar-conduit.c:1643
-msgid "Could not read pilot's Calendar application block"
-msgstr "Could not read pilot's Calendar application block"
-
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
-msgid "Could not read pilot's Memo application block"
-msgstr "Could not read pilot's Memo application block"
-
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
-msgid "Could not write pilot's Memo application block"
-msgstr "Could not write pilot's Memo application block"
-
-#: ../calendar/conduits/todo/todo-conduit.c:231
-msgid "Default Priority:"
-msgstr "Default Priority:"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1106
-#: ../calendar/conduits/todo/todo-conduit.c:1109
-msgid "Could not read pilot's ToDo application block"
-msgstr "Could not read pilot's ToDo application block"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1151
-#: ../calendar/conduits/todo/todo-conduit.c:1154
-msgid "Could not write pilot's ToDo application block"
-msgstr "Could not write pilot's ToDo application block"
-
#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
msgid "minute"
msgid_plural "minutes"
@@ -2098,10 +1966,10 @@ msgstr "Dismiss _All"
#. Location
#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1573
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
-#: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1027
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1596
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1602
+#: ../calendar/gui/e-itip-control.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1043
msgid "Location:"
msgstr "Location:"
@@ -2114,66 +1982,56 @@ msgid "_Dismiss"
msgstr "_Dismiss"
#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1015
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:151
-#: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1625
-#: ../widgets/menus/gal-define-views.ui.h:5
-msgid "_Edit"
-msgstr "_Edit"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
msgid "_Snooze"
msgstr "_Snooze"
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:424
#: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-contacts-source.c:335
msgid "hours"
msgstr "hours"
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
msgid "location of appointment"
msgstr "location of appointment"
#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:423
#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-contacts-source.c:334
msgid "minutes"
msgstr "minutes"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1434
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1556
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
msgid "No summary available."
msgstr "No summary available."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1443
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
msgid "No description available."
msgstr "No description available."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
msgid "No location information available."
msgstr "No location information available."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1519
#, c-format
msgid "You have %d alarms"
msgstr "You have %d alarms"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
#: ../e-util/e-non-intrusive-error-dialog.h:39
msgid "Warning"
msgstr "Warning"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1673
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -2185,7 +2043,7 @@ msgstr ""
"configured to send an e-mail. Evolution will display\n"
"a normal reminder dialogue box instead."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1708
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2202,7 +2060,7 @@ msgstr ""
"\n"
"Are you sure you want to run this program?"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1746
msgid "Do not ask me about this program again."
msgstr "Do not ask me about this program again."
@@ -2265,141 +2123,137 @@ msgid "Calendars to run alarms for"
msgstr "Calendars to run alarms for"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid "Check this to use system timezone in Evolution."
-msgstr "Check this to use system timezone in Evolution."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
msgid ""
"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
msgstr ""
"Colour to draw the Marcus Bains Line in the Time bar (empty for default)."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
msgid "Color to draw the Marcus Bains line in the Day View."
msgstr "Colour to draw the Marcus Bains line in the Day View."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
msgid "Compress weekends in month view"
msgstr "Compress weekends in month view"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
msgid "Confirm expunge"
msgstr "Confirm expunge"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
msgid "Count of default recurrence for a new event. -1 means forever."
msgstr "Count of default recurrence for a new event. -1 means forever."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
msgid "Days on which the start and end of work hours should be indicated."
msgstr "Days on which the start and end of work hours should be indicated."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
msgid "Default appointment reminder"
msgstr "Default appointment reminder"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
msgid "Default recurrence count"
msgstr "Default recurrence count"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
msgid "Default reminder units"
msgstr "Default reminder units"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
msgid "Default reminder value"
msgstr "Default reminder value"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
msgid "Directory for saving alarm audio files"
msgstr "Directory for saving alarm audio files"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
msgid "Event Gradient"
msgstr "Event Gradient"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
msgid "Event Transparency"
msgstr "Event Transparency"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
msgid "Free/busy server URLs"
msgstr "Free/busy server URLs"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
msgid "Free/busy template URL"
msgstr "Free/busy template URL"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
msgid "Gradient of the events in calendar views."
msgstr "Gradient of the events in calendar views."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
msgid "Hide completed tasks"
msgstr "Hide completed tasks"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
msgid "Hide task units"
msgstr "Hide task units"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
msgid "Hide task value"
msgstr "Hide task value"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
msgid "Horizontal pane position"
msgstr "Horizontal pane position"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
msgstr "Hour the workday ends on, in twenty four hour format, 0 to 23."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
msgstr "Hour the workday starts on, in twenty four hour format, 0 to 23."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
msgid "If \"true\", show the memo preview pane in the main window."
msgstr "If \"true\", show the memo preview pane in the main window."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
msgid "If \"true\", show the task preview pane in the main window."
msgstr "If \"true\", show the task preview pane in the main window."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
msgid "Intervals shown in Day and Work Week views, in minutes."
msgstr "Intervals shown in Day and Work Week views, in minutes."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
msgid "Last alarm time"
msgstr "Last alarm time"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:95
msgid "Level beyond which the message should be logged."
msgstr "Level beyond which the message should be logged."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
msgid "List of recently used second time zones in a Day View."
msgstr "List of recently used second time zones in a Day View."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
msgid "List of server URLs for free/busy publishing."
msgstr "List of server URLs for free/busy publishing."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
msgid "Marcus Bains Line"
msgstr "Marcus Bains Line"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
msgid "Marcus Bains Line Color - Day View"
msgstr "Marcus Bains Line Colour â?? Day View"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
msgid "Marcus Bains Line Color - Time bar"
msgstr "Marcus Bains Line Colour â?? Time bar"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
msgid ""
"Maximum number of recently used timezones to remember in a "
"'day_second_zones' list."
@@ -2407,51 +2261,51 @@ msgstr ""
"Maximum number of recently used timezones to remember in a "
"'day_second_zones' list."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
msgid "Maximum number of recently used timezones to remember."
msgstr "Maximum number of recently used timezones to remember."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
msgid "Memo layout style"
msgstr "Memo layout style"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
msgid "Memo preview pane position (horizontal)"
msgstr "Memo preview pane position (horizontal)"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
msgid "Memo preview pane position (vertical)"
msgstr "Memo preview pane position (vertical)"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
msgid "Minute the workday ends on, 0 to 59."
msgstr "Minute the workday ends on, 0 to 59."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
msgid "Minute the workday starts on, 0 to 59."
msgstr "Minute the workday starts on, 0 to 59."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
msgid "Month view horizontal pane position"
msgstr "Month view horizontal pane position"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
msgid "Month view vertical pane position"
msgstr "Month view vertical pane position"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
msgid "Number of units for determining a default reminder."
msgstr "Number of units for determining a default reminder."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
msgid "Number of units for determining when to hide tasks."
msgstr "Number of units for determining when to hide tasks."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
msgid "Overdue tasks color"
msgstr "Overdue tasks colour"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
msgid ""
"Position of the horizontal pane, between the date navigator calendar and the "
"task list when not in the month view, in pixels."
@@ -2459,7 +2313,7 @@ msgstr ""
"Position of the horizontal pane, between the date navigator calendar and the "
"task list when not in the month view, in pixels."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
msgid ""
"Position of the horizontal pane, between the view and the date navigator "
"calendar and task list in the month view, in pixels."
@@ -2467,19 +2321,19 @@ msgstr ""
"Position of the horizontal pane, between the view and the date navigator "
"calendar and task list in the month view, in pixels."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
msgid "Position of the memo preview pane when oriented vertically."
msgstr "Position of the memo preview pane when oriented vertically."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
msgid "Position of the task preview pane when oriented horizontally."
msgstr "Position of the task preview pane when oriented horizontally."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
msgid "Position of the task preview pane when oriented vertically."
msgstr "Position of the task preview pane when oriented vertically."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
msgid ""
"Position of the vertical pane, between the calendar lists and the date "
"navigator calendar."
@@ -2487,7 +2341,7 @@ msgstr ""
"Position of the vertical pane, between the calendar lists and the date "
"navigator calendar."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
msgid ""
"Position of the vertical pane, between the view and the date navigator "
"calendar and task list in the month view, in pixels."
@@ -2495,7 +2349,7 @@ msgstr ""
"Position of the vertical pane, between the view and the date navigator "
"calendar and task list in the month view, in pixels."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
msgid ""
"Position of the vertical pane, between the view and the date navigator "
"calendar and task list when not in the month view, in pixels."
@@ -2503,83 +2357,79 @@ msgstr ""
"Position of the vertical pane, between the view and the date navigator "
"calendar and task list when not in the month view, in pixels."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
msgid "Primary calendar"
msgstr "Primary calendar"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
msgid "Primary memo list"
msgstr "Primary memo list"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
msgid "Primary task list"
msgstr "Primary task list"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
msgid "Programs that are allowed to be run by alarms."
msgstr "Programs that are allowed to be run by alarms."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
msgid "Recently used second time zones in a Day View"
msgstr "Recently used second time zones in a Day View"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
msgid "Save directory for alarm audio"
msgstr "Save directory for alarm audio"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
msgid "Scroll Month View by a week"
msgstr "Scroll Month View by a week"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
msgid "Show RSVP field in the event/task/meeting editor"
msgstr "Show RSVP field in the event/task/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
msgid "Show Role field in the event/task/meeting editor"
msgstr "Show Role field in the event/task/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
msgid "Show appointment end times in week and month views"
msgstr "Show appointment end times in week and month views"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
msgid "Show categories field in the event/meeting/task editor"
msgstr "Show categories field in the event/meeting/task editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
msgid "Show display alarms in notification tray"
msgstr "Show display alarms in notification tray"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
msgid "Show status field in the event/task/meeting editor"
msgstr "Show status field in the event/task/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
msgid "Show the memo preview pane"
msgstr "Show the memo preview pane"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
msgid "Show the task preview pane"
msgstr "Show the task preview pane"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
msgid "Show timezone field in the event/meeting editor"
msgstr "Show timezone field in the event/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
msgid "Show type field in the event/task/meeting editor"
msgstr "Show type field in the event/task/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
-msgid "Show week number in Day and Work Week View"
-msgstr "Show week number in Day and Work Week View"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid "Show week numbers in date navigator"
-msgstr "Show week numbers in date navigator"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr "Show week numbers in Day View, Work Week View, and Date Navigator"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
msgid ""
"Shows the second time zone in a Day View, if set. Value is similar to one "
"used in a 'timezone' key."
@@ -2587,23 +2437,23 @@ msgstr ""
"Shows the second time zone in a Day View, if set. Value is similar to one "
"used in a 'timezone' key."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
msgid "Task layout style"
msgstr "Task layout style"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
msgid "Task preview pane position (horizontal)"
msgstr "Task preview pane position (horizontal)"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
msgid "Task preview pane position (vertical)"
msgstr "Task preview pane position (vertical)"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
msgid "Tasks due today color"
msgstr "Tasks due today colour"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
#, no-c-format
msgid ""
"The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -2612,7 +2462,7 @@ msgstr ""
"The URL template to use as a free/busy data fallback, %u is replaced by the "
"user part of the mail address and %d is replaced by the domain."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
msgid ""
"The default timezone to use for dates and times in the calendar, as an "
"untranslated Olsen timezone database location like \"America/New York\"."
@@ -2620,7 +2470,7 @@ msgstr ""
"The default timezone to use for dates and times in the calendar, as an "
"untranslated Olsen timezone database location like \"America/New York\"."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
msgid ""
"The layout style determines where to place the preview pane in relation to "
"the memo list. \"0\" (Classic View) places the preview pane below the memo "
@@ -2630,7 +2480,7 @@ msgstr ""
"the memo list. \"0\" (Classic View) places the preview pane below the memo "
"list. \"1\" (Vertical View) places the preview pane next to the memo list."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
msgid ""
"The layout style determines where to place the preview pane in relation to "
"the task list. \"0\" (Classic View) places the preview pane below the task "
@@ -2640,11 +2490,11 @@ msgstr ""
"the task list. \"0\" (Classic View) places the preview pane below the task "
"list. \"1\" (Vertical View) places the preview pane next to the task list."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
msgid "The second timezone for a Day View"
msgstr "The second timezone for a Day View"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
msgid ""
"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
"debug messages."
@@ -2652,19 +2502,19 @@ msgstr ""
"This can have three possible values: 0 for errors, 1 for warnings, 2 for "
"debug messages."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
msgid "Time divisions"
msgstr "Time divisions"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
msgid "Time the last alarm ran, in time_t."
msgstr "Time the last alarm ran, in time_t."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
msgid "Timezone"
msgstr "Timezone"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
msgid ""
"Transparency of the events in calendar views, a value between 0 "
"(transparent) and 1 (opaque)."
@@ -2672,65 +2522,65 @@ msgstr ""
"Transparency of the events in calendar views, a value between 0 "
"(transparent) and 1 (opaque)."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
msgid "Twenty four hour time format"
msgstr "Twenty four hour time format"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
msgid "URI of the highlighted (\"primary\") calendar"
msgstr "URI of the highlighted (\"primary\") calendar"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
msgid "URI of the highlighted (\"primary\") memo list"
msgstr "URI of the highlighted (\"primary\") memo list"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
msgid "URI of the highlighted (\"primary\") task list"
msgstr "URI of the highlighted (\"primary\") task list"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
msgstr "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
msgid ""
"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
msgstr ""
"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
msgid "Use system timezone"
msgstr "Use system timezone"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
msgid "Use the system timezone instead of the timezone selected in Evolution."
msgstr "Use the system timezone instead of the timezone selected in Evolution."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
msgid "Vertical pane position"
msgstr "Vertical pane position"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
msgid "Week start"
msgstr "Week start"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
msgstr "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
msgid "Whether or not to use the notification tray for display alarms."
msgstr "Whether to use the notification tray for display alarms."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
msgid "Whether to ask for confirmation when deleting an appointment or task."
msgstr "Whether to ask for confirmation when deleting an appointment or task."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
msgid "Whether to ask for confirmation when expunging appointments and tasks."
msgstr "Whether to ask for confirmation when expunging appointments and tasks."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
msgid ""
"Whether to compress weekends in the month view, which puts Saturday and "
"Sunday in the space of one weekday."
@@ -2738,83 +2588,79 @@ msgstr ""
"Whether to compress weekends in the month view, which puts Saturday and "
"Sunday in the space of one weekday."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
msgid "Whether to display the end time of events in the week and month views."
msgstr "Whether to display the end time of events in the week and month views."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
msgid ""
"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
msgstr ""
"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
msgid "Whether to hide completed tasks in the tasks view."
msgstr "Whether to hide completed tasks in the tasks view."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
msgid "Whether to scroll a Month View by a week, not by a month."
msgstr "Whether to scroll a Month View by a week, not by a month."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
msgid "Whether to set a default reminder for appointments."
msgstr "Whether to set a default reminder for appointments."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
msgid "Whether to show RSVP field in the event/task/meeting editor"
msgstr "Whether to show RSVP field in the event/task/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
msgid "Whether to show categories field in the event/meeting editor"
msgstr "Whether to show categories field in the event/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
msgid "Whether to show role field in the event/task/meeting editor"
msgstr "Whether to show role field in the event/task/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
msgid "Whether to show status field in the event/task/meeting editor"
msgstr "Whether to show status field in the event/task/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
msgid ""
"Whether to show times in twenty four hour format instead of using am/pm."
msgstr ""
"Whether to show times in twenty four hour format instead of using am/pm."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
msgid "Whether to show timezone field in the event/meeting editor"
msgstr "Whether to show timezone field in the event/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
msgid "Whether to show type field in the event/task/meeting editor"
msgstr "Whether to show type field in the event/task/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
-msgid "Whether to show week number in the Day and Work Week View."
-msgstr "Whether to show week number in the Day and Work Week View."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
-msgid "Whether to show week numbers in the date navigator."
-msgstr "Whether to show week numbers in the date navigator."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+msgid "Whether to show week numbers in various places in the Calendar."
+msgstr "Whether to show week numbers in various places in the Calendar."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
msgid "Work days"
msgstr "Work days"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
msgid "Workday end hour"
msgstr "Workday end hour"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
msgid "Workday end minute"
msgstr "Workday end minute"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
msgid "Workday start hour"
msgstr "Workday start hour"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
msgid "Workday start minute"
msgstr "Workday start minute"
@@ -2864,17 +2710,17 @@ msgid "Classification"
msgstr "Classification"
#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-task-table.c:489
+#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-task-table.c:490
#: ../calendar/gui/memotypes.xml.h:6
#: ../plugins/email-custom-header/email-custom-header.c:323
#: ../widgets/misc/e-send-options.ui.h:2
msgid "Confidential"
msgstr "Confidential"
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
#: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:496
+#: ../widgets/misc/e-attachment-tree-view.c:524
#: ../widgets/table/e-table-config.ui.h:6
msgid "Description"
msgstr "Description"
@@ -2895,7 +2741,7 @@ msgid "Exist"
msgstr "Exist"
#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
#: ../plugins/publish-calendar/publish-calendar.c:831
#: ../plugins/publish-calendar/publish-calendar.ui.h:8
#: ../plugins/save-calendar/csv-format.c:377
@@ -2908,25 +2754,26 @@ msgid "Organizer"
msgstr "Organiser"
#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:497 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-task-table.c:489
#: ../calendar/gui/memotypes.xml.h:12
msgid "Private"
msgstr "Private"
#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:488 ../calendar/gui/e-cal-model.c:495
-#: ../calendar/gui/e-task-table.c:487 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:514 ../calendar/gui/e-cal-model.c:521
+#: ../calendar/gui/e-task-table.c:488 ../calendar/gui/memotypes.xml.h:13
msgid "Public"
msgstr "Public"
#: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:299
+#: ../calendar/gui/dialogs/event-editor.c:322
+#: ../calendar/gui/dialogs/event-editor.c:343
#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
msgid "Recurrence"
msgstr "Recurrence"
#: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
#: ../calendar/gui/e-calendar-table.etspec.h:13
#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
#: ../calendar/gui/tasktypes.xml.h:22
@@ -2988,6 +2835,7 @@ msgid "Add Alarm"
msgstr "Add Alarm"
#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+#: ../calendar/gui/dialogs/event-editor.c:360
msgid "Alarm"
msgstr "Alarm"
@@ -3003,7 +2851,7 @@ msgstr "Custom alarm sound"
msgid "Mes_sage:"
msgstr "Mes_sage:"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:77
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:81
msgid "Options"
msgstr "Options"
@@ -3044,18 +2892,15 @@ msgid "before"
msgstr "before"
#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
msgid "day(s)"
msgstr "day(s)"
#. Translators: This is the last part of the sentence:
#. * "Purge events older than <<spin-button>> days"
-#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/google-account-setup/google-contacts-source.c:336
#: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:43
msgid "days"
msgstr "days"
@@ -3090,33 +2935,34 @@ msgstr "A_dd"
#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:1
msgid "Alarms"
msgstr "Alarms"
#. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:108
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:157
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
#: ../calendar/gui/e-day-view-time-item.c:797
msgctxt "cal-second-zone"
msgid "None"
msgstr "None"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
#: ../calendar/gui/e-day-view-time-item.c:824
#: ../calendar/gui/e-timezone-entry.c:319
msgid "Select..."
msgstr "Selectâ?¦"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:496
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:504
msgid "Selected Calendars for Alarms"
msgstr "Selected Calendars for Alarms"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
msgid "Ti_me and date:"
msgstr "Ti_me and date:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
msgid "_Date only:"
msgstr "_Date only:"
@@ -3154,8 +3000,8 @@ msgid "Alerts"
msgstr "Alerts"
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:29
-#: ../modules/addressbook/autocompletion-config.c:153
+#: ../mail/mail-config.ui.h:30
+#: ../modules/addressbook/autocompletion-config.c:156
msgid "Date/Time Format"
msgstr "Date/Time Format"
@@ -3186,14 +3032,14 @@ msgid "Friday"
msgstr "Friday"
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:278 ../mail/mail-config.ui.h:54
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:56
#: ../modules/addressbook/addressbook-config.c:1005
-#: ../plugins/itip-formatter/itip-formatter.c:2660
+#: ../plugins/itip-formatter/itip-formatter.c:2678
#: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:21
msgid "General"
msgstr "General"
@@ -3211,203 +3057,191 @@ msgstr "Minutes"
msgid "Monday"
msgstr "Monday"
-#. Translators: "None" for not including threads;
-#. * part of "Include threads: None"
-#. Translators: Used in send options dialog
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:12
-msgid "None"
-msgstr "None"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:85
msgid "Pick a color"
msgstr "Pick a colour"
#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
msgid "S_un"
msgstr "S_un"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
#: ../calendar/gui/dialogs/recurrence-page.c:1117
#: ../calendar/gui/e-itip-control.c:739
msgid "Saturday"
msgstr "Saturday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
msgid "Sc_roll Month View by a week"
msgstr "Sc_roll Month View by a week"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
msgid "Se_cond zone:"
msgstr "Se_cond zone:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
msgid "Select the calendars for alarm notification"
msgstr "Select the calendars for alarm notification"
#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
msgid "Sh_ow a reminder"
msgstr "Sh_ow a reminder"
#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
msgid "Show a _reminder"
msgstr "Show a _reminder"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
-msgid "Show week _numbers in date navigator"
-msgstr "Show week _numbers in date navigator"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
-msgid "Show week n_umber in Day and Work Week View"
-msgstr "Show week n_umber in Day and Work Week View"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
+msgid "Show week _numbers"
+msgstr "Show week _numbers"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
#: ../calendar/gui/dialogs/recurrence-page.c:1118
#: ../calendar/gui/e-itip-control.c:733
msgid "Sunday"
msgstr "Sunday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
msgid "T_asks due today:"
msgstr "T_asks due today:"
#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
msgid "T_hu"
msgstr "T_hu"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
+#: ../calendar/gui/dialogs/calendar-setup.c:381
msgid "Task List"
msgstr "Task List"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
msgid "Template:"
msgstr "Template:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
#: ../calendar/gui/dialogs/recurrence-page.c:1115
#: ../calendar/gui/e-itip-control.c:737
msgid "Thursday"
msgstr "Thursday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
#: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:592
+#: ../widgets/misc/e-dateedit.c:595
msgid "Time"
msgstr "Time"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/event-page.ui.h:9
msgid "Time _zone:"
msgstr "Time _zone:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
msgid "Time format:"
msgstr "Time format:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
#: ../calendar/gui/dialogs/recurrence-page.c:1113
#: ../calendar/gui/e-itip-control.c:735
msgid "Tuesday"
msgstr "Tuesday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
msgid "Use s_ystem time zone"
msgstr "Use s_ystem time zone"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
#: ../calendar/gui/dialogs/recurrence-page.c:1114
#: ../calendar/gui/e-itip-control.c:736
msgid "Wednesday"
msgstr "Wednesday"
#. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
msgid "Wee_k starts on:"
msgstr "Wee_k starts on:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
-#: ../modules/calendar/e-cal-shell-view-actions.c:1605
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
msgid "Work Week"
msgstr "Work Week"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
msgid "Work days:"
msgstr "Work days:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
msgid "_12 hour (AM/PM)"
msgstr "_12 hour (AM/PM)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
msgid "_24 hour"
msgstr "_24 hour"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
msgid "_Ask for confirmation when deleting items"
msgstr "_Ask for confirmation when deleting items"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
msgid "_Compress weekends in month view"
msgstr "_Compress weekends in month view"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
msgid "_Day begins:"
msgstr "_Day begins:"
#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
msgid "_Fri"
msgstr "_Fri"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
msgid "_Hide completed tasks after"
msgstr "_Hide completed tasks after"
#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
msgid "_Mon"
msgstr "_Mon"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
msgid "_Overdue tasks:"
msgstr "_Overdue tasks:"
#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
msgid "_Sat"
msgstr "_Sat"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
msgid "_Show appointment end times in week and month view"
msgstr "_Show appointment end times in week and month view"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
msgid "_Time divisions:"
msgstr "_Time divisions:"
#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
msgid "_Tue"
msgstr "_Tue"
#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
msgid "_Wed"
msgstr "_Wed"
#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
msgid "before every anniversary/birthday"
msgstr "before every anniversary/birthday"
#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:76
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
msgid "before every appointment"
msgstr "before every appointment"
@@ -3420,11 +3254,11 @@ msgstr "Type:"
msgid "_Type:"
msgstr "_Type:"
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:147
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:165
#: ../modules/addressbook/ldap-config.ui.h:26
#: ../plugins/groupwise-features/properties.ui.h:11
#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:282
+#: ../widgets/misc/e-signature-script-dialog.c:284
msgid "_Name:"
msgstr "_Name:"
@@ -3440,35 +3274,35 @@ msgstr "Cop_y task list contents locally for offline operation"
msgid "Cop_y memo list contents locally for offline operation"
msgstr "Cop_y memo list contents locally for offline operation"
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
msgid "Colo_r:"
msgstr "Colou_r:"
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
msgid "Memo List"
msgstr "Memo List"
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
msgid "Calendar Properties"
msgstr "Calendar Properties"
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
msgid "New Calendar"
msgstr "New Calendar"
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
msgid "Task List Properties"
msgstr "Task List Properties"
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
msgid "New Task List"
msgstr "New Task List"
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
msgid "Memo List Properties"
msgstr "Memo List Properties"
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
msgid "New Memo List"
msgstr "New Memo List"
@@ -3521,244 +3355,249 @@ msgstr "%s You have made no changes, update the editor?"
msgid "Validation error: %s"
msgstr "Validation error: %s"
-#: ../calendar/gui/dialogs/comp-editor.c:237
+#: ../calendar/gui/dialogs/comp-editor.c:246
msgid "Could not save attachments"
msgstr "Could not save attachments"
-#: ../calendar/gui/dialogs/comp-editor.c:505
+#: ../calendar/gui/dialogs/comp-editor.c:522
msgid "Could not update object"
msgstr "Could not update object"
-#: ../calendar/gui/dialogs/comp-editor.c:604
+#: ../calendar/gui/dialogs/comp-editor.c:637
msgid "Edit Appointment"
msgstr "Edit Appointment"
-#: ../calendar/gui/dialogs/comp-editor.c:611
+#: ../calendar/gui/dialogs/comp-editor.c:644
#, c-format
msgid "Meeting - %s"
msgstr "Meeting â?? %s"
-#: ../calendar/gui/dialogs/comp-editor.c:613
+#: ../calendar/gui/dialogs/comp-editor.c:646
#, c-format
msgid "Appointment - %s"
msgstr "Appointment â?? %s"
-#: ../calendar/gui/dialogs/comp-editor.c:619
+#: ../calendar/gui/dialogs/comp-editor.c:652
#, c-format
msgid "Assigned Task - %s"
msgstr "Assigned Task â?? %s"
-#: ../calendar/gui/dialogs/comp-editor.c:621
+#: ../calendar/gui/dialogs/comp-editor.c:654
#, c-format
msgid "Task - %s"
msgstr "Task â?? %s"
-#: ../calendar/gui/dialogs/comp-editor.c:626
+#: ../calendar/gui/dialogs/comp-editor.c:659
#, c-format
msgid "Memo - %s"
msgstr "Memo â?? %s"
-#: ../calendar/gui/dialogs/comp-editor.c:642
+#: ../calendar/gui/dialogs/comp-editor.c:675
msgid "No Summary"
msgstr "No Summary"
-#: ../calendar/gui/dialogs/comp-editor.c:751
+#: ../calendar/gui/dialogs/comp-editor.c:786
msgid "Keep original item?"
msgstr "Keep original item?"
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:983
msgid "Click here to close the current window"
msgstr "Click here to close the current window"
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../mail/e-mail-browser.c:116
-#: ../shell/e-shell-window-actions.c:1464
-#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:398 ../widgets/misc/e-web-view.c:1051
+#: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:117
+#: ../shell/e-shell-window-actions.c:1454
+#: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:552
+#: ../widgets/misc/e-web-view.c:413 ../widgets/misc/e-web-view.c:1066
msgid "Copy the selection"
msgstr "Copy the selection"
-#: ../calendar/gui/dialogs/comp-editor.c:952 ../mail/e-mail-browser.c:123
-#: ../shell/e-shell-window-actions.c:1471
-#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:1045
+#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:124
+#: ../shell/e-shell-window-actions.c:1461
+#: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:547
+#: ../widgets/misc/e-web-view.c:1060
msgid "Cut the selection"
msgstr "Cut the selection"
-#: ../calendar/gui/dialogs/comp-editor.c:959
-#: ../shell/e-shell-window-actions.c:1478
-#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
+#: ../calendar/gui/dialogs/comp-editor.c:1004
+#: ../shell/e-shell-window-actions.c:1468
+#: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:562
msgid "Delete the selection"
msgstr "Delete the selection"
-#: ../calendar/gui/dialogs/comp-editor.c:966
+#: ../calendar/gui/dialogs/comp-editor.c:1011
msgid "Click here to view help available"
msgstr "Click here to view help available"
-#: ../calendar/gui/dialogs/comp-editor.c:973 ../mail/e-mail-browser.c:130
-#: ../shell/e-shell-window-actions.c:1513
-#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:1057
+#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:131
+#: ../shell/e-shell-window-actions.c:1503
+#: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:557
+#: ../widgets/misc/e-web-view.c:1072
msgid "Paste the clipboard"
msgstr "Paste the clipboard"
-#: ../calendar/gui/dialogs/comp-editor.c:994
+#: ../calendar/gui/dialogs/comp-editor.c:1039
msgid "Click here to save the current window"
msgstr "Click here to save the current window"
-#: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:137
-#: ../shell/e-shell-window-actions.c:1583
-#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
+#: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:138
+#: ../shell/e-shell-window-actions.c:1573
+#: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:567
msgid "Select all text"
msgstr "Select all text"
-#: ../calendar/gui/dialogs/comp-editor.c:1008
+#: ../calendar/gui/dialogs/comp-editor.c:1053
msgid "_Classification"
msgstr "_Classification"
-#: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:144
-#: ../shell/e-shell-window-actions.c:1632
-#: ../widgets/misc/e-signature-editor.c:217
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:152
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../shell/e-shell-window-actions.c:1608
+#: ../widgets/menus/gal-define-views.ui.h:5
+msgid "_Edit"
+msgstr "_Edit"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:145
+#: ../shell/e-shell-window-actions.c:1615
+#: ../widgets/misc/e-signature-editor.c:220
msgid "_File"
msgstr "_File"
-#: ../calendar/gui/dialogs/comp-editor.c:1029
-#: ../shell/e-shell-window-actions.c:1639
+#: ../calendar/gui/dialogs/comp-editor.c:1074
+#: ../shell/e-shell-window-actions.c:1622
msgid "_Help"
msgstr "_Help"
-#: ../calendar/gui/dialogs/comp-editor.c:1036
+#: ../calendar/gui/dialogs/comp-editor.c:1081
msgid "_Insert"
msgstr "_Insert"
-#: ../calendar/gui/dialogs/comp-editor.c:1043
-#: ../composer/e-composer-actions.c:353
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../composer/e-composer-actions.c:315
msgid "_Options"
msgstr "_Options"
-#: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:158
-#: ../shell/e-shell-window-actions.c:1674
+#: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:159
+#: ../shell/e-shell-window-actions.c:1657 ../smime/gui/smime-ui.ui.h:45
msgid "_View"
msgstr "_View"
-#: ../calendar/gui/dialogs/comp-editor.c:1060
-#: ../composer/e-composer-actions.c:281
+#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../composer/e-composer-actions.c:243
msgid "_Attachment..."
msgstr "_Attachmentâ?¦"
-#: ../calendar/gui/dialogs/comp-editor.c:1062
+#: ../calendar/gui/dialogs/comp-editor.c:1107
msgid "Click here to attach a file"
msgstr "Click here to attach a file"
-#: ../calendar/gui/dialogs/comp-editor.c:1070
+#: ../calendar/gui/dialogs/comp-editor.c:1115
msgid "_Categories"
msgstr "_Categories"
-#: ../calendar/gui/dialogs/comp-editor.c:1072
+#: ../calendar/gui/dialogs/comp-editor.c:1117
msgid "Toggles whether to display categories"
msgstr "Toggles whether to display categories"
-#: ../calendar/gui/dialogs/comp-editor.c:1078
+#: ../calendar/gui/dialogs/comp-editor.c:1123
msgid "Time _Zone"
msgstr "Time _Zone"
-#: ../calendar/gui/dialogs/comp-editor.c:1080
+#: ../calendar/gui/dialogs/comp-editor.c:1125
msgid "Toggles whether the time zone is displayed"
msgstr "Toggles whether the time zone is displayed"
-#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/comp-editor.c:1134
msgid "Pu_blic"
msgstr "Pu_blic"
-#: ../calendar/gui/dialogs/comp-editor.c:1091
+#: ../calendar/gui/dialogs/comp-editor.c:1136
msgid "Classify as public"
msgstr "Classify as public"
-#: ../calendar/gui/dialogs/comp-editor.c:1096
+#: ../calendar/gui/dialogs/comp-editor.c:1141
msgid "_Private"
msgstr "_Private"
-#: ../calendar/gui/dialogs/comp-editor.c:1098
+#: ../calendar/gui/dialogs/comp-editor.c:1143
msgid "Classify as private"
msgstr "Classify as private"
-#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1148
msgid "_Confidential"
msgstr "_Confidential"
-#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../calendar/gui/dialogs/comp-editor.c:1150
msgid "Classify as confidential"
msgstr "Classify as confidential"
-#: ../calendar/gui/dialogs/comp-editor.c:1113
+#: ../calendar/gui/dialogs/comp-editor.c:1158
msgid "R_ole Field"
msgstr "R_ole Field"
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1160
msgid "Toggles whether the Role field is displayed"
msgstr "Toggles whether the Role field is displayed"
-#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/dialogs/comp-editor.c:1166
msgid "_RSVP"
msgstr "_RSVP"
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1168
msgid "Toggles whether the RSVP field is displayed"
msgstr "Toggles whether the RSVP field is displayed"
-#: ../calendar/gui/dialogs/comp-editor.c:1129
+#: ../calendar/gui/dialogs/comp-editor.c:1174
msgid "_Status Field"
msgstr "_Status Field"
-#: ../calendar/gui/dialogs/comp-editor.c:1131
+#: ../calendar/gui/dialogs/comp-editor.c:1176
msgid "Toggles whether the Status field is displayed"
msgstr "Toggles whether the Status field is displayed"
-#: ../calendar/gui/dialogs/comp-editor.c:1137
+#: ../calendar/gui/dialogs/comp-editor.c:1182
msgid "_Type Field"
msgstr "_Type Field"
-#: ../calendar/gui/dialogs/comp-editor.c:1139
+#: ../calendar/gui/dialogs/comp-editor.c:1184
msgid "Toggles whether the Attendee Type is displayed"
msgstr "Toggles whether the Attendee Type is displayed"
-#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../calendar/gui/dialogs/comp-editor.c:1208
#: ../composer/e-composer-private.c:70
msgid "Recent _Documents"
msgstr "Recent _Documents"
-#: ../calendar/gui/dialogs/comp-editor.c:1683
-#: ../composer/e-composer-actions.c:477
+#: ../calendar/gui/dialogs/comp-editor.c:1743
+#: ../composer/e-composer-actions.c:431
msgid "Attach"
msgstr "Attach"
-#: ../calendar/gui/dialogs/comp-editor.c:1738
-msgid "Save"
-msgstr "Save"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2015
-#: ../calendar/gui/dialogs/comp-editor.c:2064
-#: ../calendar/gui/dialogs/comp-editor.c:2958
+#: ../calendar/gui/dialogs/comp-editor.c:2072
+#: ../calendar/gui/dialogs/comp-editor.c:2121
+#: ../calendar/gui/dialogs/comp-editor.c:3086
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "Changes made to this item may be discarded if an update arrives"
-#: ../calendar/gui/dialogs/comp-editor.c:2926
+#: ../calendar/gui/dialogs/comp-editor.c:3050
#: ../plugins/prefer-plain/prefer-plain.c:64
msgid "attachment"
msgstr "attachment"
-#: ../calendar/gui/dialogs/comp-editor.c:2988
+#: ../calendar/gui/dialogs/comp-editor.c:3118
msgid "Unable to use current version!"
msgstr "Unable to use current version!"
-#: ../calendar/gui/dialogs/copy-source-dialog.c:91
+#: ../calendar/gui/dialogs/copy-source-dialog.c:92
msgid "Could not open source"
msgstr "Could not open source"
-#: ../calendar/gui/dialogs/copy-source-dialog.c:99
+#: ../calendar/gui/dialogs/copy-source-dialog.c:100
msgid "Could not open destination"
msgstr "Could not open destination"
-#: ../calendar/gui/dialogs/copy-source-dialog.c:108
+#: ../calendar/gui/dialogs/copy-source-dialog.c:109
msgid "Destination is read only"
msgstr "Destination is read only"
@@ -3770,53 +3609,69 @@ msgstr "_Delete this item from all other recipient's mailboxes?"
msgid "_Retract comment"
msgstr "_Retract comment"
-#: ../calendar/gui/dialogs/delete-error.c:55
-msgid "The event could not be deleted due to a corba error"
-msgstr "The event could not be deleted due to a corba error"
-
-#: ../calendar/gui/dialogs/delete-error.c:58
-msgid "The task could not be deleted due to a corba error"
-msgstr "The task could not be deleted due to a corba error"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:56
+#, c-format
+msgid "The event could not be deleted due to a dbus error: %s"
+msgstr "The event could not be deleted due to a D-Bus error: %s"
-#: ../calendar/gui/dialogs/delete-error.c:61
-msgid "The memo could not be deleted due to a corba error"
-msgstr "The memo could not be deleted due to a corba error"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:60
+#, c-format
+msgid "The task could not be deleted due to a dbus error: %s"
+msgstr "The task could not be deleted due to a D-Bus error: %s"
+#. Translators: The '%s' is replaced with a detailed error message
#: ../calendar/gui/dialogs/delete-error.c:64
-msgid "The item could not be deleted due to a corba error"
-msgstr "The item could not be deleted due to a corba error"
+#, c-format
+msgid "The memo could not be deleted due to a dbus error: %s"
+msgstr "The memo could not be deleted due to a D-Bus error: %s"
-#: ../calendar/gui/dialogs/delete-error.c:71
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:68
+#, c-format
+msgid "The item could not be deleted due to a dbus error: %s"
+msgstr "The item could not be deleted due to a D-Bus error: %s"
+
+#: ../calendar/gui/dialogs/delete-error.c:75
msgid "The event could not be deleted because permission was denied"
msgstr "The event could not be deleted because permission was denied"
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:78
msgid "The task could not be deleted because permission was denied"
msgstr "The task could not be deleted because permission was denied"
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:81
msgid "The memo could not be deleted because permission was denied"
msgstr "The memo could not be deleted because permission was denied"
-#: ../calendar/gui/dialogs/delete-error.c:80
+#: ../calendar/gui/dialogs/delete-error.c:84
msgid "The item could not be deleted because permission was denied"
msgstr "The item could not be deleted because permission was denied"
-#: ../calendar/gui/dialogs/delete-error.c:87
-msgid "The event could not be deleted due to an error"
-msgstr "The event could not be deleted due to an error"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:92
+#, c-format
+msgid "The event could not be deleted due to an error: %s"
+msgstr "The event could not be deleted due to an error: %s"
-#: ../calendar/gui/dialogs/delete-error.c:90
-msgid "The task could not be deleted due to an error"
-msgstr "The task could not be deleted due to an error"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:96
+#, c-format
+msgid "The task could not be deleted due to an error: %s"
+msgstr "The task could not be deleted due to an error: %s"
-#: ../calendar/gui/dialogs/delete-error.c:93
-msgid "The memo could not be deleted due to an error"
-msgstr "The memo could not be deleted due to an error"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:100
+#, c-format
+msgid "The memo could not be deleted due to an error: %s"
+msgstr "The memo could not be deleted due to an error: %s"
-#: ../calendar/gui/dialogs/delete-error.c:96
-msgid "The item could not be deleted due to an error"
-msgstr "The item could not be deleted due to an error"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:104
+#, c-format
+msgid "The item could not be deleted due to an error: %s"
+msgstr "The item could not be deleted due to an error: %s"
#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
msgid "Contacts..."
@@ -3830,133 +3685,147 @@ msgstr "Delegate To:"
msgid "Enter Delegate"
msgstr "Enter Delegate"
-#: ../calendar/gui/dialogs/event-editor.c:205
+#: ../calendar/gui/dialogs/event-editor.c:217
msgid "_Alarms"
msgstr "_Alarms"
-#: ../calendar/gui/dialogs/event-editor.c:207
+#: ../calendar/gui/dialogs/event-editor.c:219
msgid "Click here to set or unset alarms for this event"
msgstr "Click here to set or unset alarms for this event"
-#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "Show Time as _Busy"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "Toggles whether to show time as busy"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
msgid "_Recurrence"
msgstr "_Recurrence"
-#: ../calendar/gui/dialogs/event-editor.c:214
+#: ../calendar/gui/dialogs/event-editor.c:240
msgid "Make this a recurring event"
msgstr "Make this a recurring event"
-#: ../calendar/gui/dialogs/event-editor.c:219
+#: ../calendar/gui/dialogs/event-editor.c:245
#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
#: ../plugins/groupwise-features/send-options.c:210
-#: ../widgets/misc/e-send-options.ui.h:19
+#: ../widgets/misc/e-send-options.ui.h:22
msgid "Send Options"
msgstr "Send Options"
-#: ../calendar/gui/dialogs/event-editor.c:221
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/task-editor.c:129
msgid "Insert advanced send options"
msgstr "Insert advanced send options"
-#: ../calendar/gui/dialogs/event-editor.c:229
+#: ../calendar/gui/dialogs/event-editor.c:255
msgid "All _Day Event"
msgstr "All _Day Event"
-#: ../calendar/gui/dialogs/event-editor.c:231
+#: ../calendar/gui/dialogs/event-editor.c:257
msgid "Toggles whether to have All Day Event"
msgstr "Toggles whether to have All Day Event"
-#: ../calendar/gui/dialogs/event-editor.c:237
-msgid "Show Time as _Busy"
-msgstr "Show Time as _Busy"
-
-#: ../calendar/gui/dialogs/event-editor.c:239
-msgid "Toggles whether to show time as busy"
-msgstr "Toggles whether to show time as busy"
-
-#: ../calendar/gui/dialogs/event-editor.c:248
+#: ../calendar/gui/dialogs/event-editor.c:266
msgid "_Free/Busy"
msgstr "_Free/Busy"
-#: ../calendar/gui/dialogs/event-editor.c:250
+#: ../calendar/gui/dialogs/event-editor.c:268
msgid "Query free / busy information for the attendees"
msgstr "Query free / busy information for the attendees"
-#: ../calendar/gui/dialogs/event-editor.c:296
-msgid "Appoint_ment"
-msgstr "Appoint_ment"
+#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2588
+msgid "Appointment"
+msgstr "Appointment"
+
+#: ../calendar/gui/dialogs/event-editor.c:385
+#: ../calendar/gui/dialogs/event-page.ui.h:3
+#: ../calendar/gui/e-meeting-list-view.c:148
+msgid "Attendees"
+msgstr "Attendees"
+
+#: ../calendar/gui/dialogs/event-editor.c:578
+msgid "Print this event"
+msgstr "Print this event"
-#: ../calendar/gui/dialogs/event-page.c:751
+#: ../calendar/gui/dialogs/event-page.c:766
+msgid "Event's start time is in the past"
+msgstr "Event's start time is in the past"
+
+#: ../calendar/gui/dialogs/event-page.c:807
msgid "Event cannot be edited, because the selected calendar is read only"
msgstr "Event cannot be edited, because the selected calendar is read only"
-#: ../calendar/gui/dialogs/event-page.c:755
+#: ../calendar/gui/dialogs/event-page.c:811
msgid "Event cannot be fully edited, because you are not the organizer"
msgstr "Event cannot be fully edited, because you are not the organiser"
-#: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2718
+#: ../calendar/gui/dialogs/event-page.c:823
+#: ../calendar/gui/dialogs/event-page.c:2775
msgid "This event has alarms"
msgstr "This event has alarms"
-#: ../calendar/gui/dialogs/event-page.c:830
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.c:890
+#: ../calendar/gui/dialogs/event-page.ui.h:8
#: ../calendar/gui/dialogs/memo-page.ui.h:2
msgid "Or_ganizer:"
msgstr "Or_ganiser:"
-#: ../calendar/gui/dialogs/event-page.c:877
+#: ../calendar/gui/dialogs/event-page.c:937
msgid "_Delegatees"
msgstr "_Delegatees"
-#: ../calendar/gui/dialogs/event-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:939
msgid "Atte_ndees"
msgstr "Atte_ndees"
-#: ../calendar/gui/dialogs/event-page.c:1094
+#: ../calendar/gui/dialogs/event-page.c:1154
msgid "Event with no start date"
msgstr "Event with no start date"
-#: ../calendar/gui/dialogs/event-page.c:1097
+#: ../calendar/gui/dialogs/event-page.c:1157
msgid "Event with no end date"
msgstr "Event with no end date"
-#: ../calendar/gui/dialogs/event-page.c:1268
-#: ../calendar/gui/dialogs/memo-page.c:655
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/event-page.c:1328
+#: ../calendar/gui/dialogs/memo-page.c:686
+#: ../calendar/gui/dialogs/task-page.c:907
msgid "Start date is wrong"
msgstr "Start date is wrong"
-#: ../calendar/gui/dialogs/event-page.c:1278
+#: ../calendar/gui/dialogs/event-page.c:1338
msgid "End date is wrong"
msgstr "End date is wrong"
-#: ../calendar/gui/dialogs/event-page.c:1301
+#: ../calendar/gui/dialogs/event-page.c:1361
msgid "Start time is wrong"
msgstr "Start time is wrong"
-#: ../calendar/gui/dialogs/event-page.c:1308
+#: ../calendar/gui/dialogs/event-page.c:1368
msgid "End time is wrong"
msgstr "End time is wrong"
-#: ../calendar/gui/dialogs/event-page.c:1470
-#: ../calendar/gui/dialogs/memo-page.c:696
-#: ../calendar/gui/dialogs/task-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:1530
+#: ../calendar/gui/dialogs/memo-page.c:727
+#: ../calendar/gui/dialogs/task-page.c:967
msgid "The organizer selected no longer has an account."
msgstr "The organiser selected no longer has an account."
-#: ../calendar/gui/dialogs/event-page.c:1476
-#: ../calendar/gui/dialogs/memo-page.c:702
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1536
+#: ../calendar/gui/dialogs/memo-page.c:733
+#: ../calendar/gui/dialogs/task-page.c:973
msgid "An organizer is required."
msgstr "An organiser is required."
-#: ../calendar/gui/dialogs/event-page.c:1501
-#: ../calendar/gui/dialogs/task-page.c:951
+#: ../calendar/gui/dialogs/event-page.c:1561
+#: ../calendar/gui/dialogs/task-page.c:997
msgid "At least one attendee is required."
msgstr "At least one attendee is required."
-#: ../calendar/gui/dialogs/event-page.c:2591
+#: ../calendar/gui/dialogs/event-page.c:2649
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr "Unable to open the calendar '%s'."
@@ -3967,130 +3836,141 @@ msgstr "Unable to open the calendar '%s'."
#. on behalf of some other user
#. Translators: This string is used when we are creating a Task
#. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2635
-#: ../calendar/gui/dialogs/memo-page.c:915
-#: ../calendar/gui/dialogs/task-page.c:1743
+#: ../calendar/gui/dialogs/event-page.c:2693
+#: ../calendar/gui/dialogs/memo-page.c:946
+#: ../calendar/gui/dialogs/task-page.c:1787
#, c-format
msgid "You are acting on behalf of %s"
msgstr "You are acting on behalf of %s"
-#: ../calendar/gui/dialogs/event-page.c:2937
+#: ../calendar/gui/dialogs/event-page.c:2994
#, c-format
msgid "%d day before appointment"
msgid_plural "%d days before appointment"
msgstr[0] "%d day before appointment"
msgstr[1] "%d days before appointment"
-#: ../calendar/gui/dialogs/event-page.c:2943
+#: ../calendar/gui/dialogs/event-page.c:3000
#, c-format
msgid "%d hour before appointment"
msgid_plural "%d hours before appointment"
msgstr[0] "%d hour before appointment"
msgstr[1] "%d hours before appointment"
-#: ../calendar/gui/dialogs/event-page.c:2949
+#: ../calendar/gui/dialogs/event-page.c:3006
#, c-format
msgid "%d minute before appointment"
msgid_plural "%d minutes before appointment"
msgstr[0] "%d minute before appointment"
msgstr[1] "%d minutes before appointment"
-#: ../calendar/gui/dialogs/event-page.c:2962
+#: ../calendar/gui/dialogs/event-page.c:3019
msgid "Customize"
msgstr "Customise"
#. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2964
+#: ../calendar/gui/dialogs/event-page.c:3021
msgctxt "cal-alarms"
msgid "None"
msgstr "None"
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-msgid "1 day before appointment"
-msgstr "1 day before appointment"
-
#: ../calendar/gui/dialogs/event-page.ui.h:2
-msgid "1 hour before appointment"
-msgstr "1 hour before appointment"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:3
-msgid "15 minutes before appointment"
-msgstr "15 minutes before appointment"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:5
#: ../calendar/gui/dialogs/task-page.ui.h:1
#: ../calendar/gui/e-meeting-time-sel.c:578
msgid "Atte_ndees..."
msgstr "Atte_ndeesâ?¦"
#: ../calendar/gui/dialogs/event-page.ui.h:6
-#: ../calendar/gui/e-meeting-list-view.c:148
-msgid "Attendees"
-msgstr "Attendees"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:9
msgid "Custom Alarm:"
msgstr "Custom Alarm:"
-#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:7
msgid "Event Description"
msgstr "Event Description"
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/event-page.ui.h:10
msgid "_Alarm"
msgstr "_Alarm"
-#: ../calendar/gui/dialogs/event-page.ui.h:15
+#: ../calendar/gui/dialogs/event-page.ui.h:12
#: ../calendar/gui/dialogs/memo-page.ui.h:6
#: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:345
+#: ../widgets/misc/e-attachment-dialog.c:347
msgid "_Description:"
msgstr "_Description:"
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:13
#: ../plugins/calendar-weather/calendar-weather.c:358
msgid "_Location:"
msgstr "_Location:"
-#: ../calendar/gui/dialogs/event-page.ui.h:17
+#: ../calendar/gui/dialogs/event-page.ui.h:14
msgid "_Summary:"
msgstr "_Summary:"
-#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:15
msgid "_Time:"
msgstr "_Time:"
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgctxt "eventpage"
+msgid "1 day before appointment"
+msgstr "1 day before appointment"
+
+#. TRANSLATORS: Predefined alarm's description
#: ../calendar/gui/dialogs/event-page.ui.h:19
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+msgctxt "eventpage"
+msgid "1 hour before appointment"
+msgstr "1 hour before appointment"
+
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:21
+msgctxt "eventpage"
+msgid "15 minutes before appointment"
+msgstr "15 minutes before appointment"
+
+#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
+#: ../calendar/gui/dialogs/event-page.ui.h:23
+msgctxt "eventpage"
msgid "for"
msgstr "for"
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
+#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+msgctxt "eventpage"
msgid "until"
msgstr "until"
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2576
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2592
msgid "Memo"
msgstr "Memo"
-#: ../calendar/gui/dialogs/memo-page.c:350
+#: ../calendar/gui/dialogs/memo-editor.c:156
+msgid "Print this memo"
+msgstr "Print this memo"
+
+#: ../calendar/gui/dialogs/memo-page.c:338
+msgid "Memo's start date is in the past"
+msgstr "Memo's start date is in the past"
+
+#: ../calendar/gui/dialogs/memo-page.c:376
msgid "Memo cannot be edited, because the selected memo list is read only"
msgstr "Memo cannot be edited, because the selected memo list is read only"
-#: ../calendar/gui/dialogs/memo-page.c:354
+#: ../calendar/gui/dialogs/memo-page.c:380
msgid "Memo cannot be fully edited, because you are not the organizer"
msgstr "Memo cannot be fully edited, because you are not the organiser"
-#: ../calendar/gui/dialogs/memo-page.c:876
+#: ../calendar/gui/dialogs/memo-page.c:907
#, c-format
msgid "Unable to open memos in '%s'."
msgstr "Unable to open memos in '%s'."
-#: ../calendar/gui/dialogs/memo-page.c:1043 ../em-format/em-format-quote.c:215
-#: ../em-format/em-format.c:939 ../mail/em-format-html.c:2242
-#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2325
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:78
+#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:270
+#: ../em-format/em-format.c:1043 ../mail/em-format-html.c:2289
+#: ../mail/em-format-html.c:2348 ../mail/em-format-html.c:2372
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
msgid "To"
msgstr "To"
@@ -4109,7 +3989,7 @@ msgid "T_o:"
msgstr "T_o:"
#: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.c:426
#: ../calendar/gui/dialogs/task-page.ui.h:9
msgid "_Group:"
msgstr "_Group:"
@@ -4293,7 +4173,7 @@ msgstr "Every"
msgid "Exceptions"
msgstr "Exceptions"
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:85
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:89
msgid "Preview"
msgstr "Preview"
@@ -4301,19 +4181,45 @@ msgstr "Preview"
msgid "This appointment rec_urs"
msgstr "This appointment rec_urs"
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+msgctxt "recurrpage"
+msgid "day(s)"
+msgstr "day(s)"
+
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+msgctxt "recurrpage"
+msgid "for"
+msgstr "for"
+
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+msgctxt "recurrpage"
msgid "forever"
msgstr "forever"
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
+msgctxt "recurrpage"
msgid "month(s)"
msgstr "month(s)"
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
+msgctxt "recurrpage"
+msgid "until"
+msgstr "until"
+
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
+msgctxt "recurrpage"
msgid "week(s)"
msgstr "week(s)"
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
+msgctxt "recurrpage"
msgid "year(s)"
msgstr "year(s)"
@@ -4325,71 +4231,83 @@ msgstr "Send my alarms with this event"
msgid "Notify new attendees _only"
msgstr "Notify new attendees _only"
-#: ../calendar/gui/dialogs/task-details-page.c:379
-#: ../calendar/gui/dialogs/task-details-page.c:399
+#: ../calendar/gui/dialogs/task-details-page.c:350
+#: ../calendar/gui/dialogs/task-details-page.c:372
msgid "Completed date is wrong"
msgstr "Completed date is wrong"
-#: ../calendar/gui/dialogs/task-details-page.c:486
+#: ../calendar/gui/dialogs/task-details-page.c:483
msgid "Web Page"
msgstr "Web Page"
#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:588
+#: ../calendar/gui/print.c:2675 ../mail/em-sync-stream.c:151
+#: ../mail/em-sync-stream.c:178 ../mail/em-sync-stream.c:199
+#, c-format
+msgid "Canceled"
+msgstr "Cancelled"
+
+#. To Translators: This is task status
#: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-cal-component-preview.c:292
#: ../calendar/gui/e-cal-model-tasks.c:441
#: ../calendar/gui/e-cal-model-tasks.c:715
#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:586
-#: ../calendar/gui/print.c:2656 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2672 ../calendar/gui/tasktypes.xml.h:9
#: ../plugins/save-calendar/csv-format.c:367
msgid "Completed"
msgstr "Completed"
#. To Translators: This is task priority
#: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:313
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1120 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1183 ../widgets/misc/e-send-options.ui.h:13
msgid "High"
msgstr "High"
#. To Translators: This is task status
#: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-component-preview.c:289
#: ../calendar/gui/e-cal-model-tasks.c:439
#: ../calendar/gui/e-cal-model-tasks.c:713
#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:585
-#: ../calendar/gui/print.c:2653
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2669
msgid "In Progress"
msgstr "In Progress"
#. To Translators: This is task priority
#: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:317
-#: ../calendar/gui/e-task-table.c:512 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1118 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-cal-component-preview.c:318
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1181 ../widgets/misc/e-send-options.ui.h:14
msgid "Low"
msgstr "Low"
#. To Translators: This is task priority
#: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:315
-#: ../calendar/gui/e-cal-model.c:1243 ../calendar/gui/e-task-table.c:511
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1119
-#: ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:316
+#: ../calendar/gui/e-cal-model.c:1269 ../calendar/gui/e-task-table.c:512
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1182
+#: ../widgets/misc/e-send-options.ui.h:16
msgid "Normal"
msgstr "Normal"
#. To Translators: This is task status
#: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-component-preview.c:299
#: ../calendar/gui/e-cal-model-tasks.c:437
#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2650 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2666 ../calendar/gui/tasktypes.xml.h:18
msgid "Not Started"
msgstr "Not Started"
@@ -4405,8 +4323,8 @@ msgstr "Stat_us:"
#. Status: Accepted: X Declined: Y ...
#: ../calendar/gui/dialogs/task-details-page.ui.h:18
#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1759
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-calendar-view.c:1773
+#: ../calendar/gui/e-meeting-list-view.c:594
#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
#: ../mail/message-list.etspec.h:17
@@ -4415,8 +4333,8 @@ msgstr "Status"
#. To Translators: This is task priority
#: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:24
-#: ../widgets/misc/e-send-options.ui.h:24
+#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:27
msgid "Undefined"
msgstr "Undefined"
@@ -4425,7 +4343,7 @@ msgid "_Date completed:"
msgstr "_Date completed:"
#: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:36
+#: ../widgets/misc/e-send-options.ui.h:35
msgid "_Priority:"
msgstr "_Priority:"
@@ -4433,45 +4351,58 @@ msgstr "_Priority:"
msgid "_Web Page:"
msgstr "_Web Page:"
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:117
msgid "_Status Details"
msgstr "_Status Details"
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:119
msgid "Click to change or view the status details of the task"
msgstr "Click to change or view the status details of the task"
-#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../calendar/gui/dialogs/task-editor.c:127
#: ../plugins/groupwise-features/mail-send-options.c:200
msgid "_Send Options"
msgstr "_Send Options"
-#: ../calendar/gui/dialogs/task-editor.c:322
-msgid "_Task"
-msgstr "_Task"
+#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2590
+#: ../widgets/misc/e-send-options.c:503
+msgid "Task"
+msgstr "Task"
-#: ../calendar/gui/dialogs/task-editor.c:325
+#: ../calendar/gui/dialogs/task-editor.c:331
msgid "Task Details"
msgstr "Task Details"
-#: ../calendar/gui/dialogs/task-page.c:336
+#: ../calendar/gui/dialogs/task-editor.c:373
+msgid "Print this task"
+msgstr "Print this task"
+
+#: ../calendar/gui/dialogs/task-page.c:343
+msgid "Task's start date is in the past"
+msgstr "Task's start date is in the past"
+
+#: ../calendar/gui/dialogs/task-page.c:344
+msgid "Task's due date is in the past"
+msgstr "Task's due date is in the past"
+
+#: ../calendar/gui/dialogs/task-page.c:379
msgid "Task cannot be edited, because the selected task list is read only"
msgstr "Task cannot be edited, because the selected task list is read only"
-#: ../calendar/gui/dialogs/task-page.c:340
+#: ../calendar/gui/dialogs/task-page.c:383
msgid "Task cannot be fully edited, because you are not the organizer"
msgstr "Task cannot be fully edited, because you are not the organiser"
-#: ../calendar/gui/dialogs/task-page.c:388
+#: ../calendar/gui/dialogs/task-page.c:434
#: ../calendar/gui/dialogs/task-page.ui.h:4
msgid "Organi_zer:"
msgstr "Organi_ser:"
-#: ../calendar/gui/dialogs/task-page.c:834
+#: ../calendar/gui/dialogs/task-page.c:880
msgid "Due date is wrong"
msgstr "Due date is wrong"
-#: ../calendar/gui/dialogs/task-page.c:1700
+#: ../calendar/gui/dialogs/task-page.c:1744
#, c-format
msgid "Unable to open tasks in '%s'."
msgstr "Unable to open tasks in '%s'."
@@ -4564,46 +4495,46 @@ msgstr "%s at %s"
msgid "%s for an unknown trigger type"
msgstr "%s for an unknown trigger type"
-#: ../calendar/gui/e-cal-component-preview.c:191 ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:668
msgid "Untitled"
msgstr "Untitled"
-#: ../calendar/gui/e-cal-component-preview.c:197
+#: ../calendar/gui/e-cal-component-preview.c:198
msgid "Categories:"
msgstr "Categories:"
-#: ../calendar/gui/e-cal-component-preview.c:236
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
msgid "Summary:"
msgstr "Summary:"
-#: ../calendar/gui/e-cal-component-preview.c:245
-#: ../calendar/gui/e-cal-component-preview.c:258
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:259
msgid "Start Date:"
msgstr "Start Date:"
-#: ../calendar/gui/e-cal-component-preview.c:271
+#: ../calendar/gui/e-cal-component-preview.c:272
msgid "Due Date:"
msgstr "Due Date:"
#. Status
-#: ../calendar/gui/e-cal-component-preview.c:284
-#: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1058
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1189
+#: ../plugins/itip-formatter/itip-view.c:1074
msgid "Status:"
msgstr "Status:"
-#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-component-preview.c:312
msgid "Priority:"
msgstr "Priority:"
-#: ../calendar/gui/e-cal-component-preview.c:336
-#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:35
+#: ../calendar/gui/e-cal-component-preview.c:337
+#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:37
msgid "Description:"
msgstr "Description:"
-#: ../calendar/gui/e-cal-component-preview.c:367
+#: ../calendar/gui/e-cal-component-preview.c:368
msgid "Web Page:"
msgstr "Web Page:"
@@ -4614,28 +4545,28 @@ msgstr "Web Page:"
msgid "Created"
msgstr "Created"
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
msgid "End Date"
msgstr "End Date"
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
#: ../calendar/gui/e-calendar-table.etspec.h:9
#: ../calendar/gui/e-memo-table.etspec.h:4
msgid "Last modified"
msgstr "Last modified"
-#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
#: ../calendar/gui/e-memo-table.etspec.h:5
msgid "Start Date"
msgstr "Start Date"
#: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:562
+#: ../calendar/gui/e-task-table.c:563
msgid "Free"
msgstr "Free"
#: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:564
msgid "Busy"
msgstr "Busy"
@@ -4655,44 +4586,42 @@ msgctxt "cal-task-status"
msgid "None"
msgstr "None"
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
#: ../calendar/gui/e-meeting-list-view.c:187
#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
-#: ../calendar/gui/e-meeting-store.c:829
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
+#: ../calendar/gui/e-meeting-store.c:856
msgid "Yes"
msgstr "Yes"
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
#: ../calendar/gui/e-meeting-list-view.c:188
#: ../calendar/gui/e-meeting-store.c:181
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
msgid "No"
msgstr "No"
#. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:501 ../calendar/gui/e-itip-control.c:1197
-#: ../calendar/gui/e-itip-control.c:1336
+#: ../calendar/gui/e-cal-model.c:527 ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.c:1349
#: ../calendar/gui/e-meeting-list-view.c:163
#: ../calendar/gui/e-meeting-list-view.c:177
#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:976
-#: ../plugins/itip-formatter/itip-formatter.c:450
-#: ../plugins/itip-formatter/itip-formatter.c:2327
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:967
+#: ../plugins/itip-formatter/itip-formatter.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2345
#: ../plugins/plugin-manager/plugin-manager.c:89
msgid "Unknown"
msgstr "Unknown"
-#: ../calendar/gui/e-cal-model.c:1245
+#: ../calendar/gui/e-cal-model.c:1271
msgid "Recurring"
msgstr "Recurring"
-#: ../calendar/gui/e-cal-model.c:1247
+#: ../calendar/gui/e-cal-model.c:1273
msgid "Assigned"
msgstr "Assigned"
-#: ../calendar/gui/e-cal-model.c:2141
+#: ../calendar/gui/e-cal-model.c:2175
#, c-format
msgid "Opening %s"
msgstr "Opening %s"
@@ -4729,97 +4658,97 @@ msgid "Start date"
msgstr "Start date"
#: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-meeting-list-view.c:557
#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
#: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:554
+#: ../widgets/misc/e-attachment-tree-view.c:582
msgid "Type"
msgstr "Type"
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:407
msgid "Cut selected events to the clipboard"
msgstr "Cut selected events to the clipboard"
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:413
msgid "Copy selected events to the clipboard"
msgstr "Copy selected events to the clipboard"
-#: ../calendar/gui/e-calendar-view.c:416
+#: ../calendar/gui/e-calendar-view.c:419
msgid "Paste events from the clipboard"
msgstr "Paste events from the clipboard"
-#: ../calendar/gui/e-calendar-view.c:422
+#: ../calendar/gui/e-calendar-view.c:425
msgid "Delete selected events"
msgstr "Delete selected events"
-#: ../calendar/gui/e-calendar-view.c:441 ../calendar/gui/e-memo-table.c:187
-#: ../calendar/gui/e-task-table.c:265
+#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:188
+#: ../calendar/gui/e-task-table.c:266
msgid "Deleting selected objects"
msgstr "Deleting selected objects"
-#: ../calendar/gui/e-calendar-view.c:629 ../calendar/gui/e-memo-table.c:844
-#: ../calendar/gui/e-task-table.c:1067
+#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-task-table.c:1068
msgid "Updating objects"
msgstr "Updating objects"
-#: ../calendar/gui/e-calendar-view.c:1706
-#: ../calendar/gui/e-itip-control.c:1182
+#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-itip-control.c:1195
#: ../calendar/gui/e-meeting-list-view.c:199
#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
-#: ../plugins/itip-formatter/itip-formatter.c:2315
+#: ../plugins/itip-formatter/itip-formatter.c:2333
msgid "Accepted"
msgstr "Accepted"
-#: ../calendar/gui/e-calendar-view.c:1707
-#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-itip-control.c:1205
#: ../calendar/gui/e-meeting-list-view.c:200
#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
-#: ../plugins/itip-formatter/itip-formatter.c:2321
+#: ../plugins/itip-formatter/itip-formatter.c:2339
msgid "Declined"
msgstr "Declined"
-#: ../calendar/gui/e-calendar-view.c:1708
+#: ../calendar/gui/e-calendar-view.c:1722
#: ../calendar/gui/e-meeting-list-view.c:201
#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
#: ../calendar/gui/e-meeting-time-sel.c:560
msgid "Tentative"
msgstr "Tentative"
-#: ../calendar/gui/e-calendar-view.c:1709
+#: ../calendar/gui/e-calendar-view.c:1723
#: ../calendar/gui/e-meeting-list-view.c:202
#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../plugins/itip-formatter/itip-formatter.c:2324
+#: ../plugins/itip-formatter/itip-formatter.c:2342
msgid "Delegated"
msgstr "Delegated"
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1724
msgid "Needs action"
msgstr "Needs action"
#. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1852 ../calendar/gui/e-memo-table.c:527
-#: ../calendar/gui/e-task-table.c:742
+#: ../calendar/gui/e-calendar-view.c:1869 ../calendar/gui/e-memo-table.c:528
+#: ../calendar/gui/e-task-table.c:743
#, c-format
msgid "Organizer: %s <%s>"
msgstr "Organiser: %s <%s>"
#. With SunOne accouts, there may be no ':' in organiser.value
#. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1856 ../calendar/gui/e-memo-table.c:532
-#: ../calendar/gui/e-task-table.c:745
+#: ../calendar/gui/e-calendar-view.c:1873 ../calendar/gui/e-memo-table.c:533
+#: ../calendar/gui/e-task-table.c:746
#, c-format
msgid "Organizer: %s"
msgstr "Organiser: %s"
#. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1872 ../calendar/gui/print.c:2608
+#: ../calendar/gui/e-calendar-view.c:1889 ../calendar/gui/print.c:2624
#, c-format
msgid "Location: %s"
msgstr "Location: %s"
#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1903
+#: ../calendar/gui/e-calendar-view.c:1920
#, c-format
msgid "Time: %s %s"
msgstr "Time: %s %s"
@@ -4862,8 +4791,8 @@ msgstr "Show the second time zone"
#. month, %B = full month name. You can change the
#. order but don't change the specifiers or add
#. anything.
-#: ../calendar/gui/e-day-view-top-item.c:865 ../calendar/gui/e-day-view.c:1879
-#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1878
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
msgid "%A %d %B"
msgstr "%A %d %B"
@@ -4873,10 +4802,10 @@ msgstr "%A %d %B"
#. %d = day of month, %b = abbreviated month name.
#. You can change the order but don't change the
#. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:869 ../calendar/gui/e-day-view.c:1896
+#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1895
#: ../calendar/gui/e-week-view-main-item.c:227
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../modules/calendar/e-cal-shell-view-private.c:1014
msgid "%a %d %b"
msgstr "%a %d %b"
@@ -4885,31 +4814,35 @@ msgstr "%a %d %b"
#. strftime format %d = day of month, %b = abbreviated
#. month name. You can change the order but don't
#. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:873 ../calendar/gui/e-day-view.c:1912
+#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1911
#: ../calendar/gui/e-week-view-main-item.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:949
+#: ../calendar/gui/ea-gnome-calendar.c:232
+#: ../modules/calendar/e-cal-shell-view-private.c:1050
msgid "%d %b"
msgstr "%d %b"
#. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1076 ../calendar/gui/e-week-view.c:748
+#: ../calendar/gui/e-day-view.c:1077 ../calendar/gui/e-week-view.c:749
#: ../calendar/gui/print.c:819
msgid "am"
msgstr "am"
#. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1079 ../calendar/gui/e-week-view.c:751
+#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
#: ../calendar/gui/print.c:821
msgid "pm"
msgstr "pm"
#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2609
+#: ../calendar/gui/e-day-view.c:2645
#, c-format
msgid "Week %d"
msgstr "Week %d"
+#: ../calendar/gui/e-itip-control.c:761
+msgid "Recurring:"
+msgstr "Recurring:"
+
#: ../calendar/gui/e-itip-control.c:765
msgid "Yes. (Complex Recurrence)"
msgstr "Yes. (Complex Recurrence)"
@@ -4991,7 +4924,7 @@ msgstr "Ends"
msgid "Due"
msgstr "Due"
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
msgid "iCalendar Information"
msgstr "iCalendar Information"
@@ -5000,37 +4933,37 @@ msgstr "iCalendar Information"
msgid "iCalendar Error"
msgstr "iCalendar Error"
-#: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
-#: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
-#: ../plugins/itip-formatter/itip-view.c:346
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:434
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:522
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:538
msgid "An unknown person"
msgstr "An unknown person"
-#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-itip-control.c:1145
msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
+"Please review the following information, and then select an action from the "
+"menu below."
msgstr ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
+"Please review the following information, and then select an action from the "
+"menu below."
#. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2302
+#: ../calendar/gui/e-itip-control.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:2320
msgctxt "cal-itip"
msgid "None"
msgstr "None"
-#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2318
+#: ../calendar/gui/e-itip-control.c:1200
+#: ../plugins/itip-formatter/itip-formatter.c:2336
msgid "Tentatively Accepted"
msgstr "Tentatively Accepted"
-#: ../calendar/gui/e-itip-control.c:1277
+#: ../calendar/gui/e-itip-control.c:1290
msgid ""
"The meeting has been canceled, however it could not be found in your "
"calendars"
@@ -5038,270 +4971,270 @@ msgstr ""
"The meeting has been cancelled, however it could not be found in your "
"calendars"
-#: ../calendar/gui/e-itip-control.c:1279
+#: ../calendar/gui/e-itip-control.c:1292
msgid ""
"The task has been canceled, however it could not be found in your task lists"
msgstr ""
"The task has been cancelled, however it could not be found in your task lists"
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1369
#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> has published meeting information."
+msgid "%s has published meeting information."
+msgstr "%s has published meeting information."
-#: ../calendar/gui/e-itip-control.c:1357
+#: ../calendar/gui/e-itip-control.c:1370
msgid "Meeting Information"
msgstr "Meeting Information"
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1376
#, c-format
-msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr "<b>%s</b> requests the presence of %s at a meeting."
+msgid "%s requests the presence of %s at a meeting."
+msgstr "%s requests the presence of %s at a meeting."
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1378
#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> requests your presence at a meeting."
+msgid "%s requests your presence at a meeting."
+msgstr "%s requests your presence at a meeting."
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1379
msgid "Meeting Proposal"
msgstr "Meeting Proposal"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1385
#, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
-msgstr "<b>%s</b> wishes to be added to an existing meeting."
+msgid "%s wishes to be added to an existing meeting."
+msgstr "%s wishes to be added to an existing meeting."
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1386
msgid "Meeting Update"
msgstr "Meeting Update"
-#: ../calendar/gui/e-itip-control.c:1377
+#: ../calendar/gui/e-itip-control.c:1390
#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> wishes to receive the latest meeting information."
+msgid "%s wishes to receive the latest meeting information."
+msgstr "%s wishes to receive the latest meeting information."
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1391
msgid "Meeting Update Request"
msgstr "Meeting Update Request"
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1398
#, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> has replied to a meeting request."
+msgid "%s has replied to a meeting request."
+msgstr "%s has replied to a meeting request."
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1399
msgid "Meeting Reply"
msgstr "Meeting Reply"
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1406
#, c-format
-msgid "<b>%s</b> has canceled a meeting."
-msgstr "<b>%s</b> has cancelled a meeting."
+msgid "%s has canceled a meeting."
+msgstr "%s has cancelled a meeting."
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1407
msgid "Meeting Cancelation"
msgstr "Meeting Cancellation"
-#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
-#: ../calendar/gui/e-itip-control.c:1521
+#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
+#: ../calendar/gui/e-itip-control.c:1534
#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> has sent an unintelligible message."
+msgid "%s has sent an unintelligible message."
+msgstr "%s has sent an unintelligible message."
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1418
msgid "Bad Meeting Message"
msgstr "Bad Meeting Message"
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1445
#, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> has published task information."
+msgid "%s has published task information."
+msgstr "%s has published task information."
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1446
msgid "Task Information"
msgstr "Task Information"
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1453
#, c-format
-msgid "<b>%s</b> requests %s to perform a task."
-msgstr "<b>%s</b> requests %s to perform a task."
+msgid "%s requests %s to perform a task."
+msgstr "%s requests %s to perform a task."
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1455
#, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> requests you perform a task."
+msgid "%s requests you perform a task."
+msgstr "%s requests you perform a task."
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1456
msgid "Task Proposal"
msgstr "Task Proposal"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1462
#, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
-msgstr "<b>%s</b> wishes to be added to an existing task."
+msgid "%s wishes to be added to an existing task."
+msgstr "%s wishes to be added to an existing task."
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1463
msgid "Task Update"
msgstr "Task Update"
-#: ../calendar/gui/e-itip-control.c:1454
+#: ../calendar/gui/e-itip-control.c:1467
#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> wishes to receive the latest task information."
+msgid "%s wishes to receive the latest task information."
+msgstr "%s wishes to receive the latest task information."
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1468
msgid "Task Update Request"
msgstr "Task Update Request"
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1475
#, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> has replied to a task assignment."
+msgid "%s has replied to a task assignment."
+msgstr "%s has replied to a task assignment."
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1476
msgid "Task Reply"
msgstr "Task Reply"
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1483
#, c-format
-msgid "<b>%s</b> has canceled a task."
-msgstr "<b>%s</b> has cancelled a task."
+msgid "%s has canceled a task."
+msgstr "%s has cancelled a task."
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1484
msgid "Task Cancelation"
msgstr "Task Cancellation"
-#: ../calendar/gui/e-itip-control.c:1482
+#: ../calendar/gui/e-itip-control.c:1495
msgid "Bad Task Message"
msgstr "Bad Task Message"
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1519
#, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> has published free/busy information."
+msgid "%s has published free/busy information."
+msgstr "%s has published free/busy information."
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1520
msgid "Free/Busy Information"
msgstr "Free/Busy Information"
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1524
#, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> requests your free/busy information."
+msgid "%s requests your free/busy information."
+msgstr "%s requests your free/busy information."
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1525
msgid "Free/Busy Request"
msgstr "Free/Busy Request"
-#: ../calendar/gui/e-itip-control.c:1516
+#: ../calendar/gui/e-itip-control.c:1529
#, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> has replied to a free/busy request."
+msgid "%s has replied to a free/busy request."
+msgstr "%s has replied to a free/busy request."
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1530
msgid "Free/Busy Reply"
msgstr "Free/Busy Reply"
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1535
msgid "Bad Free/Busy Message"
msgstr "Bad Free/Busy Message"
-#: ../calendar/gui/e-itip-control.c:1598
+#: ../calendar/gui/e-itip-control.c:1611
msgid "The message does not appear to be properly formed"
msgstr "The message does not appear to be properly formed"
-#: ../calendar/gui/e-itip-control.c:1657
+#: ../calendar/gui/e-itip-control.c:1670
msgid "The message contains only unsupported requests."
msgstr "The message contains only unsupported requests."
-#: ../calendar/gui/e-itip-control.c:1690
+#: ../calendar/gui/e-itip-control.c:1703
msgid "The attachment does not contain a valid calendar message"
msgstr "The attachment does not contain a valid calendar message"
-#: ../calendar/gui/e-itip-control.c:1728
+#: ../calendar/gui/e-itip-control.c:1741
msgid "The attachment has no viewable calendar items"
msgstr "The attachment has no viewable calendar items"
-#: ../calendar/gui/e-itip-control.c:1970
+#: ../calendar/gui/e-itip-control.c:1983
msgid "Update complete\n"
msgstr "Update complete\n"
-#: ../calendar/gui/e-itip-control.c:2004
+#: ../calendar/gui/e-itip-control.c:2017
msgid "Object is invalid and cannot be updated\n"
msgstr "Object is invalid and cannot be updated\n"
-#: ../calendar/gui/e-itip-control.c:2022
+#: ../calendar/gui/e-itip-control.c:2035
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr "This response is not from a current attendee. Add as an attendee?"
-#: ../calendar/gui/e-itip-control.c:2040
+#: ../calendar/gui/e-itip-control.c:2053
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "Attendee status could not be updated because of an invalid status!\n"
-#: ../calendar/gui/e-itip-control.c:2064
+#: ../calendar/gui/e-itip-control.c:2077
msgid "Attendee status updated\n"
msgstr "Attendee status updated\n"
-#: ../calendar/gui/e-itip-control.c:2071
-#: ../plugins/itip-formatter/itip-formatter.c:1410
+#: ../calendar/gui/e-itip-control.c:2084
+#: ../plugins/itip-formatter/itip-formatter.c:1421
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "Attendee status can not be updated because the item no longer exists"
-#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
+#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
msgid "Item sent!\n"
msgstr "Item sent!\n"
-#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
+#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
msgid "The item could not be sent!\n"
msgstr "The item could not be sent!\n"
-#: ../calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2273
msgid "Choose an action:"
msgstr "Choose an action:"
#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2289
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-itip-control.c:2302
+#: ../calendar/gui/e-meeting-list-view.c:582
#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "RSVP"
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2342
msgid "Update"
msgstr "Update"
-#: ../calendar/gui/e-itip-control.c:2353
+#: ../calendar/gui/e-itip-control.c:2366
#: ../plugins/groupwise-features/gw-ui.c:331
msgid "Accept"
msgstr "Accept"
-#: ../calendar/gui/e-itip-control.c:2354
+#: ../calendar/gui/e-itip-control.c:2367
msgid "Tentatively accept"
msgstr "Tentatively accept"
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2368
#: ../plugins/groupwise-features/gw-ui.c:345
msgid "Decline"
msgstr "Decline"
-#: ../calendar/gui/e-itip-control.c:2380
+#: ../calendar/gui/e-itip-control.c:2393
msgid "Send Free/Busy Information"
msgstr "Send Free/Busy Information"
-#: ../calendar/gui/e-itip-control.c:2404
+#: ../calendar/gui/e-itip-control.c:2417
msgid "Update respondent status"
msgstr "Update respondent status"
-#: ../calendar/gui/e-itip-control.c:2428
+#: ../calendar/gui/e-itip-control.c:2441
msgid "Send Latest Information"
msgstr "Send Latest Information"
-#: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:970
-#: ../widgets/misc/e-activity-proxy.c:298
+#: ../calendar/gui/e-itip-control.c:2465
+#: ../modules/mail/e-mail-shell-view-actions.c:1036
+#: ../widgets/misc/e-activity-proxy.c:300
msgid "Cancel"
msgstr "Cancel"
@@ -5351,7 +5284,7 @@ msgstr "Resources"
#: ../calendar/gui/e-meeting-list-view.c:159
#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
-#: ../calendar/gui/e-meeting-store.c:823 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
msgid "Individual"
msgstr "Individual"
@@ -5381,7 +5314,7 @@ msgstr "Chair"
#: ../calendar/gui/e-meeting-list-view.c:174
#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
-#: ../calendar/gui/e-meeting-store.c:826 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
msgid "Required Participant"
msgstr "Required Participant"
@@ -5399,12 +5332,12 @@ msgstr "Non-Participant"
#: ../calendar/gui/e-meeting-list-view.c:198
#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
-#: ../calendar/gui/e-meeting-store.c:836
+#: ../calendar/gui/e-meeting-store.c:863
msgid "Needs Action"
msgstr "Needs Action"
#. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:537
msgid "Attendee "
msgstr "Attendee "
@@ -5415,7 +5348,7 @@ msgstr "In Process"
#. This is a strftime() format string %A = full weekday name,
#. %B = full month name, %d = month day, %Y = full year.
#: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2366
+#: ../calendar/gui/e-meeting-time-sel.c:2376
msgid "%A, %B %d, %Y"
msgstr "%A, %d %B, %Y"
@@ -5424,7 +5357,7 @@ msgstr "%A, %d %B, %Y"
#. This is a strftime() format string %a = abbreviated weekday name,
#. %m = month number, %d = month day, %Y = full year.
#: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2397
+#: ../calendar/gui/e-meeting-time-sel.c:2407
msgid "%a %m/%d/%Y"
msgstr "%a %d/%m/%Y"
@@ -5518,8 +5451,8 @@ msgstr "Language"
msgid "Member"
msgstr "Member"
-#: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:461
+#: ../calendar/gui/e-memo-table.c:412
+#: ../modules/calendar/e-cal-shell-content.c:473
#: ../modules/calendar/e-memo-shell-view-actions.c:218
#: ../modules/calendar/e-memo-shell-view-actions.c:233
#: ../modules/calendar/e-memo-shell-view.c:289
@@ -5527,38 +5460,38 @@ msgstr "Member"
msgid "Memos"
msgstr "Memos"
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:706
+#: ../calendar/gui/e-memo-table.c:490 ../calendar/gui/e-task-table.c:707
msgid "* No Summary *"
msgstr "* No Summary *"
#. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:574 ../calendar/gui/e-task-table.c:786
+#: ../calendar/gui/e-memo-table.c:575 ../calendar/gui/e-task-table.c:787
msgid "Start: "
msgstr "Start: "
#. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:593 ../calendar/gui/e-task-table.c:804
+#: ../calendar/gui/e-memo-table.c:594 ../calendar/gui/e-task-table.c:805
msgid "Due: "
msgstr "Due: "
-#: ../calendar/gui/e-memo-table.c:709
+#: ../calendar/gui/e-memo-table.c:710
msgid "Cut selected memos to the clipboard"
msgstr "Cut selected memos to the clipboard"
-#: ../calendar/gui/e-memo-table.c:715
+#: ../calendar/gui/e-memo-table.c:716
msgid "Copy selected memos to the clipboard"
msgstr "Copy selected memos to the clipboard"
-#: ../calendar/gui/e-memo-table.c:721
+#: ../calendar/gui/e-memo-table.c:722
msgid "Paste memos from the clipboard"
msgstr "Paste memos from the clipboard"
-#: ../calendar/gui/e-memo-table.c:727
-#: ../modules/calendar/e-memo-shell-view-actions.c:556
+#: ../calendar/gui/e-memo-table.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:566
msgid "Delete selected memos"
msgstr "Delete selected memos"
-#: ../calendar/gui/e-memo-table.c:733
+#: ../calendar/gui/e-memo-table.c:734
msgid "Select all visible memos"
msgstr "Select all visible memos"
@@ -5570,15 +5503,15 @@ msgstr "Click to add a memo"
#. %d is the actual value, %% is replaced with a percent sign.
#. Result values will be 0%, 10%, 20%, ... 100%
#.
-#: ../calendar/gui/e-task-table.c:538
+#: ../calendar/gui/e-task-table.c:539
#, c-format
msgid "%d%%"
msgstr "%d%%"
-#: ../calendar/gui/e-task-table.c:628 ../calendar/gui/print.c:2043
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:423
+#: ../calendar/gui/e-task-table.c:629 ../calendar/gui/print.c:2052
+#: ../calendar/importers/icalendar-importer.c:81
+#: ../calendar/importers/icalendar-importer.c:828
+#: ../modules/calendar/e-cal-shell-content.c:434
#: ../modules/calendar/e-task-shell-view-actions.c:241
#: ../modules/calendar/e-task-shell-view-actions.c:256
#: ../modules/calendar/e-task-shell-view.c:437
@@ -5589,24 +5522,24 @@ msgstr "%d%%"
msgid "Tasks"
msgstr "Tasks"
-#: ../calendar/gui/e-task-table.c:932
+#: ../calendar/gui/e-task-table.c:933
msgid "Cut selected tasks to the clipboard"
msgstr "Cut selected tasks to the clipboard"
-#: ../calendar/gui/e-task-table.c:938
+#: ../calendar/gui/e-task-table.c:939
msgid "Copy selected tasks to the clipboard"
msgstr "Copy selected tasks to the clipboard"
-#: ../calendar/gui/e-task-table.c:944
+#: ../calendar/gui/e-task-table.c:945
msgid "Paste tasks from the clipboard"
msgstr "Paste tasks from the clipboard"
-#: ../calendar/gui/e-task-table.c:950
-#: ../modules/calendar/e-task-shell-view-actions.c:681
+#: ../calendar/gui/e-task-table.c:951
+#: ../modules/calendar/e-task-shell-view-actions.c:690
msgid "Delete selected tasks"
msgstr "Delete selected tasks"
-#: ../calendar/gui/e-task-table.c:956
+#: ../calendar/gui/e-task-table.c:957
msgid "Select all visible tasks"
msgstr "Select all visible tasks"
@@ -5617,56 +5550,56 @@ msgstr "Select Timezone"
#. strftime format %d = day of month, %B = full
#. month name. You can change the order but don't
#. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
msgid "%d %B"
msgstr "%d %B"
-#: ../calendar/gui/ea-cal-view-event.c:276
+#: ../calendar/gui/ea-cal-view-event.c:286
msgid "It has alarms."
msgstr "It has alarms."
-#: ../calendar/gui/ea-cal-view-event.c:279
+#: ../calendar/gui/ea-cal-view-event.c:289
msgid "It has recurrences."
msgstr "It has recurrences."
-#: ../calendar/gui/ea-cal-view-event.c:282
+#: ../calendar/gui/ea-cal-view-event.c:292
msgid "It is a meeting."
msgstr "It is a meeting."
-#: ../calendar/gui/ea-cal-view-event.c:288
+#: ../calendar/gui/ea-cal-view-event.c:298
#, c-format
msgid "Calendar Event: Summary is %s."
msgstr "Calendar Event: Summary is %s."
-#: ../calendar/gui/ea-cal-view-event.c:290
+#: ../calendar/gui/ea-cal-view-event.c:300
msgid "Calendar Event: It has no summary."
msgstr "Calendar Event: It has no summary."
-#: ../calendar/gui/ea-cal-view-event.c:312
+#: ../calendar/gui/ea-cal-view-event.c:322
msgid "calendar view event"
msgstr "calendar view event"
-#: ../calendar/gui/ea-cal-view-event.c:541
+#: ../calendar/gui/ea-cal-view-event.c:551
msgid "Grab Focus"
msgstr "Grab Focus"
-#: ../calendar/gui/ea-cal-view.c:300
+#: ../calendar/gui/ea-cal-view.c:304
msgid "New Appointment"
msgstr "New Appointment"
-#: ../calendar/gui/ea-cal-view.c:301
+#: ../calendar/gui/ea-cal-view.c:305
msgid "New All Day Event"
msgstr "New All Day Event"
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:306
msgid "New Meeting"
msgstr "New Meeting"
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:307
msgid "Go to Today"
msgstr "Go to Today"
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:308
msgid "Go to Date"
msgstr "Go to Date"
@@ -5675,7 +5608,7 @@ msgstr "Go to Date"
msgid "a table to view and select the current time range"
msgstr "a table to view and select the current time range"
-#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
+#: ../calendar/gui/ea-day-view.c:150 ../calendar/gui/ea-week-view.c:149
#, c-format
msgid "It has %d event."
msgid_plural "It has %d events."
@@ -5684,14 +5617,14 @@ msgstr[1] "It has %d events."
#. To translators: Here, "It" is either like "Work Week View: July
#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
+#: ../calendar/gui/ea-day-view.c:155 ../calendar/gui/ea-week-view.c:152
msgid "It has no events."
msgstr "It has no events."
#. To translators: First %s is the week, for example "July 10th -
#. July 14th, 2006". Second %s is the number of events in this work
#. week, for example "It has %d event/events." or "It has no events."
-#: ../calendar/gui/ea-day-view.c:160
+#: ../calendar/gui/ea-day-view.c:162
#, c-format
msgid "Work Week View: %s. %s"
msgstr "Work Week View: %s. %s"
@@ -5699,47 +5632,47 @@ msgstr "Work Week View: %s. %s"
#. To translators: First %s is the day, for example "Thursday July
#. 13th, 2006". Second %s is the number of events on this day, for
#. example "It has %d event/events." or "It has no events."
-#: ../calendar/gui/ea-day-view.c:166
+#: ../calendar/gui/ea-day-view.c:168
#, c-format
msgid "Day View: %s. %s"
msgstr "Day View: %s. %s"
-#: ../calendar/gui/ea-day-view.c:197
+#: ../calendar/gui/ea-day-view.c:202
msgid "calendar view for a work week"
msgstr "calendar view for a work week"
-#: ../calendar/gui/ea-day-view.c:199
+#: ../calendar/gui/ea-day-view.c:204
msgid "calendar view for one or more days"
msgstr "calendar view for one or more days"
-#: ../calendar/gui/ea-gnome-calendar.c:46
-#: ../calendar/gui/ea-gnome-calendar.c:54
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/gui/ea-gnome-calendar.c:48
+#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/importers/icalendar-importer.c:860
msgid "Gnome Calendar"
msgstr "Gnome Calendar"
-#: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:909
+#: ../calendar/gui/ea-gnome-calendar.c:199
+#: ../modules/calendar/e-cal-shell-view-private.c:1010
msgid "%A %d %b %Y"
msgstr "%A %d %b %Y"
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:204
#: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:916
-#: ../modules/calendar/e-cal-shell-view-private.c:922
-#: ../modules/calendar/e-cal-shell-view-private.c:925
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../modules/calendar/e-cal-shell-view-private.c:1017
+#: ../modules/calendar/e-cal-shell-view-private.c:1023
+#: ../modules/calendar/e-cal-shell-view-private.c:1026
msgid "%a %d %b %Y"
msgstr "%a %d %b %Y"
-#: ../calendar/gui/ea-gnome-calendar.c:226
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:228
+#: ../calendar/gui/ea-gnome-calendar.c:234
#: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:942
-#: ../modules/calendar/e-cal-shell-view-private.c:953
-#: ../modules/calendar/e-cal-shell-view-private.c:960
-#: ../modules/calendar/e-cal-shell-view-private.c:963
+#: ../calendar/gui/ea-gnome-calendar.c:242
+#: ../modules/calendar/e-cal-shell-view-private.c:1043
+#: ../modules/calendar/e-cal-shell-view-private.c:1054
+#: ../modules/calendar/e-cal-shell-view-private.c:1061
+#: ../modules/calendar/e-cal-shell-view-private.c:1064
msgid "%d %b %Y"
msgstr "%d %b %Y"
@@ -5751,25 +5684,25 @@ msgstr "Jump button"
msgid "Click here, you can find more events."
msgstr "Click here, you can find more events."
-#: ../calendar/gui/ea-week-view.c:153
+#: ../calendar/gui/ea-week-view.c:157
#, c-format
msgid "Month View: %s. %s"
msgstr "Month View: %s. %s"
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:161
#, c-format
msgid "Week View: %s. %s"
msgstr "Week View: %s. %s"
-#: ../calendar/gui/ea-week-view.c:188
+#: ../calendar/gui/ea-week-view.c:195
msgid "calendar view for a month"
msgstr "calendar view for a month"
-#: ../calendar/gui/ea-week-view.c:190
+#: ../calendar/gui/ea-week-view.c:197
msgid "calendar view for one or more weeks"
msgstr "calendar view for one or more weeks"
-#: ../calendar/gui/gnome-cal.c:2242
+#: ../calendar/gui/gnome-cal.c:2291
msgid "Purging"
msgstr "Purging"
@@ -5822,7 +5755,7 @@ msgid "Select Date"
msgstr "Select Date"
#: ../calendar/gui/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
msgid "Select _Today"
msgstr "Select _Today"
@@ -6103,74 +6036,73 @@ msgstr "Fr"
msgid "Sa"
msgstr "Sa"
-#. Translators: This is part of "START to END" text, where START and END are date/times
-#: ../calendar/gui/print.c:2419
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:2429
msgid " to "
msgstr " to "
-#. Translators: This is part of "START to END (Completed COMPLETED)", where COMPLETED is a completed date/time
-#: ../calendar/gui/print.c:2425
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:2437
msgid " (Completed "
msgstr " (Completed "
-#. Translators: This is part of "Completed COMPLETED", where COMPLETED is a completed date/time
-#: ../calendar/gui/print.c:2428
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:2441
msgid "Completed "
msgstr "Completed "
-#. Translators: This is part of "START (Due DUE)", where START and DUE are dates/times
-#: ../calendar/gui/print.c:2435
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:2449
msgid " (Due "
msgstr " (Due "
-#. Translators: This is part of "Due DUE", where DUE is a date/time due the event should be finished
-#: ../calendar/gui/print.c:2438
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:2454
msgid "Due "
msgstr "Due "
-#: ../calendar/gui/print.c:2572
-msgid "Appointment"
-msgstr "Appointment"
-
-#: ../calendar/gui/print.c:2574 ../widgets/misc/e-send-options.c:502
-msgid "Task"
-msgstr "Task"
-
-#: ../calendar/gui/print.c:2599
+#: ../calendar/gui/print.c:2615
#, c-format
msgid "Summary: %s"
msgstr "Summary: %s"
-#: ../calendar/gui/print.c:2623
+#: ../calendar/gui/print.c:2639
msgid "Attendees: "
msgstr "Attendees: "
-#: ../calendar/gui/print.c:2666
+#: ../calendar/gui/print.c:2682
#, c-format
msgid "Status: %s"
msgstr "Status: %s"
-#: ../calendar/gui/print.c:2681
+#: ../calendar/gui/print.c:2697
#, c-format
msgid "Priority: %s"
msgstr "Priority: %s"
-#: ../calendar/gui/print.c:2699
+#: ../calendar/gui/print.c:2715
#, c-format
msgid "Percent Complete: %i"
msgstr "Percent Complete: %i"
-#: ../calendar/gui/print.c:2710
+#: ../calendar/gui/print.c:2726
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: ../calendar/gui/print.c:2723
+#: ../calendar/gui/print.c:2739
#, c-format
msgid "Categories: %s"
msgstr "Categories: %s"
-#: ../calendar/gui/print.c:2734
+#: ../calendar/gui/print.c:2750
msgid "Contacts: "
msgstr "Contacts: "
@@ -6179,10 +6111,6 @@ msgstr "Contacts: "
msgid "% Completed"
msgstr "% Completed"
-#: ../calendar/gui/tasktypes.xml.h:7
-msgid "Cancelled"
-msgstr "Cancelled"
-
#: ../calendar/gui/tasktypes.xml.h:15
msgid "In progress"
msgstr "In progress"
@@ -6195,44 +6123,189 @@ msgstr "is greater than"
msgid "is less than"
msgstr "is less than"
-#: ../calendar/importers/icalendar-importer.c:75
+#: ../calendar/importers/icalendar-importer.c:80
msgid "Appointments and Meetings"
msgstr "Appointments and Meetings"
-#: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1822
+#: ../calendar/importers/icalendar-importer.c:350
+#: ../calendar/importers/icalendar-importer.c:707
+#: ../plugins/itip-formatter/itip-formatter.c:1835
msgid "Opening calendar"
msgstr "Opening calendar"
-#: ../calendar/importers/icalendar-importer.c:442
+#: ../calendar/importers/icalendar-importer.c:493
msgid "iCalendar files (.ics)"
msgstr "iCalendar files (.ics)"
-#: ../calendar/importers/icalendar-importer.c:443
+#: ../calendar/importers/icalendar-importer.c:494
msgid "Evolution iCalendar importer"
msgstr "Evolution iCalendar importer"
-#: ../calendar/importers/icalendar-importer.c:531
+#: ../calendar/importers/icalendar-importer.c:582
msgid "Reminder!"
msgstr "Reminder!"
-#: ../calendar/importers/icalendar-importer.c:583
-msgid "vCalendar files (.vcf)"
-msgstr "vCalendar files (.vcf)"
+#: ../calendar/importers/icalendar-importer.c:662
+msgid "vCalendar files (.vcs)"
+msgstr "vCalendar files (.vcs)"
-#: ../calendar/importers/icalendar-importer.c:584
+#: ../calendar/importers/icalendar-importer.c:663
msgid "Evolution vCalendar importer"
msgstr "Evolution vCalendar importer"
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:823
msgid "Calendar Events"
msgstr "Calendar Events"
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:861
msgid "Evolution Calendar intelligent importer"
msgstr "Evolution Calendar intelligent importer"
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+msgctxt "iCalImp"
+msgid "Meeting"
+msgstr "Meeting"
+
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+msgctxt "iCalImp"
+msgid "Event"
+msgstr "Event"
+
+#: ../calendar/importers/icalendar-importer.c:929
+#: ../calendar/importers/icalendar-importer.c:1244
+msgctxt "iCalImp"
+msgid "Task"
+msgstr "Task"
+
+#: ../calendar/importers/icalendar-importer.c:932
+#: ../calendar/importers/icalendar-importer.c:1245
+msgctxt "iCalImp"
+msgid "Memo"
+msgstr "Memo"
+
+#: ../calendar/importers/icalendar-importer.c:941
+msgctxt "iCalImp"
+msgid "has recurrences"
+msgstr "has recurrences"
+
+#: ../calendar/importers/icalendar-importer.c:946
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "is an instance"
+
+#: ../calendar/importers/icalendar-importer.c:951
+msgctxt "iCalImp"
+msgid "has alarms"
+msgstr "has alarms"
+
+#: ../calendar/importers/icalendar-importer.c:956
+msgctxt "iCalImp"
+msgid "has attachments"
+msgstr "has attachments"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:969
+msgctxt "iCalImp"
+msgid "Public"
+msgstr "Public"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:972
+msgctxt "iCalImp"
+msgid "Private"
+msgstr "Private"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:975
+msgctxt "iCalImp"
+msgid "Confidential"
+msgstr "Confidential"
+
+#. Translators: Appointment's classification section name
+#: ../calendar/importers/icalendar-importer.c:979
+msgctxt "iCalImp"
+msgid "Classification"
+msgstr "Classification"
+
+#. Translators: Appointment's summary
+#. Translators: Column header for a component summary
+#: ../calendar/importers/icalendar-importer.c:984
+#: ../calendar/importers/icalendar-importer.c:1284
+msgctxt "iCalImp"
+msgid "Summary"
+msgstr "Summary"
+
+#. Translators: Appointment's location
+#: ../calendar/importers/icalendar-importer.c:990
+msgctxt "iCalImp"
+msgid "Location"
+msgstr "Location"
+
+#. Translators: Appointment's start time
+#. Translators: Column header for a component start date/time
+#: ../calendar/importers/icalendar-importer.c:998
+#: ../calendar/importers/icalendar-importer.c:1280
+msgctxt "iCalImp"
+msgid "Start"
+msgstr "Start"
+
+#. Translators: 'Due' like the time due a task should be finished
+#: ../calendar/importers/icalendar-importer.c:1009
+msgctxt "iCalImp"
+msgid "Due"
+msgstr "Due"
+
+#. Translators: Appointment's end time
+#: ../calendar/importers/icalendar-importer.c:1021
+msgctxt "iCalImp"
+msgid "End"
+msgstr "End"
+
+#. Translators: Appointment's categories
+#: ../calendar/importers/icalendar-importer.c:1031
+msgctxt "iCalImp"
+msgid "Categories"
+msgstr "Categories"
+
+#. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
+#: ../calendar/importers/icalendar-importer.c:1055
+msgctxt "iCalImp"
+msgid "Completed"
+msgstr "Completed"
+
+#. Translators: Appointment's URL
+#: ../calendar/importers/icalendar-importer.c:1063
+msgctxt "iCalImp"
+msgid "URL"
+msgstr "URL"
+
+#. Translators: Appointment's organizer
+#: ../calendar/importers/icalendar-importer.c:1074
+#: ../calendar/importers/icalendar-importer.c:1077
+msgctxt "iCalImp"
+msgid "Organizer"
+msgstr "Organiser"
+
+#. Translators: Appointment's attendees
+#: ../calendar/importers/icalendar-importer.c:1097
+#: ../calendar/importers/icalendar-importer.c:1100
+msgctxt "iCalImp"
+msgid "Attendees"
+msgstr "Attendees"
+
+#: ../calendar/importers/icalendar-importer.c:1114
+msgctxt "iCalImp"
+msgid "Description"
+msgstr "Description"
+
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../calendar/importers/icalendar-importer.c:1276
+msgctxt "iCalImp"
+msgid "Type"
+msgstr "Type"
+
#.
#. *
#. * This program is free software; you can redistribute it and/or
@@ -7782,168 +7855,148 @@ msgstr "Pacific/Wallis"
msgid "Pacific/Yap"
msgstr "Pacific/Yap"
-#: ../composer/e-composer-actions.c:81
-msgid "Untitled Message"
-msgstr "Untitled Message"
-
-#: ../composer/e-composer-actions.c:204
+#: ../composer/e-composer-actions.c:163
msgid "Save as..."
msgstr "Save asâ?¦"
-#: ../composer/e-composer-actions.c:283
-#: ../widgets/misc/e-attachment-view.c:327
+#: ../composer/e-composer-actions.c:245
+#: ../widgets/misc/e-attachment-view.c:379
msgid "Attach a file"
msgstr "Attach a file"
-#: ../composer/e-composer-actions.c:288
-#: ../widgets/misc/e-signature-editor.c:203
+#: ../composer/e-composer-actions.c:250
+#: ../widgets/misc/e-signature-editor.c:206
msgid "_Close"
msgstr "_Close"
-#: ../composer/e-composer-actions.c:290
+#: ../composer/e-composer-actions.c:252
msgid "Close the current file"
msgstr "Close the current file"
-#: ../composer/e-composer-actions.c:295
+#: ../composer/e-composer-actions.c:257
msgid "_Print..."
msgstr "_Printâ?¦"
-#: ../composer/e-composer-actions.c:302
+#: ../composer/e-composer-actions.c:264
msgid "Print Pre_view"
msgstr "Print Pre_view"
-#: ../composer/e-composer-actions.c:311
+#: ../composer/e-composer-actions.c:273
msgid "Save the current file"
msgstr "Save the current file"
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:278
msgid "Save _As..."
msgstr "Save _Asâ?¦"
-#: ../composer/e-composer-actions.c:318
+#: ../composer/e-composer-actions.c:280
msgid "Save the current file with a different name"
msgstr "Save the current file with a different name"
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:285
msgid "Save as _Draft"
msgstr "Save as _Draft"
-#: ../composer/e-composer-actions.c:325
+#: ../composer/e-composer-actions.c:287
msgid "Save as draft"
msgstr "Save as draft"
-#: ../composer/e-composer-actions.c:330 ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:292 ../composer/e-composer-private.c:297
msgid "S_end"
msgstr "S_end"
-#: ../composer/e-composer-actions.c:332
+#: ../composer/e-composer-actions.c:294
msgid "Send this message"
msgstr "Send this message"
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:299
msgid "New _Message"
msgstr "New _Message"
-#: ../composer/e-composer-actions.c:339
+#: ../composer/e-composer-actions.c:301
msgid "Open New Message window"
msgstr "Open New Message window"
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:308
msgid "Character _Encoding"
msgstr "Character _Encoding"
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:325
msgid "PGP _Encrypt"
msgstr "PGP _Encrypt"
-#: ../composer/e-composer-actions.c:365
+#: ../composer/e-composer-actions.c:327
msgid "Encrypt this message with PGP"
msgstr "Encrypt this message with PGP"
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:333
msgid "PGP _Sign"
msgstr "PGP _Sign"
-#: ../composer/e-composer-actions.c:373
+#: ../composer/e-composer-actions.c:335
msgid "Sign this message with your PGP key"
msgstr "Sign this message with your PGP key"
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:341
msgid "_Prioritize Message"
msgstr "_Prioritise Message"
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:343
msgid "Set the message priority to high"
msgstr "Set the message priority to high"
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:349
msgid "Re_quest Read Receipt"
msgstr "Re_quest Read Receipt"
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:351
msgid "Get delivery notification when your message is read"
msgstr "Get delivery notification when your message is read"
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:357
msgid "S/MIME En_crypt"
msgstr "S/MIME En_crypt"
-#: ../composer/e-composer-actions.c:397
+#: ../composer/e-composer-actions.c:359
msgid "Encrypt this message with your S/MIME Encryption Certificate"
msgstr "Encrypt this message with your S/MIME Encryption Certificate"
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:365
msgid "S/MIME Sig_n"
msgstr "S/MIME Sig_n"
-#: ../composer/e-composer-actions.c:405
+#: ../composer/e-composer-actions.c:367
msgid "Sign this message with your S/MIME Signature Certificate"
msgstr "Sign this message with your S/MIME Signature Certificate"
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:373
msgid "_Bcc Field"
msgstr "_Bcc Field"
-#: ../composer/e-composer-actions.c:413
+#: ../composer/e-composer-actions.c:375
msgid "Toggles whether the BCC field is displayed"
msgstr "Toggles whether the BCC field is displayed"
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:381
msgid "_Cc Field"
msgstr "_Cc Field"
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:383
msgid "Toggles whether the CC field is displayed"
msgstr "Toggles whether the CC field is displayed"
-#: ../composer/e-composer-actions.c:427
-msgid "_From Field"
-msgstr "_From Field"
-
-#: ../composer/e-composer-actions.c:429
-msgid "Toggles whether the From chooser is displayed"
-msgstr "Toggles whether the From chooser is displayed"
-
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:389
msgid "_Reply-To Field"
msgstr "_Reply-To Field"
-#: ../composer/e-composer-actions.c:437
+#: ../composer/e-composer-actions.c:391
msgid "Toggles whether the Reply-To field is displayed"
msgstr "Toggles whether the Reply-To field is displayed"
-#: ../composer/e-composer-actions.c:480
+#: ../composer/e-composer-actions.c:434
msgid "Save Draft"
msgstr "Save Draft"
-#: ../composer/e-composer-header.c:129
-msgid "Show"
-msgstr "Show"
-
-#: ../composer/e-composer-header.c:137
-msgid "Hide"
-msgstr "Hide"
-
#: ../composer/e-composer-header-table.c:41
msgid "Enter the recipients of the message"
msgstr "Enter the recipients of the message"
@@ -7960,94 +8013,81 @@ msgstr ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message"
-#: ../composer/e-composer-header-table.c:958
+#: ../composer/e-composer-header-table.c:1005
msgid "Fr_om:"
msgstr "Fr_om:"
-#: ../composer/e-composer-header-table.c:958
-#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:937
-#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:76
-msgid "From"
-msgstr "From"
-
-#: ../composer/e-composer-header-table.c:967
+#: ../composer/e-composer-header-table.c:1014
msgid "_Reply-To:"
msgstr "_Reply-To:"
-#: ../composer/e-composer-header-table.c:972
+#: ../composer/e-composer-header-table.c:1018
msgid "_To:"
msgstr "_To:"
-#: ../composer/e-composer-header-table.c:978
+#: ../composer/e-composer-header-table.c:1023
msgid "_Cc:"
msgstr "_Cc:"
-#: ../composer/e-composer-header-table.c:978 ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "CC"
-
-#: ../composer/e-composer-header-table.c:984
+#: ../composer/e-composer-header-table.c:1028
msgid "_Bcc:"
msgstr "_Bcc:"
-#: ../composer/e-composer-header-table.c:984 ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "BCC"
-
-#: ../composer/e-composer-header-table.c:989
+#: ../composer/e-composer-header-table.c:1033
msgid "_Post To:"
msgstr "_Post To:"
-#: ../composer/e-composer-header-table.c:993
+#: ../composer/e-composer-header-table.c:1037
msgid "S_ubject:"
msgstr "S_ubject:"
-#: ../composer/e-composer-header-table.c:1002
+#: ../composer/e-composer-header-table.c:1046
msgid "Si_gnature:"
msgstr "Si_gnature:"
-#: ../composer/e-composer-name-header.c:134
+#: ../composer/e-composer-name-header.c:141
msgid "Click here for the address book"
msgstr "Click here for the address book"
-#: ../composer/e-composer-post-header.c:116
+#: ../composer/e-composer-post-header.c:130
msgid "Click here to select folders to post to"
msgstr "Click here to select folders to post to"
-#: ../composer/e-composer-private.c:199
+#: ../composer/e-composer-private.c:215
msgid "Undo the last action"
msgstr "Undo the last action"
-#: ../composer/e-composer-private.c:203
+#: ../composer/e-composer-private.c:219
msgid "Redo the last undone action"
msgstr "Redo the last undone action"
-#: ../composer/e-composer-private.c:207
+#: ../composer/e-composer-private.c:223
msgid "Search for text"
msgstr "Search for text"
-#: ../composer/e-composer-private.c:211
+#: ../composer/e-composer-private.c:227
msgid "Search for and replace text"
msgstr "Search for and replace text"
-#: ../composer/e-composer-private.c:301
+#: ../composer/e-composer-private.c:317
msgid "Save draft"
msgstr "Save draft"
#. Check buttons
-#: ../composer/e-msg-composer.c:188 ../mail/em-utils.c:152
-#: ../plugins/attachment-reminder/attachment-reminder.c:122
+#: ../composer/e-msg-composer.c:196
+#: ../plugins/attachment-reminder/attachment-reminder.c:117
msgid "_Do not show this message again."
msgstr "_Do not show this message again."
-#: ../composer/e-msg-composer.c:988
+#: ../composer/e-msg-composer.c:1028
+#, c-format
msgid ""
"Cannot sign outgoing message: No signing certificate set for this account"
msgstr ""
"Cannot sign outgoing message: No signing certificate set for this account"
-#: ../composer/e-msg-composer.c:995
+#: ../composer/e-msg-composer.c:1040
+#, c-format
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
"account"
@@ -8055,21 +8095,21 @@ msgstr ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
"account"
-#: ../composer/e-msg-composer.c:1386
+#: ../composer/e-msg-composer.c:1465
msgid "Unable to reconstruct message from autosave file"
msgstr "Unable to reconstruct message from autosave file"
-#: ../composer/e-msg-composer.c:1452 ../composer/e-msg-composer.c:1648
+#: ../composer/e-msg-composer.c:1535 ../composer/e-msg-composer.c:1881
msgid "Compose Message"
msgstr "Compose Message"
-#: ../composer/e-msg-composer.c:3313
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
-msgstr ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
+#: ../composer/e-msg-composer.c:3540
+msgid "The composer contains a non-text message body, which cannot be edited."
+msgstr "The composer contains a non-text message body, which cannot be edited."
+
+#: ../composer/e-msg-composer.c:4152
+msgid "Untitled Message"
+msgstr "Untitled Message"
#: ../composer/mail-composer.error.xml.h:1
msgid ""
@@ -8215,64 +8255,79 @@ msgstr "socket"
msgid "Anjal email client"
msgstr "Anjal e-mail client"
-#: ../capplet/settings/mail-account-view.c:56
+#: ../capplet/settings/mail-account-view.c:74
msgid "Please enter your full name."
msgstr "Please enter your full name."
-#: ../capplet/settings/mail-account-view.c:57
+#: ../capplet/settings/mail-account-view.c:75
msgid "Please enter your email address."
msgstr "Please enter your e-mail address."
-#: ../capplet/settings/mail-account-view.c:58
+#: ../capplet/settings/mail-account-view.c:76
msgid "The email address you have entered is invalid."
msgstr "The e-mail address you have entered is invalid."
-#: ../capplet/settings/mail-account-view.c:181
-msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Personal details:</span>"
+#: ../capplet/settings/mail-account-view.c:77
+msgid "Please enter your password."
+msgstr "Please enter your password."
+
+#: ../capplet/settings/mail-account-view.c:256
+#: ../plugins/caldav/caldav-source.c:66
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../capplet/settings/mail-account-view.c:360
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-source.c:81
+msgid "Google"
+msgstr "Google"
+
+#: ../capplet/settings/mail-account-view.c:464
+msgid "Personal details:"
+msgstr "Personal details:"
-#: ../capplet/settings/mail-account-view.c:186
+#: ../capplet/settings/mail-account-view.c:471
msgid "Name:"
msgstr "Name:"
-#: ../capplet/settings/mail-account-view.c:195
+#: ../capplet/settings/mail-account-view.c:480
msgid "Email address:"
msgstr "E-mail address:"
-#: ../capplet/settings/mail-account-view.c:205
-msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
+#: ../capplet/settings/mail-account-view.c:490
+msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Details:</span>"
-#: ../capplet/settings/mail-account-view.c:210
-#: ../capplet/settings/mail-account-view.c:258
+#: ../capplet/settings/mail-account-view.c:496
+msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Receiving</span>"
+
+#: ../capplet/settings/mail-account-view.c:501
msgid "Server type:"
msgstr "Server type:"
-#: ../capplet/settings/mail-account-view.c:219
-#: ../capplet/settings/mail-account-view.c:267
+#: ../capplet/settings/mail-account-view.c:510
msgid "Server address:"
msgstr "Server address:"
-#: ../capplet/settings/mail-account-view.c:228
-#: ../capplet/settings/mail-account-view.c:276
+#: ../capplet/settings/mail-account-view.c:519
msgid "Username:"
msgstr "Username:"
-#: ../capplet/settings/mail-account-view.c:237
-#: ../capplet/settings/mail-account-view.c:285
+#: ../capplet/settings/mail-account-view.c:528
msgid "Use encryption:"
msgstr "Use encryption:"
-#: ../capplet/settings/mail-account-view.c:242
-#: ../capplet/settings/mail-account-view.c:290
+#: ../capplet/settings/mail-account-view.c:533
+#: ../capplet/settings/mail-account-view.c:566
msgid "never"
msgstr "never"
-#: ../capplet/settings/mail-account-view.c:253
-msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Sending details:</span>"
+#: ../capplet/settings/mail-account-view.c:545
+msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Sending</span>"
-#: ../capplet/settings/mail-account-view.c:309
+#: ../capplet/settings/mail-account-view.c:585
msgid ""
"To use the email application you'll need to setup an account. Put your email "
"address and password in below and we'll try and work out all the settings. "
@@ -8283,7 +8338,7 @@ msgstr ""
"settings. If we can't do it automatically you'll need your server details as "
"well."
-#: ../capplet/settings/mail-account-view.c:311
+#: ../capplet/settings/mail-account-view.c:587
msgid ""
"Sorry, we can't work out the settings to get your mail automatically. Please "
"enter them below. We've tried to make a start with the details you just "
@@ -8293,11 +8348,11 @@ msgstr ""
"enter them below. We've tried to make a start with the details you just "
"entered but you may need to change them."
-#: ../capplet/settings/mail-account-view.c:313
+#: ../capplet/settings/mail-account-view.c:589
msgid "You can specify more options to configure the account."
msgstr "You can specify more options to configure the account."
-#: ../capplet/settings/mail-account-view.c:315
+#: ../capplet/settings/mail-account-view.c:591
msgid ""
"Now we need your settings for sending mail. We've tried to make some guesses "
"but you should check them over to make sure."
@@ -8305,11 +8360,11 @@ msgstr ""
"Now we need your settings for sending mail. We've tried to make some guesses "
"but you should check them over to make sure."
-#: ../capplet/settings/mail-account-view.c:316
+#: ../capplet/settings/mail-account-view.c:592
msgid "You can specify your default settings for your account."
msgstr "You can specify your default settings for your account."
-#: ../capplet/settings/mail-account-view.c:317
+#: ../capplet/settings/mail-account-view.c:593
msgid ""
"Time to check things over before we try and connect to the server and fetch "
"your mail."
@@ -8317,86 +8372,128 @@ msgstr ""
"Time to check things over before we try and connect to the server and fetch "
"your mail."
-#: ../capplet/settings/mail-account-view.c:332
-#: ../mail/em-account-editor.c:2059 ../mail/em-account-editor.c:2191
-#: ../mail/mail-config.ui.h:59
+#: ../capplet/settings/mail-account-view.c:608
+#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2222
+#: ../mail/mail-config.ui.h:62
msgid "Identity"
msgstr "Identity"
-#: ../capplet/settings/mail-account-view.c:332
+#: ../capplet/settings/mail-account-view.c:608
msgid "Next - Receiving mail"
msgstr "Next â?? Receiving mail"
-#: ../capplet/settings/mail-account-view.c:333
+#: ../capplet/settings/mail-account-view.c:609
msgid "Receiving mail"
msgstr "Receiving mail"
-#: ../capplet/settings/mail-account-view.c:333
-#: ../capplet/settings/mail-account-view.c:334
+#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:610
msgid "Next - Sending mail"
msgstr "Next â?? Sending mail"
-#: ../capplet/settings/mail-account-view.c:333
+#: ../capplet/settings/mail-account-view.c:609
msgid "Back - Identity"
msgstr "Back â?? Identity"
-#: ../capplet/settings/mail-account-view.c:333
+#: ../capplet/settings/mail-account-view.c:609
msgid "Next - Receiving options"
msgstr "Next â?? Receiving options"
-#: ../capplet/settings/mail-account-view.c:334
+#: ../capplet/settings/mail-account-view.c:610
msgid "Receiving options"
msgstr "Receiving options"
-#: ../capplet/settings/mail-account-view.c:334
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:612
msgid "Back - Receiving mail"
msgstr "Back â?? Receiving mail"
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:612
msgid "Sending mail"
msgstr "Sending mail"
-#: ../capplet/settings/mail-account-view.c:336
-#: ../capplet/settings/mail-account-view.c:337
+#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:613
msgid "Next - Review account"
msgstr "Next â?? Review account"
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:612
msgid "Next - Defaults"
msgstr "Next â?? Defaults"
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:612
msgid "Back - Receiving options"
msgstr "Back â?? Receiving options"
-#: ../capplet/settings/mail-account-view.c:337
-#: ../mail/em-account-editor.c:2769 ../mail/mail-config.ui.h:32
+#: ../capplet/settings/mail-account-view.c:613
+#: ../mail/em-account-editor.c:2988 ../mail/mail-config.ui.h:34
msgid "Defaults"
msgstr "Defaults"
-#: ../capplet/settings/mail-account-view.c:337
+#: ../capplet/settings/mail-account-view.c:613
msgid "Back - Sending mail"
msgstr "Back â?? Sending mail"
-#: ../capplet/settings/mail-account-view.c:339
+#: ../capplet/settings/mail-account-view.c:615
msgid "Review account"
msgstr "Review account"
-#: ../capplet/settings/mail-account-view.c:339
+#: ../capplet/settings/mail-account-view.c:615
msgid "Finish"
msgstr "Finish"
-#: ../capplet/settings/mail-account-view.c:339
+#: ../capplet/settings/mail-account-view.c:615
msgid "Back - Sending"
msgstr "Back â?? Sending"
-#: ../capplet/settings/mail-account-view.c:671
-#: ../capplet/settings/mail-settings-view.c:262
+#: ../capplet/settings/mail-account-view.c:719
+msgid "Setup Google contacts with Evolution"
+msgstr "Set up Google Contacts with Evolution"
+
+#: ../capplet/settings/mail-account-view.c:720
+msgid "Set up Google calendar with Evolution"
+msgstr "Set up Google Calendar with Evolution."
+
+#: ../capplet/settings/mail-account-view.c:725
+msgid "You may need to enable IMAP access."
+msgstr "You may need to enable IMAP access."
+
+#: ../capplet/settings/mail-account-view.c:733
+msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
+
+#: ../capplet/settings/mail-account-view.c:757
+msgid "Setup Yahoo calendar with Evolution"
+msgstr "Set up Yahoo! Calendar with Evolution"
+
+#: ../capplet/settings/mail-account-view.c:761
+msgid ""
+"Yahoo calendars are named as firstname_lastname. We have tried to form the "
+"calendar name. So please confirm and re-enter the calendar name if it is not "
+"correct."
+msgstr ""
+"Yahoo! calendars are named as firstname_lastname. We have tried to form the "
+"calendar name, so please confirm and re-enter the calendar name if it is not "
+"correct."
+
+#: ../capplet/settings/mail-account-view.c:768
+msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Yahoo! account settings:</span>"
+
+#: ../capplet/settings/mail-account-view.c:780
+msgid "Yahoo Calendar name:"
+msgstr "Yahoo! Calendar name:"
+
+#: ../capplet/settings/mail-account-view.c:1049
+msgid "Password:"
+msgstr "Password:"
+
+#: ../capplet/settings/mail-account-view.c:1117
+#: ../capplet/settings/mail-settings-view.c:267
msgid "Close Tab"
msgstr "Close Tab"
-#: ../capplet/settings/mail-account-view.c:681
+#: ../capplet/settings/mail-account-view.c:1127
msgid "Account Wizard"
msgstr "Account Wizard"
@@ -8405,25 +8502,25 @@ msgid "Evolution account assistant"
msgstr "Evolution account assistant"
#. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:338 ../mail/e-mail-migrate.c:675
-#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:145
-#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:151
-#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:160
-#: ../mail/em-folder-tree-model.c:162 ../mail/mail-vfolder.c:212
-#: ../mail/message-list.c:1602
-#: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:126
-#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:664
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:148
+#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
+#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:207
+#: ../mail/message-list.c:1666
+#: ../modules/addressbook/e-book-shell-backend.c:96
+#: ../modules/addressbook/e-book-shell-migrate.c:130
+#: ../modules/calendar/e-cal-shell-backend.c:102
#: ../modules/calendar/e-cal-shell-migrate.c:141
-#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-backend.c:92
#: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:109
+#: ../modules/calendar/e-task-shell-backend.c:92
+#: ../modules/calendar/e-task-shell-migrate.c:111
msgid "On This Computer"
msgstr "On This Computer"
#: ../capplet/settings/mail-settings-view.c:146
-#: ../plugins/groupwise-features/share-folder.c:747
+#: ../plugins/groupwise-features/share-folder.c:737
msgid "Modify"
msgstr "Modify"
@@ -8431,11 +8528,11 @@ msgstr "Modify"
msgid "Add a new account"
msgstr "Add a new account"
-#: ../capplet/settings/mail-settings-view.c:183
-msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Account management</span>"
+#: ../capplet/settings/mail-settings-view.c:184
+msgid "Account management"
+msgstr "Account management"
-#: ../capplet/settings/mail-settings-view.c:272
+#: ../capplet/settings/mail-settings-view.c:277
msgid "Settings"
msgstr "Settings"
@@ -8447,8 +8544,8 @@ msgstr "Calendar event notifications"
msgid "Evolution Alarm Notify"
msgstr "Evolution Alarm Notify"
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:821
-#: ../shell/e-shell-window-private.c:251
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:845
+#: ../shell/e-shell-window-private.c:253
msgid "Evolution"
msgstr "Evolution"
@@ -8472,47 +8569,39 @@ msgstr "Configure e-mail accounts"
msgid "Email Settings"
msgstr "E-mail Settings"
-#: ../data/evolution.keys.in.in.h:1
-msgid "address card"
-msgstr "address card"
-
-#: ../data/evolution.keys.in.in.h:2
-msgid "calendar information"
-msgstr "calendar information"
-
#. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:224
+#: ../e-util/e-activity.c:228
#, c-format
msgid "%s (cancelled)"
msgstr "%s (cancelled)"
#. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:227
+#: ../e-util/e-activity.c:231
#, c-format
msgid "%s (completed)"
msgstr "%s (completed)"
#. Translators: This is an activity whose percent
#. * complete is unknown.
-#: ../e-util/e-activity.c:231
+#: ../e-util/e-activity.c:235
#, c-format
msgid "%s..."
msgstr "%sâ?¦"
-#: ../e-util/e-activity.c:236
+#: ../e-util/e-activity.c:240
#, c-format
msgid "%s (%d%% complete)"
msgstr "%s (%d%% complete)"
-#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
+#: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
msgid "Evolution Error"
msgstr "Evolution Error"
-#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
+#: ../e-util/e-alert.c:79 ../e-util/e-alert.c:82
msgid "Evolution Warning"
msgstr "Evolution Warning"
-#: ../e-util/e-alert.c:634
+#: ../e-util/e-alert.c:652
#, c-format
msgid "Internal error, unknown error '%s' requested"
msgstr "Internal error, unknown error '%s' requested"
@@ -8596,7 +8685,7 @@ msgstr "Visual"
#. strftime format of a weekday and a date.
#: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1756
+#: ../modules/calendar/e-cal-shell-view-actions.c:1790
#: ../plugins/itip-formatter/itip-view.c:191
#: ../widgets/table/e-cell-date-edit.c:311
msgid "Today"
@@ -8675,13 +8764,15 @@ msgstr "Log Messages:"
msgid "Log Level"
msgstr "Log Level"
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2674
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2757
#: ../mail/message-list.etspec.h:10
msgid "Messages"
msgstr "Messages"
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
-#: ../shell/e-shell-window-actions.c:1450
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
+#: ../shell/e-shell-window-actions.c:1426
+#: ../shell/e-shell-window-actions.c:1433
+#: ../shell/e-shell-window-actions.c:1440
msgid "Close this window"
msgstr "Close this window"
@@ -8705,27 +8796,27 @@ msgstr "Debug"
msgid "Error, Warnings and Debug messages"
msgstr "Error, Warnings and Debug messages"
-#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:337
#: ../plugins/publish-calendar/publish-calendar.ui.h:33
msgid "weeks"
msgstr "weeks"
-#: ../e-util/e-print.c:160
+#: ../e-util/e-print.c:161
msgid "An error occurred while printing"
msgstr "An error occurred while printing"
-#: ../e-util/e-print.c:167
+#: ../e-util/e-print.c:168
msgid "The printing system reported the following details about the error:"
msgstr "The printing system reported the following details about the error:"
-#: ../e-util/e-print.c:173
+#: ../e-util/e-print.c:174
msgid ""
"The printing system did not report any additional details about the error."
msgstr ""
"The printing system did not report any additional details about the error."
-#: ../e-util/e-signature.c:701
+#: ../e-util/e-signature.c:707
msgid "Autogenerated"
msgstr "Autogenerated"
@@ -8749,15 +8840,15 @@ msgstr "Do you wish to overwrite it?"
msgid "File exists \"{0}\"."
msgstr "File exists \"{0}\"."
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:132
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:140
msgid "_Overwrite"
msgstr "_Overwrite"
-#: ../e-util/e-util.c:169
+#: ../e-util/e-util.c:146
msgid "Could not open the link."
msgstr "Could not open the link."
-#: ../e-util/e-util.c:219
+#: ../e-util/e-util.c:193
msgid "Could not display help for Evolution."
msgstr "Could not display help for Evolution."
@@ -8770,100 +8861,108 @@ msgstr "GConf error: %s"
msgid "All further errors shown only on terminal."
msgstr "All further errors shown only on terminal."
-#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:938
-#: ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1041
+#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:72
+msgid "From"
+msgstr "From"
+
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1042
+#: ../modules/mail/em-mailer-prefs.c:73
msgid "Reply-To"
msgstr "Reply-To"
-#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2305
-#: ../mail/em-format-html.c:2328 ../modules/mail/em-mailer-prefs.c:79
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1044
+#: ../mail/em-format-html.c:2290 ../mail/em-format-html.c:2352
+#: ../mail/em-format-html.c:2375 ../modules/mail/em-mailer-prefs.c:75
msgid "Cc"
msgstr "Cc"
-#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
-#: ../mail/em-format-html.c:2244 ../mail/em-format-html.c:2309
-#: ../mail/em-format-html.c:2331 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1045
+#: ../mail/em-format-html.c:2291 ../mail/em-format-html.c:2356
+#: ../mail/em-format-html.c:2378 ../modules/mail/em-mailer-prefs.c:76
msgid "Bcc"
msgstr "Bcc"
-#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:942
+#: ../em-format/em-format-quote.c:410 ../em-format/em-format.c:1046
#: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:81
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1131
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
+#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
msgid "Subject"
msgstr "Subject"
#. pseudo-header
-#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2425
-#: ../modules/mail/em-mailer-prefs.c:1137
+#: ../em-format/em-format-quote.c:421 ../mail/em-format-html.c:2472
+#: ../modules/mail/em-mailer-prefs.c:1120
msgid "Mailer"
msgstr "Mailer"
-#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1221
+#: ../em-format/em-format-quote.c:500 ../mail/em-composer-utils.c:1262
msgid "-------- Forwarded Message --------"
msgstr "-------- Forwarded Message --------"
-#: ../em-format/em-format.c:943 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:82 ../widgets/misc/e-dateedit.c:524
-#: ../widgets/misc/e-dateedit.c:546
+#: ../em-format/em-format.c:1047 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:527
+#: ../widgets/misc/e-dateedit.c:549
msgid "Date"
msgstr "Date"
-#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:83
+#: ../em-format/em-format.c:1048 ../modules/mail/em-mailer-prefs.c:79
msgid "Newsgroups"
msgstr "Newsgroups"
-#: ../em-format/em-format.c:945 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:1049 ../modules/mail/em-mailer-prefs.c:80
#: ../plugins/face/org-gnome-face.eplug.xml.h:2
msgid "Face"
msgstr "Face"
-#: ../em-format/em-format.c:1302
+#: ../em-format/em-format.c:1429
#, c-format
msgid "%s attachment"
msgstr "%s attachment"
-#: ../em-format/em-format.c:1361
+#: ../em-format/em-format.c:1501
msgid "Could not parse S/MIME message: Unknown error"
msgstr "Could not parse S/MIME message: Unknown error"
-#: ../em-format/em-format.c:1515 ../em-format/em-format.c:1685
+#: ../em-format/em-format.c:1659 ../em-format/em-format.c:1843
msgid "Could not parse MIME message. Displaying as source."
msgstr "Could not parse MIME message. Displaying as source."
-#: ../em-format/em-format.c:1523
+#: ../em-format/em-format.c:1669
msgid "Unsupported encryption type for multipart/encrypted"
msgstr "Unsupported encryption type for multipart/encrypted"
-#: ../em-format/em-format.c:1535
+#: ../em-format/em-format.c:1685
msgid "Could not parse PGP/MIME message"
msgstr "Could not parse PGP/MIME message"
-#: ../em-format/em-format.c:1535
+#: ../em-format/em-format.c:1686
msgid "Could not parse PGP/MIME message: Unknown error"
msgstr "Could not parse PGP/MIME message: Unknown error"
-#: ../em-format/em-format.c:1709
+#: ../em-format/em-format.c:1868
msgid "Unsupported signature format"
msgstr "Unsupported signature format"
-#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1867
+#: ../em-format/em-format.c:1878 ../em-format/em-format.c:2038
msgid "Error verifying signature"
msgstr "Error verifying signature"
-#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1856
-#: ../em-format/em-format.c:1867
+#: ../em-format/em-format.c:1879 ../em-format/em-format.c:2026
+#: ../em-format/em-format.c:2039
msgid "Unknown error verifying signature"
msgstr "Unknown error verifying signature"
-#: ../em-format/em-format.c:1946
-msgid "Could not parse PGP message"
-msgstr "Could not parse PGP message"
+#: ../em-format/em-format.c:2126
+msgid "Could not parse PGP message: "
+msgstr "Could not parse PGP message: "
-#: ../em-format/em-format.c:1946
-msgid "Could not parse PGP message: Unknown error"
-msgstr "Could not parse PGP message: Unknown error"
+#: ../em-format/em-format.c:2132 ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
+#: ../smime/gui/certificate-manager.c:100
+msgid "Unknown error"
+msgstr "Unknown error"
#: ../filter/e-filter-datespec.c:74
#, c-format
@@ -8963,86 +9062,92 @@ msgid_plural "%d years in the future"
msgstr[0] "1 year in the future"
msgstr[1] "%d years in the future"
-#: ../filter/e-filter-datespec.c:119
+#: ../filter/e-filter-datespec.c:122
msgid "<click here to select a date>"
msgstr "<click here to select a date>"
-#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
-#: ../filter/e-filter-datespec.c:144
+#: ../filter/e-filter-datespec.c:125 ../filter/e-filter-datespec.c:136
+#: ../filter/e-filter-datespec.c:147
msgid "now"
msgstr "now"
#. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:129
+#: ../filter/e-filter-datespec.c:132
msgid "%d-%b-%Y"
msgstr "%d-%b-%Y"
-#: ../filter/e-filter-datespec.c:272
+#: ../filter/e-filter-datespec.c:275
msgid "Select a time to compare against"
msgstr "Select a time to compare against"
-#: ../filter/e-filter-file.c:184
+#: ../filter/e-filter-file.c:188
msgid "Choose a File"
msgstr "Choose a File"
-#: ../filter/e-filter-rule.c:659
+#: ../filter/e-filter-rule.c:663
msgid "R_ule name:"
msgstr "R_ule name:"
-#: ../filter/e-filter-rule.c:689
+#: ../filter/e-filter-rule.c:693
msgid "Find items that meet the following conditions"
msgstr "Find items that meet the following conditions"
-#: ../filter/e-filter-rule.c:723
+#: ../filter/e-filter-rule.c:727
msgid "A_dd Condition"
msgstr "A_dd Condition"
-#: ../filter/e-filter-rule.c:732
+#: ../filter/e-filter-rule.c:736
msgid "If all conditions are met"
msgstr "If all conditions are met"
-#: ../filter/e-filter-rule.c:733
+#: ../filter/e-filter-rule.c:737
msgid "If any conditions are met"
msgstr "If any conditions are met"
-#: ../filter/e-filter-rule.c:736
+#: ../filter/e-filter-rule.c:740
msgid "_Find items:"
msgstr "_Find items:"
-#: ../filter/e-filter-rule.c:760
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#: ../filter/e-filter-rule.c:763
+msgid "None"
+msgstr "None"
+
+#: ../filter/e-filter-rule.c:764
msgid "All related"
msgstr "All related"
-#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
+#: ../filter/e-filter-rule.c:765 ../widgets/misc/e-send-options.ui.h:19
msgid "Replies"
msgstr "Replies"
-#: ../filter/e-filter-rule.c:762
+#: ../filter/e-filter-rule.c:766
msgid "Replies and parents"
msgstr "Replies and parents"
-#: ../filter/e-filter-rule.c:763
+#: ../filter/e-filter-rule.c:767
msgid "No reply or parent"
msgstr "No reply or parent"
-#: ../filter/e-filter-rule.c:766
+#: ../filter/e-filter-rule.c:770
msgid "I_nclude threads"
msgstr "I_nclude threads"
-#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
+#: ../filter/e-filter-rule.c:1118 ../filter/filter.ui.h:2
#: ../mail/em-utils.c:304
msgid "Incoming"
msgstr "Incoming"
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
+#: ../filter/e-filter-rule.c:1118 ../mail/em-utils.c:305
msgid "Outgoing"
msgstr "Outgoing"
-#: ../filter/e-rule-editor.c:265
+#: ../filter/e-rule-editor.c:268
msgid "Add Rule"
msgstr "Add Rule"
-#: ../filter/e-rule-editor.c:352
+#: ../filter/e-rule-editor.c:355
msgid "Edit Rule"
msgstr "Edit Rule"
@@ -9066,7 +9171,7 @@ msgstr "Missing date."
msgid "Missing file name."
msgstr "Missing file name."
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:74
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
msgid "Missing name."
msgstr "Missing name."
@@ -9122,7 +9227,7 @@ msgstr ""
"The message's date will be compared against\n"
"the current time when filtering occurs."
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:189
msgid "_Filter Rules"
msgstr "_Filter Rules"
@@ -9143,7 +9248,7 @@ msgstr "in the future"
msgid "months"
msgstr "months"
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:171
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:190
msgid "seconds"
msgstr "seconds"
@@ -9159,26 +9264,26 @@ msgstr "the time you specify"
msgid "years"
msgstr "years"
-#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1020 ../mail/mail-config.ui.h:14
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
-#: ../widgets/misc/e-attachment-paned.c:153
+#: ../mail/e-mail-attachment-bar.c:91 ../mail/e-mail-attachment-bar.c:96
+#: ../mail/em-format-html-display.c:1024 ../mail/mail-config.ui.h:15
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:129
+#: ../widgets/misc/e-attachment-paned.c:134
msgid "Attachment"
msgid_plural "Attachments"
msgstr[0] "Attachment"
msgstr[1] "Attachments"
-#: ../mail/e-mail-attachment-bar.c:617
-#: ../widgets/misc/e-attachment-paned.c:612
+#: ../mail/e-mail-attachment-bar.c:611
+#: ../widgets/misc/e-attachment-paned.c:599
msgid "Icon View"
msgstr "Icon View"
-#: ../mail/e-mail-attachment-bar.c:618
-#: ../widgets/misc/e-attachment-paned.c:613
+#: ../mail/e-mail-attachment-bar.c:612
+#: ../widgets/misc/e-attachment-paned.c:600
msgid "List View"
msgstr "List View"
-#: ../mail/e-mail-browser.c:262
+#: ../mail/e-mail-browser.c:265
msgid "(No Subject)"
msgstr "(No Subject)"
@@ -9227,7 +9332,7 @@ msgid "_Later"
msgstr "_Later"
#: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:472
+#: ../modules/mail/e-mail-shell-view-actions.c:505
msgid "Add Label"
msgstr "Add Label"
@@ -9248,56 +9353,56 @@ msgid "Color"
msgstr "Colour"
#: ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1158
+#: ../plugins/caldav/caldav-browse-server.c:1163
#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-define-views-dialog.c:334
#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
msgid "Name"
msgstr "Name"
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:363
-#: ../mail/em-folder-tree-model.c:675 ../mail/em-folder-tree.c:2585
-#: ../modules/mail/e-mail-shell-view-private.c:952
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
+#: ../mail/em-folder-tree-model.c:696 ../mail/em-folder-tree.c:2759
+#: ../modules/mail/e-mail-shell-view-private.c:1062
msgid "Inbox"
msgstr "Inbox"
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:668
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:688
msgid "Drafts"
msgstr "Drafts"
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:678
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:700
msgid "Outbox"
msgstr "Outbox"
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:680
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:702
msgid "Sent"
msgstr "Sent"
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:671
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:691
#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:570
+#: ../plugins/templates/templates.c:577
msgid "Templates"
msgstr "Templates"
-#: ../mail/e-mail-migrate.c:147
+#: ../mail/e-mail-migrate.c:131
msgid "Migrating..."
msgstr "Migratingâ?¦"
-#: ../mail/e-mail-migrate.c:180
+#: ../mail/e-mail-migrate.c:164
msgid "Migration"
msgstr "Migration"
-#: ../mail/e-mail-migrate.c:220
+#: ../mail/e-mail-migrate.c:204
#, c-format
msgid "Migrating '%s':"
msgstr "Migrating '%s':"
-#: ../mail/e-mail-migrate.c:659
+#: ../mail/e-mail-migrate.c:649
msgid "Migrating Folders"
msgstr "Migrating Folders"
-#: ../mail/e-mail-migrate.c:660
+#: ../mail/e-mail-migrate.c:650
msgid ""
"The summary format of the Evolution mailbox folders has been moved to SQLite "
"since Evolution 2.24.\n"
@@ -9309,36 +9414,50 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your foldersâ?¦"
-#: ../mail/e-mail-migrate.c:756
+#: ../mail/e-mail-migrate.c:739
#, c-format
msgid "Unable to create local mail folders at '%s': %s"
msgstr "Unable to create local mail folders at '%s': %s"
+#: ../mail/e-mail-notebook-view.c:563
+msgid "Please select a folder"
+msgstr "Please select a folder"
+
#. XXX e-error should provide a widget layout and API suitable
#. * for packing additional widgets to the right of the alert
#. * icon. But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:103
-#: ../modules/calendar/e-task-shell-view-actions.c:561
+#: ../mail/e-mail-reader-utils.c:109
+#: ../modules/calendar/e-task-shell-view-actions.c:570
msgid "Do not ask me again"
msgstr "Do not ask me again"
-#: ../mail/e-mail-reader.c:264 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:276 ../mail/em-filter-i18n.h:11
msgid "Copy to Folder"
msgstr "Copy to Folder"
-#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:378
+#: ../mail/e-mail-reader.c:276 ../mail/em-folder-utils.c:402
msgid "C_opy"
msgstr "C_opy"
-#: ../mail/e-mail-reader.c:638 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:689 ../mail/em-filter-i18n.h:51
msgid "Move to Folder"
msgstr "Move to Folder"
-#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:378
+#: ../mail/e-mail-reader.c:689 ../mail/em-folder-utils.c:402
msgid "_Move"
msgstr "_Move"
-#: ../mail/e-mail-reader.c:864
+#. Check buttons
+#: ../mail/e-mail-reader.c:954 ../mail/e-mail-reader.c:1070
+#: ../mail/e-mail-reader.c:1111
+msgid "_Do not ask me again."
+msgstr "_Do not ask me again."
+
+#: ../mail/e-mail-reader.c:1116
+msgid "_Always ignore Reply-To: for mailing lists."
+msgstr "_Always ignore Reply-To: for mailing lists."
+
+#: ../mail/e-mail-reader.c:1206
msgid "Save Message"
msgid_plural "Save Messages"
msgstr[0] "Save Message"
@@ -9350,548 +9469,597 @@ msgstr[1] "Save Messages"
#. * Subject. The extension ".mbox" is appended to this
#. * string, thus it will be something like "Message.mbox"
#. * at the end.
-#: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:5
+#: ../mail/e-mail-reader.c:1227
+#: ../plugins/groupwise-features/properties.ui.h:4
msgid "Message"
msgid_plural "Messages"
msgstr[0] "Message"
msgstr[1] "Messages"
-#: ../mail/e-mail-reader.c:1143
+#: ../mail/e-mail-reader.c:1492
msgid "A_dd Sender to Address Book"
msgstr "A_dd Sender to Address Book"
-#: ../mail/e-mail-reader.c:1145
+#: ../mail/e-mail-reader.c:1494
msgid "Add sender to address book"
msgstr "Add sender to address book"
-#: ../mail/e-mail-reader.c:1150
+#: ../mail/e-mail-reader.c:1499
msgid "Check for _Junk"
msgstr "Check for _Junk"
-#: ../mail/e-mail-reader.c:1152
+#: ../mail/e-mail-reader.c:1501
msgid "Filter the selected messages for junk status"
msgstr "Filter the selected messages for junk status"
-#: ../mail/e-mail-reader.c:1157
+#: ../mail/e-mail-reader.c:1506
msgid "_Copy to Folder..."
msgstr "_Copy to Folderâ?¦"
-#: ../mail/e-mail-reader.c:1159
+#: ../mail/e-mail-reader.c:1508
msgid "Copy selected messages to another folder"
msgstr "Copy selected messages to another folder"
-#: ../mail/e-mail-reader.c:1164
+#: ../mail/e-mail-reader.c:1513
msgid "_Delete Message"
msgstr "_Delete Message"
-#: ../mail/e-mail-reader.c:1166
+#: ../mail/e-mail-reader.c:1515
msgid "Mark the selected messages for deletion"
msgstr "Mark the selected messages for deletion"
-#: ../mail/e-mail-reader.c:1171
+#: ../mail/e-mail-reader.c:1520
msgid "Filter on Mailing _List..."
msgstr "Filter on Mailing _Listâ?¦"
-#: ../mail/e-mail-reader.c:1173
+#: ../mail/e-mail-reader.c:1522
msgid "Create a rule to filter messages to this mailing list"
msgstr "Create a rule to filter messages to this mailing list"
-#: ../mail/e-mail-reader.c:1178
+#: ../mail/e-mail-reader.c:1527
msgid "Filter on _Recipients..."
msgstr "Filter on _Recipientsâ?¦"
-#: ../mail/e-mail-reader.c:1180
+#: ../mail/e-mail-reader.c:1529
msgid "Create a rule to filter messages to these recipients"
msgstr "Create a rule to filter messages to these recipients"
-#: ../mail/e-mail-reader.c:1185
+#: ../mail/e-mail-reader.c:1534
msgid "Filter on Se_nder..."
msgstr "Filter on Se_nderâ?¦"
-#: ../mail/e-mail-reader.c:1187
+#: ../mail/e-mail-reader.c:1536
msgid "Create a rule to filter messages from this sender"
msgstr "Create a rule to filter messages from this sender"
-#: ../mail/e-mail-reader.c:1192
+#: ../mail/e-mail-reader.c:1541
msgid "Filter on _Subject..."
msgstr "Filter on _Subjectâ?¦"
-#: ../mail/e-mail-reader.c:1194
+#: ../mail/e-mail-reader.c:1543
msgid "Create a rule to filter messages with this subject"
msgstr "Create a rule to filter messages with this subject"
-#: ../mail/e-mail-reader.c:1199
+#: ../mail/e-mail-reader.c:1548
msgid "A_pply Filters"
msgstr "A_pply Filters"
-#: ../mail/e-mail-reader.c:1201
+#: ../mail/e-mail-reader.c:1550
msgid "Apply filter rules to the selected messages"
msgstr "Apply filter rules to the selected messages"
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1555
msgid "_Find in Message..."
msgstr "_Find in Messageâ?¦"
-#: ../mail/e-mail-reader.c:1208
+#: ../mail/e-mail-reader.c:1557
msgid "Search for text in the body of the displayed message"
msgstr "Search for text in the body of the displayed message"
-#: ../mail/e-mail-reader.c:1213
+#: ../mail/e-mail-reader.c:1562
msgid "_Clear Flag"
msgstr "_Clear Flag"
-#: ../mail/e-mail-reader.c:1215
+#: ../mail/e-mail-reader.c:1564
msgid "Remove the follow-up flag from the selected messages"
msgstr "Remove the follow-up flag from the selected messages"
-#: ../mail/e-mail-reader.c:1220
+#: ../mail/e-mail-reader.c:1569
msgid "_Flag Completed"
msgstr "_Flag Completed"
-#: ../mail/e-mail-reader.c:1222
+#: ../mail/e-mail-reader.c:1571
msgid "Set the follow-up flag to completed on the selected messages"
msgstr "Set the follow-up flag to completed on the selected messages"
-#: ../mail/e-mail-reader.c:1227
+#: ../mail/e-mail-reader.c:1576
msgid "Follow _Up..."
msgstr "Follow _Upâ?¦"
-#: ../mail/e-mail-reader.c:1229
+#: ../mail/e-mail-reader.c:1578
msgid "Flag the selected messages for follow-up"
msgstr "Flag the selected messages for follow-up"
-#: ../mail/e-mail-reader.c:1234
+#: ../mail/e-mail-reader.c:1583
msgid "_Attached"
msgstr "_Attached"
-#: ../mail/e-mail-reader.c:1236 ../mail/e-mail-reader.c:1243
+#: ../mail/e-mail-reader.c:1585 ../mail/e-mail-reader.c:1592
msgid "Forward the selected message to someone as an attachment"
msgstr "Forward the selected message to someone as an attachment"
-#: ../mail/e-mail-reader.c:1241
+#: ../mail/e-mail-reader.c:1590
msgid "Forward As _Attached"
msgstr "Forward As _Attached"
-#: ../mail/e-mail-reader.c:1248
+#: ../mail/e-mail-reader.c:1597
msgid "_Inline"
msgstr "_Inline"
-#: ../mail/e-mail-reader.c:1250 ../mail/e-mail-reader.c:1257
+#: ../mail/e-mail-reader.c:1599 ../mail/e-mail-reader.c:1606
msgid "Forward the selected message in the body of a new message"
msgstr "Forward the selected message in the body of a new message"
-#: ../mail/e-mail-reader.c:1255
+#: ../mail/e-mail-reader.c:1604
msgid "Forward As _Inline"
msgstr "Forward As _Inline"
-#: ../mail/e-mail-reader.c:1262
+#: ../mail/e-mail-reader.c:1611
msgid "_Quoted"
msgstr "_Quoted"
-#: ../mail/e-mail-reader.c:1264 ../mail/e-mail-reader.c:1271
+#: ../mail/e-mail-reader.c:1613 ../mail/e-mail-reader.c:1620
msgid "Forward the selected message quoted like a reply"
msgstr "Forward the selected message quoted like a reply"
-#: ../mail/e-mail-reader.c:1269
+#: ../mail/e-mail-reader.c:1618
msgid "Forward As _Quoted"
msgstr "Forward As _Quoted"
-#: ../mail/e-mail-reader.c:1276
+#: ../mail/e-mail-reader.c:1625
msgid "_Load Images"
msgstr "_Load Images"
-#: ../mail/e-mail-reader.c:1278
+#: ../mail/e-mail-reader.c:1627
msgid "Force images in HTML mail to be loaded"
msgstr "Force images in HTML mail to be loaded"
-#: ../mail/e-mail-reader.c:1283
+#: ../mail/e-mail-reader.c:1632
msgid "_Important"
msgstr "_Important"
-#: ../mail/e-mail-reader.c:1285
+#: ../mail/e-mail-reader.c:1634
msgid "Mark the selected messages as important"
msgstr "Mark the selected messages as important"
-#: ../mail/e-mail-reader.c:1290
+#: ../mail/e-mail-reader.c:1639
msgid "_Junk"
msgstr "_Junk"
-#: ../mail/e-mail-reader.c:1292
+#: ../mail/e-mail-reader.c:1641
msgid "Mark the selected messages as junk"
msgstr "Mark the selected messages as junk"
-#: ../mail/e-mail-reader.c:1297
+#: ../mail/e-mail-reader.c:1646
msgid "_Not Junk"
msgstr "_Not Junk"
-#: ../mail/e-mail-reader.c:1299
+#: ../mail/e-mail-reader.c:1648
msgid "Mark the selected messages as not being junk"
msgstr "Mark the selected messages as not being junk"
-#: ../mail/e-mail-reader.c:1304
+#: ../mail/e-mail-reader.c:1653
msgid "_Read"
msgstr "_Read"
-#: ../mail/e-mail-reader.c:1306
+#: ../mail/e-mail-reader.c:1655
msgid "Mark the selected messages as having been read"
msgstr "Mark the selected messages as having been read"
-#: ../mail/e-mail-reader.c:1311
+#: ../mail/e-mail-reader.c:1660
msgid "Uni_mportant"
msgstr "Uni_mportant"
-#: ../mail/e-mail-reader.c:1313
+#: ../mail/e-mail-reader.c:1662
msgid "Mark the selected messages as unimportant"
msgstr "Mark the selected messages as unimportant"
-#: ../mail/e-mail-reader.c:1318
+#: ../mail/e-mail-reader.c:1667
msgid "_Unread"
msgstr "_Unread"
-#: ../mail/e-mail-reader.c:1320
+#: ../mail/e-mail-reader.c:1669
msgid "Mark the selected messages as not having been read"
msgstr "Mark the selected messages as not having been read"
-#: ../mail/e-mail-reader.c:1325
+#: ../mail/e-mail-reader.c:1674
msgid "_Edit as New Message..."
msgstr "_Edit as New Messageâ?¦"
-#: ../mail/e-mail-reader.c:1327
+#: ../mail/e-mail-reader.c:1676
msgid "Open the selected messages in the composer for editing"
msgstr "Open the selected messages in the composer for editing"
-#: ../mail/e-mail-reader.c:1332
+#: ../mail/e-mail-reader.c:1681
msgid "Compose _New Message"
msgstr "Compose _New Message"
-#: ../mail/e-mail-reader.c:1334
+#: ../mail/e-mail-reader.c:1683
msgid "Open a window for composing a mail message"
msgstr "Open a window for composing a mail message"
-#: ../mail/e-mail-reader.c:1339
+#: ../mail/e-mail-reader.c:1688
msgid "_Open in New Window"
msgstr "_Open in New Window"
-#: ../mail/e-mail-reader.c:1341
+#: ../mail/e-mail-reader.c:1690
msgid "Open the selected messages in a new window"
msgstr "Open the selected messages in a new window"
-#: ../mail/e-mail-reader.c:1346
+#: ../mail/e-mail-reader.c:1695
msgid "_Move to Folder..."
msgstr "_Move to Folderâ?¦"
-#: ../mail/e-mail-reader.c:1348
+#: ../mail/e-mail-reader.c:1697
msgid "Move selected messages to another folder"
msgstr "Move selected messages to another folder"
-#: ../mail/e-mail-reader.c:1353
+#: ../mail/e-mail-reader.c:1702
+msgid "_Switch to Folder"
+msgstr "_Switch to Folder"
+
+#: ../mail/e-mail-reader.c:1704
+msgid "Display the parent folder"
+msgstr "Display the parent folder"
+
+#: ../mail/e-mail-reader.c:1709
+msgid "Switch to _next tab"
+msgstr "Switch to _next tab"
+
+#: ../mail/e-mail-reader.c:1711
+msgid "Switch to the next tab"
+msgstr "Switch to the next tab"
+
+#: ../mail/e-mail-reader.c:1716
+msgid "Switch to _previous tab"
+msgstr "Switch to _previous tab"
+
+#: ../mail/e-mail-reader.c:1718
+msgid "Switch to the previous tab"
+msgstr "Switch to the previous tab"
+
+#: ../mail/e-mail-reader.c:1723
+msgid "Cl_ose current tab"
+msgstr "Cl_ose current tab"
+
+#: ../mail/e-mail-reader.c:1725
+msgid "Close current tab"
+msgstr "Close current tab"
+
+#: ../mail/e-mail-reader.c:1730
msgid "_Next Message"
msgstr "_Next Message"
-#: ../mail/e-mail-reader.c:1355
+#: ../mail/e-mail-reader.c:1732
msgid "Display the next message"
msgstr "Display the next message"
-#: ../mail/e-mail-reader.c:1360
+#: ../mail/e-mail-reader.c:1737
msgid "Next _Important Message"
msgstr "Next _Important Message"
-#: ../mail/e-mail-reader.c:1362
+#: ../mail/e-mail-reader.c:1739
msgid "Display the next important message"
msgstr "Display the next important message"
-#: ../mail/e-mail-reader.c:1367
+#: ../mail/e-mail-reader.c:1744
msgid "Next _Thread"
msgstr "Next _Thread"
-#: ../mail/e-mail-reader.c:1369
+#: ../mail/e-mail-reader.c:1746
msgid "Display the next thread"
msgstr "Display the next thread"
-#: ../mail/e-mail-reader.c:1374
+#: ../mail/e-mail-reader.c:1751
msgid "Next _Unread Message"
msgstr "Next _Unread Message"
-#: ../mail/e-mail-reader.c:1376
+#: ../mail/e-mail-reader.c:1753
msgid "Display the next unread message"
msgstr "Display the next unread message"
-#: ../mail/e-mail-reader.c:1381
+#: ../mail/e-mail-reader.c:1758
msgid "_Previous Message"
msgstr "_Previous Message"
-#: ../mail/e-mail-reader.c:1383
+#: ../mail/e-mail-reader.c:1760
msgid "Display the previous message"
msgstr "Display the previous message"
-#: ../mail/e-mail-reader.c:1388
+#: ../mail/e-mail-reader.c:1765
msgid "Pr_evious Important Message"
msgstr "Pr_evious Important Message"
-#: ../mail/e-mail-reader.c:1390
+#: ../mail/e-mail-reader.c:1767
msgid "Display the previous important message"
msgstr "Display the previous important message"
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1772
msgid "P_revious Unread Message"
msgstr "P_revious Unread Message"
-#: ../mail/e-mail-reader.c:1397
+#: ../mail/e-mail-reader.c:1774
msgid "Display the previous unread message"
msgstr "Display the previous unread message"
-#: ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1781
msgid "Print this message"
msgstr "Print this message"
-#: ../mail/e-mail-reader.c:1411
+#: ../mail/e-mail-reader.c:1788
msgid "Preview the message to be printed"
msgstr "Preview the message to be printed"
-#: ../mail/e-mail-reader.c:1416
+#: ../mail/e-mail-reader.c:1793
msgid "Re_direct"
msgstr "Re_direct"
-#: ../mail/e-mail-reader.c:1418
+#: ../mail/e-mail-reader.c:1795
msgid "Redirect (bounce) the selected message to someone"
msgstr "Redirect (bounce) the selected message to someone"
-#: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1425
-#: ../modules/mail/e-mail-attachment-handler.c:139
+#: ../mail/e-mail-reader.c:1800 ../mail/mail.error.xml.h:91
+#: ../modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../modules/mail/e-mail-attachment-handler.c:151
msgid "Reply to _All"
msgstr "Reply to _All"
-#: ../mail/e-mail-reader.c:1425
+#: ../mail/e-mail-reader.c:1802
msgid "Compose a reply to all the recipients of the selected message"
msgstr "Compose a reply to all the recipients of the selected message"
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1807 ../mail/mail.error.xml.h:92
msgid "Reply to _List"
msgstr "Reply to _List"
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1809
msgid "Compose a reply to the mailing list of the selected message"
msgstr "Compose a reply to the mailing list of the selected message"
-#: ../mail/e-mail-reader.c:1437
-#: ../modules/mail/e-mail-attachment-handler.c:146
+#: ../mail/e-mail-reader.c:1814
+#: ../modules/mail/e-mail-attachment-handler.c:158
msgid "_Reply to Sender"
msgstr "_Reply to Sender"
-#: ../mail/e-mail-reader.c:1439
+#: ../mail/e-mail-reader.c:1816
msgid "Compose a reply to the sender of the selected message"
msgstr "Compose a reply to the sender of the selected message"
-#: ../mail/e-mail-reader.c:1444
+#: ../mail/e-mail-reader.c:1821
msgid "_Save as mbox..."
msgstr "_Save as mboxâ?¦"
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1823
msgid "Save selected messages as an mbox file"
msgstr "Save selected messages as an mbox file"
-#: ../mail/e-mail-reader.c:1451
+#: ../mail/e-mail-reader.c:1828
msgid "Search Folder from Mailing _List..."
msgstr "Search Folder from Mailing _Listâ?¦"
-#: ../mail/e-mail-reader.c:1453
+#: ../mail/e-mail-reader.c:1830
msgid "Create a search folder for this mailing list"
msgstr "Create a search folder for this mailing list"
-#: ../mail/e-mail-reader.c:1458
+#: ../mail/e-mail-reader.c:1835
msgid "Search Folder from Recipien_ts..."
msgstr "Search Folder from Recipien_tsâ?¦"
-#: ../mail/e-mail-reader.c:1460
+#: ../mail/e-mail-reader.c:1837
msgid "Create a search folder for these recipients"
msgstr "Create a search folder for these recipients"
-#: ../mail/e-mail-reader.c:1465
+#: ../mail/e-mail-reader.c:1842
msgid "Search Folder from Sen_der..."
msgstr "Search Folder from Sen_derâ?¦"
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1844
msgid "Create a search folder for this sender"
msgstr "Create a search folder for this sender"
-#: ../mail/e-mail-reader.c:1472
+#: ../mail/e-mail-reader.c:1849
msgid "Search Folder from S_ubject..."
msgstr "Search Folder from S_ubjectâ?¦"
-#: ../mail/e-mail-reader.c:1474
+#: ../mail/e-mail-reader.c:1851
msgid "Create a search folder for this subject"
msgstr "Create a search folder for this subject"
-#: ../mail/e-mail-reader.c:1479
+#: ../mail/e-mail-reader.c:1856
msgid "_Message Source"
msgstr "_Message Source"
-#: ../mail/e-mail-reader.c:1481
+#: ../mail/e-mail-reader.c:1858
msgid "Show the raw email source of the message"
msgstr "Show the raw e-mail source of the message"
-#: ../mail/e-mail-reader.c:1493
+#: ../mail/e-mail-reader.c:1870
msgid "_Undelete Message"
msgstr "_Undelete Message"
-#: ../mail/e-mail-reader.c:1495
+#: ../mail/e-mail-reader.c:1872
msgid "Undelete the selected messages"
msgstr "Undelete the selected messages"
-#: ../mail/e-mail-reader.c:1500
+#: ../mail/e-mail-reader.c:1877
msgid "_Normal Size"
msgstr "_Normal Size"
-#: ../mail/e-mail-reader.c:1502
+#: ../mail/e-mail-reader.c:1879
msgid "Reset the text to its original size"
msgstr "Reset the text to its original size"
-#: ../mail/e-mail-reader.c:1507
+#: ../mail/e-mail-reader.c:1884
msgid "_Zoom In"
msgstr "_Zoom In"
-#: ../mail/e-mail-reader.c:1509
+#: ../mail/e-mail-reader.c:1886
msgid "Increase the text size"
msgstr "Increase the text size"
-#: ../mail/e-mail-reader.c:1514
+#: ../mail/e-mail-reader.c:1891
msgid "Zoom _Out"
msgstr "Zoom _Out"
-#: ../mail/e-mail-reader.c:1516
+#: ../mail/e-mail-reader.c:1893
msgid "Decrease the text size"
msgstr "Decrease the text size"
-#: ../mail/e-mail-reader.c:1523
+#: ../mail/e-mail-reader.c:1900
msgid "Create R_ule"
msgstr "Create R_ule"
-#: ../mail/e-mail-reader.c:1530
+#: ../mail/e-mail-reader.c:1907
msgid "Ch_aracter Encoding"
msgstr "Ch_aracter Encoding"
-#: ../mail/e-mail-reader.c:1537
+#: ../mail/e-mail-reader.c:1914
msgid "F_orward As"
msgstr "F_orward As"
-#: ../mail/e-mail-reader.c:1544
+#: ../mail/e-mail-reader.c:1921
+msgid "_Group Reply"
+msgstr "_Group Reply"
+
+#: ../mail/e-mail-reader.c:1928
msgid "_Go To"
msgstr "_Go To"
-#: ../mail/e-mail-reader.c:1551
+#: ../mail/e-mail-reader.c:1935
msgid "Mar_k As"
msgstr "Mar_k As"
-#: ../mail/e-mail-reader.c:1558
+#: ../mail/e-mail-reader.c:1942
msgid "_Message"
msgstr "_Message"
-#: ../mail/e-mail-reader.c:1565
+#: ../mail/e-mail-reader.c:1949
msgid "_Zoom"
msgstr "_Zoom"
-#: ../mail/e-mail-reader.c:1590
+#: ../mail/e-mail-reader.c:1974
msgid "Mark for Follo_w Up..."
msgstr "Mark for Follo_w Upâ?¦"
-#: ../mail/e-mail-reader.c:1598
+#: ../mail/e-mail-reader.c:1982
msgid "Mark as _Important"
msgstr "Mark as _Important"
-#: ../mail/e-mail-reader.c:1602
+#: ../mail/e-mail-reader.c:1986
msgid "Mark as _Junk"
msgstr "Mark as _Junk"
-#: ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1990
msgid "Mark as _Not Junk"
msgstr "Mark as _Not Junk"
-#: ../mail/e-mail-reader.c:1610
+#: ../mail/e-mail-reader.c:1994
msgid "Mar_k as Read"
msgstr "Mar_k as Read"
-#: ../mail/e-mail-reader.c:1614
+#: ../mail/e-mail-reader.c:1998
msgid "Mark as Uni_mportant"
msgstr "Mark as Uni_mportant"
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:2002
msgid "Mark as _Unread"
msgstr "Mark as _Unread"
-#: ../mail/e-mail-reader.c:1654
+#: ../mail/e-mail-reader.c:2038
msgid "_Caret Mode"
msgstr "_Caret Mode"
-#: ../mail/e-mail-reader.c:1656
+#: ../mail/e-mail-reader.c:2040
msgid "Show a blinking cursor in the body of displayed messages"
msgstr "Show a blinking cursor in the body of displayed messages"
-#: ../mail/e-mail-reader.c:1662
+#: ../mail/e-mail-reader.c:2046
msgid "All Message _Headers"
msgstr "All Message _Headers"
-#: ../mail/e-mail-reader.c:1664
+#: ../mail/e-mail-reader.c:2048
msgid "Show messages with all email headers"
msgstr "Show messages with all e-mail headers"
-#: ../mail/e-mail-reader.c:1878
+#: ../mail/e-mail-reader.c:2269
msgid "Unable to retrieve message"
msgstr "Unable to retrieve message"
-#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1939
-#: ../mail/mail-ops.c:1838
+#: ../mail/e-mail-reader.c:2329 ../mail/mail-ops.c:1891
#, c-format
msgid "Retrieving message '%s'"
msgstr "Retrieving message '%s'"
#. we changed user, thus reset the chosen calendar combo too, because
#. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2453
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:534
-#: ../plugins/google-account-setup/google-source.c:656
-#: ../widgets/misc/e-account-tree-view.c:234
+#: ../mail/e-mail-reader.c:2889 ../mail/mail-config.ui.h:31
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:537
+#: ../plugins/google-account-setup/google-source.c:659
+#: ../widgets/misc/e-account-tree-view.c:240
msgid "Default"
msgstr "Default"
-#: ../mail/e-mail-reader.c:2574
-#: ../modules/mail/e-mail-attachment-handler.c:132
+#: ../mail/e-mail-reader.c:3037
+#: ../modules/mail/e-mail-attachment-handler.c:144
msgid "_Forward"
msgstr "_Forward"
-#: ../mail/e-mail-reader.c:2575
+#: ../mail/e-mail-reader.c:3038
msgid "Forward the selected message to someone"
msgstr "Forward the selected message to someone"
-#: ../mail/e-mail-reader.c:2619 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:753
+#: ../mail/e-mail-reader.c:3057
+msgid "Group Reply"
+msgstr "Group Reply"
+
+#: ../mail/e-mail-reader.c:3058
+msgid "Reply to the mailing list, or to all recipients"
+msgstr "Reply to the mailing list, or to all recipients"
+
+#: ../mail/e-mail-reader.c:3103 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:743
msgid "Delete"
msgstr "Delete"
-#: ../mail/e-mail-reader.c:2623
-#: ../modules/calendar/e-cal-shell-view-actions.c:1271
-#: ../widgets/misc/e-calendar.c:193
+#: ../mail/e-mail-reader.c:3136
+#: ../modules/calendar/e-cal-shell-view-actions.c:1305
+#: ../widgets/misc/e-calendar.c:196
msgid "Next"
msgstr "Next"
-#: ../mail/e-mail-reader.c:2627
-#: ../modules/calendar/e-cal-shell-view-actions.c:1264
-#: ../widgets/misc/e-calendar.c:169
+#: ../mail/e-mail-reader.c:3140
+#: ../modules/calendar/e-cal-shell-view-actions.c:1298
+#: ../widgets/misc/e-calendar.c:172
msgid "Previous"
msgstr "Previous"
-#: ../mail/e-mail-reader.c:2631 ../mail/mail-dialogs.ui.h:17
+#: ../mail/e-mail-reader.c:3150 ../mail/mail-dialogs.ui.h:19
msgid "Reply"
msgstr "Reply"
+#: ../mail/e-mail-reader.c:3718
+#, c-format
+msgid "Folder '%s'"
+msgstr "Folder '%s'"
+
#: ../mail/e-mail-tag-editor.c:292
msgid "Flag to Follow Up"
msgstr "Flag to Follow Up"
#. Translators: This string is a "Use secure connection" option for
#. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:73
+#: ../mail/em-account-editor.c:512 ../mail/mail-config.ui.h:77
#: ../modules/addressbook/ldap-config.ui.h:9
msgid "No encryption"
msgstr "No encryption"
@@ -9899,7 +10067,7 @@ msgstr "No encryption"
#. Translators: This string is a "Use secure connection" option for
#. the Mailer. TLS (Transport Layer Security) is commonly known by
#. this abbreviation.
-#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:121
+#: ../mail/em-account-editor.c:516 ../mail/mail-config.ui.h:136
#: ../modules/addressbook/ldap-config.ui.h:20
msgid "TLS encryption"
msgstr "TLS encryption"
@@ -9907,17 +10075,17 @@ msgstr "TLS encryption"
#. Translators: This string is a "Use secure connection" option for
#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
#. abbreviation.
-#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:94
+#: ../mail/em-account-editor.c:520 ../mail/mail-config.ui.h:105
#: ../modules/addressbook/ldap-config.ui.h:12
msgid "SSL encryption"
msgstr "SSL encryption"
-#: ../mail/em-account-editor.c:594
+#: ../mail/em-account-editor.c:607
#, c-format
msgid "%s License Agreement"
msgstr "%s Licence Agreement"
-#: ../mail/em-account-editor.c:601
+#: ../mail/em-account-editor.c:614
#, c-format
msgid ""
"\n"
@@ -9931,34 +10099,34 @@ msgstr ""
"and tick the check box for accepting it\n"
#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:876 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:901 ../widgets/misc/e-signature-combo-box.c:79
msgctxt "mail-signature"
msgid "None"
msgstr "None"
-#: ../mail/em-account-editor.c:960
+#: ../mail/em-account-editor.c:985
msgid "Never"
msgstr "Never"
-#: ../mail/em-account-editor.c:961
+#: ../mail/em-account-editor.c:986
msgid "Always"
msgstr "Always"
-#: ../mail/em-account-editor.c:962
+#: ../mail/em-account-editor.c:987
msgid "Ask for each message"
msgstr "Ask for each message"
#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1723 ../widgets/misc/e-account-tree-view.c:128
msgctxt "mail-receiving"
msgid "None"
msgstr "None"
-#: ../mail/em-account-editor.c:2056
+#: ../mail/em-account-editor.c:2098
msgid "Mail Configuration"
msgstr "Mail Configuration"
-#: ../mail/em-account-editor.c:2057
+#: ../mail/em-account-editor.c:2099
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -9968,7 +10136,7 @@ msgstr ""
"\n"
"Click \"Forward\" to begin."
-#: ../mail/em-account-editor.c:2060
+#: ../mail/em-account-editor.c:2102
msgid ""
"Please enter your name and email address below. The \"optional\" fields "
"below do not need to be filled in, unless you wish to include this "
@@ -9978,20 +10146,20 @@ msgstr ""
"below do not need to be filled in, unless you wish to include this "
"information in e-mails you send."
-#: ../mail/em-account-editor.c:2062 ../mail/em-account-editor.c:2228
-#: ../mail/mail-config.ui.h:91
+#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2261
+#: ../mail/mail-config.ui.h:98
msgid "Receiving Email"
msgstr "Receiving E-mail"
-#: ../mail/em-account-editor.c:2063
+#: ../mail/em-account-editor.c:2105
msgid "Please configure the following account settings."
msgstr "Please configure the following account settings."
-#: ../mail/em-account-editor.c:2065 ../mail/em-account-editor.c:2705
+#: ../mail/em-account-editor.c:2107 ../mail/em-account-editor.c:2743
msgid "Sending Email"
msgstr "Sending E-mail"
-#: ../mail/em-account-editor.c:2066
+#: ../mail/em-account-editor.c:2108
msgid ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
@@ -9999,11 +10167,11 @@ msgstr ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2110
msgid "Account Management"
msgstr "Account Management"
-#: ../mail/em-account-editor.c:2069
+#: ../mail/em-account-editor.c:2111
msgid ""
"Please enter a descriptive name for this account in the space below.\n"
"This name will be used for display purposes only."
@@ -10011,11 +10179,11 @@ msgstr ""
"Please enter a descriptive name for this account in the space below.\n"
"This name will be used for display purposes only."
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2115
msgid "Done"
msgstr "Done"
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2116
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -10029,56 +10197,52 @@ msgstr ""
"\n"
"Click \"Apply\" to save your settings."
-#: ../mail/em-account-editor.c:2515
+#: ../mail/em-account-editor.c:2557
msgid "Check for _new messages every"
msgstr "Check for _new messages every"
-#: ../mail/em-account-editor.c:2523
+#: ../mail/em-account-editor.c:2565
msgid "minu_tes"
msgstr "minu_tes"
-#: ../mail/em-account-editor.c:2831 ../mail/mail-config.ui.h:101
+#: ../mail/em-account-editor.c:2841
+msgid "Please select a folder from the current account."
+msgstr "Please select a folder from the current account."
+
+#: ../mail/em-account-editor.c:3111 ../mail/mail-config.ui.h:112
msgid "Security"
msgstr "Security"
#. Most sections for this is auto-generated from the camel config
#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2876 ../mail/em-account-editor.c:2944
+#: ../mail/em-account-editor.c:3156 ../mail/em-account-editor.c:3224
msgid "Receiving Options"
msgstr "Receiving Options"
-#: ../mail/em-account-editor.c:2877 ../mail/em-account-editor.c:2945
+#: ../mail/em-account-editor.c:3157 ../mail/em-account-editor.c:3225
msgid "Checking for New Messages"
msgstr "Checking for New Messages"
-#: ../mail/em-account-editor.c:3413
-msgid "Account Editor"
-msgstr "Account Editor"
-
-#: ../mail/em-account-editor.c:3413
-msgid "Evolution Account Assistant"
-msgstr "Evolution Account Assistant"
-
#. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1571
+#: ../mail/em-composer-utils.c:1695
#, c-format
msgid "Your message to %s about \"%s\" on %s has been read."
msgstr "Your message to %s about \"%s\" on %s has been read."
#. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1619
+#: ../mail/em-composer-utils.c:1743
#, c-format
msgid "Delivery Notification for: \"%s\""
msgstr "Delivery Notification for: \"%s\""
-#: ../mail/em-composer-utils.c:1943
+#: ../mail/em-composer-utils.c:2152
msgid "an unknown sender"
msgstr "an unknown sender"
#. Note to translators: this is the attribution string used when quoting messages.
#. * each ${Variable} gets replaced with a value. To see a full list of available
#. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1990
+#: ../mail/em-composer-utils.c:2199
msgid ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
@@ -10086,15 +10250,15 @@ msgstr ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
-#: ../mail/em-composer-utils.c:2134
+#: ../mail/em-composer-utils.c:2343
msgid "-----Original Message-----"
msgstr "-----Original Message-----"
-#: ../mail/em-composer-utils.c:2315
+#: ../mail/em-composer-utils.c:2555
msgid "Posting destination"
msgstr "Posting destination"
-#: ../mail/em-composer-utils.c:2316
+#: ../mail/em-composer-utils.c:2556
msgid "Choose folders to post the message to."
msgstr "Choose folders to post the message to."
@@ -10115,10 +10279,18 @@ msgstr "Assign Colour"
msgid "Assign Score"
msgstr "Assign Score"
+#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
+
#: ../mail/em-filter-i18n.h:7
msgid "Beep"
msgstr "Beep"
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
+
#: ../mail/em-filter-i18n.h:9
msgid "Completed On"
msgstr "Completed On"
@@ -10207,7 +10379,7 @@ msgstr "is not set"
msgid "is set"
msgstr "is set"
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:62
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:66
msgid "Junk"
msgstr "Junk"
@@ -10256,7 +10428,7 @@ msgid "Play Sound"
msgstr "Play Sound"
#. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
msgid "Read"
msgstr "Read"
@@ -10346,7 +10518,7 @@ msgid "Add Ac_tion"
msgstr "Add Ac_tion"
#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:169
+#: ../mail/em-folder-properties.c:126
msgid "Unread messages:"
msgid_plural "Unread messages:"
msgstr[0] "Unread messages:"
@@ -10354,24 +10526,24 @@ msgstr[1] "Unread messages:"
#. TODO: can this be done in a loop?
#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:173
+#: ../mail/em-folder-properties.c:130
msgid "Total messages:"
msgid_plural "Total messages:"
msgstr[0] "Total messages:"
msgstr[1] "Total messages:"
-#: ../mail/em-folder-properties.c:191
+#: ../mail/em-folder-properties.c:148
#, c-format
msgid "Quota usage (%s):"
msgstr "Quota usage (%s):"
-#: ../mail/em-folder-properties.c:193
+#: ../mail/em-folder-properties.c:150
#, c-format
msgid "Quota usage"
msgstr "Quota usage"
-#: ../mail/em-folder-properties.c:395
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/em-folder-properties.c:288
+#: ../plugins/groupwise-features/properties.ui.h:3
msgid "Folder Properties"
msgstr "Folder Properties"
@@ -10388,28 +10560,28 @@ msgid "Folder _name:"
msgstr "Folder _name:"
#. load store to mail component
-#: ../mail/em-folder-tree-model.c:146 ../mail/em-folder-tree-model.c:149
-#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:157
-#: ../mail/em-folder-tree-model.c:164 ../mail/em-folder-tree-model.c:166
-#: ../mail/mail-vfolder.c:1073 ../mail/mail-vfolder.c:1138
+#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
+#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
+#: ../mail/mail-vfolder.c:1064 ../mail/mail-vfolder.c:1129
msgid "Search Folders"
msgstr "Search Folders"
#. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:171 ../mail/em-folder-tree-model.c:173
+#: ../mail/em-folder-tree-model.c:174 ../mail/em-folder-tree-model.c:176
msgid "UNMATCHED"
msgstr "UNMATCHED"
-#: ../mail/em-folder-tree-model.c:743 ../mail/em-folder-tree-model.c:1080
+#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree-model.c:1113
msgid "Loading..."
msgstr "Loadingâ?¦"
-#: ../mail/em-folder-tree.c:179
+#: ../mail/em-folder-tree.c:184
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "Scanning folders in \"%s\""
-#: ../mail/em-folder-tree.c:592
+#: ../mail/em-folder-tree.c:601
msgid "Folder names cannot contain '/'"
msgstr "Folder names cannot contain '/'"
@@ -10431,70 +10603,71 @@ msgstr "Folder names cannot contain '/'"
#. * Do not translate the "folder-display|" part. Remove it
#. * from your translation.
#.
-#: ../mail/em-folder-tree.c:1074
+#: ../mail/em-folder-tree.c:1084
#, c-format
msgctxt "folder-display"
msgid "%s (%u%s)"
msgstr "%s (%u%s)"
-#: ../mail/em-folder-tree.c:1280
+#: ../mail/em-folder-tree.c:1318
msgid "Mail Folder Tree"
msgstr "Mail Folder Tree"
-#: ../mail/em-folder-tree.c:1486 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:1623 ../mail/em-folder-utils.c:92
#, c-format
msgid "Moving folder %s"
msgstr "Moving folder %s"
-#: ../mail/em-folder-tree.c:1488 ../mail/em-folder-utils.c:94
+#: ../mail/em-folder-tree.c:1625 ../mail/em-folder-utils.c:94
#, c-format
msgid "Copying folder %s"
msgstr "Copying folder %s"
-#: ../mail/em-folder-tree.c:1495 ../mail/message-list.c:2095
+#: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2164
#, c-format
msgid "Moving messages into folder %s"
msgstr "Moving messages into folder %s"
-#: ../mail/em-folder-tree.c:1497 ../mail/message-list.c:2097
+#: ../mail/em-folder-tree.c:1634 ../mail/message-list.c:2166
#, c-format
msgid "Copying messages into folder %s"
msgstr "Copying messages into folder %s"
-#: ../mail/em-folder-tree.c:1512
+#: ../mail/em-folder-tree.c:1650
+#, c-format
msgid "Cannot drop message(s) into toplevel store"
msgstr "Cannot drop message(s) into toplevel store"
-#: ../mail/em-folder-utils.c:379
+#: ../mail/em-folder-utils.c:403
msgid "Move Folder To"
msgstr "Move Folder To"
-#: ../mail/em-folder-utils.c:379
+#: ../mail/em-folder-utils.c:403
msgid "Copy Folder To"
msgstr "Copy Folder To"
-#: ../mail/em-folder-utils.c:500
+#: ../mail/em-folder-utils.c:533
#: ../plugins/groupwise-features/share-folder-common.c:136
#, c-format
msgid "Creating folder '%s'"
msgstr "Creating folder '%s'"
-#: ../mail/em-folder-utils.c:663
+#: ../mail/em-folder-utils.c:693
msgid "Create Folder"
msgstr "Create Folder"
-#: ../mail/em-folder-utils.c:664
-#: ../plugins/groupwise-features/install-shared.c:167
-#: ../plugins/groupwise-features/share-folder-common.c:347
+#: ../mail/em-folder-utils.c:694
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:343
msgid "Specify where to create the folder:"
msgstr "Specify where to create the folder:"
-#: ../mail/em-folder-utils.c:680
+#: ../mail/em-folder-utils.c:714
#, c-format
msgid "Unsubscribing from folder \"%s\""
msgstr "Unsubscribing from folder \"%s\""
-#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1533
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1576
msgid "Unsigned"
msgstr "Unsigned"
@@ -10506,7 +10679,7 @@ msgstr ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
-#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1534
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1577
msgid "Valid signature"
msgstr "Valid signature"
@@ -10518,7 +10691,7 @@ msgstr ""
"This message is signed and is valid meaning that it is very likely that this "
"message is authentic."
-#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1578
msgid "Invalid signature"
msgstr "Invalid signature"
@@ -10530,7 +10703,7 @@ msgstr ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
-#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1579
msgid "Valid signature, but cannot verify sender"
msgstr "Valid signature, but cannot verify sender"
@@ -10542,7 +10715,7 @@ msgstr ""
"This message is signed with a valid signature, but the sender of the message "
"cannot be verified."
-#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1580
msgid "Signature exists, but need public key"
msgstr "Signature exists, but need public key"
@@ -10554,7 +10727,7 @@ msgstr ""
"This message is signed with a signature, but there is no corresponding "
"public key."
-#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1543
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1586
msgid "Unencrypted"
msgstr "Unencrypted"
@@ -10566,7 +10739,7 @@ msgstr ""
"This message is not encrypted. Its content may be viewed in transit across "
"the Internet."
-#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1544
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1587
msgid "Encrypted, weak"
msgstr "Encrypted, weak"
@@ -10580,7 +10753,7 @@ msgstr ""
"difficult, but not impossible for an outsider to view the content of this "
"message in a practical amount of time."
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1588
msgid "Encrypted"
msgstr "Encrypted"
@@ -10592,7 +10765,7 @@ msgstr ""
"This message is encrypted. It would be difficult for an outsider to view "
"the content of this message."
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1589
msgid "Encrypted, strong"
msgstr "Encrypted, strong"
@@ -10606,7 +10779,7 @@ msgstr ""
"very difficult for an outsider to view the content of this message in a "
"practical amount of time."
-#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
msgid "_View Certificate"
msgstr "_View Certificate"
@@ -10622,108 +10795,113 @@ msgstr ""
"Evolution cannot render this e-mail as it is too large to process. You can "
"view it unformatted or with an external text editor."
-#: ../mail/em-format-html-display.c:726
+#: ../mail/em-format-html-display.c:725
msgid "Completed on"
msgstr "Completed on"
-#: ../mail/em-format-html-display.c:734
+#: ../mail/em-format-html-display.c:733
msgid "Overdue:"
msgstr "Overdue:"
#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:737
msgid "by"
msgstr "by"
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html-display.c:996
msgid "View _Unformatted"
msgstr "View _Unformatted"
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:951
msgid "Hide _Unformatted"
msgstr "Hide _Unformatted"
-#: ../mail/em-format-html-display.c:1012
+#: ../mail/em-format-html-display.c:1016
msgid "O_pen With"
msgstr "O_pen With"
-#: ../mail/em-format-html-print.c:163
+#: ../mail/em-format-html-print.c:176
#, c-format
msgid "Page %d of %d"
msgstr "Page %d of %d"
-#: ../mail/em-format-html.c:147
+#: ../mail/em-format-html.c:153
msgid "Formatting message"
msgstr "Formatting message"
-#: ../mail/em-format-html.c:338
+#: ../mail/em-format-html.c:352
msgid "Formatting Message..."
msgstr "Formatting Messageâ?¦"
-#: ../mail/em-format-html.c:1380 ../mail/em-format-html.c:1389
+#: ../mail/em-format-html.c:1421 ../mail/em-format-html.c:1430
#, c-format
msgid "Retrieving '%s'"
msgstr "Retrieving '%s'"
-#: ../mail/em-format-html.c:1854
+#: ../mail/em-format-html.c:1901
msgid "Unknown external-body part."
msgstr "Unknown external-body part."
-#: ../mail/em-format-html.c:1862
+#: ../mail/em-format-html.c:1909
msgid "Malformed external-body part."
msgstr "Malformed external-body part."
-#: ../mail/em-format-html.c:1892
+#: ../mail/em-format-html.c:1939
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "Pointer to FTP site (%s)"
-#: ../mail/em-format-html.c:1903
+#: ../mail/em-format-html.c:1950
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "Pointer to local file (%s) valid at site \"%s\""
-#: ../mail/em-format-html.c:1905
+#: ../mail/em-format-html.c:1952
#, c-format
msgid "Pointer to local file (%s)"
msgstr "Pointer to local file (%s)"
-#: ../mail/em-format-html.c:1926
+#: ../mail/em-format-html.c:1973
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "Pointer to remote data (%s)"
-#: ../mail/em-format-html.c:1937
+#: ../mail/em-format-html.c:1984
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "Pointer to unknown external data (\"%s\" type)"
#. To translators: This message suggests to the receipients that the sender of the mail is
#. different from the one listed in From field.
-#.
-#: ../mail/em-format-html.c:2598
+#: ../mail/em-format-html.c:2647
#, c-format
-msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
-msgstr "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+msgid "This message was sent by %s on behalf of %s"
+msgstr "This message was sent by %s on behalf of %s"
-#: ../mail/em-subscribe-editor.c:583
+#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
+#: ../mail/em-html-stream.c:122
+#, c-format
+msgid "No HTML stream available"
+msgstr "No HTML stream available"
+
+#: ../mail/em-subscribe-editor.c:677
msgid "This store does not support subscriptions, or they are not enabled."
msgstr "This store does not support subscriptions, or they are not enabled."
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:728
msgid "Subscribed"
msgstr "Subscribed"
-#: ../mail/em-subscribe-editor.c:620
+#: ../mail/em-subscribe-editor.c:732
msgid "Folder"
msgstr "Folder"
#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:837
+#: ../mail/em-subscribe-editor.c:1120
msgid "Please select a server."
msgstr "Please select a server."
-#: ../mail/em-subscribe-editor.c:873
+#: ../mail/em-subscribe-editor.c:1166
msgid "No server has been selected"
msgstr "No server has been selected"
@@ -10737,12 +10915,16 @@ msgid_plural "Are you sure you want to open %d messages at once?"
msgstr[0] "Are you sure you want to open %d messages at once?"
msgstr[1] "Are you sure you want to open %d messages at once?"
+#: ../mail/em-utils.c:152
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+msgid "_Do not show this message again"
+msgstr "_Do not show this message again"
+
#: ../mail/em-utils.c:314
msgid "Message Filters"
msgstr "Message Filters"
-#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:852
+#: ../mail/em-utils.c:848
#, c-format
msgid "Messages from %s"
msgstr "Messages from %s"
@@ -10751,7 +10933,7 @@ msgstr "Messages from %s"
msgid "Search _Folders"
msgstr "Search _Folders"
-#: ../mail/em-vfolder-rule.c:521
+#: ../mail/em-vfolder-rule.c:525
msgid "Add Folder"
msgstr "Add Folder"
@@ -10934,10 +11116,10 @@ msgid ""
"can be slow, if remote address books (like LDAP) are marked for "
"autocompletion."
msgstr ""
-"Determines whether to look up the sender e-mail in the address book. If found, it "
-"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
-"can be slow, if remote address books (like LDAP) are marked for "
-"autocompletion."
+"Determines whether to look up the sender e-mail in the address book. If "
+"found, it shouldn't be a spam. It looks up in the books marked for "
+"autocompletion. It can be slow, if remote address books (like LDAP) are "
+"marked for autocompletion."
#: ../mail/evolution-mail.schemas.in.h:42
msgid "Determines whether to use custom headers to check for junk"
@@ -11054,18 +11236,26 @@ msgid ""
"Enable to display only message texts not exceeding size defined in "
"'message_text_part_limit' key."
msgstr ""
-"Enable to display only message texts not exceeding size defined in "
+"Enable display only of message texts not exceeding size defined in "
"'message_text_part_limit' key."
#: ../mail/evolution-mail.schemas.in.h:65
+msgid "Enable to use a similar message list view settings for all folders"
+msgstr "Enable use of a similar message list view settings for all folders"
+
+#: ../mail/evolution-mail.schemas.in.h:66
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr "Enable use of a similar message list view settings for all folders."
+
+#: ../mail/evolution-mail.schemas.in.h:67
msgid "Enable/disable caret mode"
-msgstr "Enable/disable caret mode"
+msgstr "Enable/Disable caret mode"
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:46
+#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
msgid "Encode file names in an Outlook/GMail way"
msgstr "Encode file names in an Outlook/GMail way"
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:69
msgid ""
"Encode file names in the mail headers same as Outlook or GMail do, to let "
"them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -11077,19 +11267,27 @@ msgstr ""
"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
"standard."
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "Flush Outbox after filtering"
+msgstr "Flush Outbox after filtering"
+
+#: ../mail/evolution-mail.schemas.in.h:71
+msgid "Group Reply replies to list"
+msgstr "Group Reply replies to list"
+
+#: ../mail/evolution-mail.schemas.in.h:72
msgid "Height of the message-list pane"
msgstr "Height of the message-list pane"
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:73
msgid "Height of the message-list pane."
msgstr "Height of the message-list pane."
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:74
msgid "Hides the per-folder preview and removes the selection"
msgstr "Hides the per-folder preview and removes the selection"
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:75
msgid ""
"If a user tries to open 10 or more messages at one time, ask the user if "
"they really want to do it."
@@ -11097,7 +11295,7 @@ msgstr ""
"If a user tries to open 10 or more messages at one time, ask the user if "
"they really want to do it."
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:76
msgid ""
"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
"any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -11108,7 +11306,11 @@ msgstr ""
"component viewer in GNOME's MIME type database may be used for displaying "
"content."
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "Ignore list Reply-To:"
+msgstr "Ignore list Reply-To:"
+
+#: ../mail/evolution-mail.schemas.in.h:78
msgid ""
"Initial height of the \"Filter Editor\" window. The value updates as the "
"user resizes the window vertically."
@@ -11116,7 +11318,7 @@ msgstr ""
"Initial height of the \"Filter Editor\" window. The value updates as the "
"user resizes the window vertically."
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:79
msgid ""
"Initial height of the \"Search Folder Editor\" window. The value updates as "
"the user resizes the window vertically."
@@ -11124,7 +11326,7 @@ msgstr ""
"Initial height of the \"Search Folder Editor\" window. The value updates as "
"the user resizes the window vertically."
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:80
msgid ""
"Initial height of the \"Send and Receive Mail\" window. The value updates as "
"the user resizes the window vertically."
@@ -11132,7 +11334,7 @@ msgstr ""
"Initial height of the \"Send and Receive Mail\" window. The value updates as "
"the user resizes the window vertically."
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:81
msgid ""
"Initial maximize state of the \"Filter Editor\" window. The value updates "
"when the user maximizes or unmaximizes the window. Note, this particular "
@@ -11144,7 +11346,7 @@ msgstr ""
"value is not used by Evolution since the \"Filter Editor\" window cannot be "
"maximised. This key exists only as an implementation detail."
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:82
msgid ""
"Initial maximize state of the \"Search Folder Editor\" window. The value "
"updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11156,7 +11358,7 @@ msgstr ""
"particular value is not used by Evolution since the \"Search Folder Editor\" "
"window cannot be maximised. This key exists only as an implementation detail."
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:83
msgid ""
"Initial maximize state of the \"Send and Receive Mail\" window. The value "
"updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11170,7 +11372,7 @@ msgstr ""
"\" window cannot be maximised. This key exists only as an implementation "
"detail."
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:84
msgid ""
"Initial width of the \"Filter Editor\" window. The value updates as the user "
"resizes the window horizontally."
@@ -11178,7 +11380,7 @@ msgstr ""
"Initial width of the \"Filter Editor\" window. The value updates as the user "
"resizes the window horizontally."
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:85
msgid ""
"Initial width of the \"Search Folder Editor\" window. The value updates as "
"the user resizes the window horizontally."
@@ -11186,7 +11388,7 @@ msgstr ""
"Initial width of the \"Search Folder Editor\" window. The value updates as "
"the user resizes the window horizontally."
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:86
msgid ""
"Initial width of the \"Send and Receive Mail\" window. The value updates as "
"the user resizes the window horizontally."
@@ -11194,7 +11396,19 @@ msgstr ""
"Initial width of the \"Send and Receive Mail\" window. The value updates as "
"the user resizes the window horizontally."
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid ""
+"Instead of the normal \"Reply to All\" behaviour, this option will make the "
+"'Group Reply' toolbar button try to reply only to the mailing list through "
+"which you happened to receive the copy of the message to which you're "
+"replying."
+msgstr ""
+"Instead of the normal \"Reply to All\" behaviour, this option will make the "
+"'Group Reply' toolbar button try to reply only to the mailing list through "
+"which you happened to receive the copy of the message to which you're "
+"replying."
+
+#: ../mail/evolution-mail.schemas.in.h:88
msgid ""
"It disables/enables the repeated prompts to warn that deleting messages from "
"a search folder permanently deletes the message, not simply removing it from "
@@ -11204,35 +11418,61 @@ msgstr ""
"a search folder permanently deletes the message, not simply removing it from "
"the search results."
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:89
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"private reply to a message which arrived via a mailing list."
+msgstr ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"private reply to a message which arrived via a mailing list."
+
+#: ../mail/evolution-mail.schemas.in.h:90
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+msgstr ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+
+#: ../mail/evolution-mail.schemas.in.h:91
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying sending "
+"a private reply to a message which arrived via a mailing list, but the list "
+"sets a Reply-To: header which redirects your reply back to the list"
+msgstr ""
+"It disables/enables the repeated prompts to warn that you are trying to send "
+"a private reply to a message which arrived via a mailing list, but the list "
+"sets a Reply-To: header which redirects your reply back to the list."
+
+#: ../mail/evolution-mail.schemas.in.h:92
msgid "Last time Empty Junk was run"
msgstr "Last time Empty Junk was run"
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:93
msgid "Last time Empty Trash was run"
msgstr "Last time Empty Wastebasket was run"
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:94
msgid "Layout style"
msgstr "Layout style"
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:96
msgid "List of Labels and their associated colors"
msgstr "List of Labels and their associated colours"
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:97
msgid "List of MIME types to check for Bonobo component viewers"
msgstr "List of MIME types to check for Bonobo component viewers"
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:98
msgid "List of accepted licenses"
msgstr "List of accepted licences"
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:99
msgid "List of accounts"
msgstr "List of accounts"
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:100
msgid ""
"List of accounts known to the mail component of Evolution. The list contains "
"strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -11240,15 +11480,15 @@ msgstr ""
"List of accounts known to the mail component of Evolution. The list contains "
"strings naming subdirectories relative to /apps/evolution/mail/accounts."
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:101
msgid "List of custom headers and whether they are enabled."
msgstr "List of custom headers and whether they are enabled."
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:102
msgid "List of dictionary language codes used for spell checking."
msgstr "List of dictionary language codes used for spell checking."
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:103
msgid ""
"List of labels known to the mail component of Evolution. The list contains "
"strings containing name:color where color uses the HTML hex encoding."
@@ -11256,15 +11496,15 @@ msgstr ""
"List of labels known to the mail component of Evolution. The list contains "
"strings containing name:colour where colour uses the HTML hex encoding."
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:104
msgid "List of protocol names whose license has been accepted."
msgstr "List of protocol names whose licence has been accepted."
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:105
msgid "Load images for HTML messages over HTTP"
msgstr "Load images for HTML messages over HTTP"
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:106
msgid ""
"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
"Never load images off the net. \"1\" - Load images in messages from "
@@ -11274,109 +11514,121 @@ msgstr ""
"Never load images off the net. \"1\" â?? Load images in messages from "
"contacts. \"2\" â?? Always load images off the net."
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:107
msgid "Log filter actions"
msgstr "Log filter actions"
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:108
msgid "Log filter actions to the specified log file."
msgstr "Log filter actions to the specified log file."
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:109
msgid "Logfile to log filter actions"
msgstr "Logfile to log filter actions"
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:110
msgid "Logfile to log filter actions."
msgstr "Logfile to log filter actions."
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:111
msgid "Mail browser height"
msgstr "Mail browser height"
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:112
msgid "Mail browser maximized"
msgstr "Mail browser maximised"
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:113
msgid "Mail browser width"
msgstr "Mail browser width"
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:114
msgid "Mark as Seen after specified timeout"
msgstr "Mark as Seen after specified timeout"
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:115
msgid "Mark as Seen after specified timeout."
msgstr "Mark as Seen after specified timeout."
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:116
msgid "Mark citations in the message \"Preview\""
msgstr "Mark citations in the message \"Preview\""
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:117
msgid "Mark citations in the message \"Preview\"."
msgstr "Mark citations in the message \"Preview\"."
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:118
msgid "Message text limit for display"
msgstr "Message text limit for display"
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:119
msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
msgstr "Message-display style (\"normal\", \"full headers\", \"source\")"
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:120
msgid "Minimum days between emptying the junk on exit"
msgstr "Minimum days between emptying the junk on exit"
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:121
msgid "Minimum days between emptying the trash on exit"
msgstr "Minimum number of days between emptying the wastebasket on exit"
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:122
msgid "Minimum time between emptying the junk on exit, in days."
msgstr "Minimum time between emptying the junk on exit, in days."
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:123
msgid "Minimum time between emptying the trash on exit, in days."
msgstr "Minimum time between emptying the wastebasket on exit, in days."
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:124
msgid "Number of addresses to display in TO/CC/BCC"
msgstr "Number of addresses to display in TO/CC/BCC"
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:125
msgid "Prompt on empty subject"
msgstr "Prompt on empty subject"
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:126
msgid "Prompt the user when he or she tries to expunge a folder."
msgstr "Prompt the user when he or she tries to expunge a folder."
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:127
msgid ""
"Prompt the user when he or she tries to send a message without a Subject."
msgstr ""
"Prompt the user when he or she tries to send a message without a Subject."
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:128
msgid "Prompt when deleting messages in search folder"
msgstr "Prompt when deleting messages in search folder"
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Prompt when mailing list hijacks private replies"
+msgstr "Prompt when mailing list hijacks private replies"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Prompt when replying privately to list messages"
+msgstr "Prompt when replying privately to list messages"
+
+#: ../mail/evolution-mail.schemas.in.h:131
+msgid "Prompt when replying to many recipients"
+msgstr "Prompt when replying to many recipients"
+
+#: ../mail/evolution-mail.schemas.in.h:132
msgid "Prompt when user expunges"
msgstr "Prompt when user expunges"
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:133
msgid "Prompt when user only fills Bcc"
msgstr "Prompt when user only fills Bcc"
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:134
msgid "Prompt when user tries to open 10 or more messages at once"
msgstr "Prompt when user tries to open 10 or more messages at once"
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:135
msgid ""
"Prompt when user tries to send HTML mail to recipients that may not want to "
"receive HTML mail."
@@ -11384,63 +11636,63 @@ msgstr ""
"Prompt when user tries to send HTML mail to recipients that may not want to "
"receive HTML mail."
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:136
msgid "Prompt when user tries to send a message with no To or Cc recipients."
msgstr "Prompt when user tries to send a message with no To or Cc recipients."
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:137
msgid "Prompt when user tries to send unwanted HTML"
msgstr "Prompt when user tries to send unwanted HTML"
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:138
msgid "Prompt while marking multiple messages"
msgstr "Prompt while marking multiple messages"
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:139
msgid "Put personalized signatures at the top of replies"
msgstr "Put personalised signatures at the top of replies"
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:140
msgid "Put the cursor at the bottom of replies"
msgstr "Put the cursor at the bottom of replies"
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:141
msgid "Recognize emoticons in text and replace them with images."
msgstr "Recognise emoticons in text and replace them with images."
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:142
msgid "Recognize links in text and replace them."
msgstr "Recognise links in text and replace them."
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:143
msgid "Run junk test on incoming mail."
msgstr "Run junk test on incoming mail."
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:144
msgid "Save directory"
msgstr "Save directory"
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:145
msgid "Search for the sender photo in local address books"
msgstr "Search for the sender photo in local address books"
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:146
msgid "Send HTML mail by default"
msgstr "Send HTML mail by default"
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:147
msgid "Send HTML mail by default."
msgstr "Send HTML mail by default."
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:148
msgid "Sender email-address column in the message list"
msgstr "Sender e-mail address column in the message list"
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:149
msgid "Server synchronization interval"
msgstr "Server synchronisation interval"
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:150
msgid ""
"Set to TRUE in case you do not want to add signature delimiter before your "
"signature when composing a mail."
@@ -11448,67 +11700,63 @@ msgstr ""
"Set to TRUE in case you do not want to add signature delimiter before your "
"signature when composing a mail."
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:151
msgid "Show \"Bcc\" field when sending a mail message"
msgstr "Show \"Bcc\" field when sending a mail message"
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:152
msgid "Show \"Cc\" field when sending a mail message"
msgstr "Show \"Cc\" field when sending a mail message"
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:153
msgid "Show \"From\" field when posting to a newsgroup"
msgstr "Show \"From\" field when posting to a newsgroup"
-#: ../mail/evolution-mail.schemas.in.h:142
-msgid "Show \"From\" field when sending a mail message"
-msgstr "Show \"From\" field when sending a mail message"
-
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:154
msgid "Show \"Reply To\" field when posting to a newsgroup"
msgstr "Show \"Reply To\" field when posting to a newsgroup"
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:155
msgid "Show \"Reply To\" field when sending a mail message"
msgstr "Show \"Reply To\" field when sending a mail message"
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:156
msgid "Show Animations"
msgstr "Show Animations"
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:157
msgid "Show all message headers"
msgstr "Show all message headers"
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:158
msgid "Show all the headers when viewing a messages."
msgstr "Show all the headers when viewing a messages."
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:159
msgid "Show animated images as animations."
msgstr "Show animated images as animations."
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:160
msgid "Show deleted messages (with a strike-through) in the message-list."
msgstr "Show deleted messages (with a strike-through) in the message-list."
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:161
msgid "Show deleted messages in the message-list"
msgstr "Show deleted messages in the message-list"
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:162
msgid "Show image animations"
msgstr "Show image animations"
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:163
msgid "Show original \"Date\" header value."
msgstr "Show original \"Date\" header value."
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:164
msgid "Show photo of the sender"
msgstr "Show photo of the sender"
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:165
msgid ""
"Show the \"Bcc\" field when sending a mail message. This is controlled from "
"the View menu when a mail account is chosen."
@@ -11516,7 +11764,7 @@ msgstr ""
"Show the \"Bcc\" field when sending a mail message. This is controlled from "
"the View menu when a mail account is chosen."
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:166
msgid ""
"Show the \"Cc\" field when sending a mail message. This is controlled from "
"the View menu when a mail account is chosen."
@@ -11524,7 +11772,7 @@ msgstr ""
"Show the \"Cc\" field when sending a mail message. This is controlled from "
"the View menu when a mail account is chosen."
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:167
msgid ""
"Show the \"From\" field when posting to a newsgroup. This is controlled from "
"the View menu when a news account is chosen."
@@ -11532,15 +11780,7 @@ msgstr ""
"Show the \"From\" field when posting to a newsgroup. This is controlled from "
"the View menu when a news account is chosen."
-#: ../mail/evolution-mail.schemas.in.h:157
-msgid ""
-"Show the \"From\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-"Show the \"From\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:168
msgid ""
"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
"from the View menu when a news account is chosen."
@@ -11548,7 +11788,7 @@ msgstr ""
"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
"from the View menu when a news account is chosen."
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:169
msgid ""
"Show the \"Reply To\" field when sending a mail message. This is controlled "
"from the View menu when a mail account is chosen."
@@ -11556,7 +11796,7 @@ msgstr ""
"Show the \"Reply To\" field when sending a mail message. This is controlled "
"from the View menu when a mail account is chosen."
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:170
msgid ""
"Show the email-address of the sender in a separate column in the message "
"list."
@@ -11564,7 +11804,7 @@ msgstr ""
"Show the e-mail address of the sender in a separate column in the message "
"list."
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:171
msgid ""
"Show the original \"Date\" header (with a local time only if the time zone "
"differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -11574,51 +11814,70 @@ msgstr ""
"differs). Otherwise always show \"Date\" header value in a user preferred "
"format and local time zone."
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:172
msgid "Show the photo of the sender in the message reading pane."
msgstr "Show the photo of the sender in the message reading pane."
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:173
+msgid ""
+"Some mailing lists set a Reply-To: header to trick users into sending "
+"replies to the list, even when they ask Evolution to make a private reply. "
+"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
+"so that Evolution will do as you ask it. If you use the private reply "
+"action, it will reply privately, while if you use the 'Reply to List' action "
+"it will do that. It works by comparing the Reply-To: header with a List-"
+"Post: header, if there is one."
+msgstr ""
+"Some mailing lists set a Reply-To: header to trick users into sending "
+"replies to the list, even when they ask Evolution to make a private reply. "
+"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
+"so that Evolution will do as you ask it. If you use the private reply "
+"action, it will reply privately, while if you use the 'Reply to List' action "
+"it will do that. It works by comparing the Reply-To: header with a List-"
+"Post: header, if there is one."
+
+#: ../mail/evolution-mail.schemas.in.h:174
msgid "Spell check inline"
msgstr "Spell check inline"
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:175
msgid "Spell checking color"
msgstr "Spell checking colour"
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:176
msgid "Spell checking languages"
msgstr "Spell checking languages"
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:177
msgid "Subscribe dialog default height"
msgstr "Subscribe dialogue default height"
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:178
msgid "Subscribe dialog default width"
msgstr "Subscribe dialogue default width"
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:179
msgid "Terminal font"
msgstr "Terminal font"
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:180
msgid "The default plugin for Junk hook"
msgstr "The default plugin for Junk hook"
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:181
msgid ""
"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
msgstr ""
"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:182
msgid ""
"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
msgstr ""
-"The last time Empty Wastebasket was run, in days since January 1st, 1970 (Epoch)."
+"The last time Empty Wastebasket was run, in days since January 1st, 1970 "
+"(Epoch)."
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:183
msgid ""
"The layout style determines where to place the preview pane in relation to "
"the message list. \"0\" (Classic View) places the preview pane below the "
@@ -11630,15 +11889,15 @@ msgstr ""
"message list. \"1\" (Vertical View) places the preview pane next to the "
"message list."
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:184
msgid "The terminal font for mail display."
msgstr "The terminal font for mail display."
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:185
msgid "The variable width font for mail display."
msgstr "The variable width font for mail display."
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:186
msgid ""
"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
"\"2\" for debug messages."
@@ -11646,17 +11905,17 @@ msgstr ""
"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
"\"2\" for debug messages."
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:187
msgid ""
"This decides the max size of the message text that will be displayed under "
"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
"is used only when 'force_message_limit' key is activated."
msgstr ""
-"This decides the maximum size of the message text that will be displayed under "
-"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
-"is used only when the 'force_message_limit' key is activated."
+"This decides the maximum size of the message text that will be displayed "
+"under Evolution, specified in terms of KB. The default is 4096 (4MB). This "
+"value is used only when the 'force_message_limit' key is activated."
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:188
msgid ""
"This is the default junk plugin, even though there are multiple plugins "
"enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -11666,7 +11925,7 @@ msgstr ""
"enabled. If the default listed plugin is disabled, then it won't fall back "
"to the other available plugins."
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:189
msgid ""
"This key is read only once and reset to \"false\" after read. This unselects "
"the mail in the list and removes the preview for that folder."
@@ -11674,7 +11933,7 @@ msgstr ""
"This key is read only once and reset to \"false\" after read. This unselects "
"the mail in the list and removes the preview for that folder."
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:190
msgid ""
"This key should contain a list of XML structures specifying custom headers, "
"and whether they are to be displayed. The format of the XML structure is <"
@@ -11686,7 +11945,7 @@ msgstr ""
"header enabled> â?? set enabled if the header is to be displayed in the "
"mail view."
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:191
msgid ""
"This option is related to the key lookup_addressbook and is used to "
"determine whether to look up addresses in local address book only to exclude "
@@ -11696,11 +11955,11 @@ msgstr ""
"determine whether to look up addresses in local address book only to exclude "
"mail sent by known contacts from junk filtering."
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:192
msgid "This option would help in improving the speed of fetching."
msgstr "This option would help in improving the speed of fetching."
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:193
msgid ""
"This sets the number of addresses to show in default message list view, "
"beyond which a '...' is shown."
@@ -11708,7 +11967,7 @@ msgstr ""
"This sets the number of addresses to show in default message list view, "
"beyond which a 'â?¦' is shown."
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:194
msgid ""
"This setting specifies whether the threads should be in expanded or "
"collapsed state by default. Evolution requires a restart."
@@ -11716,7 +11975,7 @@ msgstr ""
"This setting specifies whether the threads should be in expanded or "
"collapsed state by default. Evolution requires a restart."
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:195
msgid ""
"This setting specifies whether the threads should be sorted based on latest "
"message in each thread, rather than by message's date. Evolution requires a "
@@ -11726,51 +11985,51 @@ msgstr ""
"message in each thread, rather than by message's date. Evolution requires a "
"restart."
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:196
msgid "Thread the message-list based on Subject"
msgstr "Thread the message-list based on Subject"
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:197
msgid "Timeout for marking message as seen"
msgstr "Timeout for marking message as seen"
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:198
msgid "Timeout for marking message as seen."
msgstr "Timeout for marking message as seen."
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:199
msgid "UID string of the default account."
msgstr "UID string of the default account."
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:200
msgid "Underline color for misspelled words when using inline spelling."
msgstr "Underline colour for misspelt words when using inline spelling."
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:201
msgid "Use SpamAssassin daemon and client"
msgstr "Use SpamAssassin daemon and client"
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:202
msgid "Use SpamAssassin daemon and client (spamc/spamd)."
msgstr "Use SpamAssassin daemon and client (spamc/spamd)."
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:203
msgid "Use custom fonts"
msgstr "Use custom fonts"
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:204
msgid "Use custom fonts for displaying mail."
msgstr "Use custom fonts for displaying mail."
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:205
msgid "Use only local spam tests."
msgstr "Use only local spam tests."
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:206
msgid "Use only the local spam tests (no DNS)."
msgstr "Use only the local spam tests (no DNS)."
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:207
msgid ""
"Users get all up in arms over where the cursor should go when replying to a "
"message. This determines whether the cursor is placed at the top of the "
@@ -11780,7 +12039,7 @@ msgstr ""
"message. This determines whether the cursor is placed at the top of the "
"message or the bottom."
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:208
msgid ""
"Users get all up in arms over where their signature should go when replying "
"to a message. This determines whether the signature is placed at the top of "
@@ -11790,36 +12049,46 @@ msgstr ""
"to a message. This determines whether the signature is placed at the top of "
"the message or the bottom."
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:209
msgid "Variable width font"
msgstr "Variable width font"
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:210
msgid "Whether a read receipt request gets added to every message by default."
msgstr "Whether a read receipt request gets added to every message by default."
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:211
msgid "Whether disable ellipsizing feature of folder names in side bar."
msgstr ""
"Whether to disable ellipsizing feature of folder names in the side bar."
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:212
msgid ""
"Whether or not to fall back on threading by subjects when the messages do "
"not contain In-Reply-To or References headers."
msgstr ""
-"Whether to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
+"Whether to fall back on threading by subjects when the messages do not "
+"contain In-Reply-To or References headers."
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:213
msgid "Whether sort threads based on latest message in that thread"
msgstr "Whether sort threads based on latest message in that thread"
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:214
+msgid ""
+"Whether to flush Outbox after filtering is done. Outbox flush will happen "
+"only when there was used any 'Forward to' filter action and approximately "
+"one minute after the last action invocation."
+msgstr ""
+"Whether to flush Outbox after filtering is done. Outbox flush will happen "
+"only when a 'Forward to' filter action is used and approximately "
+"one minute after the last action invocation."
+
+#: ../mail/evolution-mail.schemas.in.h:215
msgid "Width of the message-list pane"
msgstr "Width of the message-list pane"
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:216
msgid "Width of the message-list pane."
msgstr "Width of the message-list pane."
@@ -11827,42 +12096,55 @@ msgstr "Width of the message-list pane."
msgid "Importing Elm data"
msgstr "Importing Elm data"
-#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:372
-#: ../modules/mail/e-mail-shell-view.c:952
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
+#: ../modules/mail/e-mail-shell-view.c:964
#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
-#: ../widgets/misc/e-send-options.c:499
+#: ../widgets/misc/e-send-options.c:500
msgid "Mail"
msgstr "Mail"
-#: ../mail/importers/elm-importer.c:365
+#: ../mail/importers/elm-importer.c:366
msgid "Evolution Elm importer"
msgstr "Evolution Elm importer"
-#: ../mail/importers/elm-importer.c:366
+#: ../mail/importers/elm-importer.c:367
msgid "Import mail from Elm."
msgstr "Import mail from Elm."
-#: ../mail/importers/evolution-mbox-importer.c:113
-#: ../plugins/pst-import/pst-importer.c:301
-msgid "Destination folder:"
-msgstr "Destination folder:"
+#: ../mail/importers/evolution-mbox-importer.c:116
+#: ../plugins/dbx-import/dbx-importer.c:226
+msgid "_Destination folder:"
+msgstr "_Destination folder:"
-#: ../mail/importers/evolution-mbox-importer.c:117
-#: ../plugins/pst-import/pst-importer.c:294
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/dbx-import/dbx-importer.c:232
+#: ../plugins/pst-import/pst-importer.c:300
msgid "Select folder"
msgstr "Select folder"
-#: ../mail/importers/evolution-mbox-importer.c:117
-#: ../plugins/pst-import/pst-importer.c:294
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/pst-import/pst-importer.c:300
msgid "Select folder to import into"
msgstr "Select folder to import into"
-#: ../mail/importers/evolution-mbox-importer.c:258
+#. Translators: Column header for a message subject
+#: ../mail/importers/evolution-mbox-importer.c:372
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "Subject"
+
+#. Translators: Column header for a message From address
+#: ../mail/importers/evolution-mbox-importer.c:376
+msgctxt "mboxImp"
+msgid "From"
+msgstr "From"
+
+#: ../mail/importers/evolution-mbox-importer.c:412
#: ../shell/e-shell-utils.c:251
msgid "Berkeley Mailbox (mbox)"
msgstr "Berkeley Mailbox (mbox)"
-#: ../mail/importers/evolution-mbox-importer.c:259
+#: ../mail/importers/evolution-mbox-importer.c:413
msgid "Importer Berkeley Mailbox format folders"
msgstr "Importer Berkeley Mailbox format folders"
@@ -11871,32 +12153,33 @@ msgid "Importing mailbox"
msgstr "Importing mailbox"
#. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:148
-#: ../plugins/pst-import/pst-importer.c:446
-#: ../plugins/pst-import/pst-importer.c:552
+#: ../mail/importers/mail-importer.c:150
+#: ../plugins/dbx-import/dbx-importer.c:554
+#: ../plugins/pst-import/pst-importer.c:452
+#: ../plugins/pst-import/pst-importer.c:558
#, c-format
msgid "Importing '%s'"
msgstr "Importing '%s'"
-#: ../mail/importers/mail-importer.c:291
+#: ../mail/importers/mail-importer.c:295
#, c-format
msgid "Scanning %s"
msgstr "Scanning %s"
-#: ../mail/importers/pine-importer.c:219
+#: ../mail/importers/pine-importer.c:221
msgid "Importing Pine data"
msgstr "Importing Pine data"
-#: ../mail/importers/pine-importer.c:377
+#: ../mail/importers/pine-importer.c:405
#: ../modules/addressbook/addressbook-config.c:1006
msgid "Address Book"
msgstr "Address Book"
-#: ../mail/importers/pine-importer.c:418
+#: ../mail/importers/pine-importer.c:447
msgid "Evolution Pine importer"
msgstr "Evolution Pine importer"
-#: ../mail/importers/pine-importer.c:419
+#: ../mail/importers/pine-importer.c:448
msgid "Import mail from Pine."
msgstr "Import mail from Pine."
@@ -11947,14 +12230,14 @@ msgstr[1] ""
"%s have been updated, because they used the just-removed folder\n"
"\"%s\"."
-#: ../mail/mail-config.ui.h:1
-msgid "(Note: Requires restart of the application)"
-msgstr "(Note: Requires restart of the application)"
+#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
+#: ../mail/mail-config.ui.h:2
+msgid "(Not Recommended)"
+msgstr "(Not Recommended)"
-#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
#: ../mail/mail-config.ui.h:3
-msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr "<b>Top Posting Option</b> (Not Recommended)"
+msgid "(Note: Requires restart of the application)"
+msgstr "(Note: Requires restart of the application)"
#: ../mail/mail-config.ui.h:4
msgid "Account Information"
@@ -11992,212 +12275,224 @@ msgstr "Always encrypt to _myself when sending encrypted messages"
msgid "Always request rea_d receipt"
msgstr "Always request rea_d receipt"
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:14
+msgid "Apply the same _view settings to all folders"
+msgstr "Apply the same _view settings to all folders"
+
+#: ../mail/mail-config.ui.h:16
#: ../modules/addressbook/addressbook-config.c:1013
msgid "Authentication"
msgstr "Authentication"
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
msgid "Automatically insert _emoticon images"
msgstr "Automatically insert _emoticon images"
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
msgid "C_haracter set:"
msgstr "C_haracter set:"
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
msgid "Ch_eck for Supported Types"
msgstr "Ch_eck for Supported Types"
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
msgid "Check cu_stom headers for junk"
msgstr "Check cu_stom headers for junk"
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
msgid "Check incoming _messages for junk"
msgstr "Check incoming _messages for junk"
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
msgid "Check spelling while I _type"
msgstr "Check spelling while I _type"
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
msgid "Checks incoming mail messages to be Junk"
msgstr "Checks incoming mail messages to be Junk"
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
msgid "Cle_ar"
msgstr "Cle_ar"
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
msgid "Clea_r"
msgstr "Clea_r"
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
msgid "Color for _misspelled words:"
msgstr "Colour for _misspelt words:"
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:27
msgid "Composing Messages"
msgstr "Composing Messages"
-#: ../mail/mail-config.ui.h:27 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
msgid "Configuration"
msgstr "Configuration"
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
msgid "Confirm _when expunging a folder"
msgstr "Confirm _when expunging a folder"
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:32
msgid "Default Behavior"
msgstr "Default Behaviour"
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:33
msgid "Default character e_ncoding:"
msgstr "Default character e_ncoding:"
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:35
msgid "Delete Mail"
msgstr "Delete Mail"
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:36
msgid "Delete junk messages on e_xit"
msgstr "Delete junk messages on e_xit"
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:38
msgid "Digitally sign o_utgoing messages (by default)"
msgstr "Digitally sign o_utgoing messages (by default)"
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:39
msgid "Displayed Message Headers"
msgstr "Displayed Message Headers"
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:40
msgid "Do not display messages when text si_ze exceeds"
msgstr "Do not display messages when text si_ze exceeds"
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:41
msgid "Do not mar_k messages as junk if sender is in my address book"
msgstr "Do not mar_k messages as junk if sender is in my address book"
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:42
msgid "Do not quote"
msgstr "Do not quote"
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:43
msgid "Drafts _Folder:"
msgstr "Drafts _Folder:"
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:44
msgid "Email _Address:"
msgstr "E-mail _Address:"
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:45
msgid "Empty trash folders on e_xit"
msgstr "Empty wastebasket folders on e_xit"
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:46
msgid "Enable Magic S_pacebar"
msgstr "Enable Magic S_pacebar"
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:47
msgid "Enable Sea_rch Folders"
msgstr "Enable Sea_rch Folders"
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:49
msgid "Encry_ption certificate:"
msgstr "Encry_ption certificate:"
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:50
msgid "Encrypt out_going messages (by default)"
msgstr "Encrypt out_going messages (by default)"
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:51
msgid "Fi_xed-width:"
msgstr "Fi_xed-width:"
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:52
msgid "Fix_ed width Font:"
msgstr "Fix_ed width Font:"
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:53
msgid "Font Properties"
msgstr "Font Properties"
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:54
msgid "Format messages in _HTML"
msgstr "Format messages in _HTML"
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:55
msgid "Full Nam_e:"
msgstr "Full Nam_e:"
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:57
+msgid "Group Reply goes only to mailing list, if possible"
+msgstr "Group Reply goes only to mailing list, if possible"
+
+#: ../mail/mail-config.ui.h:58
msgid "HTML Messages"
msgstr "HTML Messages"
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:59
msgid "H_TTP Proxy:"
msgstr "H_TTP Proxy:"
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:60
msgid "Headers"
msgstr "Headers"
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:61
msgid "Highlight _quotations with"
msgstr "Highlight _quotations with"
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:63
+msgid "Ignore Reply-To: for mailing lists"
+msgstr "Ignore Reply-To: for mailing lists"
+
+#: ../mail/mail-config.ui.h:64
msgid "Inline"
msgstr "Inline"
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:65
msgid "Inline (Outlook style)"
msgstr "Inline (Outlook style)"
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:67
msgid "KB"
msgstr "KB"
-#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
msgid "Labels"
msgstr "Labels"
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:69
msgid "Languages Table"
msgstr "Languages Table"
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:70
msgid "Loading Images"
msgstr "Loading Images"
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:71
msgid "Mail Headers Table"
msgstr "Mail Headers Table"
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:72
msgid "Mailbox location"
msgstr "Mailbox location"
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:73
msgid "Message Display"
msgstr "Message Display"
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:74
msgid "Message Fonts"
msgstr "Message Fonts"
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:75
msgid "Message Receipts"
msgstr "Message Receipts"
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:76
msgid "No _Proxy for:"
msgstr "No _Proxy for:"
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:78
msgid ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
@@ -12205,172 +12500,216 @@ msgstr ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:79
msgid "Option is ignored if a match for custom junk headers is found."
msgstr "Option is ignored if a match for custom junk headers is found."
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:80
#: ../plugins/publish-calendar/publish-calendar.ui.h:10
msgid "Optional Information"
msgstr "Optional Information"
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:82
msgid "Or_ganization:"
msgstr "Or_ganisation:"
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:83
msgid "PGP/GPG _Key ID:"
msgstr "PGP/GPG _Key ID:"
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:84
msgid "Pass_word:"
msgstr "Pass_word:"
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:86
msgid "Port:"
msgstr "Port:"
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:87
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr "Pr_ompt when sending messages with only Bcc recipients defined"
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:88
msgid "Pretty Good Privacy (PGP/GPG)"
msgstr "Pretty Good Privacy (PGP/GPG)"
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:90
msgid "Printed Fonts"
msgstr "Printed Fonts"
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:91
+msgid "Prompt when mailing list redirects private reply back to list"
+msgstr "Prompt when mailing list redirects private reply back to list"
+
+#: ../mail/mail-config.ui.h:92
+msgid "Prompt when sending private replies to mailing _list messages"
+msgstr "Prompt when sending private replies to mailing _list messages"
+
+#: ../mail/mail-config.ui.h:93
+msgid "Prompt when sending replies to _many recipients"
+msgstr "Prompt when sending replies to _many recipients"
+
+#: ../mail/mail-config.ui.h:94
msgid "Proxy Settings"
msgstr "Proxy Settings"
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:95
msgid "Quoted"
msgstr "Quoted"
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:96
msgid "Re_member password"
msgstr "Re_member password"
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:97
msgid "Re_ply-To:"
msgstr "Re_ply-To:"
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:99
msgid "Remember _password"
msgstr "Remember _password"
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:100
msgid "Required Information"
msgstr "Required Information"
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:101
+msgid "SHA1"
+msgstr "SHA1"
+
+#: ../mail/mail-config.ui.h:102
+msgid "SHA256"
+msgstr "SHA256"
+
+#: ../mail/mail-config.ui.h:103
+msgid "SHA384"
+msgstr "SHA384"
+
+#: ../mail/mail-config.ui.h:104
+msgid "SHA512"
+msgstr "SHA512"
+
+#: ../mail/mail-config.ui.h:106
msgid "SSL is not supported in this build of Evolution"
msgstr "SSL is not supported in this build of Evolution"
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:107
msgid "S_earch for sender photograph only in local address books"
msgstr "S_earch for sender photograph only in local address books"
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:108
msgid "S_elect..."
msgstr "S_electâ?¦"
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:109
msgid "S_end message receipts:"
msgstr "S_end message receipts:"
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:110
msgid "S_tandard Font:"
msgstr "S_tandard Font:"
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:111
msgid "Secure MIME (S/MIME)"
msgstr "Secure MIME (S/MIME)"
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:113
msgid "Select Drafts Folder"
msgstr "Select Drafts Folder"
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:114
msgid "Select HTML fixed width font"
msgstr "Select HTML fixed width font"
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:115
msgid "Select HTML fixed width font for printing"
msgstr "Select HTML fixed width font for printing"
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:116
msgid "Select HTML variable width font"
msgstr "Select HTML variable width font"
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:117
msgid "Select HTML variable width font for printing"
msgstr "Select HTML variable width font for printing"
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:118
+msgid "Select Junk Folder"
+msgstr "Select Junk Folder"
+
+#: ../mail/mail-config.ui.h:119
msgid "Select Sent Folder"
msgstr "Select Sent Folder"
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:120
+msgid "Select Trash Folder"
+msgstr "Select Wastebasket Folder"
+
+#: ../mail/mail-config.ui.h:121
msgid "Sender Photograph"
msgstr "Sender Photograph"
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:122
msgid "Sending Mail"
msgstr "Sending Mail"
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:123
msgid "Sent _Messages Folder:"
msgstr "Sent _Messages Folder:"
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:124
msgid "Sent and Draft Messages"
msgstr "Sent and Draft Messages"
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:125
msgid "Ser_ver requires authentication"
msgstr "Ser_ver requires authentication"
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:126
msgid "Server Configuration"
msgstr "Server Configuration"
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:127
msgid "Server _Type:"
msgstr "Server _Type:"
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:128
+msgid "Si_gning algorithm:"
+msgstr "Si_gning algorithm:"
+
+#: ../mail/mail-config.ui.h:129
msgid "Sig_natures"
msgstr "Sig_natures"
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:130
msgid "Sig_ning certificate:"
msgstr "Sig_ning certificate:"
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:131
msgid "Signat_ure:"
msgstr "Signat_ure:"
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:132
msgid "Signatures"
msgstr "Signatures"
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:133
+msgid "Signing _algorithm:"
+msgstr "Signing _algorithm:"
+
+#: ../mail/mail-config.ui.h:134
msgid "Spell Checking"
msgstr "Spell Checking"
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:135
msgid "Start _typing at the bottom on replying"
msgstr "Start _typing at the bottom on replying"
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:137
msgid "T_ype:"
msgstr "T_ype:"
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:138
msgid ""
"The list of languages here reflects only the languages for which you have a "
"dictionary installed."
@@ -12378,7 +12717,7 @@ msgstr ""
"The list of languages here reflects only the languages for which you have a "
"dictionary installed."
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:139
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -12388,7 +12727,12 @@ msgstr ""
"signature. The name you specify will be used\n"
"for display purposes only. "
-#: ../mail/mail-config.ui.h:127
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:143
+msgid "Top Posting Option"
+msgstr "Top Posting Option"
+
+#: ../mail/mail-config.ui.h:144
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -12396,158 +12740,166 @@ msgstr ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:146
msgid "Us_ername:"
msgstr "Us_ername:"
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:147
msgid "Use Authe_ntication"
msgstr "Use Authe_ntication"
-#: ../mail/mail-config.ui.h:131 ../plugins/caldav/caldav-source.c:221
-#: ../plugins/google-account-setup/google-contacts-source.c:283
-#: ../plugins/google-account-setup/google-source.c:620
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
+#: ../mail/mail-config.ui.h:148 ../plugins/caldav/caldav-source.c:225
+#: ../plugins/google-account-setup/google-contacts-source.c:286
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
msgid "User_name:"
msgstr "User_name:"
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:149
msgid "V_ariable-width:"
msgstr "V_ariable-width:"
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:150
msgid "_Add Signature"
msgstr "_Add Signature"
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:151
msgid "_Always load images from the Internet"
msgstr "_Always load images from the Internet"
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:152
msgid "_Authentication Type"
msgstr "_Authentication Type"
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:153
msgid "_Default junk plugin:"
msgstr "_Default junk plugin:"
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:154
msgid "_Direct connection to the Internet"
msgstr "_Direct connection to the Internet"
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:155
msgid "_Do not sign meeting requests (for Outlook compatibility)"
msgstr "_Do not sign meeting requests (for Outlook compatibility)"
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:156
msgid "_Forward style:"
msgstr "_Forward style:"
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:157
+msgid "_Junk Folder:"
+msgstr "_Junk Folder:"
+
+#: ../mail/mail-config.ui.h:158
msgid "_Keep Signature above the original message on replying"
msgstr "_Keep Signature above the original message on replying"
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:159
msgid "_Languages"
msgstr "_Languages"
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:160
msgid "_Load images in messages from contacts"
msgstr "_Load images in messages from contacts"
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:161
msgid "_Lookup in local address book only"
msgstr "_Look up in local address book only"
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:162
msgid "_Make this my default account"
msgstr "_Make this my default account"
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:163
msgid "_Manual proxy configuration:"
msgstr "_Manual proxy configuration:"
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:164
msgid "_Mark messages as read after"
msgstr "_Mark messages as read after"
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:166
msgid "_Never load images from the Internet"
msgstr "_Never load images from the Internet"
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:167
msgid "_Path:"
msgstr "_Path:"
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:168
msgid "_Prompt on sending HTML mail to contacts that do not want them"
msgstr "_Prompt on sending HTML mail to contacts that do not want them"
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:169
msgid "_Prompt when sending messages with an empty subject line"
msgstr "_Prompt when sending messages with an empty subject line"
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:170
msgid "_Reply style:"
msgstr "_Reply style:"
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:171
msgid "_Script:"
msgstr "_Script:"
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:172
msgid "_Secure HTTP Proxy:"
msgstr "_Secure HTTP Proxy:"
-#: ../mail/mail-config.ui.h:156 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:174 ../modules/addressbook/ldap-config.ui.h:29
#: ../plugins/publish-calendar/publish-calendar.ui.h:28
msgid "_Server:"
msgstr "_Server:"
#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:176
msgid "_Show image animations"
msgstr "_Show image animations"
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:177
msgid "_Show the photograph of sender in the message preview"
msgstr "_Show the photograph of sender in the message preview"
#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:179
msgid "_Shrink To / Cc / Bcc headers to "
msgstr "_Shrink To / Cc / Bcc headers to "
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:180
+msgid "_Trash Folder:"
+msgstr "Wastebaske_t Folder:"
+
+#: ../mail/mail-config.ui.h:181
msgid "_Use Secure Connection:"
msgstr "_Use Secure Connection:"
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:182
msgid "_Use system defaults"
msgstr "_Use system defaults"
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:183
msgid "_Use the same fonts as other applications"
msgstr "_Use the same fonts as other applications"
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:47
msgid "a"
msgstr "a"
#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:186
msgid "addresses"
msgstr "addresses"
-#: ../mail/mail-config.ui.h:168 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:48
msgid "b"
msgstr "b"
-#: ../mail/mail-config.ui.h:169
+#: ../mail/mail-config.ui.h:188
msgid "color"
msgstr "colour"
-#: ../mail/mail-config.ui.h:170
+#: ../mail/mail-config.ui.h:189
msgid "description"
msgstr "description"
@@ -12572,66 +12924,78 @@ msgid "Co_mpleted"
msgstr "Co_mpleted"
#: ../mail/mail-dialogs.ui.h:6
+msgid "Collapse _all"
+msgstr "Collapse _all"
+
+#: ../mail/mail-dialogs.ui.h:7
msgid "Digital Signature"
msgstr "Digital Signature"
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:8
msgid "Do Not Forward"
msgstr "Do Not Forward"
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:9
+msgid "E_xpand all"
+msgstr "E_xpand all"
+
+#: ../mail/mail-dialogs.ui.h:10
msgid "Encryption"
msgstr "Encryption"
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:11
msgid "Folder Subscriptions"
msgstr "Folder Subscriptions"
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:12
msgid "Follow-Up"
msgstr "Follow-Up"
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:13
msgid "For Your Information"
msgstr "For Your Information"
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:14
msgid "Forward"
msgstr "Forward"
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:15
msgid "License Agreement"
msgstr "Licence Agreement"
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:16
msgid "No Response Necessary"
msgstr "No Response Necessary"
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:20
msgid "Reply to All"
msgstr "Reply to All"
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:21
msgid "Review"
msgstr "Review"
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:22
msgid "S_erver:"
msgstr "S_erver:"
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:23
+msgid "S_how only items containing:"
+msgstr "S_how only items containing:"
+
+#: ../mail/mail-dialogs.ui.h:24
msgid "Search Folder Sources"
msgstr "Search Folder Sources"
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:25
msgid "Security Information"
msgstr "Security Information"
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:26
msgid "Specific folders"
msgstr "Specific folders"
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:27
msgid ""
"The messages you have selected for follow up are listed below.\n"
"Please select a follow up action from the \"Flag\" menu."
@@ -12639,23 +13003,23 @@ msgstr ""
"The messages you have selected for follow up are listed below.\n"
"Please select a follow up action from the \"Flag\" menu."
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:29
msgid "_Accept License"
msgstr "_Accept Licence"
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:30
msgid "_Due By:"
msgstr "_Due By:"
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:31
msgid "_Flag:"
msgstr "_Flag:"
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:32
msgid "_Tick this to accept the license agreement"
msgstr "_Tick this to accept the licence agreement"
-#: ../mail/mail-folder-cache.c:891
+#: ../mail/mail-folder-cache.c:783
#, c-format
msgid "Pinging %s"
msgstr "Pinging %s"
@@ -12664,17 +13028,16 @@ msgstr "Pinging %s"
msgid "Filtering Selected Messages"
msgstr "Filtering Selected Messages"
-#: ../mail/mail-ops.c:243
+#: ../mail/mail-ops.c:245
msgid "Fetching Mail"
msgstr "Fetching Mail"
-#. sending mail, filtering failed
-#: ../mail/mail-ops.c:574
+#: ../mail/mail-ops.c:592
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "Failed to apply outgoing filters: %s"
-#: ../mail/mail-ops.c:586 ../mail/mail-ops.c:613
+#: ../mail/mail-ops.c:608 ../mail/mail-ops.c:635
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -12683,139 +13046,135 @@ msgstr ""
"Failed to append to %s: %s\n"
"Appending to local 'Sent' folder instead."
-#: ../mail/mail-ops.c:630
+#: ../mail/mail-ops.c:654
#, c-format
msgid "Failed to append to local 'Sent' folder: %s"
msgstr "Failed to append to local 'Sent' folder: %s"
-#: ../mail/mail-ops.c:741 ../mail/mail-ops.c:822
+#: ../mail/mail-ops.c:774 ../mail/mail-ops.c:866
msgid "Sending message"
msgstr "Sending message"
-#: ../mail/mail-ops.c:751
+#: ../mail/mail-ops.c:782
#, c-format
msgid "Sending message %d of %d"
msgstr "Sending message %d of %d"
-#: ../mail/mail-ops.c:778
+#: ../mail/mail-ops.c:826
#, c-format
msgid "Failed to send %d of %d messages"
msgstr "Failed to send %d of %d messages"
-#: ../mail/mail-ops.c:780 ../mail/mail-send-recv.c:761
+#: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:758
msgid "Canceled."
msgstr "Cancelled."
-#: ../mail/mail-ops.c:782 ../mail/mail-send-recv.c:763
+#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:760
msgid "Complete."
msgstr "Complete."
-#: ../mail/mail-ops.c:894
+#: ../mail/mail-ops.c:938
#, c-format
msgid "Saving message to folder '%s'"
msgstr "Saving message to folder '%s'"
-#: ../mail/mail-ops.c:971
+#: ../mail/mail-ops.c:1018
#, c-format
msgid "Moving messages to '%s'"
msgstr "Moving messages to '%s'"
-#: ../mail/mail-ops.c:971
+#: ../mail/mail-ops.c:1018
#, c-format
msgid "Copying messages to '%s'"
msgstr "Copying messages to '%s'"
-#: ../mail/mail-ops.c:1080
+#: ../mail/mail-ops.c:1127
#, c-format
msgid "Scanning folders in '%s'"
msgstr "Scanning folders in '%s'"
-#: ../mail/mail-ops.c:1188
+#: ../mail/mail-ops.c:1235
msgid "Forwarded messages"
msgstr "Forwarded messages"
-#: ../mail/mail-ops.c:1229
+#: ../mail/mail-ops.c:1276
#, c-format
msgid "Opening folder '%s'"
msgstr "Opening folder '%s'"
-#: ../mail/mail-ops.c:1295
+#: ../mail/mail-ops.c:1342
#, c-format
msgid "Retrieving quota information for folder '%s'"
msgstr "Retrieving quota information for folder '%s'"
-#: ../mail/mail-ops.c:1367
+#: ../mail/mail-ops.c:1414
#, c-format
msgid "Opening store '%s'"
msgstr "Opening store '%s'"
-#: ../mail/mail-ops.c:1438
+#: ../mail/mail-ops.c:1485
#, c-format
msgid "Removing folder '%s'"
msgstr "Removing folder '%s'"
-#: ../mail/mail-ops.c:1556
+#: ../mail/mail-ops.c:1609
#, c-format
msgid "Storing folder '%s'"
msgstr "Storing folder '%s'"
-#: ../mail/mail-ops.c:1619
+#: ../mail/mail-ops.c:1672
#, c-format
msgid "Expunging and storing account '%s'"
msgstr "Expunging and storing account '%s'"
-#: ../mail/mail-ops.c:1620
+#: ../mail/mail-ops.c:1673
#, c-format
msgid "Storing account '%s'"
msgstr "Storing account '%s'"
-#: ../mail/mail-ops.c:1674
+#: ../mail/mail-ops.c:1727
#, c-format
msgid "Refreshing folder '%s'"
msgstr "Refreshing folder '%s'"
-#: ../mail/mail-ops.c:1714
+#: ../mail/mail-ops.c:1767
#, c-format
msgid "Expunging folder '%s'"
msgstr "Expunging folder '%s'"
-#: ../mail/mail-ops.c:1759
+#: ../mail/mail-ops.c:1812
#, c-format
msgid "Emptying trash in '%s'"
msgstr "Emptying wastebasket in '%s'"
-#: ../mail/mail-ops.c:1760
+#: ../mail/mail-ops.c:1813
msgid "Local Folders"
msgstr "Local Folders"
-#: ../mail/mail-ops.c:1956
+#: ../mail/mail-ops.c:2016
#, c-format
msgid "Retrieving %d message"
msgid_plural "Retrieving %d messages"
msgstr[0] "Retrieving %d message"
msgstr[1] "Retrieving %d messages"
-#: ../mail/mail-ops.c:2045
+#: ../mail/mail-ops.c:2105
#, c-format
msgid "Saving %d message"
msgid_plural "Saving %d messages"
msgstr[0] "Saving %d message"
msgstr[1] "Saving %d messages"
-#: ../mail/mail-ops.c:2126
+#: ../mail/mail-ops.c:2192
#, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"Error saving messages to: %s:\n"
-" %s"
+msgid "Error saving messages to: %s:\n"
+msgstr "Error saving messages to: %s:\n"
-#: ../mail/mail-ops.c:2198
+#: ../mail/mail-ops.c:2265
msgid "Saving attachment"
msgstr "Saving attachment"
-#: ../mail/mail-ops.c:2216 ../mail/mail-ops.c:2224
+#: ../mail/mail-ops.c:2285 ../mail/mail-ops.c:2295
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -12824,27 +13183,26 @@ msgstr ""
"Cannot create output file: %s:\n"
" %s"
-#: ../mail/mail-ops.c:2239
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Could not write data: %s"
+#: ../mail/mail-ops.c:2310
+msgid "Could not write data: "
+msgstr "Could not write data: "
-#: ../mail/mail-ops.c:2384
+#: ../mail/mail-ops.c:2454
#, c-format
msgid "Disconnecting from '%s'"
msgstr "Disconnecting from '%s'"
-#: ../mail/mail-ops.c:2384
+#: ../mail/mail-ops.c:2454
#, c-format
msgid "Reconnecting to '%s'"
msgstr "Reconnecting to '%s'"
-#: ../mail/mail-ops.c:2480
+#: ../mail/mail-ops.c:2550
#, c-format
msgid "Preparing account '%s' for offline"
msgstr "Preparing account '%s' for offline"
-#: ../mail/mail-ops.c:2566
+#: ../mail/mail-ops.c:2636
msgid "Checking Service"
msgstr "Checking Service"
@@ -12852,94 +13210,97 @@ msgstr "Checking Service"
msgid "Canceling..."
msgstr "Cancellingâ?¦"
-#: ../mail/mail-send-recv.c:427
+#: ../mail/mail-send-recv.c:424
msgid "Send & Receive Mail"
msgstr "Send & Receive Mail"
-#: ../mail/mail-send-recv.c:444
+#: ../mail/mail-send-recv.c:441
msgid "Cancel _All"
msgstr "Cancel _All"
-#: ../mail/mail-send-recv.c:554
+#: ../mail/mail-send-recv.c:551
msgid "Updating..."
msgstr "Updatingâ?¦"
-#: ../mail/mail-send-recv.c:554 ../mail/mail-send-recv.c:631
+#: ../mail/mail-send-recv.c:551 ../mail/mail-send-recv.c:628
msgid "Waiting..."
msgstr "Waitingâ?¦"
-#: ../mail/mail-send-recv.c:874
+#: ../mail/mail-send-recv.c:866
#, c-format
msgid "Checking for new mail"
msgstr "Checking for new mail"
-#: ../mail/mail-session.c:217
+#: ../mail/mail-session.c:225
#, c-format
msgid "Enter Passphrase for %s"
msgstr "Enter Passphrase for %s"
-#: ../mail/mail-session.c:219
+#: ../mail/mail-session.c:227
msgid "Enter Passphrase"
msgstr "Enter Passphrase"
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:230
#, c-format
msgid "Enter Password for %s"
msgstr "Enter Password for %s"
-#: ../mail/mail-session.c:224
+#: ../mail/mail-session.c:232
msgid "Enter Password"
msgstr "Enter Password"
-#: ../mail/mail-session.c:266
+#: ../mail/mail-session.c:277
+#, c-format
msgid "User canceled operation."
msgstr "User cancelled operation."
-#: ../mail/mail-session.c:660
+#: ../mail/mail-session.c:724
+#, c-format
msgid ""
"No destination address provided, forward of the message has been cancelled."
msgstr ""
"No destination address provided; forward of the message has been cancelled."
-#: ../mail/mail-session.c:666
+#: ../mail/mail-session.c:733
+#, c-format
msgid "No account found to use, forward of the message has been cancelled."
msgstr "No account found to use; forward of the message has been cancelled."
-#: ../mail/mail-tools.c:119
+#: ../mail/mail-tools.c:128
#, c-format
msgid "Could not create spool directory '%s': %s"
msgstr "Could not create spool directory '%s': %s"
-#: ../mail/mail-tools.c:149
+#: ../mail/mail-tools.c:161
#, c-format
msgid "Trying to movemail a non-mbox source '%s'"
msgstr "Trying to movemail a non-mbox source '%s'"
-#: ../mail/mail-tools.c:255
+#: ../mail/mail-tools.c:273
#, c-format
msgid "Forwarded message - %s"
msgstr "Forwarded message â?? %s"
-#: ../mail/mail-tools.c:257
+#: ../mail/mail-tools.c:275
msgid "Forwarded message"
msgstr "Forwarded message"
-#: ../mail/mail-tools.c:297
+#: ../mail/mail-tools.c:318
#, c-format
msgid "Invalid folder: '%s'"
msgstr "Invalid folder: '%s'"
-#: ../mail/mail-vfolder.c:84
+#: ../mail/mail-vfolder.c:85
#, c-format
msgid "Setting up Search Folder: %s"
msgstr "Setting up Search Folder: %s"
-#: ../mail/mail-vfolder.c:229
+#: ../mail/mail-vfolder.c:224
#, c-format
msgid "Updating Search Folders for '%s:%s'"
msgstr "Updating Search Folders for '%s:%s'"
-#: ../mail/mail-vfolder.c:236
+#: ../mail/mail-vfolder.c:231
#, c-format
msgid "Updating Search Folders for '%s'"
msgstr "Updating Search Folders for '%s'"
@@ -12948,7 +13309,7 @@ msgstr "Updating Search Folders for '%s'"
#. the second %s is uri of the removed folder. For more than one search
#. folder is each of them on a separate line, with four spaces in front
#. of its name, without quotes.
-#: ../mail/mail-vfolder.c:679
+#: ../mail/mail-vfolder.c:674
#, c-format
msgid ""
"The Search Folder \"%s\" has been updated, because it used just removed "
@@ -12967,11 +13328,11 @@ msgstr[1] ""
"%s have been updated, because they used the just-removed folder\n"
"\"%s\"."
-#: ../mail/mail-vfolder.c:1191
+#: ../mail/mail-vfolder.c:1182
msgid "Edit Search Folder"
msgstr "Edit Search Folder"
-#: ../mail/mail-vfolder.c:1296
+#: ../mail/mail-vfolder.c:1287
msgid "New Search Folder"
msgstr "New Search Folder"
@@ -13181,19 +13542,19 @@ msgstr "Could not save signature file."
msgid "Delete messages in Search Folder \"{0}\"?"
msgstr "Delete messages in Search Folder \"{0}\"?"
-#: ../mail/mail.error.xml.h:45
-msgid "Do not d_elete"
-msgstr "Do not d_elete"
-
#: ../mail/mail.error.xml.h:46
-msgid "Do not delete"
-msgstr "Do not delete"
+msgid "Do _Not Disable"
+msgstr "Do _Not Disable"
#: ../mail/mail.error.xml.h:47
-msgid "Do not disable"
-msgstr "Do not disable"
+msgid "Do _Not Send"
+msgstr "Do _Not Send"
#: ../mail/mail.error.xml.h:48
+msgid "Do _Not Synchronize"
+msgstr "Do _Not Synchronise"
+
+#: ../mail/mail.error.xml.h:49
msgid ""
"Do you want to locally synchronize the folders that are marked for offline "
"usage?"
@@ -13201,46 +13562,46 @@ msgstr ""
"Do you want to locally synchronise the folders that are marked for offline "
"usage?"
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
msgid "Do you want to mark all messages as read?"
msgstr "Do you want to mark all messages as read?"
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
msgid "Do you wish to save your changes?"
msgstr "Do you wish to save your changes?"
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:52
msgid "Enter password."
msgstr "Enter password."
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:53
msgid "Error loading filter definitions."
msgstr "Error loading filter definitions."
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:54
msgid "Error while performing operation."
msgstr "Error while performing operation."
#. Translators: the {0} is replaced with an operation name, which failed.
#. It can be basically anything run asynchronously, like "Fetching Mail",
#. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
msgid "Error while {0}."
msgstr "Error while {0}."
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
msgid "File exists but cannot overwrite it."
msgstr "File exists but cannot overwrite it."
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
msgid "File exists but is not a regular file."
msgstr "File exists but is not a regular file."
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:61
msgid "If you continue, you will not be able to recover these messages."
msgstr "If you continue, you will not be able to recover these messages."
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:62
msgid ""
"If you delete the folder, all of its contents and its subfolders' contents "
"will be deleted permanently."
@@ -13248,17 +13609,17 @@ msgstr ""
"If you delete the folder, all of its contents and its subfolders' contents "
"will be deleted permanently."
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
msgid ""
"If you delete the folder, all of its contents will be deleted permanently."
msgstr ""
"If you delete the folder, all of its contents will be deleted permanently."
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
msgid "If you proceed, all proxy accounts will be deleted permanently."
msgstr "If you proceed, all proxy accounts will be deleted permanently."
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:65
msgid ""
"If you proceed, the account information and\n"
"all proxy information will be deleted permanently."
@@ -13266,11 +13627,11 @@ msgstr ""
"If you proceed, the account information and\n"
"all proxy information will be deleted permanently."
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:67
msgid "If you proceed, the account information will be deleted permanently."
msgstr "If you proceed, the account information will be deleted permanently."
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
msgid ""
"If you quit, these messages will not be sent until Evolution is started "
"again."
@@ -13278,23 +13639,23 @@ msgstr ""
"If you quit, these messages will not be sent until Evolution is started "
"again."
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
msgid "Ignore"
msgstr "Ignore"
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
msgid "Invalid authentication"
msgstr "Invalid authentication"
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
msgid "Mail Deletion Failed"
msgstr "Mail Deletion Failed"
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
msgid "Mail filters automatically updated."
msgstr "Mail filters automatically updated."
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
msgid ""
"Many email systems add an Apparently-To header to messages that only have "
"BCC recipients. This header, if added, will list all of your recipients to "
@@ -13306,29 +13667,29 @@ msgstr ""
"your message anyway. To avoid this, you should add at least one To: or CC: "
"recipient."
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:74
msgid "Missing folder."
msgstr "Missing folder."
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
msgid "No sources selected."
msgstr "No sources selected."
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
msgid "Opening too many messages at once may take a long time."
msgstr "Opening too many messages at once may take a long time."
# mail:gw-accountsetup-error secondary
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
msgid "Please check your account settings and try again."
msgstr "Please check your account settings and try again."
# mail:gw-accountsetup-error secondary
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
msgid "Please enable the account or send using another account."
msgstr "Please enable the account or send using another account."
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
msgid ""
"Please enter a valid email address in the To: field. You can search for "
"email addresses by clicking on the To: button next to the entry box."
@@ -13336,7 +13697,7 @@ msgstr ""
"Please enter a valid e-mail address in the To: field. You can search for e-"
"mail addresses by clicking on the To: button next to the entry box."
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
msgid ""
"Please make sure the following recipients are willing and able to receive "
"HTML email:\n"
@@ -13346,55 +13707,59 @@ msgstr ""
"HTML e-mail:\n"
"{0}"
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
msgid "Please provide an unique name to identify this signature."
msgstr "Please provide an unique name to identify this signature."
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
msgid "Please wait."
msgstr "Please wait."
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
msgid "Problem migrating old mail folder \"{0}\"."
msgstr "Problem migrating old mail folder \"{0}\"."
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
msgid "Querying server for a list of supported authentication mechanisms."
msgstr "Querying server for a list of supported authentication mechanisms."
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
msgid "Read receipt requested."
msgstr "Read receipt requested."
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
msgid "Really delete folder \"{0}\" and all of its subfolders?"
msgstr "Really delete folder \"{0}\" and all of its subfolders?"
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
msgid "Really delete folder \"{0}\"?"
msgstr "Really delete folder \"{0}\"?"
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:90
+msgid "Reply _Privately"
+msgstr "Reply _Privately"
+
+#: ../mail/mail.error.xml.h:93
msgid "Search Folders automatically updated."
msgstr "Search Folders automatically updated."
-#: ../mail/mail.error.xml.h:90
-msgid "Send Receipt"
-msgstr "Send Receipt"
+#: ../mail/mail.error.xml.h:94
+msgid "Send private reply?"
+msgstr "Send private reply?"
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:95
+msgid "Send reply to all recipients?"
+msgstr "Send reply to all recipients?"
+
+#: ../mail/mail.error.xml.h:96
msgid "Signature Already Exists"
msgstr "Signature Already Exists"
-#: ../mail/mail.error.xml.h:92
-msgid "Synchronize"
-msgstr "Synchronise"
-
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:97
msgid "Synchronize folders locally for offline usage?"
msgstr "Synchronise folders locally for offline usage?"
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:98
msgid ""
"System folders are required for Evolution to function correctly and cannot "
"be renamed, moved, or deleted."
@@ -13402,7 +13767,7 @@ msgstr ""
"System folders are required for Evolution to function correctly and cannot "
"be renamed, moved, or deleted."
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:99
msgid ""
"The contact list you are sending to is configured to hide list recipients.\n"
"\n"
@@ -13418,7 +13783,7 @@ msgstr ""
"your message. To avoid this, you should add at least one To: or CC: "
"recipient. "
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:102
msgid ""
"The following recipient was not recognized as a valid mail address:\n"
"{0}"
@@ -13426,7 +13791,7 @@ msgstr ""
"The following recipient was not recognised as a valid mail address:\n"
"{0}"
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:104
msgid ""
"The following recipients were not recognized as valid mail addresses:\n"
"{0}"
@@ -13434,11 +13799,11 @@ msgstr ""
"The following recipients were not recognised as valid mail addresses:\n"
"{0}"
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:106
msgid "The script file must exist and be executable."
msgstr "The script file must exist and be executable."
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:107
msgid ""
"This folder may have been added implicitly,\n"
"go to the Search Folder editor to add it explicitly, if required."
@@ -13446,7 +13811,7 @@ msgstr ""
"This folder may have been added implicitly,\n"
"go to the Search Folder editor to add it explicitly, if required."
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:109
msgid ""
"This message cannot be sent because the account you chose to send with is "
"not enabled"
@@ -13454,13 +13819,13 @@ msgstr ""
"This message cannot be sent because the account you chose to send with is "
"not enabled"
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:110
msgid ""
"This message cannot be sent because you have not specified any recipients"
msgstr ""
"This message cannot be sent because you have not specified any recipients"
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:111
msgid ""
"This server does not support this type of authentication and may not support "
"authentication at all."
@@ -13468,11 +13833,11 @@ msgstr ""
"This server does not support this type of authentication and may not support "
"authentication at all."
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:112
msgid "This signature has been changed, but has not been saved."
msgstr "This signature has been changed, but has not been saved."
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:113
msgid ""
"This will mark all messages as read in the selected folder and its "
"subfolders."
@@ -13480,12 +13845,16 @@ msgstr ""
"This will mark all messages as read in the selected folder and its "
"subfolders."
+#: ../mail/mail.error.xml.h:114
+msgid "This will mark all messages as read in the selected folder."
+msgstr "This will mark all messages as read in the selected folder."
+
# mail:gw-accountsetup-error primary
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:115
msgid "Unable to connect to the GroupWise server."
msgstr "Unable to connect to the GroupWise server."
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:116
msgid ""
"Unable to open the drafts folder for this account. Use the system drafts "
"folder instead?"
@@ -13493,19 +13862,19 @@ msgstr ""
"Unable to open the drafts folder for this account. Use the system drafts "
"folder instead?"
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:117
msgid "Unable to read license file."
msgstr "Unable to read licence file."
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:118
msgid "Use _Default"
msgstr "Use _Default"
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:119
msgid "Use default drafts folder?"
msgstr "Use default drafts folder?"
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:120
msgid ""
"Warning: Deleting messages from a Search Folder will delete the actual "
"message from one of your local or remote folders.\n"
@@ -13515,31 +13884,59 @@ msgstr ""
"message from one of your local or remote folders.\n"
"Do you really want to do this?"
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:122
+msgid ""
+"You are replying privately to a message which arrived via a mailing list, "
+"but the list is trying to redirect your reply to go back to the list. Are "
+"you sure you want to proceed?"
+msgstr ""
+"You are replying privately to a message which arrived via a mailing list, "
+"but the list is trying to redirect your reply to go back to the list. Are "
+"you sure you want to proceed?"
+
+#: ../mail/mail.error.xml.h:123
+msgid ""
+"You are replying to a message which arrived via a mailing list, but you are "
+"replying privately to the sender; not to the list. Are you sure you want to "
+"proceed?"
+msgstr ""
+"You are replying to a message which arrived via a mailing list, but you are "
+"replying privately to the sender; not to the list. Are you sure you want to "
+"proceed?"
+
+#: ../mail/mail.error.xml.h:124
+msgid ""
+"You are replying to a message which was sent to many recipients. Are you "
+"sure you want to reply to ALL of them?"
+msgstr ""
+"You are replying to a message which was sent to many recipients. Are you "
+"sure you want to reply to ALL of them?"
+
+#: ../mail/mail.error.xml.h:125
msgid "You do not have sufficient permissions to delete this mail."
msgstr "You do not have sufficient permissions to delete this mail."
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:126
msgid "You have not filled in all of the required information."
msgstr "You have not filled in all of the required information."
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:127
msgid "You have unsent messages, do you wish to quit anyway?"
msgstr "You have unsent messages, do you wish to quit anyway?"
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:128
msgid "You may not create two accounts with the same name."
msgstr "You may not create two accounts with the same name."
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:129
msgid "You must name this Search Folder."
msgstr "You must name this Search Folder."
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:130
msgid "You must specify a folder."
msgstr "You must specify a folder."
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:131
msgid ""
"You must specify at least one folder as a source.\n"
"Either by selecting the folders individually, and/or by selecting all local "
@@ -13549,111 +13946,121 @@ msgstr ""
"Either by selecting the folders individually, and/or by selecting all local "
"folders, all remote folders, or both."
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:133
msgid "Your login to your server \"{0}\" as \"{0}\" failed."
msgstr "Your login to your server \"{0}\" as \"{0}\" failed."
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:134
msgid "_Append"
msgstr "_Append"
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:135
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:596
+msgid "_Disable"
+msgstr "_Disable"
+
+#: ../mail/mail.error.xml.h:136
msgid "_Discard changes"
msgstr "_Discard changes"
-#: ../mail/mail.error.xml.h:128
-msgid "_Do not Synchronize"
-msgstr "_Do not Synchronise"
-
-#: ../mail/mail.error.xml.h:129
-#: ../modules/mail/e-mail-shell-view-actions.c:821
+#: ../mail/mail.error.xml.h:137
+#: ../modules/mail/e-mail-shell-view-actions.c:887
msgid "_Empty Trash"
msgstr "_Empty Wastebasket"
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:138
msgid "_Expunge"
msgstr "_Expunge"
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:139
msgid "_Open Messages"
msgstr "_Open Messages"
-#: ../mail/message-list.c:1107
+#: ../mail/mail.error.xml.h:142
+msgid "_Send Receipt"
+msgstr "_Send Receipt"
+
+#: ../mail/mail.error.xml.h:143
+msgid "_Synchronize"
+msgstr "_Synchronise"
+
+#: ../mail/message-list.c:1170
msgid "Unseen"
msgstr "Unseen"
-#: ../mail/message-list.c:1108
+#: ../mail/message-list.c:1171
msgid "Seen"
msgstr "Seen"
-#: ../mail/message-list.c:1109
+#: ../mail/message-list.c:1172
msgid "Answered"
msgstr "Answered"
-#: ../mail/message-list.c:1110
+#: ../mail/message-list.c:1173
msgid "Forwarded"
msgstr "Forwarded"
-#: ../mail/message-list.c:1111
+#: ../mail/message-list.c:1174
msgid "Multiple Unseen Messages"
msgstr "Multiple Unseen Messages"
-#: ../mail/message-list.c:1112
+#: ../mail/message-list.c:1175
msgid "Multiple Messages"
msgstr "Multiple Messages"
-#: ../mail/message-list.c:1116
+#: ../mail/message-list.c:1179
msgid "Lowest"
msgstr "Lowest"
-#: ../mail/message-list.c:1117
+#: ../mail/message-list.c:1180
msgid "Lower"
msgstr "Lower"
-#: ../mail/message-list.c:1121
+#: ../mail/message-list.c:1184
msgid "Higher"
msgstr "Higher"
-#: ../mail/message-list.c:1122
+#: ../mail/message-list.c:1185
msgid "Highest"
msgstr "Highest"
-#: ../mail/message-list.c:1732 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1795 ../widgets/table/e-cell-date.c:46
msgid "?"
msgstr "?"
#. strftime format of a time,
#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1739 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1802 ../plugins/itip-formatter/itip-view.c:205
msgid "Today %l:%M %p"
msgstr "Today %l:%M %p"
-#: ../mail/message-list.c:1748
+#: ../mail/message-list.c:1811
msgid "Yesterday %l:%M %p"
msgstr "Yesterday %l:%M %p"
-#: ../mail/message-list.c:1760
+#: ../mail/message-list.c:1823
msgid "%a %l:%M %p"
msgstr "%a %l:%M %p"
-#: ../mail/message-list.c:1768
+#: ../mail/message-list.c:1831
msgid "%b %d %l:%M %p"
msgstr "%d %b %l:%M %p"
-#: ../mail/message-list.c:1770
+#: ../mail/message-list.c:1833
msgid "%b %d %Y"
msgstr "%d %b %Y"
-#: ../mail/message-list.c:2515
+#: ../mail/message-list.c:2598
msgid "Select all visible messages"
msgstr "Select all visible messages"
#. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4196 ../mail/message-list.c:4592
+#: ../mail/message-list.c:4412 ../mail/message-list.c:4820
msgid "Generating message list"
msgstr "Generating message list"
-#: ../mail/message-list.c:4429
+#: ../mail/message-list.c:4643
msgid ""
"No message satisfies your search criteria. Either clear search with Search-"
">Clear menu item or change it."
@@ -13661,7 +14068,7 @@ msgstr ""
"No message satisfies your search criteria. Either clear search with Search-"
">Clear menu item or change it."
-#: ../mail/message-list.c:4431
+#: ../mail/message-list.c:4645
msgid "There are no messages in this folder."
msgstr "There are no messages in this folder."
@@ -13690,7 +14097,7 @@ msgid "Sent Messages"
msgstr "Sent Messages"
#: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:542
+#: ../widgets/misc/e-attachment-tree-view.c:570
msgid "Size"
msgstr "Size"
@@ -13699,27 +14106,27 @@ msgid "Subject - Trimmed"
msgstr "Subject â?? Trimmed"
#: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
msgid "Body contains"
msgstr "Body contains"
#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1219
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
msgid "Message contains"
msgstr "Message contains"
#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1226
+#: ../modules/mail/e-mail-shell-view-actions.c:1292
msgid "Recipients contain"
msgstr "Recipients contain"
#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/mail/e-mail-shell-view-actions.c:1299
msgid "Sender contains"
msgstr "Sender contains"
#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1240
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
msgid "Subject contains"
msgstr "Subject contains"
@@ -13798,7 +14205,7 @@ msgid "Server Information"
msgstr "Server Information"
#: ../modules/addressbook/addressbook-config.c:1016
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../smime/gui/smime-ui.ui.h:13
msgid "Details"
msgstr "Details"
@@ -13892,332 +14299,336 @@ msgid ""
"Whether force showing the mail address with the name of the autocompleted "
"contact in the entry."
msgstr ""
-"Whether to force showing the e-mail address with the name of the autocompleted "
-"contact in the entry."
+"Whether to force showing the e-mail address with the name of the "
+"autocompleted contact in the entry."
#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
msgid "Whether to show the preview pane."
msgstr "Whether to show the preview pane."
#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:159
-#: ../modules/mail/em-mailer-prefs.c:1158
+#: ../modules/addressbook/autocompletion-config.c:162
+#: ../modules/mail/em-mailer-prefs.c:1141
msgid "_Table column:"
msgstr "_Table column:"
-#: ../modules/addressbook/autocompletion-config.c:162
+#: ../modules/addressbook/autocompletion-config.c:165
msgid "Autocompletion"
msgstr "Autocompletion"
-#: ../modules/addressbook/autocompletion-config.c:165
+#: ../modules/addressbook/autocompletion-config.c:168
msgid "Always _show address of the autocompleted contact"
msgstr "Always _show address of the autocompleted contact"
#. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:144
+#: ../modules/addressbook/e-book-shell-backend.c:98
+#: ../modules/addressbook/e-book-shell-migrate.c:148
msgid "On LDAP Servers"
msgstr "On LDAP Servers"
-#: ../modules/addressbook/e-book-shell-backend.c:340
+#: ../modules/addressbook/e-book-shell-backend.c:280
msgctxt "New"
msgid "_Contact"
msgstr "_Contact"
-#: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:757
+#: ../modules/addressbook/e-book-shell-backend.c:282
+#: ../modules/addressbook/e-book-shell-view-actions.c:773
msgid "Create a new contact"
msgstr "Create a new contact"
-#: ../modules/addressbook/e-book-shell-backend.c:347
+#: ../modules/addressbook/e-book-shell-backend.c:287
msgctxt "New"
msgid "Contact _List"
msgstr "Contact _List"
-#: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:764
+#: ../modules/addressbook/e-book-shell-backend.c:289
+#: ../modules/addressbook/e-book-shell-view-actions.c:780
msgid "Create a new contact list"
msgstr "Create a new contact list"
-#: ../modules/addressbook/e-book-shell-backend.c:357
+#: ../modules/addressbook/e-book-shell-backend.c:297
msgctxt "New"
msgid "Address _Book"
msgstr "Address _Book"
-#: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
+#: ../modules/addressbook/e-book-shell-backend.c:299
+#: ../modules/addressbook/e-book-shell-view-actions.c:703
msgid "Create a new address book"
msgstr "Create a new address book"
#. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:376
-#: ../modules/addressbook/e-book-shell-view.c:394
-#: ../modules/calendar/e-cal-shell-backend.c:123
+#: ../modules/addressbook/e-book-shell-backend.c:316
+#: ../modules/addressbook/e-book-shell-view.c:401
+#: ../modules/calendar/e-cal-shell-backend.c:104
#: ../modules/calendar/e-cal-shell-migrate.c:57
msgid "Contacts"
msgstr "Contacts"
+#: ../modules/addressbook/e-book-shell-backend.c:325
+msgid "Certificates"
+msgstr "Certificates"
+
#. Translators: This is a save dialog title
#: ../modules/addressbook/e-book-shell-view-actions.c:263
-#: ../modules/addressbook/e-book-shell-view-actions.c:541
+#: ../modules/addressbook/e-book-shell-view-actions.c:549
msgid "Save as vCard"
msgstr "Save as vCardâ?¦"
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
msgid "Co_py All Contacts To..."
msgstr "Co_py All Contacts Toâ?¦"
-#: ../modules/addressbook/e-book-shell-view-actions.c:666
+#: ../modules/addressbook/e-book-shell-view-actions.c:682
msgid "Copy the contacts of the selected address book to another"
msgstr "Copy the contacts of the selected address book to another"
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
msgid "D_elete Address Book"
msgstr "D_elete Address Book"
-#: ../modules/addressbook/e-book-shell-view-actions.c:673
+#: ../modules/addressbook/e-book-shell-view-actions.c:689
msgid "Delete the selected address book"
msgstr "Delete the selected address book"
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
msgid "Mo_ve All Contacts To..."
msgstr "Mo_ve All Contacts Toâ?¦"
-#: ../modules/addressbook/e-book-shell-view-actions.c:680
+#: ../modules/addressbook/e-book-shell-view-actions.c:696
msgid "Move the contacts of the selected address book to another"
msgstr "Move the contacts of the selected address book to another"
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
msgid "_New Address Book"
msgstr "_New Address Book"
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
msgid "Address _Book Properties"
msgstr "Address _Book Properties"
-#: ../modules/addressbook/e-book-shell-view-actions.c:694
+#: ../modules/addressbook/e-book-shell-view-actions.c:710
msgid "Show properties of the selected address book"
msgstr "Show properties of the selected address book"
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
-#: ../modules/calendar/e-cal-shell-view-actions.c:1320
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:735
-#: ../modules/mail/e-mail-shell-view-actions.c:905
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
+#: ../modules/calendar/e-cal-shell-view-actions.c:1354
+#: ../modules/calendar/e-memo-shell-view-actions.c:620
+#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/mail/e-mail-shell-view-actions.c:971
msgid "_Rename..."
msgstr "_Renameâ?¦"
-#: ../modules/addressbook/e-book-shell-view-actions.c:701
+#: ../modules/addressbook/e-book-shell-view-actions.c:717
msgid "Rename the selected address book"
msgstr "Rename the selected address book"
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
msgid "S_ave Address Book as vCard"
msgstr "S_ave Address Book as vCard"
-#: ../modules/addressbook/e-book-shell-view-actions.c:708
+#: ../modules/addressbook/e-book-shell-view-actions.c:724
msgid "Save the contacts of the selected address book as a vCard"
msgstr "Save the contacts of the selected address book as a vCard"
-#: ../modules/addressbook/e-book-shell-view-actions.c:715
+#: ../modules/addressbook/e-book-shell-view-actions.c:731
msgid "Stop loading"
msgstr "Stop loading"
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
msgid "_Copy Contact To..."
msgstr "_Copy Contact Toâ?¦"
-#: ../modules/addressbook/e-book-shell-view-actions.c:722
+#: ../modules/addressbook/e-book-shell-view-actions.c:738
msgid "Copy selected contacts to another address book"
msgstr "Copy selected contacts to another address book"
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
msgid "_Delete Contact"
msgstr "_Delete Contact"
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
msgid "_Find in Contact..."
msgstr "_Find in Contactâ?¦"
-#: ../modules/addressbook/e-book-shell-view-actions.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:752
msgid "Search for text in the displayed contact"
msgstr "Search for text in the displayed contact"
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
msgid "_Forward Contact..."
msgstr "_Forward Contactâ?¦"
-#: ../modules/addressbook/e-book-shell-view-actions.c:743
+#: ../modules/addressbook/e-book-shell-view-actions.c:759
msgid "Send selected contacts to another person"
msgstr "Send selected contacts to another person"
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
msgid "_Move Contact To..."
msgstr "_Move Contact Toâ?¦"
-#: ../modules/addressbook/e-book-shell-view-actions.c:750
+#: ../modules/addressbook/e-book-shell-view-actions.c:766
msgid "Move selected contacts to another address book"
msgstr "Move selected contacts to another address book"
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
msgid "_New Contact..."
msgstr "_New Contactâ?¦"
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
msgid "New Contact _List..."
msgstr "New Contact _Listâ?¦"
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
msgid "_Open Contact"
msgstr "_Open Contact"
-#: ../modules/addressbook/e-book-shell-view-actions.c:771
+#: ../modules/addressbook/e-book-shell-view-actions.c:787
msgid "View the current contact"
msgstr "View the current contact"
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
msgid "_Send Message to Contact..."
msgstr "_Send Message to Contactâ?¦"
-#: ../modules/addressbook/e-book-shell-view-actions.c:778
+#: ../modules/addressbook/e-book-shell-view-actions.c:794
msgid "Send a message to the selected contacts"
msgstr "Send a message to the selected contacts"
-#: ../modules/addressbook/e-book-shell-view-actions.c:785
-#: ../modules/calendar/e-cal-shell-view-actions.c:1462
-#: ../modules/calendar/e-task-shell-view-actions.c:793
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-task-shell-view-actions.c:802
msgid "_Actions"
msgstr "_Actions"
-#: ../modules/addressbook/e-book-shell-view-actions.c:792
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:800
-#: ../modules/mail/e-mail-shell-view-actions.c:1028
+#: ../modules/addressbook/e-book-shell-view-actions.c:808
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/mail/e-mail-shell-view-actions.c:1094
msgid "_Preview"
msgstr "_Preview"
-#: ../modules/addressbook/e-book-shell-view-actions.c:801
-#: ../modules/calendar/e-cal-shell-view-actions.c:1479
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:813
+#: ../modules/addressbook/e-book-shell-view-actions.c:817
+#: ../modules/calendar/e-cal-shell-view-actions.c:1513
+#: ../modules/calendar/e-memo-shell-view-actions.c:670
+#: ../modules/calendar/e-task-shell-view-actions.c:822
msgid "_Delete"
msgstr "_Delete"
-#: ../modules/addressbook/e-book-shell-view-actions.c:805
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
msgid "_Properties"
msgstr "_Properties"
#. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:814
-#: ../modules/addressbook/e-book-shell-view-actions.c:960
+#: ../modules/addressbook/e-book-shell-view-actions.c:830
+#: ../modules/addressbook/e-book-shell-view-actions.c:976
msgid "_Save as vCard..."
msgstr "_Save as vCardâ?¦"
-#: ../modules/addressbook/e-book-shell-view-actions.c:842
+#: ../modules/addressbook/e-book-shell-view-actions.c:858
msgid "Contact _Preview"
msgstr "Contact _Preview"
-#: ../modules/addressbook/e-book-shell-view-actions.c:844
+#: ../modules/addressbook/e-book-shell-view-actions.c:860
msgid "Show contact preview window"
msgstr "Show contact preview window"
-#: ../modules/addressbook/e-book-shell-view-actions.c:863
-#: ../modules/calendar/e-memo-shell-view-actions.c:717
-#: ../modules/calendar/e-task-shell-view-actions.c:882
-#: ../modules/mail/e-mail-shell-view-actions.c:1122
+#: ../modules/addressbook/e-book-shell-view-actions.c:879
+#: ../modules/calendar/e-memo-shell-view-actions.c:727
+#: ../modules/calendar/e-task-shell-view-actions.c:891
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
msgid "_Classic View"
msgstr "_Classic View"
-#: ../modules/addressbook/e-book-shell-view-actions.c:865
+#: ../modules/addressbook/e-book-shell-view-actions.c:881
msgid "Show contact preview below the contact list"
msgstr "Show contact preview below the contact list"
-#: ../modules/addressbook/e-book-shell-view-actions.c:870
-#: ../modules/calendar/e-memo-shell-view-actions.c:724
-#: ../modules/calendar/e-task-shell-view-actions.c:889
-#: ../modules/mail/e-mail-shell-view-actions.c:1129
+#: ../modules/addressbook/e-book-shell-view-actions.c:886
+#: ../modules/calendar/e-memo-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/mail/e-mail-shell-view-actions.c:1195
msgid "_Vertical View"
msgstr "_Vertical View"
-#: ../modules/addressbook/e-book-shell-view-actions.c:872
+#: ../modules/addressbook/e-book-shell-view-actions.c:888
msgid "Show contact preview alongside the contact list"
msgstr "Show contact preview alongside the contact list"
-#: ../modules/addressbook/e-book-shell-view-actions.c:880
-#: ../modules/calendar/e-cal-shell-view-actions.c:1622
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:906
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
+#: ../modules/calendar/e-cal-shell-view-actions.c:1656
+#: ../modules/calendar/e-memo-shell-view-actions.c:744
+#: ../modules/calendar/e-task-shell-view-actions.c:915
msgid "Any Category"
msgstr "Any Category"
-#: ../modules/addressbook/e-book-shell-view-actions.c:887
-#: ../modules/calendar/e-cal-shell-view-actions.c:1636
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
+#: ../modules/calendar/e-cal-shell-view-actions.c:1670
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:950
msgid "Unmatched"
msgstr "Unmatched"
-#: ../modules/addressbook/e-book-shell-view-actions.c:897
-#: ../modules/calendar/e-cal-shell-view-actions.c:1646
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:951
-#: ../modules/mail/e-mail-shell-view-actions.c:1205
-#: ../shell/e-shell-content.c:441
+#: ../modules/addressbook/e-book-shell-view-actions.c:913
+#: ../modules/calendar/e-cal-shell-view-actions.c:1680
+#: ../modules/calendar/e-memo-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../shell/e-shell-content.c:462
msgid "Advanced Search"
msgstr "Advanced Search"
-#: ../modules/addressbook/e-book-shell-view-actions.c:930
+#: ../modules/addressbook/e-book-shell-view-actions.c:946
msgid "Print all shown contacts"
msgstr "Print all shown contacts"
-#: ../modules/addressbook/e-book-shell-view-actions.c:937
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
msgid "Preview the contacts to be printed"
msgstr "Preview the contacts to be printed"
-#: ../modules/addressbook/e-book-shell-view-actions.c:944
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
msgid "Print selected contacts"
msgstr "Print selected contacts"
-#: ../modules/addressbook/e-book-shell-view-actions.c:962
+#: ../modules/addressbook/e-book-shell-view-actions.c:978
msgid "Save selected contacts as a vCard"
msgstr "Save selected contacts as a vCard"
-#: ../modules/addressbook/e-book-shell-view.c:338
+#: ../modules/addressbook/e-book-shell-view.c:345
msgid "_Forward Contacts"
msgstr "_Forward Contacts"
-#: ../modules/addressbook/e-book-shell-view.c:340
+#: ../modules/addressbook/e-book-shell-view.c:347
msgid "_Forward Contact"
msgstr "_Forward Contact"
-#: ../modules/addressbook/e-book-shell-view.c:371
+#: ../modules/addressbook/e-book-shell-view.c:378
msgid "_Send Message to Contacts"
msgstr "_Send Message to Contacts"
-#: ../modules/addressbook/e-book-shell-view.c:373
+#: ../modules/addressbook/e-book-shell-view.c:380
msgid "_Send Message to List"
msgstr "_Send Message to List"
-#: ../modules/addressbook/e-book-shell-view.c:375
+#: ../modules/addressbook/e-book-shell-view.c:382
msgid "_Send Message to Contact"
msgstr "_Send Message to Contact"
-#: ../modules/addressbook/eab-composer-util.c:137
+#: ../modules/addressbook/eab-composer-util.c:143
msgid "Multiple vCards"
msgstr "Multiple vCards"
-#: ../modules/addressbook/eab-composer-util.c:145
+#: ../modules/addressbook/eab-composer-util.c:151
#, c-format
msgid "vCard for %s"
msgstr "vCard for %s"
-#: ../modules/addressbook/eab-composer-util.c:157
-#: ../modules/addressbook/eab-composer-util.c:184
+#: ../modules/addressbook/eab-composer-util.c:163
+#: ../modules/addressbook/eab-composer-util.c:190
#, c-format
msgid "Contact information"
msgstr "Contact information"
-#: ../modules/addressbook/eab-composer-util.c:186
+#: ../modules/addressbook/eab-composer-util.c:192
#, c-format
msgid "Contact information for %s"
msgstr "Contact information for %s"
@@ -14320,6 +14731,7 @@ msgid "cards"
msgstr "cards"
#: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../smime/gui/smime-ui.ui.h:22
msgid "I_mport"
msgstr "I_mport"
@@ -14340,71 +14752,71 @@ msgid "I_mport to Tasks"
msgstr "I_mport to Tasks"
#. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:125
+#: ../modules/calendar/e-cal-shell-backend.c:106
#: ../modules/calendar/e-cal-shell-migrate.c:176
-#: ../modules/calendar/e-memo-shell-backend.c:110
+#: ../modules/calendar/e-memo-shell-backend.c:94
#: ../modules/calendar/e-memo-shell-migrate.c:136
-#: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:143
+#: ../modules/calendar/e-task-shell-backend.c:94
+#: ../modules/calendar/e-task-shell-migrate.c:145
msgid "On The Web"
msgstr "On The Web"
-#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../modules/calendar/e-cal-shell-backend.c:108
#: ../plugins/calendar-weather/calendar-weather.c:117
msgid "Weather"
msgstr "Weather"
-#: ../modules/calendar/e-cal-shell-backend.c:242
+#: ../modules/calendar/e-cal-shell-backend.c:193
#: ../modules/calendar/e-cal-shell-migrate.c:60
msgid "Birthdays & Anniversaries"
msgstr "Birthdays & Anniversaries"
-#: ../modules/calendar/e-cal-shell-backend.c:446
+#: ../modules/calendar/e-cal-shell-backend.c:406
msgctxt "New"
msgid "_Appointment"
msgstr "_Appointment"
-#: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1399
+#: ../modules/calendar/e-cal-shell-backend.c:408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
msgid "Create a new appointment"
msgstr "Create a new appointment"
-#: ../modules/calendar/e-cal-shell-backend.c:453
+#: ../modules/calendar/e-cal-shell-backend.c:413
msgctxt "New"
msgid "All Day A_ppointment"
msgstr "All Day A_ppointment"
-#: ../modules/calendar/e-cal-shell-backend.c:455
+#: ../modules/calendar/e-cal-shell-backend.c:415
msgid "Create a new all-day appointment"
msgstr "Create a new all-day appointment"
-#: ../modules/calendar/e-cal-shell-backend.c:460
+#: ../modules/calendar/e-cal-shell-backend.c:420
msgctxt "New"
msgid "M_eeting"
msgstr "M_eeting"
-#: ../modules/calendar/e-cal-shell-backend.c:462
+#: ../modules/calendar/e-cal-shell-backend.c:422
msgid "Create a new meeting request"
msgstr "Create a new meeting request"
-#: ../modules/calendar/e-cal-shell-backend.c:470
+#: ../modules/calendar/e-cal-shell-backend.c:430
msgctxt "New"
msgid "Cale_ndar"
msgstr "Cale_ndar"
-#: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1294
+#: ../modules/calendar/e-cal-shell-backend.c:432
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
msgid "Create a new calendar"
msgstr "Create a new calendar"
-#: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2651
+#: ../modules/calendar/e-cal-shell-backend.c:717
+#: ../plugins/itip-formatter/itip-formatter.c:2669
msgid "Calendar and Tasks"
msgstr "Calendar and Tasks"
-#: ../modules/calendar/e-cal-shell-sidebar.c:168
-#: ../modules/calendar/e-memo-shell-sidebar.c:163
-#: ../modules/calendar/e-task-shell-sidebar.c:163
+#: ../modules/calendar/e-cal-shell-sidebar.c:171
+#: ../modules/calendar/e-memo-shell-sidebar.c:165
+#: ../modules/calendar/e-task-shell-sidebar.c:165
#, c-format
msgid ""
"Error on %s\n"
@@ -14413,16 +14825,20 @@ msgstr ""
"Error on %s\n"
"%s"
-#: ../modules/calendar/e-cal-shell-sidebar.c:227
+#: ../modules/calendar/e-cal-shell-sidebar.c:239
msgid "Loading calendars"
msgstr "Loading calendars"
-#: ../modules/calendar/e-cal-shell-sidebar.c:617
+#: ../modules/calendar/e-cal-shell-sidebar.c:674
+msgid "_New Calendar..."
+msgstr "_New Calendarâ?¦"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:691
msgid "Calendar Selector"
msgstr "Calendar Selector"
#. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:952
+#: ../modules/calendar/e-cal-shell-sidebar.c:1032
#, c-format
msgid "Opening calendar at %s"
msgstr "Opening calendar at %s"
@@ -14452,298 +14868,298 @@ msgstr "Purge events older than"
msgid "Copying Items"
msgstr "Copying Items"
-#: ../modules/calendar/e-cal-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-actions.c:804
msgid "Moving Items"
msgstr "Moving Items"
#. Translators: Default filename part saving an event to a file when
#. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1098
+#: ../modules/calendar/e-cal-shell-view-actions.c:1126
msgid "event"
msgstr "event"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1100
-#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-actions.c:1128
+#: ../modules/calendar/e-cal-shell-view-memopad.c:210
#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:494
-#: ../modules/calendar/e-task-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:504
+#: ../modules/calendar/e-task-shell-view-actions.c:621
msgid "Save as iCalendar"
msgstr "Save as iCalendar"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1250
-#: ../modules/calendar/e-memo-shell-view-actions.c:575
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
msgid "_Copy..."
msgstr "_Copyâ?¦"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1257
+#: ../modules/calendar/e-cal-shell-view-actions.c:1291
msgid "D_elete Calendar"
msgstr "D_elete Calendar"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1259
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
msgid "Delete the selected calendar"
msgstr "Delete the selected calendar"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+#: ../modules/calendar/e-cal-shell-view-actions.c:1300
msgid "Go Back"
msgstr "Go Back"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1273
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
msgid "Go Forward"
msgstr "Go Forward"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1280
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
msgid "Select today"
msgstr "Select today"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1285
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
msgid "Select _Date"
msgstr "Select _Date"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1287
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
msgid "Select a specific date"
msgstr "Select a specific date"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
msgid "_New Calendar"
msgstr "_New Calendar"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1306
-#: ../modules/calendar/e-task-shell-view-actions.c:784
+#: ../modules/calendar/e-cal-shell-view-actions.c:1340
+#: ../modules/calendar/e-task-shell-view-actions.c:793
msgid "Purg_e"
msgstr "Purg_e"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1308
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
msgid "Purge old appointments and meetings"
msgstr "Purge old appointments and meetings"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1313
-#: ../modules/calendar/e-memo-shell-view-actions.c:603
-#: ../modules/calendar/e-task-shell-view-actions.c:728
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-task-shell-view-actions.c:737
msgid "Re_fresh"
msgstr "Re_fresh"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1315
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
msgid "Refresh the selected calendar"
msgstr "Refresh the selected calendar"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1322
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
msgid "Rename the selected calendar"
msgstr "Rename the selected calendar"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
msgid "Show _Only This Calendar"
msgstr "Show _Only This Calendar"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+#: ../modules/calendar/e-cal-shell-view-actions.c:1368
msgid "Cop_y to Calendar..."
msgstr "Cop_y to Calendarâ?¦"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1341
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
msgid "_Delegate Meeting..."
msgstr "_Delegate Meetingâ?¦"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
msgid "_Delete Appointment"
msgstr "_Delete Appointment"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1350
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
msgid "Delete selected appointments"
msgstr "Delete selected appointments"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
msgid "Delete This _Occurrence"
msgstr "Delete This _Occurrence"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1357
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
msgid "Delete this occurrence"
msgstr "Delete this occurrence"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
msgid "Delete All Occ_urrences"
msgstr "Delete All Occ_urrences"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
msgid "Delete all occurrences"
msgstr "Delete all occurrences"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1369
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
msgid "New All Day _Event..."
msgstr "New All Day _Eventâ?¦"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1371
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
msgid "Create a new all day event"
msgstr "Create a new all-day event"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1376
-#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-actions.c:1410
+#: ../modules/calendar/e-cal-shell-view-memopad.c:244
#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:568
-#: ../modules/calendar/e-task-shell-view-actions.c:693
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-task-shell-view-actions.c:702
msgid "_Forward as iCalendar..."
msgstr "_Forward as iCalendarâ?¦"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1383
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
msgid "New _Meeting..."
msgstr "New _Meetingâ?¦"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1385
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
msgid "Create a new meeting"
msgstr "Create a new meeting"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+#: ../modules/calendar/e-cal-shell-view-actions.c:1424
msgid "Mo_ve to Calendar..."
msgstr "Mo_ve to Calendarâ?¦"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+#: ../modules/calendar/e-cal-shell-view-actions.c:1431
msgid "New _Appointment..."
msgstr "New _Appointmentâ?¦"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+#: ../modules/calendar/e-cal-shell-view-actions.c:1438
msgid "Make this Occurrence _Movable"
msgstr "Make this Occurrence _Movable"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1411
+#: ../modules/calendar/e-cal-shell-view-actions.c:1445
msgid "_Open Appointment"
msgstr "_Open Appointment"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1413
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
msgid "View the current appointment"
msgstr "View the current appointment"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1418
+#: ../modules/calendar/e-cal-shell-view-actions.c:1452
msgid "_Reply"
msgstr "_Reply"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1432
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../modules/calendar/e-cal-shell-view-actions.c:1466
+#: ../modules/calendar/e-cal-shell-view-memopad.c:272
msgid "Save as iCalendar..."
msgstr "Save as iCalendarâ?¦"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1439
+#: ../modules/calendar/e-cal-shell-view-actions.c:1473
msgid "_Schedule Meeting..."
msgstr "_Schedule Meetingâ?¦"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
msgid "Converts an appointment to a meeting"
msgstr "Converts an appointment to a meeting"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1446
+#: ../modules/calendar/e-cal-shell-view-actions.c:1480
msgid "Conv_ert to Appointment..."
msgstr "Conv_ert to Appointmentâ?¦"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
msgid "Converts a meeting to an appointment"
msgstr "Converts a meeting to an appointment"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+#: ../modules/calendar/e-cal-shell-view-actions.c:1487
msgid "Quit"
msgstr "Quit"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1577
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
msgid "Day"
msgstr "Day"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1579
+#: ../modules/calendar/e-cal-shell-view-actions.c:1613
msgid "Show one day"
msgstr "Show one day"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1584
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
msgid "List"
msgstr "List"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1586
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
msgid "Show as list"
msgstr "Show as list"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1591
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
msgid "Month"
msgstr "Month"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1593
+#: ../modules/calendar/e-cal-shell-view-actions.c:1627
msgid "Show one month"
msgstr "Show one month"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1598
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
msgid "Week"
msgstr "Week"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1600
+#: ../modules/calendar/e-cal-shell-view-actions.c:1634
msgid "Show one week"
msgstr "Show one week"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1607
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
msgid "Show one work week"
msgstr "Show one work week"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1615
+#: ../modules/calendar/e-cal-shell-view-actions.c:1649
msgid "Active Appointments"
msgstr "Active Appointments"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1629
+#: ../modules/calendar/e-cal-shell-view-actions.c:1663
msgid "Next 7 Days' Appointments"
msgstr "Next 7 Days' Appointments"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1660
-#: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:965
+#: ../modules/calendar/e-cal-shell-view-actions.c:1694
+#: ../modules/calendar/e-memo-shell-view-actions.c:775
+#: ../modules/calendar/e-task-shell-view-actions.c:974
msgid "Description contains"
msgstr "Description contains"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1667
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:972
+#: ../modules/calendar/e-cal-shell-view-actions.c:1701
+#: ../modules/calendar/e-memo-shell-view-actions.c:782
+#: ../modules/calendar/e-task-shell-view-actions.c:981
msgid "Summary contains"
msgstr "Summary contains"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+#: ../modules/calendar/e-cal-shell-view-actions.c:1713
msgid "Print this calendar"
msgstr "Print this calendar"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1686
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
msgid "Preview the calendar to be printed"
msgstr "Preview the calendar to be printed"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1759
+#: ../modules/calendar/e-cal-shell-view-actions.c:1793
msgid "Go To"
msgstr "Go To"
#. Translators: Default filename part saving a memo to a file when
#. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:492
+#: ../modules/calendar/e-cal-shell-view-memopad.c:208
+#: ../modules/calendar/e-memo-shell-view-actions.c:502
msgid "memo"
msgstr "memo"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-memo-shell-view-actions.c:634
msgid "New _Memo"
msgstr "New _Memo"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:252
-#: ../modules/calendar/e-memo-shell-backend.c:320
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#: ../modules/calendar/e-cal-shell-view-memopad.c:253
+#: ../modules/calendar/e-memo-shell-backend.c:281
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
msgid "Create a new memo"
msgstr "Create a new memo"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-cal-shell-view-memopad.c:258
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
msgid "_Open Memo"
msgstr "_Open Memo"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
msgid "View the selected memo"
msgstr "View the selected memo"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-memopad.c:265
#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
-#: ../modules/calendar/e-task-shell-view-actions.c:777
+#: ../modules/calendar/e-memo-shell-view-actions.c:648
+#: ../modules/calendar/e-task-shell-view-actions.c:786
msgid "Open _Web Page"
msgstr "Open _Web Page"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-cal-shell-view-memopad.c:284
+#: ../modules/calendar/e-memo-shell-view-actions.c:808
msgid "Print the selected memo"
msgstr "Print the selected memo"
@@ -14752,22 +15168,22 @@ msgstr "Print the selected memo"
#. Translators: Default filename part saving a task to a file when
#. * no summary is filed, the '.ics' extension is concatenated to it
#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:610
+#: ../modules/calendar/e-task-shell-view-actions.c:619
msgid "task"
msgstr "task"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:672
+#: ../modules/calendar/e-task-shell-view-actions.c:681
msgid "_Assign Task"
msgstr "_Assign Task"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:749
+#: ../modules/calendar/e-task-shell-view-actions.c:758
msgid "_Mark as Complete"
msgstr "_Mark as Complete"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:760
msgid "Mark selected tasks as complete"
msgstr "Mark selected tasks as complete"
@@ -14776,76 +15192,76 @@ msgid "_Mark as Incomplete"
msgstr "_Mark as Incomplete"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:758
+#: ../modules/calendar/e-task-shell-view-actions.c:767
msgid "Mark selected tasks as incomplete"
msgstr "Mark selected tasks as incomplete"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:763
+#: ../modules/calendar/e-task-shell-view-actions.c:772
msgid "New _Task"
msgstr "New _Task"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-backend.c:280
+#: ../modules/calendar/e-task-shell-view-actions.c:774
msgid "Create a new task"
msgstr "Create a new task"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:770
+#: ../modules/calendar/e-task-shell-view-actions.c:779
msgid "_Open Task"
msgstr "_Open Task"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:781
msgid "View the selected task"
msgstr "View the selected task"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
+#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../modules/calendar/e-task-shell-view-actions.c:1022
msgid "_Save as iCalendar..."
msgstr "_Save as iCalendarâ?¦"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:998
+#: ../modules/calendar/e-task-shell-view-actions.c:1007
msgid "Print the selected task"
msgstr "Print the selected task"
-#: ../modules/calendar/e-memo-shell-backend.c:318
+#: ../modules/calendar/e-memo-shell-backend.c:279
msgctxt "New"
msgid "Mem_o"
msgstr "Mem_o"
-#: ../modules/calendar/e-memo-shell-backend.c:325
+#: ../modules/calendar/e-memo-shell-backend.c:286
msgctxt "New"
msgid "_Shared Memo"
msgstr "_Shared Memo"
-#: ../modules/calendar/e-memo-shell-backend.c:327
+#: ../modules/calendar/e-memo-shell-backend.c:288
msgid "Create a new shared memo"
msgstr "Create a new shared memo"
-#: ../modules/calendar/e-memo-shell-backend.c:335
+#: ../modules/calendar/e-memo-shell-backend.c:296
msgctxt "New"
msgid "Memo Li_st"
msgstr "Memo Li_st"
-#: ../modules/calendar/e-memo-shell-backend.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-memo-shell-backend.c:298
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
msgid "Create a new memo list"
msgstr "Create a new memo list"
-#: ../modules/calendar/e-memo-shell-sidebar.c:222
+#: ../modules/calendar/e-memo-shell-sidebar.c:233
msgid "Loading memos"
msgstr "Loading memos"
-#: ../modules/calendar/e-memo-shell-sidebar.c:571
+#: ../modules/calendar/e-memo-shell-sidebar.c:613
msgid "Memo List Selector"
msgstr "Memo List Selector"
#. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:870
+#: ../modules/calendar/e-memo-shell-sidebar.c:918
#, c-format
msgid "Opening memos at %s"
msgstr "Opening memos at %s"
@@ -14855,63 +15271,63 @@ msgstr "Opening memos at %s"
msgid "Print Memos"
msgstr "Print Memos"
-#: ../modules/calendar/e-memo-shell-view-actions.c:554
+#: ../modules/calendar/e-memo-shell-view-actions.c:564
msgid "_Delete Memo"
msgstr "_Delete Memo"
-#: ../modules/calendar/e-memo-shell-view-actions.c:561
+#: ../modules/calendar/e-memo-shell-view-actions.c:571
msgid "_Find in Memo..."
msgstr "_Find in Memoâ?¦"
-#: ../modules/calendar/e-memo-shell-view-actions.c:563
+#: ../modules/calendar/e-memo-shell-view-actions.c:573
msgid "Search for text in the displayed memo"
msgstr "Search for text in the displayed memo"
-#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
msgid "D_elete Memo List"
msgstr "D_elete Memo List"
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
msgid "Delete the selected memo list"
msgstr "Delete the selected memo list"
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
msgid "_New Memo List"
msgstr "_New Memo List"
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
msgid "Refresh the selected memo list"
msgstr "Refresh the selected memo list"
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
msgid "Rename the selected memo list"
msgstr "Rename the selected memo list"
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:627
msgid "Show _Only This Memo List"
msgstr "Show _Only This Memo List"
-#: ../modules/calendar/e-memo-shell-view-actions.c:696
+#: ../modules/calendar/e-memo-shell-view-actions.c:706
msgid "Memo _Preview"
msgstr "Memo _Preview"
-#: ../modules/calendar/e-memo-shell-view-actions.c:698
+#: ../modules/calendar/e-memo-shell-view-actions.c:708
msgid "Show memo preview pane"
msgstr "Show memo preview pane"
-#: ../modules/calendar/e-memo-shell-view-actions.c:719
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
msgid "Show memo preview below the memo list"
msgstr "Show memo preview below the memo list"
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-memo-shell-view-actions.c:736
msgid "Show memo preview alongside the memo list"
msgstr "Show memo preview alongside the memo list"
-#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-memo-shell-view-actions.c:794
msgid "Print the list of memos"
msgstr "Print the list of memos"
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-memo-shell-view-actions.c:801
msgid "Preview the list of memos to be printed"
msgstr "Preview the list of memos to be printed"
@@ -14936,40 +15352,40 @@ msgstr "Delete Memos"
msgid "Delete Memo"
msgstr "Delete Memo"
-#: ../modules/calendar/e-task-shell-backend.c:322
+#: ../modules/calendar/e-task-shell-backend.c:278
msgctxt "New"
msgid "_Task"
msgstr "_Task"
-#: ../modules/calendar/e-task-shell-backend.c:329
+#: ../modules/calendar/e-task-shell-backend.c:285
msgctxt "New"
msgid "Assigne_d Task"
msgstr "Assigne_d Task"
-#: ../modules/calendar/e-task-shell-backend.c:331
+#: ../modules/calendar/e-task-shell-backend.c:287
msgid "Create a new assigned task"
msgstr "Create a new assigned task"
-#: ../modules/calendar/e-task-shell-backend.c:339
+#: ../modules/calendar/e-task-shell-backend.c:295
msgctxt "New"
msgid "Tas_k List"
msgstr "Tas_k List"
-#: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-backend.c:297
+#: ../modules/calendar/e-task-shell-view-actions.c:725
msgid "Create a new task list"
msgstr "Create a new task list"
-#: ../modules/calendar/e-task-shell-sidebar.c:222
+#: ../modules/calendar/e-task-shell-sidebar.c:233
msgid "Loading tasks"
msgstr "Loading tasks"
-#: ../modules/calendar/e-task-shell-sidebar.c:571
+#: ../modules/calendar/e-task-shell-sidebar.c:613
msgid "Task List Selector"
msgstr "Task List Selector"
#. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:870
+#: ../modules/calendar/e-task-shell-sidebar.c:918
#, c-format
msgid "Opening tasks at %s"
msgstr "Opening tasks at %s"
@@ -14979,7 +15395,7 @@ msgstr "Opening tasks at %s"
msgid "Print Tasks"
msgstr "Print Tasks"
-#: ../modules/calendar/e-task-shell-view-actions.c:554
+#: ../modules/calendar/e-task-shell-view-actions.c:563
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -14991,95 +15407,95 @@ msgstr ""
"\n"
"Really erase these tasks?"
-#: ../modules/calendar/e-task-shell-view-actions.c:679
+#: ../modules/calendar/e-task-shell-view-actions.c:688
msgid "_Delete Task"
msgstr "_Delete Task"
-#: ../modules/calendar/e-task-shell-view-actions.c:686
+#: ../modules/calendar/e-task-shell-view-actions.c:695
msgid "_Find in Task..."
msgstr "_Find in Taskâ?¦"
-#: ../modules/calendar/e-task-shell-view-actions.c:688
+#: ../modules/calendar/e-task-shell-view-actions.c:697
msgid "Search for text in the displayed task"
msgstr "Search for text in the displayed task"
-#: ../modules/calendar/e-task-shell-view-actions.c:700
+#: ../modules/calendar/e-task-shell-view-actions.c:709
msgid "Copy..."
msgstr "Copyâ?¦"
-#: ../modules/calendar/e-task-shell-view-actions.c:707
+#: ../modules/calendar/e-task-shell-view-actions.c:716
msgid "D_elete Task List"
msgstr "D_elete Task List"
-#: ../modules/calendar/e-task-shell-view-actions.c:709
+#: ../modules/calendar/e-task-shell-view-actions.c:718
msgid "Delete the selected task list"
msgstr "Delete the selected task list"
-#: ../modules/calendar/e-task-shell-view-actions.c:714
+#: ../modules/calendar/e-task-shell-view-actions.c:723
msgid "_New Task List"
msgstr "_New Task List"
-#: ../modules/calendar/e-task-shell-view-actions.c:730
+#: ../modules/calendar/e-task-shell-view-actions.c:739
msgid "Refresh the selected task list"
msgstr "Refresh the selected task list"
-#: ../modules/calendar/e-task-shell-view-actions.c:737
+#: ../modules/calendar/e-task-shell-view-actions.c:746
msgid "Rename the selected task list"
msgstr "Rename the selected task list"
-#: ../modules/calendar/e-task-shell-view-actions.c:742
+#: ../modules/calendar/e-task-shell-view-actions.c:751
msgid "Show _Only This Task List"
msgstr "Show _Only This Task List"
-#: ../modules/calendar/e-task-shell-view-actions.c:756
+#: ../modules/calendar/e-task-shell-view-actions.c:765
msgid "Mar_k as Incomplete"
msgstr "Mar_k as Incomplete"
-#: ../modules/calendar/e-task-shell-view-actions.c:786
+#: ../modules/calendar/e-task-shell-view-actions.c:795
msgid "Delete completed tasks"
msgstr "Delete completed tasks"
-#: ../modules/calendar/e-task-shell-view-actions.c:861
+#: ../modules/calendar/e-task-shell-view-actions.c:870
msgid "Task _Preview"
msgstr "Task _Preview"
-#: ../modules/calendar/e-task-shell-view-actions.c:863
+#: ../modules/calendar/e-task-shell-view-actions.c:872
msgid "Show task preview pane"
msgstr "Show task preview pane"
-#: ../modules/calendar/e-task-shell-view-actions.c:884
+#: ../modules/calendar/e-task-shell-view-actions.c:893
msgid "Show task preview below the task list"
msgstr "Show task preview below the task list"
-#: ../modules/calendar/e-task-shell-view-actions.c:891
+#: ../modules/calendar/e-task-shell-view-actions.c:900
msgid "Show task preview alongside the task list"
msgstr "Show task preview alongside the task list"
-#: ../modules/calendar/e-task-shell-view-actions.c:899
+#: ../modules/calendar/e-task-shell-view-actions.c:908
msgid "Active Tasks"
msgstr "Active Tasks"
-#: ../modules/calendar/e-task-shell-view-actions.c:913
+#: ../modules/calendar/e-task-shell-view-actions.c:922
msgid "Completed Tasks"
msgstr "Completed Tasks"
-#: ../modules/calendar/e-task-shell-view-actions.c:920
+#: ../modules/calendar/e-task-shell-view-actions.c:929
msgid "Next 7 Days' Tasks"
msgstr "Next 7 Days' Tasks"
-#: ../modules/calendar/e-task-shell-view-actions.c:927
+#: ../modules/calendar/e-task-shell-view-actions.c:936
msgid "Overdue Tasks"
msgstr "Overdue Tasks"
-#: ../modules/calendar/e-task-shell-view-actions.c:934
+#: ../modules/calendar/e-task-shell-view-actions.c:943
msgid "Tasks with Attachments"
msgstr "Tasks with Attachments"
-#: ../modules/calendar/e-task-shell-view-actions.c:984
+#: ../modules/calendar/e-task-shell-view-actions.c:993
msgid "Print the list of tasks"
msgstr "Print the list of tasks"
-#: ../modules/calendar/e-task-shell-view-actions.c:991
+#: ../modules/calendar/e-task-shell-view-actions.c:1000
msgid "Preview the list of tasks to be printed"
msgstr "Preview the list of tasks to be printed"
@@ -15103,7 +15519,7 @@ msgid "Delete Task"
msgstr "Delete Task"
#. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:333
+#: ../modules/mail/e-mail-attachment-handler.c:345
#, c-format
msgid "%d attached messages"
msgstr "%d attached messages"
@@ -15115,448 +15531,469 @@ msgctxt "mail-junk-hook"
msgid "None"
msgstr "None"
-#: ../modules/mail/e-mail-shell-backend.c:164
+#: ../modules/mail/e-mail-shell-backend.c:171
msgctxt "New"
msgid "_Mail Message"
msgstr "_Mail Message"
-#: ../modules/mail/e-mail-shell-backend.c:166
+#: ../modules/mail/e-mail-shell-backend.c:173
msgid "Compose a new mail message"
msgstr "Compose a new mail message"
-#: ../modules/mail/e-mail-shell-backend.c:174
+#: ../modules/mail/e-mail-shell-backend.c:181
msgctxt "New"
msgid "Mail _Folder"
msgstr "Mail _Folder"
-#: ../modules/mail/e-mail-shell-backend.c:176
+#: ../modules/mail/e-mail-shell-backend.c:183
msgid "Create a new mail folder"
msgstr "Create a new mail folder"
-#: ../modules/mail/e-mail-shell-backend.c:195
+#: ../modules/mail/e-mail-shell-backend.c:489
msgid "Mail Accounts"
msgstr "Mail Accounts"
-#: ../modules/mail/e-mail-shell-backend.c:203
+#: ../modules/mail/e-mail-shell-backend.c:497
msgid "Mail Preferences"
msgstr "Mail Preferences"
-#: ../modules/mail/e-mail-shell-backend.c:211
+#: ../modules/mail/e-mail-shell-backend.c:505
msgid "Composer Preferences"
msgstr "Composer Preferences"
-#: ../modules/mail/e-mail-shell-backend.c:219
+#: ../modules/mail/e-mail-shell-backend.c:513
msgid "Network Preferences"
msgstr "Network Preferences"
-#: ../modules/mail/e-mail-shell-view-actions.c:814
-#: ../modules/mail/e-mail-shell-view.c:875
+#: ../modules/mail/e-mail-shell-view-actions.c:880
+#: ../modules/mail/e-mail-shell-view.c:883
msgid "_Disable Account"
msgstr "_Disable Account"
-#: ../modules/mail/e-mail-shell-view-actions.c:816
+#: ../modules/mail/e-mail-shell-view-actions.c:882
msgid "Disable this account"
msgstr "Disable this account"
-#: ../modules/mail/e-mail-shell-view-actions.c:823
+#: ../modules/mail/e-mail-shell-view-actions.c:889
msgid "Permanently remove all the deleted messages from all folders"
msgstr "Permanently remove all the deleted messages from all folders"
-#: ../modules/mail/e-mail-shell-view-actions.c:828
+#: ../modules/mail/e-mail-shell-view-actions.c:894
msgid "C_reate Search Folder From Search..."
msgstr "C_reate Search Folder From Searchâ?¦"
-#: ../modules/mail/e-mail-shell-view-actions.c:835
+#: ../modules/mail/e-mail-shell-view-actions.c:901
msgid "_Download Messages for Offline Usage"
msgstr "_Download Messages for Offline Usage"
-#: ../modules/mail/e-mail-shell-view-actions.c:837
+#: ../modules/mail/e-mail-shell-view-actions.c:903
msgid "Download messages of accounts and folders marked for offline usage"
msgstr "Download messages of accounts and folders marked for offline usage"
-#: ../modules/mail/e-mail-shell-view-actions.c:842
+#: ../modules/mail/e-mail-shell-view-actions.c:908
msgid "Fl_ush Outbox"
msgstr "Fl_ush Outbox"
-#: ../modules/mail/e-mail-shell-view-actions.c:849
+#: ../modules/mail/e-mail-shell-view-actions.c:915
msgid "_Copy Folder To..."
msgstr "_Copy Folder Toâ?¦"
-#: ../modules/mail/e-mail-shell-view-actions.c:851
+#: ../modules/mail/e-mail-shell-view-actions.c:917
msgid "Copy the selected folder into another folder"
msgstr "Copy the selected folder into another folder"
-#: ../modules/mail/e-mail-shell-view-actions.c:858
+#: ../modules/mail/e-mail-shell-view-actions.c:924
msgid "Permanently remove this folder"
msgstr "Permanently remove this folder"
-#: ../modules/mail/e-mail-shell-view-actions.c:863
+#: ../modules/mail/e-mail-shell-view-actions.c:929
msgid "E_xpunge"
msgstr "E_xpunge"
-#: ../modules/mail/e-mail-shell-view-actions.c:865
+#: ../modules/mail/e-mail-shell-view-actions.c:931
msgid "Permanently remove all deleted messages from this folder"
msgstr "Permanently remove all deleted messages from this folder"
-#: ../modules/mail/e-mail-shell-view-actions.c:870
+#: ../modules/mail/e-mail-shell-view-actions.c:936
msgid "Mar_k All Messages as Read"
msgstr "Mar_k All Messages as Read"
-#: ../modules/mail/e-mail-shell-view-actions.c:872
+#: ../modules/mail/e-mail-shell-view-actions.c:938
msgid "Mark all messages in the folder as read"
msgstr "Mark all messages in the folder as read"
-#: ../modules/mail/e-mail-shell-view-actions.c:877
+#: ../modules/mail/e-mail-shell-view-actions.c:943
msgid "_Move Folder To..."
msgstr "_Move Folder Toâ?¦"
-#: ../modules/mail/e-mail-shell-view-actions.c:879
+#: ../modules/mail/e-mail-shell-view-actions.c:945
msgid "Move the selected folder into another folder"
msgstr "Move the selected folder into another folder"
-#: ../modules/mail/e-mail-shell-view-actions.c:884
+#: ../modules/mail/e-mail-shell-view-actions.c:950
msgid "_New..."
msgstr "_Newâ?¦"
-#: ../modules/mail/e-mail-shell-view-actions.c:886
+#: ../modules/mail/e-mail-shell-view-actions.c:952
msgid "Create a new folder for storing mail"
msgstr "Create a new folder for storing mail"
-#: ../modules/mail/e-mail-shell-view-actions.c:893
+#: ../modules/mail/e-mail-shell-view-actions.c:959
msgid "Change the properties of this folder"
msgstr "Change the properties of this folder"
-#: ../modules/mail/e-mail-shell-view-actions.c:900
+#: ../modules/mail/e-mail-shell-view-actions.c:966
msgid "Refresh the folder"
msgstr "Refresh the folder"
-#: ../modules/mail/e-mail-shell-view-actions.c:907
+#: ../modules/mail/e-mail-shell-view-actions.c:973
msgid "Change the name of this folder"
msgstr "Change the name of this folder"
-#: ../modules/mail/e-mail-shell-view-actions.c:912
+#: ../modules/mail/e-mail-shell-view-actions.c:978
msgid "Select Message _Thread"
msgstr "Select Message _Thread"
-#: ../modules/mail/e-mail-shell-view-actions.c:914
+#: ../modules/mail/e-mail-shell-view-actions.c:980
msgid "Select all messages in the same thread as the selected message"
msgstr "Select all messages in the same thread as the selected message"
-#: ../modules/mail/e-mail-shell-view-actions.c:919
+#: ../modules/mail/e-mail-shell-view-actions.c:985
msgid "Select Message S_ubthread"
msgstr "Select Message S_ubthread"
-#: ../modules/mail/e-mail-shell-view-actions.c:921
+#: ../modules/mail/e-mail-shell-view-actions.c:987
msgid "Select all replies to the currently selected message"
msgstr "Select all replies to the currently selected message"
-#: ../modules/mail/e-mail-shell-view-actions.c:926
+#: ../modules/mail/e-mail-shell-view-actions.c:992
msgid "_Unsubscribe"
msgstr "_Unsubscribe"
-#: ../modules/mail/e-mail-shell-view-actions.c:928
+#: ../modules/mail/e-mail-shell-view-actions.c:994
msgid "Unsubscribe from the selected folder"
msgstr "Unsubscribe from the selected folder"
-#: ../modules/mail/e-mail-shell-view-actions.c:933
+#: ../modules/mail/e-mail-shell-view-actions.c:999
msgid "Empty _Trash"
msgstr "Empty Was_tebasket"
-#: ../modules/mail/e-mail-shell-view-actions.c:935
+#: ../modules/mail/e-mail-shell-view-actions.c:1001
msgid "Permanently remove all the deleted messages from all accounts"
msgstr "Permanently remove all the deleted messages from all accounts"
-#: ../modules/mail/e-mail-shell-view-actions.c:940
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
msgid "_New Label"
msgstr "_New Label"
-#: ../modules/mail/e-mail-shell-view-actions.c:949
+#: ../modules/mail/e-mail-shell-view-actions.c:1015
msgid "N_one"
msgstr "N_one"
-#: ../modules/mail/e-mail-shell-view-actions.c:972
+#: ../modules/mail/e-mail-shell-view-actions.c:1038
msgid "Cancel the current mail operation"
msgstr "Cancel the current mail operation"
-#: ../modules/mail/e-mail-shell-view-actions.c:977
+#: ../modules/mail/e-mail-shell-view-actions.c:1043
msgid "Collapse All _Threads"
msgstr "Collapse All _Threads"
-#: ../modules/mail/e-mail-shell-view-actions.c:979
+#: ../modules/mail/e-mail-shell-view-actions.c:1045
msgid "Collapse all message threads"
msgstr "Collapse all message threads"
-#: ../modules/mail/e-mail-shell-view-actions.c:984
+#: ../modules/mail/e-mail-shell-view-actions.c:1050
msgid "E_xpand All Threads"
msgstr "E_xpand All Threads"
-#: ../modules/mail/e-mail-shell-view-actions.c:986
+#: ../modules/mail/e-mail-shell-view-actions.c:1052
msgid "Expand all message threads"
msgstr "Expand all message threads"
-#: ../modules/mail/e-mail-shell-view-actions.c:991
+#: ../modules/mail/e-mail-shell-view-actions.c:1057
msgid "_Message Filters"
msgstr "_Message Filters"
-#: ../modules/mail/e-mail-shell-view-actions.c:993
+#: ../modules/mail/e-mail-shell-view-actions.c:1059
msgid "Create or edit rules for filtering new mail"
msgstr "Create or edit rules for filtering new mail"
-#: ../modules/mail/e-mail-shell-view-actions.c:998
+#: ../modules/mail/e-mail-shell-view-actions.c:1064
msgid "Search F_olders"
msgstr "Search F_olders"
-#: ../modules/mail/e-mail-shell-view-actions.c:1000
+#: ../modules/mail/e-mail-shell-view-actions.c:1066
msgid "Create or edit search folder definitions"
msgstr "Create or edit search folder definitions"
-#: ../modules/mail/e-mail-shell-view-actions.c:1005
+#: ../modules/mail/e-mail-shell-view-actions.c:1071
msgid "_Subscriptions..."
msgstr "_Subscriptionsâ?¦"
-#: ../modules/mail/e-mail-shell-view-actions.c:1007
+#: ../modules/mail/e-mail-shell-view-actions.c:1073
msgid "Subscribe or unsubscribe to folders on remote servers"
msgstr "Subscribe or unsubscribe to folders on remote servers"
-#: ../modules/mail/e-mail-shell-view-actions.c:1014
+#: ../modules/mail/e-mail-shell-view-actions.c:1080
msgid "F_older"
msgstr "F_older"
-#: ../modules/mail/e-mail-shell-view-actions.c:1021
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
msgid "_Label"
msgstr "_Label"
-#: ../modules/mail/e-mail-shell-view-actions.c:1061
+#: ../modules/mail/e-mail-shell-view-actions.c:1127
msgid "_New Folder..."
msgstr "_New Folderâ?¦"
-#: ../modules/mail/e-mail-shell-view-actions.c:1085
+#: ../modules/mail/e-mail-shell-view-actions.c:1151
msgid "Show Message _Preview"
msgstr "Show Message _Preview"
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
msgid "Show message preview pane"
msgstr "Show message preview pane"
-#: ../modules/mail/e-mail-shell-view-actions.c:1093
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
msgid "Show _Deleted Messages"
msgstr "Show _Deleted Messages"
-#: ../modules/mail/e-mail-shell-view-actions.c:1095
+#: ../modules/mail/e-mail-shell-view-actions.c:1161
msgid "Show deleted messages with a line through them"
msgstr "Show deleted messages with a line through them"
-#: ../modules/mail/e-mail-shell-view-actions.c:1101
+#: ../modules/mail/e-mail-shell-view-actions.c:1167
msgid "_Group By Threads"
msgstr "_Group By Threads"
-#: ../modules/mail/e-mail-shell-view-actions.c:1103
+#: ../modules/mail/e-mail-shell-view-actions.c:1169
msgid "Threaded message list"
msgstr "Threaded message list"
-#: ../modules/mail/e-mail-shell-view-actions.c:1124
+#: ../modules/mail/e-mail-shell-view-actions.c:1190
msgid "Show message preview below the message list"
msgstr "Show message preview below the message list"
-#: ../modules/mail/e-mail-shell-view-actions.c:1131
+#: ../modules/mail/e-mail-shell-view-actions.c:1197
msgid "Show message preview alongside the message list"
msgstr "Show message preview alongside the message list"
-#: ../modules/mail/e-mail-shell-view-actions.c:1139
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
msgid "All Messages"
msgstr "All Messages"
-#: ../modules/mail/e-mail-shell-view-actions.c:1146
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
msgid "Important Messages"
msgstr "Important Messages"
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
msgid "Last 5 Days' Messages"
msgstr "Last 5 Days' Messages"
-#: ../modules/mail/e-mail-shell-view-actions.c:1160
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
msgid "Messages Not Junk"
msgstr "Messages Not Junk"
-#: ../modules/mail/e-mail-shell-view-actions.c:1167
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
msgid "Messages with Attachments"
msgstr "Messages with Attachments"
-#: ../modules/mail/e-mail-shell-view-actions.c:1174
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
msgid "No Label"
msgstr "No Label"
-#: ../modules/mail/e-mail-shell-view-actions.c:1181
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
msgid "Read Messages"
msgstr "Read Messages"
-#: ../modules/mail/e-mail-shell-view-actions.c:1188
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
msgid "Recent Messages"
msgstr "Recent Messages"
-#: ../modules/mail/e-mail-shell-view-actions.c:1195
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
msgid "Unread Messages"
msgstr "Unread Messages"
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
msgid "Subject or Addresses contain"
msgstr "Subject or Addresses contain"
-#: ../modules/mail/e-mail-shell-view-actions.c:1257
+#: ../modules/mail/e-mail-shell-view-actions.c:1323
msgid "All Accounts"
msgstr "All Accounts"
-#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1330
msgid "Current Account"
msgstr "Current Account"
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../modules/mail/e-mail-shell-view-actions.c:1337
msgid "Current Folder"
msgstr "Current Folder"
-#: ../modules/mail/e-mail-shell-view-private.c:880
+#: ../modules/mail/e-mail-shell-view-private.c:990
#, c-format
msgid "%d selected, "
msgid_plural "%d selected, "
msgstr[0] "%d selected, "
msgstr[1] "%d selected, "
-#: ../modules/mail/e-mail-shell-view-private.c:891
+#: ../modules/mail/e-mail-shell-view-private.c:1001
#, c-format
msgid "%d deleted"
msgid_plural "%d deleted"
msgstr[0] "%d deleted"
msgstr[1] "%d deleted"
-#: ../modules/mail/e-mail-shell-view-private.c:897
-#: ../modules/mail/e-mail-shell-view-private.c:904
+#: ../modules/mail/e-mail-shell-view-private.c:1007
+#: ../modules/mail/e-mail-shell-view-private.c:1014
#, c-format
msgid "%d junk"
msgid_plural "%d junk"
msgstr[0] "%d junk"
msgstr[1] "%d junk"
-#: ../modules/mail/e-mail-shell-view-private.c:910
+#: ../modules/mail/e-mail-shell-view-private.c:1020
#, c-format
msgid "%d draft"
msgid_plural "%d drafts"
msgstr[0] "%d draft"
msgstr[1] "%d drafts"
-#: ../modules/mail/e-mail-shell-view-private.c:916
+#: ../modules/mail/e-mail-shell-view-private.c:1026
#, c-format
msgid "%d unsent"
msgid_plural "%d unsent"
msgstr[0] "%d unsent"
msgstr[1] "%d unsent"
-#: ../modules/mail/e-mail-shell-view-private.c:922
+#: ../modules/mail/e-mail-shell-view-private.c:1032
#, c-format
msgid "%d sent"
msgid_plural "%d sent"
msgstr[0] "%d sent"
msgstr[1] "%d sent"
-#: ../modules/mail/e-mail-shell-view-private.c:934
+#: ../modules/mail/e-mail-shell-view-private.c:1044
#, c-format
msgid "%d unread, "
msgid_plural "%d unread, "
msgstr[0] "%d unread, "
msgstr[1] "%d unread, "
-#: ../modules/mail/e-mail-shell-view-private.c:937
+#: ../modules/mail/e-mail-shell-view-private.c:1047
#, c-format
msgid "%d total"
msgid_plural "%d total"
msgstr[0] "%d total"
msgstr[1] "%d total"
-#: ../modules/mail/e-mail-shell-view.c:548
+#: ../modules/mail/e-mail-shell-view.c:559
msgid "All Account Search"
msgstr "All Account Search"
-#: ../modules/mail/e-mail-shell-view.c:685
+#: ../modules/mail/e-mail-shell-view.c:686
msgid "Account Search"
msgstr "Account Search"
-#: ../modules/mail/e-mail-shell-view.c:873
+#: ../modules/mail/e-mail-shell-view.c:881
msgid "Proxy _Logout"
msgstr "Proxy _Logout"
-#: ../modules/mail/em-composer-prefs.c:472
+#: ../modules/mail/em-account-prefs.c:133
+msgid "Evolution Account Assistant"
+msgstr "Evolution Account Assistant"
+
+#: ../modules/mail/em-account-prefs.c:182
+msgid "Account Editor"
+msgstr "Account Editor"
+
+#: ../modules/mail/em-composer-prefs.c:505
#: ../plugins/plugin-manager/plugin-manager.c:349
#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
+#: ../widgets/misc/e-account-tree-view.c:211
msgid "Enabled"
msgstr "Enabled"
-#: ../modules/mail/em-composer-prefs.c:476
+#: ../modules/mail/em-composer-prefs.c:509
msgid "Language(s)"
msgstr "Language(s)"
-#: ../modules/mail/em-mailer-prefs.c:95
+#: ../modules/mail/em-mailer-prefs.c:91
msgid "Every time"
msgstr "Every time"
-#: ../modules/mail/em-mailer-prefs.c:96
+#: ../modules/mail/em-mailer-prefs.c:92
msgid "Once per day"
msgstr "Once per day"
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:93
msgid "Once per week"
msgstr "Once per week"
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:94
msgid "Once per month"
msgstr "Once per month"
-#: ../modules/mail/em-mailer-prefs.c:223
+#: ../modules/mail/em-mailer-prefs.c:201
msgid "Add Custom Junk Header"
msgstr "Add Custom Junk Header"
-#: ../modules/mail/em-mailer-prefs.c:231
+#: ../modules/mail/em-mailer-prefs.c:209
msgid "Header Name:"
msgstr "Header Name:"
-#: ../modules/mail/em-mailer-prefs.c:232
+#: ../modules/mail/em-mailer-prefs.c:210
msgid "Header Value Contains:"
msgstr "Header Value Contains:"
-#: ../modules/mail/em-mailer-prefs.c:332
+#: ../modules/mail/em-mailer-prefs.c:310
msgid "Header"
msgstr "Header"
-#: ../modules/mail/em-mailer-prefs.c:336
+#: ../modules/mail/em-mailer-prefs.c:314
msgid "Contains Value"
msgstr "Contains Value"
#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:729 ../modules/mail/em-mailer-prefs.c:800
+#: ../modules/mail/em-mailer-prefs.c:707 ../modules/mail/em-mailer-prefs.c:778
#, c-format
msgid "%s plugin is available and the binary is installed."
msgstr "%s plugin is available and the binary is installed."
#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:737 ../modules/mail/em-mailer-prefs.c:809
+#: ../modules/mail/em-mailer-prefs.c:715 ../modules/mail/em-mailer-prefs.c:787
#, c-format
msgid ""
"%s plugin is not available. Please check whether the package is installed."
msgstr ""
"%s plugin is not available. Please check whether the package is installed."
-#: ../modules/mail/em-mailer-prefs.c:773
+#: ../modules/mail/em-mailer-prefs.c:751
msgid "No junk plugin available"
msgstr "No junk plugin available"
#. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1160
+#: ../modules/mail/em-mailer-prefs.c:1143
msgid "_Date header:"
msgstr "_Date header:"
-#: ../modules/mail/em-mailer-prefs.c:1161
+#: ../modules/mail/em-mailer-prefs.c:1144
msgid "Show _original header value"
msgstr "Show _original header value"
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "Check whether Evolution is the default mailer"
+
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr "Every time Evolution starts, check whether it is the default mailer."
+
+#: ../modules/mailto-handler/evolution-mailto-handler.c:138
+msgid "Do you want to make Evolution your default email client?"
+msgstr "Do you want to make Evolution your default e-mail client?"
+
#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
msgid "Hello Python"
msgstr "Hello Python"
@@ -15573,6 +16010,50 @@ msgstr "Python Test Plugin"
msgid "Test Plugin for Python EPlugin loader."
msgstr "Test Plugin for Python EPlugin loader."
+#: ../modules/startup-wizard/evolution-startup-wizard.c:275
+#: ../widgets/misc/e-import-assistant.c:396
+msgid "Please select the information that you would like to import:"
+msgstr "Please select the information that you would like to import:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:307
+#: ../widgets/misc/e-import-assistant.c:552
+#, c-format
+msgid "From %s:"
+msgstr "From %s:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:318
+#: ../modules/startup-wizard/evolution-startup-wizard.c:415
+msgid "Importing Files"
+msgstr "Importing Files"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:393
+msgid "Import cancelled. Click \"Forward\" to continue."
+msgstr "Import cancelled. Click \"Forward\" to continue."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:411
+msgid "Import complete. Click \"Forward\" to continue."
+msgstr "Import complete. Click \"Forward\" to continue."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:471
+msgid "Evolution Setup Assistant"
+msgstr "Evolution Setup Assistant"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+msgid "Welcome"
+msgstr "Welcome"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:482
+msgid ""
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your e-mail accounts, and to import files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+
#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
msgid "Add local address books to Evolution."
msgstr "Add local address books to Evolution."
@@ -15589,7 +16070,7 @@ msgstr ""
"List of clues for the attachment reminder plugin to look for in a message "
"body"
-#: ../plugins/attachment-reminder/attachment-reminder.c:509
+#: ../plugins/attachment-reminder/attachment-reminder.c:451
#: ../plugins/templates/templates.c:409
msgid "Keywords"
msgstr "Keywords"
@@ -15630,23 +16111,23 @@ msgstr "Inline Audio"
msgid "Play audio attachments directly in mail messages."
msgstr "Play audio attachments directly in mail messages."
-#: ../plugins/backup-restore/backup-restore.c:152
+#: ../plugins/backup-restore/backup-restore.c:160
msgid "Select name of the Evolution backup file"
msgstr "Select name of the Evolution backup file"
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:191
msgid "_Restart Evolution after backup"
msgstr "_Restart Evolution after backup"
-#: ../plugins/backup-restore/backup-restore.c:209
+#: ../plugins/backup-restore/backup-restore.c:217
msgid "Select name of the Evolution backup file to restore"
msgstr "Select name of the Evolution backup file to restore"
-#: ../plugins/backup-restore/backup-restore.c:222
+#: ../plugins/backup-restore/backup-restore.c:230
msgid "_Restart Evolution after restore"
msgstr "_Restart Evolution after restore"
-#: ../plugins/backup-restore/backup-restore.c:290
+#: ../plugins/backup-restore/backup-restore.c:298
msgid ""
"You can restore Evolution from your backup. It can restore all the Mails, "
"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -15656,35 +16137,35 @@ msgstr ""
"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
"settings, mail filters etc."
-#: ../plugins/backup-restore/backup-restore.c:297
+#: ../plugins/backup-restore/backup-restore.c:305
msgid "_Restore Evolution from the backup file"
msgstr "_Restore Evolution from the backup file"
-#: ../plugins/backup-restore/backup-restore.c:304
+#: ../plugins/backup-restore/backup-restore.c:312
msgid "Please select an Evolution Archive to restore:"
msgstr "Please select an Evolution Archive to restore:"
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:315
msgid "Choose a file to restore"
msgstr "Choose a file to restore"
-#: ../plugins/backup-restore/backup-restore.c:315
+#: ../plugins/backup-restore/backup-restore.c:323
msgid "Restore from backup"
msgstr "Restore from backup"
-#: ../plugins/backup-restore/backup-restore.c:353
+#: ../plugins/backup-restore/backup-restore.c:361
msgid "_Backup Evolution Settings..."
msgstr "_Back Up Evolution Settingsâ?¦"
-#: ../plugins/backup-restore/backup-restore.c:355
+#: ../plugins/backup-restore/backup-restore.c:363
msgid "Backup Evolution data and settings to an archive file"
msgstr "Back up Evolution data and settings to an archive file"
-#: ../plugins/backup-restore/backup-restore.c:360
+#: ../plugins/backup-restore/backup-restore.c:368
msgid "R_estore Evolution Settings..."
msgstr "R_estore Evolution Settingsâ?¦"
-#: ../plugins/backup-restore/backup-restore.c:362
+#: ../plugins/backup-restore/backup-restore.c:370
msgid "Restore Evolution data and settings from an archive file"
msgstr "Restore Evolution data and settings from an archive file"
@@ -15732,7 +16213,7 @@ msgid "Restarting Evolution"
msgstr "Restarting Evolution"
#: ../plugins/backup-restore/backup.c:255
-msgid "Backup current Evolution data"
+msgid "Back up current Evolution data"
msgstr "Back up current Evolution data"
#: ../plugins/backup-restore/backup.c:260
@@ -15810,46 +16291,48 @@ msgstr ""
"Are you sure you want to restore Evolution from the selected backup file?"
#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid ""
-"Evolution backup can start only when Evolution is not running. Please make "
-"sure that you save and close all your unsaved windows before proceeding. If "
-"you want Evolution to restart automatically after backup, please enable the "
-"toggle button."
-msgstr ""
-"Evolution backup can start only when Evolution is not running. Please make "
-"sure that you save and close all your unsaved windows before proceeding. If "
-"you want Evolution to restart automatically after backup, please enable the "
-"toggle button."
+msgid "Close and Backup Evolution"
+msgstr "Close and Back Up Evolution"
#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Close and Restore Evolution"
+msgstr "Close and Restore Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
msgid "Insufficient Permissions"
msgstr "Insufficient Permissions"
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
msgid "Invalid Evolution backup file"
msgstr "Invalid Evolution backup file"
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
msgid "Please select a valid backup file to restore."
msgstr "Please select a valid backup file to restore."
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
msgid "The selected folder is not writable."
msgstr "The selected folder is not writable."
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
+msgid ""
+"To backup your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
+msgstr ""
+"To back up your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
msgid ""
-"This will delete all your current Evolution data and settings and restore "
-"them from your backup. Evolution restore can start only when Evolution is "
-"not running. Please make sure that you close all your unsaved windows before "
-"you proceed. If you want Evolution to restart automatically restart after "
-"restore, please enable the toggle button."
+"To restore your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding. This will delete "
+"all your current Evolution data and settings and restore them from your "
+"backup."
msgstr ""
-"This will delete all your current Evolution data and settings and restore "
-"them from your backup. Evolution restore can start only when Evolution is "
-"not running. Please make sure that you close all your unsaved windows before "
-"you proceed. If you want Evolution to restart automatically restart after "
-"restore, please enable the toggle button."
+"To restore your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding. This will delete "
+"all your current Evolution data and settings and restore them from your "
+"backup."
#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
@@ -15901,33 +16384,33 @@ msgstr ""
"reply to messages. Also fills in IM contact information from your buddy "
"lists."
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:153
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
#, c-format
msgid "Bogofilter is not available. Please install it first."
msgstr "Bogofilter is not available. Please install it first."
#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
#, c-format
msgid "Error occurred while spawning %s: %s."
msgstr "Error occurred while spawning %s: %s."
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
#, c-format
msgid "Bogofilter child process does not respond, killing..."
msgstr "Bogofilter child process does not respond, killingâ?¦"
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:189
#, c-format
msgid "Wait for Bogofilter child process interrupted, terminating..."
msgstr "Wait for Bogofilter child process interrupted, terminatingâ?¦"
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:210
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:212
#, c-format
msgid "Pipe to Bogofilter failed, error code: %d."
msgstr "Pipe to Bogofilter failed, error code: %d."
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:392
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
msgid "Convert message text to _Unicode"
msgstr "Convert message text to _Unicode"
@@ -15972,11 +16455,6 @@ msgstr ""
"Server returned unexpected data.\n"
"%d - %s"
-#: ../plugins/caldav/caldav-browse-server.c:203
-#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
-msgid "Unknown error"
-msgstr "Unknown error"
-
#: ../plugins/caldav/caldav-browse-server.c:333
#: ../plugins/caldav/caldav-browse-server.c:584
msgid "Failed to parse server response."
@@ -15997,7 +16475,7 @@ msgstr "Failed to get server URL."
#: ../plugins/caldav/caldav-browse-server.c:626
#: ../plugins/caldav/caldav-browse-server.c:667
-#: ../plugins/caldav/caldav-browse-server.c:1272
+#: ../plugins/caldav/caldav-browse-server.c:1277
msgid "Searching for user's calendars..."
msgstr "Searching for user's calendarsâ?¦"
@@ -16005,77 +16483,73 @@ msgstr "Searching for user's calendarsâ?¦"
msgid "Could not find any user calendar."
msgstr "Could not find any user calendar."
-#: ../plugins/caldav/caldav-browse-server.c:793
+#: ../plugins/caldav/caldav-browse-server.c:794
#, c-format
msgid "Previous attempt failed: %s"
msgstr "Previous attempt failed: %s"
-#: ../plugins/caldav/caldav-browse-server.c:795
+#: ../plugins/caldav/caldav-browse-server.c:796
#, c-format
msgid "Previous attempt failed with code %d"
msgstr "Previous attempt failed with code %d"
-#: ../plugins/caldav/caldav-browse-server.c:798
+#: ../plugins/caldav/caldav-browse-server.c:801
#, c-format
-msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
-msgstr "Enter password for user <b>%s</b> on server <b>%s</b>"
+msgid "Enter password for user %s on server %s"
+msgstr "Enter password for user %s on server %s"
-#: ../plugins/caldav/caldav-browse-server.c:855
+#: ../plugins/caldav/caldav-browse-server.c:860
#, c-format
msgid "Cannot create soup message for URL '%s'"
msgstr "Cannot create soup message for URL '%s'"
#. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1090
+#: ../plugins/caldav/caldav-browse-server.c:1095
msgid "Searching folder content..."
msgstr "Searching folder contentsâ?¦"
-#: ../plugins/caldav/caldav-browse-server.c:1133
+#: ../plugins/caldav/caldav-browse-server.c:1138
msgid "List of available calendars:"
msgstr "List of available calendars:"
-#: ../plugins/caldav/caldav-browse-server.c:1170
+#: ../plugins/caldav/caldav-browse-server.c:1175
msgid "Supports"
msgstr "Supports"
-#: ../plugins/caldav/caldav-browse-server.c:1249
+#: ../plugins/caldav/caldav-browse-server.c:1254
#, c-format
msgid "Failed to create thread: %s"
msgstr "Failed to create thread: %s"
-#: ../plugins/caldav/caldav-browse-server.c:1357
+#: ../plugins/caldav/caldav-browse-server.c:1362
#, c-format
msgid "Server URL '%s' is not a valid URL"
msgstr "Server URL '%s' is not a valid URL"
-#: ../plugins/caldav/caldav-browse-server.c:1363
+#: ../plugins/caldav/caldav-browse-server.c:1368
msgid "Browse for a CalDAV calendar"
msgstr "Browse for a CalDAV calendar"
-#: ../plugins/caldav/caldav-source.c:66
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#: ../plugins/caldav/caldav-source.c:215
-#: ../plugins/calendar-http/calendar-http.c:92
+#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/calendar-http/calendar-http.c:100
msgid "_URL:"
msgstr "_URL:"
-#: ../plugins/caldav/caldav-source.c:219
-#: ../plugins/google-account-setup/google-contacts-source.c:305
+#: ../plugins/caldav/caldav-source.c:223
+#: ../plugins/google-account-setup/google-contacts-source.c:308
msgid "Use _SSL"
msgstr "Use _SSL"
-#: ../plugins/caldav/caldav-source.c:228
+#: ../plugins/caldav/caldav-source.c:235
msgid "Brows_e server for a calendar"
msgstr "Brows_e server for a calendar"
-#: ../plugins/caldav/caldav-source.c:237
-#: ../plugins/calendar-file/calendar-file.c:178
-#: ../plugins/calendar-http/calendar-http.c:111
+#: ../plugins/caldav/caldav-source.c:251
+#: ../plugins/calendar-file/calendar-file.c:191
+#: ../plugins/calendar-http/calendar-http.c:119
#: ../plugins/calendar-weather/calendar-weather.c:395
-#: ../plugins/google-account-setup/google-contacts-source.c:323
-#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-source.c:630
msgid "Re_fresh:"
msgstr "Re_fresh:"
@@ -16087,31 +16561,31 @@ msgstr "Add CalDAV support to Evolution."
msgid "CalDAV Support"
msgstr "CalDAV Support"
-#: ../plugins/calendar-file/calendar-file.c:112
+#: ../plugins/calendar-file/calendar-file.c:125
msgid "_Customize options"
msgstr "_Customise options"
-#: ../plugins/calendar-file/calendar-file.c:131
+#: ../plugins/calendar-file/calendar-file.c:144
msgid "File _name:"
msgstr "File _name:"
-#: ../plugins/calendar-file/calendar-file.c:135
+#: ../plugins/calendar-file/calendar-file.c:148
msgid "Choose calendar file"
msgstr "Choose calendar file"
-#: ../plugins/calendar-file/calendar-file.c:183
+#: ../plugins/calendar-file/calendar-file.c:196
msgid "On open"
msgstr "On open"
-#: ../plugins/calendar-file/calendar-file.c:184
+#: ../plugins/calendar-file/calendar-file.c:197
msgid "On file change"
msgstr "On file change"
-#: ../plugins/calendar-file/calendar-file.c:185
+#: ../plugins/calendar-file/calendar-file.c:198
msgid "Periodically"
msgstr "Periodically"
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:213
msgid "Force read _only"
msgstr "Force read _only"
@@ -16123,11 +16597,11 @@ msgstr "Add local calendars to Evolution."
msgid "Local Calendars"
msgstr "Local Calendars"
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/calendar-http/calendar-http.c:134
msgid "_Secure connection"
msgstr "_Secure connection"
-#: ../plugins/calendar-http/calendar-http.c:186
+#: ../plugins/calendar-http/calendar-http.c:194
msgid "Userna_me:"
msgstr "Userna_me:"
@@ -16223,45 +16697,43 @@ msgstr "Add a map showing the location of contacts when possible."
msgid "Map for contacts"
msgstr "Map for contacts"
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "Check whether Evolution is the default mailer"
+#: ../plugins/dbx-import/dbx-importer.c:232
+msgid "Select folder to import OE folder into"
+msgstr "Select folder to import OE folder into"
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr ""
-"Every time Evolution starts, check whether it is the default mailer."
+#: ../plugins/dbx-import/dbx-importer.c:251
+msgid "Importing Outlook Express data"
+msgstr "Importing Outlook Express data"
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Check whether Evolution is the default mail client on startup."
-msgstr "Check whether Evolution is the default mail client on startup."
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
+msgid "Import Outlook Express messages from DBX file"
+msgstr "Import Outlook Express messages from DBX file"
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client"
-msgstr "Default Mail Client"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
+msgid "Outlook DBX import"
+msgstr "Outlook DBX import"
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
-msgid "Do you want to make Evolution your default e-mail client?"
-msgstr "Do you want to make Evolution your default e-mail client?"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+msgid "Outlook Express 5/6 personal folders (.dbx)"
+msgstr "Outlook Express 5/6 personal folders (.dbx)"
-#: ../plugins/default-source/default-source.c:75
+#: ../plugins/default-source/default-source.c:83
msgid "Mark as _default address book"
msgstr "Mark as _default address book"
-#: ../plugins/default-source/default-source.c:88
+#: ../plugins/default-source/default-source.c:96
msgid "A_utocomplete with this address book"
msgstr "A_utocomplete with this address book"
-#: ../plugins/default-source/default-source.c:97
+#: ../plugins/default-source/default-source.c:105
msgid "Mark as _default calendar"
msgstr "Mark as _default calendar"
-#: ../plugins/default-source/default-source.c:98
+#: ../plugins/default-source/default-source.c:106
msgid "Mark as _default task list"
msgstr "Mark as _default task list"
-#: ../plugins/default-source/default-source.c:99
+#: ../plugins/default-source/default-source.c:107
msgid "Mark as _default memo list"
msgstr "Mark as _default memo list"
@@ -16300,7 +16772,7 @@ msgid "Protected"
msgstr "Protected"
#: ../plugins/email-custom-header/email-custom-header.c:324
-#: ../widgets/misc/e-send-options.ui.h:18
+#: ../widgets/misc/e-send-options.ui.h:21
msgid "Secret"
msgstr "Secret"
@@ -16320,7 +16792,7 @@ msgid "_Custom Header"
msgstr "_Custom Header"
#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:896
+#: ../plugins/email-custom-header/email-custom-header.c:830
msgid ""
"The format for specifying a Custom Header key value is:\n"
"Name of the Custom Header key values separated by \";\"."
@@ -16328,11 +16800,11 @@ msgstr ""
"The format for specifying a Custom Header key value is:\n"
"Name of the Custom Header key values separated by \";\"."
-#: ../plugins/email-custom-header/email-custom-header.c:950
+#: ../plugins/email-custom-header/email-custom-header.c:884
msgid "Key"
msgstr "Key"
-#: ../plugins/email-custom-header/email-custom-header.c:961
+#: ../plugins/email-custom-header/email-custom-header.c:900
#: ../plugins/templates/templates.c:415
msgid "Values"
msgstr "Values"
@@ -16355,7 +16827,7 @@ msgid "Automatically launch editor when key is pressed in the mail composer"
msgstr "Automatically launch editor when key is pressed in the mail composer"
#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:118
+#: ../plugins/external-editor/external-editor.c:126
msgid "Automatically launch when a new mail is edited"
msgstr "Automatically launch when a new mail is edited"
@@ -16367,11 +16839,11 @@ msgstr "Default External Editor"
msgid "The default command that must be used as the editor."
msgstr "The default command that must be used as the editor."
-#: ../plugins/external-editor/external-editor.c:107
+#: ../plugins/external-editor/external-editor.c:115
msgid "Command to be executed to launch the editor: "
msgstr "Command to be executed to launch the editor: "
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:116
msgid ""
"For Emacs use \"xemacs\"\n"
"For VI use \"gvim -f\""
@@ -16379,8 +16851,8 @@ msgstr ""
"For Emacs use \"xemacs\"\n"
"For VI use \"gvim -f\""
-#: ../plugins/external-editor/external-editor.c:374
-#: ../plugins/external-editor/external-editor.c:376
+#: ../plugins/external-editor/external-editor.c:382
+#: ../plugins/external-editor/external-editor.c:384
msgid "Compose in External Editor"
msgstr "Compose in External Editor"
@@ -16456,7 +16928,7 @@ msgstr "_Insert Face picture by default"
msgid "Load new _Face picture"
msgstr "Load new _Face picture"
-#: ../plugins/face/face.c:415
+#: ../plugins/face/face.c:422
msgid "Include _Face"
msgstr "Include _Face"
@@ -16486,25 +16958,19 @@ msgstr "The file cannot be read"
#: ../plugins/face/org-gnome-face.error.xml.h:6
msgid "The file you selected does not look like a valid .png image. Error: {0}"
-msgstr ""
-"The file you selected does not look like a valid PNG image. Error: {0}"
+msgstr "The file you selected does not look like a valid PNG image. Error: {0}"
-#: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:82
-msgid "Google"
-msgstr "Google"
+#: ../plugins/google-account-setup/google-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+msgid "Server"
+msgstr "Server"
-#: ../plugins/google-account-setup/google-contacts-source.c:273
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
-msgid "<b>Server</b>"
-msgstr "<b>Server</b>"
-
-#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/google-account-setup/google-source.c:437
#, c-format
msgid "Enter password for user %s to access list of subscribed calendars."
msgstr "Enter password for user %s to access list of subscribed calendars."
-#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/google-account-setup/google-source.c:548
#, c-format
msgid ""
"Cannot read data from Google server.\n"
@@ -16513,19 +16979,19 @@ msgstr ""
"Cannot read data from Google server.\n"
"%s"
-#: ../plugins/google-account-setup/google-source.c:545
-#: ../plugins/mail-to-task/mail-to-task.c:718
-#: ../plugins/mail-to-task/mail-to-task.c:934
+#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:952
msgid "Unknown error."
msgstr "Unknown error."
-#: ../plugins/google-account-setup/google-source.c:631
+#: ../plugins/google-account-setup/google-source.c:634
msgid "Cal_endar:"
msgstr "Cal_endar:"
-#: ../plugins/google-account-setup/google-source.c:666
-msgid "Retrieve _list"
-msgstr "Retrieve _list"
+#: ../plugins/google-account-setup/google-source.c:669
+msgid "Retrieve _List"
+msgstr "Retrieve _List"
#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
msgid "Add Google Calendars to Evolution."
@@ -16567,12 +17033,12 @@ msgstr "Accept Tentatively"
msgid "Rese_nd Meeting..."
msgstr "Rese_nd Meetingâ?¦"
-#: ../plugins/groupwise-features/install-shared.c:167
-#: ../plugins/groupwise-features/share-folder-common.c:347
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:343
msgid "Create folder"
msgstr "Create folder"
-#: ../plugins/groupwise-features/install-shared.c:219
+#: ../plugins/groupwise-features/install-shared.c:217
#, c-format
msgid ""
"The user '%s' has shared a folder with you\n"
@@ -16597,11 +17063,11 @@ msgstr ""
"Click 'Apply' to install the shared folder\n"
"\n"
-#: ../plugins/groupwise-features/install-shared.c:231
+#: ../plugins/groupwise-features/install-shared.c:229
msgid "Install the shared folder"
msgstr "Install the shared folder"
-#: ../plugins/groupwise-features/install-shared.c:235
+#: ../plugins/groupwise-features/install-shared.c:233
msgid "Shared Folder Installation"
msgstr "Shared Folder Installation"
@@ -16622,11 +17088,6 @@ msgstr "E-mail:"
msgid "Junk List:"
msgstr "Junk List:"
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:596
-msgid "_Disable"
-msgstr "_Disable"
-
#: ../plugins/groupwise-features/junk-settings.ui.h:6
msgid "_Enable"
msgstr "_Enable"
@@ -16774,25 +17235,25 @@ msgid "Would you like to decline it?"
msgstr "Would you like to decline it?"
#: ../plugins/groupwise-features/properties.ui.h:1
-msgid "<b>Users:</b>"
-msgstr "<b>Users:</b>"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
msgid "C_ustomize notification message"
msgstr "C_ustomise notification message"
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:2
msgid "Con_tacts..."
msgstr "Con_tactsâ?¦"
-#: ../plugins/groupwise-features/properties.ui.h:6
+#: ../plugins/groupwise-features/properties.ui.h:5
msgid "Shared Folder Notification"
msgstr "Shared Folder Notification"
-#: ../plugins/groupwise-features/properties.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:7
msgid "The participants will receive the following notification.\n"
msgstr "The participants will receive the following notification.\n"
+#: ../plugins/groupwise-features/properties.ui.h:9
+msgid "Users:"
+msgstr "Users:"
+
#: ../plugins/groupwise-features/properties.ui.h:12
msgid "_Not Shared"
msgstr "_Not Shared"
@@ -16850,8 +17311,9 @@ msgid "Proxy"
msgstr "Proxy"
#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-msgid "<b>Account Name</b>"
-msgstr "<b>Account Name</b>"
+#: ../widgets/misc/e-account-tree-view.c:230
+msgid "Account Name"
+msgstr "Account Name"
#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
msgid "Proxy Login"
@@ -16866,23 +17328,23 @@ msgid "%sEnter password for %s (user %s)"
msgstr "%sEnter password for %s (user %s)"
#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:690
+#: ../plugins/groupwise-features/proxy.c:689
msgid "The Proxy tab will be available only when the account is online."
msgstr "The Proxy tab will be available only when the account is online."
#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:696
+#: ../plugins/groupwise-features/proxy.c:695
msgid "The Proxy tab will be available only when the account is enabled."
msgstr "The Proxy tab will be available only when the account is enabled."
#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:700
msgctxt "GW"
msgid "Proxy"
msgstr "Proxy"
-#: ../plugins/groupwise-features/proxy.c:929
-#: ../plugins/groupwise-features/share-folder.c:701
+#: ../plugins/groupwise-features/proxy.c:926
+#: ../plugins/groupwise-features/share-folder.c:691
msgid "Add User"
msgstr "Add User"
@@ -16890,16 +17352,16 @@ msgstr "Add User"
msgid "Advanced send options"
msgstr "Advanced send options"
-#: ../plugins/groupwise-features/share-folder-common.c:313
-#: ../plugins/groupwise-features/share-folder.c:736
+#: ../plugins/groupwise-features/share-folder-common.c:309
+#: ../plugins/groupwise-features/share-folder.c:726
msgid "Users"
msgstr "Users"
-#: ../plugins/groupwise-features/share-folder-common.c:314
+#: ../plugins/groupwise-features/share-folder-common.c:310
msgid "Enter the users and set permissions"
msgstr "Enter the users and set permissions"
-#: ../plugins/groupwise-features/share-folder-common.c:412
+#: ../plugins/groupwise-features/share-folder-common.c:410
msgid "Sharing"
msgstr "Sharing"
@@ -16907,7 +17369,7 @@ msgstr "Sharing"
msgid "Custom Notification"
msgstr "Custom Notification"
-#: ../plugins/groupwise-features/share-folder.c:741
+#: ../plugins/groupwise-features/share-folder.c:731
msgid "Add "
msgstr "Add "
@@ -16968,12 +17430,12 @@ msgstr "Inline Image"
msgid "View image attachments directly in mail messages."
msgstr "View image attachments directly in mail messages."
-#: ../plugins/imap-features/imap-headers.c:325
+#: ../plugins/imap-features/imap-headers.c:330
#: ../plugins/imap-features/imap-headers.ui.h:2
msgid "Custom Headers"
msgstr "Custom Headers"
-#: ../plugins/imap-features/imap-headers.c:338
+#: ../plugins/imap-features/imap-headers.c:343
#: ../plugins/imap-features/imap-headers.ui.h:5
msgid "IMAP Headers"
msgstr "IMAP Headers"
@@ -17020,140 +17482,142 @@ msgstr "Fine-tune your IMAP accounts."
msgid "IMAP Features"
msgstr "IMAP Features"
-#: ../plugins/itip-formatter/itip-formatter.c:475
+#. Translators: The first '%s' is replaced with a calendar name,
+#. the second '%s' with an error message
+#: ../plugins/itip-formatter/itip-formatter.c:485
#, c-format
-msgid "Failed to load the calendar '%s'"
-msgstr "Failed to load the calendar '%s'"
+msgid "Failed to load the calendar '%s' (%s)"
+msgstr "Failed to load the calendar '%s' (%s)"
-#: ../plugins/itip-formatter/itip-formatter.c:641
+#: ../plugins/itip-formatter/itip-formatter.c:649
#, c-format
msgid "An appointment in the calendar '%s' conflicts with this meeting"
msgstr "An appointment in the calendar '%s' conflicts with this meeting"
-#: ../plugins/itip-formatter/itip-formatter.c:677
+#: ../plugins/itip-formatter/itip-formatter.c:685
#, c-format
msgid "Found the appointment in the calendar '%s'"
msgstr "Found the appointment in the calendar '%s'"
-#: ../plugins/itip-formatter/itip-formatter.c:776
+#: ../plugins/itip-formatter/itip-formatter.c:784
msgid "Unable to find any calendars"
msgstr "Unable to find any calendars"
-#: ../plugins/itip-formatter/itip-formatter.c:783
+#: ../plugins/itip-formatter/itip-formatter.c:791
msgid "Unable to find this meeting in any calendar"
msgstr "Unable to find this meeting in any calendar"
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:795
msgid "Unable to find this task in any task list"
msgstr "Unable to find this task in any task list"
-#: ../plugins/itip-formatter/itip-formatter.c:791
+#: ../plugins/itip-formatter/itip-formatter.c:799
msgid "Unable to find this memo in any memo list"
msgstr "Unable to find this memo in any memo list"
-#: ../plugins/itip-formatter/itip-formatter.c:862
+#: ../plugins/itip-formatter/itip-formatter.c:873
msgid "Opening the calendar. Please wait.."
msgstr "Opening the calendar. Please wait.."
-#: ../plugins/itip-formatter/itip-formatter.c:865
+#: ../plugins/itip-formatter/itip-formatter.c:876
msgid "Searching for an existing version of this appointment"
msgstr "Searching for an existing version of this appointment"
-#: ../plugins/itip-formatter/itip-formatter.c:1046
+#: ../plugins/itip-formatter/itip-formatter.c:1057
msgid "Unable to parse item"
msgstr "Unable to parse item"
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1144
#, c-format
msgid "Unable to send item to calendar '%s'. %s"
msgstr "Unable to send item to calendar '%s'. %s"
-#: ../plugins/itip-formatter/itip-formatter.c:1145
+#: ../plugins/itip-formatter/itip-formatter.c:1156
#, c-format
msgid "Sent to calendar '%s' as accepted"
msgstr "Sent to calendar '%s' as accepted"
-#: ../plugins/itip-formatter/itip-formatter.c:1149
+#: ../plugins/itip-formatter/itip-formatter.c:1160
#, c-format
msgid "Sent to calendar '%s' as tentative"
msgstr "Sent to calendar '%s' as tentative"
-#: ../plugins/itip-formatter/itip-formatter.c:1154
+#: ../plugins/itip-formatter/itip-formatter.c:1165
#, c-format
msgid "Sent to calendar '%s' as declined"
msgstr "Sent to calendar '%s' as declined"
-#: ../plugins/itip-formatter/itip-formatter.c:1159
+#: ../plugins/itip-formatter/itip-formatter.c:1170
#, c-format
msgid "Sent to calendar '%s' as canceled"
msgstr "Sent to calendar '%s' as cancelled"
-#: ../plugins/itip-formatter/itip-formatter.c:1253
+#: ../plugins/itip-formatter/itip-formatter.c:1264
#, c-format
msgid "Organizer has removed the delegate %s "
msgstr "Organiser has removed the delegate %s "
-#: ../plugins/itip-formatter/itip-formatter.c:1260
+#: ../plugins/itip-formatter/itip-formatter.c:1271
msgid "Sent a cancelation notice to the delegate"
msgstr "Sent a cancellation notice to the delegate"
-#: ../plugins/itip-formatter/itip-formatter.c:1262
+#: ../plugins/itip-formatter/itip-formatter.c:1273
msgid "Could not send the cancelation notice to the delegate"
msgstr "Could not send the cancellation notice to the delegate"
-#: ../plugins/itip-formatter/itip-formatter.c:1373
+#: ../plugins/itip-formatter/itip-formatter.c:1384
msgid "Attendee status could not be updated because the status is invalid"
msgstr "Attendee status could not be updated because the status is invalid"
-#: ../plugins/itip-formatter/itip-formatter.c:1402
+#: ../plugins/itip-formatter/itip-formatter.c:1413
#, c-format
msgid "Unable to update attendee. %s"
msgstr "Unable to update attendee. %s"
-#: ../plugins/itip-formatter/itip-formatter.c:1406
+#: ../plugins/itip-formatter/itip-formatter.c:1417
msgid "Attendee status updated"
msgstr "Attendee status updated"
-#: ../plugins/itip-formatter/itip-formatter.c:1432
+#: ../plugins/itip-formatter/itip-formatter.c:1443
msgid "Meeting information sent"
msgstr "Meeting information sent"
-#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1446
msgid "Task information sent"
msgstr "Task information sent"
-#: ../plugins/itip-formatter/itip-formatter.c:1438
+#: ../plugins/itip-formatter/itip-formatter.c:1449
msgid "Memo information sent"
msgstr "Memo information sent"
-#: ../plugins/itip-formatter/itip-formatter.c:1447
+#: ../plugins/itip-formatter/itip-formatter.c:1458
msgid "Unable to send meeting information, the meeting does not exist"
msgstr "Unable to send meeting information, the meeting does not exist"
-#: ../plugins/itip-formatter/itip-formatter.c:1450
+#: ../plugins/itip-formatter/itip-formatter.c:1461
msgid "Unable to send task information, the task does not exist"
msgstr "Unable to send task information, the task does not exist"
-#: ../plugins/itip-formatter/itip-formatter.c:1453
+#: ../plugins/itip-formatter/itip-formatter.c:1464
msgid "Unable to send memo information, the memo does not exist"
msgstr "Unable to send memo information, the memo does not exist"
#. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1529
msgid "calendar.ics"
msgstr "calendar.ics"
-#: ../plugins/itip-formatter/itip-formatter.c:1523
+#: ../plugins/itip-formatter/itip-formatter.c:1534
msgid "Save Calendar"
msgstr "Save Calendar"
-#: ../plugins/itip-formatter/itip-formatter.c:1576
-#: ../plugins/itip-formatter/itip-formatter.c:1587
+#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1597
msgid "The calendar attached is not valid"
msgstr "The calendar attached is not valid"
-#: ../plugins/itip-formatter/itip-formatter.c:1577
-#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1587
+#: ../plugins/itip-formatter/itip-formatter.c:1598
msgid ""
"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
@@ -17161,15 +17625,15 @@ msgstr ""
"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
-#: ../plugins/itip-formatter/itip-formatter.c:1628
-#: ../plugins/itip-formatter/itip-formatter.c:1656
-#: ../plugins/itip-formatter/itip-formatter.c:1762
+#: ../plugins/itip-formatter/itip-formatter.c:1638
+#: ../plugins/itip-formatter/itip-formatter.c:1666
+#: ../plugins/itip-formatter/itip-formatter.c:1775
msgid "The item in the calendar is not valid"
msgstr "The item in the calendar is not valid"
-#: ../plugins/itip-formatter/itip-formatter.c:1629
-#: ../plugins/itip-formatter/itip-formatter.c:1657
-#: ../plugins/itip-formatter/itip-formatter.c:1763
+#: ../plugins/itip-formatter/itip-formatter.c:1639
+#: ../plugins/itip-formatter/itip-formatter.c:1667
+#: ../plugins/itip-formatter/itip-formatter.c:1776
msgid ""
"The message does contain a calendar, but the calendar contains no events, "
"tasks or free/busy information"
@@ -17177,11 +17641,11 @@ msgstr ""
"The message does contain a calendar, but the calendar contains no events, "
"tasks or free/busy information"
-#: ../plugins/itip-formatter/itip-formatter.c:1670
+#: ../plugins/itip-formatter/itip-formatter.c:1680
msgid "The calendar attached contains multiple items"
msgstr "The calendar attached contains multiple items"
-#: ../plugins/itip-formatter/itip-formatter.c:1671
+#: ../plugins/itip-formatter/itip-formatter.c:1681
msgid ""
"To process all of these items, the file should be saved and the calendar "
"imported"
@@ -17189,31 +17653,31 @@ msgstr ""
"To process all of these items, the file should be saved and the calendar "
"imported"
-#: ../plugins/itip-formatter/itip-formatter.c:2436
+#: ../plugins/itip-formatter/itip-formatter.c:2454
msgid "This meeting recurs"
msgstr "This meeting recurs"
-#: ../plugins/itip-formatter/itip-formatter.c:2439
+#: ../plugins/itip-formatter/itip-formatter.c:2457
msgid "This task recurs"
msgstr "This task recurs"
-#: ../plugins/itip-formatter/itip-formatter.c:2442
+#: ../plugins/itip-formatter/itip-formatter.c:2460
msgid "This memo recurs"
msgstr "This memo recurs"
#. Delete message after acting
#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2676
+#: ../plugins/itip-formatter/itip-formatter.c:2694
msgid "_Delete message after acting"
msgstr "_Delete message after acting"
-#: ../plugins/itip-formatter/itip-formatter.c:2686
-#: ../plugins/itip-formatter/itip-formatter.c:2719
+#: ../plugins/itip-formatter/itip-formatter.c:2704
+#: ../plugins/itip-formatter/itip-formatter.c:2737
msgid "Conflict Search"
msgstr "Conflict Search"
#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2701
+#: ../plugins/itip-formatter/itip-formatter.c:2719
msgid "Select the calendars to search for meeting conflicts"
msgstr "Select the calendars to search for meeting conflicts"
@@ -17349,352 +17813,344 @@ msgstr "%A, %e %B, %Y %l:%M %p"
msgid "%A, %B %e, %Y %l:%M:%S %p"
msgstr "%A, %e %B, %Y %l:%M:%S %p"
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
-#, c-format
-msgid "Please respond on behalf of <b>%s</b>"
-msgstr "Please respond on behalf of <b>%s</b>"
-
-#: ../plugins/itip-formatter/itip-view.c:353
-#: ../plugins/itip-formatter/itip-view.c:441
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:542
#, c-format
-msgid "Received on behalf of <b>%s</b>"
-msgstr "Received on behalf of <b>%s</b>"
+msgid "Please respond on behalf of %s"
+msgstr "Please respond on behalf of %s"
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
#, c-format
-msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr "<b>%s</b> through %s has published the following meeting information:"
+msgid "Received on behalf of %s"
+msgstr "Received on behalf of %s"
-#: ../plugins/itip-formatter/itip-view.c:360
+#: ../plugins/itip-formatter/itip-view.c:374
#, c-format
-msgid "<b>%s</b> has published the following meeting information:"
-msgstr "<b>%s</b> has published the following meeting information:"
+msgid "%s through %s has published the following meeting information:"
+msgstr "%s through %s has published the following meeting information:"
-#: ../plugins/itip-formatter/itip-view.c:365
+#: ../plugins/itip-formatter/itip-view.c:376
#, c-format
-msgid "<b>%s</b> has delegated the following meeting to you:"
-msgstr "<b>%s</b> has delegated the following meeting to you:"
+msgid "%s has published the following meeting information:"
+msgstr "%s has published the following meeting information:"
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:381
#, c-format
-msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> through %s requests your presence at the following meeting:"
+msgid "%s has delegated the following meeting to you:"
+msgstr "%s has delegated the following meeting to you:"
-#: ../plugins/itip-formatter/itip-view.c:370
+#: ../plugins/itip-formatter/itip-view.c:384
#, c-format
-msgid "<b>%s</b> requests your presence at the following meeting:"
-msgstr "<b>%s</b> requests your presence at the following meeting:"
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr "%s through %s requests your presence at the following meeting:"
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:386
#, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr "<b>%s</b> through %s wishes to add to an existing meeting:"
+msgid "%s requests your presence at the following meeting:"
+msgstr "%s requests your presence at the following meeting:"
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:392
#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr "<b>%s</b> wishes to add to an existing meeting:"
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr "%s through %s wishes to add to an existing meeting:"
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:394
#, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following meeting:"
-msgstr ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following meeting:"
+msgid "%s wishes to add to an existing meeting:"
+msgstr "%s wishes to add to an existing meeting:"
-#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:398
#, c-format
msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
msgstr ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:400
#, c-format
-msgid "<b>%s</b> through %s has sent back the following meeting response:"
-msgstr "<b>%s</b> through %s has sent back the following meeting response:"
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr "%s wishes to receive the latest information for the following meeting:"
-#: ../plugins/itip-formatter/itip-view.c:390
+#: ../plugins/itip-formatter/itip-view.c:404
#, c-format
-msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr "<b>%s</b> has sent back the following meeting response:"
+msgid "%s through %s has sent back the following meeting response:"
+msgstr "%s through %s has sent back the following meeting response:"
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:406
#, c-format
-msgid "<b>%s</b> through %s has canceled the following meeting:"
-msgstr "<b>%s</b> through %s has cancelled the following meeting:"
+msgid "%s has sent back the following meeting response:"
+msgstr "%s has sent back the following meeting response:"
-#: ../plugins/itip-formatter/itip-view.c:396
+#: ../plugins/itip-formatter/itip-view.c:410
#, c-format
-msgid "<b>%s</b> has canceled the following meeting."
-msgstr "<b>%s</b> has cancelled the following meeting."
+msgid "%s through %s has canceled the following meeting:"
+msgstr "%s through %s has cancelled the following meeting:"
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:412
#, c-format
-msgid "<b>%s</b> through %s has proposed the following meeting changes."
-msgstr "<b>%s</b> through %s has proposed the following meeting changes."
+msgid "%s has canceled the following meeting."
+msgstr "%s has cancelled the following meeting."
-#: ../plugins/itip-formatter/itip-view.c:402
+#: ../plugins/itip-formatter/itip-view.c:416
#, c-format
-msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b> has proposed the following meeting changes."
+msgid "%s through %s has proposed the following meeting changes."
+msgstr "%s through %s has proposed the following meeting changes."
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:418
#, c-format
-msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> through %s has declined the following meeting changes:"
+msgid "%s has proposed the following meeting changes."
+msgstr "%s has proposed the following meeting changes."
-#: ../plugins/itip-formatter/itip-view.c:408
+#: ../plugins/itip-formatter/itip-view.c:422
#, c-format
-msgid "<b>%s</b> has declined the following meeting changes."
-msgstr "<b>%s</b> has declined the following meeting changes."
+msgid "%s through %s has declined the following meeting changes:"
+msgstr "%s through %s has declined the following meeting changes:"
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:424
#, c-format
-msgid "<b>%s</b> through %s has published the following task:"
-msgstr "<b>%s</b> through %s has published the following task:"
+msgid "%s has declined the following meeting changes."
+msgstr "%s has declined the following meeting changes."
-#: ../plugins/itip-formatter/itip-view.c:448
+#: ../plugins/itip-formatter/itip-view.c:462
#, c-format
-msgid "<b>%s</b> has published the following task:"
-msgstr "<b>%s</b> has published the following task:"
+msgid "%s through %s has published the following task:"
+msgstr "%s through %s has published the following task:"
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:464
#, c-format
-msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr "<b>%s</b> requests the assignment of %s to the following task:"
+msgid "%s has published the following task:"
+msgstr "%s has published the following task:"
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:469
#, c-format
-msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b> through %s has assigned you a task:"
+msgid "%s requests the assignment of %s to the following task:"
+msgstr "%s requests the assignment of %s to the following task:"
-#: ../plugins/itip-formatter/itip-view.c:458
+#: ../plugins/itip-formatter/itip-view.c:472
#, c-format
-msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> has assigned you a task:"
+msgid "%s through %s has assigned you a task:"
+msgstr "%s through %s has assigned you a task:"
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:474
#, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr "<b>%s</b> through %s wishes to add to an existing task:"
+msgid "%s has assigned you a task:"
+msgstr "%s has assigned you a task:"
-#: ../plugins/itip-formatter/itip-view.c:466
+#: ../plugins/itip-formatter/itip-view.c:480
#, c-format
-msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr "<b>%s</b> wishes to add to an existing task:"
+msgid "%s through %s wishes to add to an existing task:"
+msgstr "%s through %s wishes to add to an existing task:"
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:482
#, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following assigned task:"
-msgstr ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following assigned task:"
+msgid "%s wishes to add to an existing task:"
+msgstr "%s wishes to add to an existing task:"
-#: ../plugins/itip-formatter/itip-view.c:472
+#: ../plugins/itip-formatter/itip-view.c:486
#, c-format
msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
+"%s through %s wishes to receive the latest information for the following "
"assigned task:"
msgstr ""
-"<b>%s</b> wishes to receive the latest information for the following "
+"%s through %s wishes to receive the latest information for the following "
"assigned task:"
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:488
#, c-format
msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
+"%s wishes to receive the latest information for the following assigned task:"
msgstr ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
+"%s wishes to receive the latest information for the following assigned task:"
-#: ../plugins/itip-formatter/itip-view.c:478
+#: ../plugins/itip-formatter/itip-view.c:492
#, c-format
-msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr "<b>%s</b> has sent back the following assigned task response:"
+msgid "%s through %s has sent back the following assigned task response:"
+msgstr "%s through %s has sent back the following assigned task response:"
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:494
#, c-format
-msgid "<b>%s</b> through %s has canceled the following assigned task:"
-msgstr "<b>%s</b> through %s has cancelled the following assigned task:"
+msgid "%s has sent back the following assigned task response:"
+msgstr "%s has sent back the following assigned task response:"
-#: ../plugins/itip-formatter/itip-view.c:484
+#: ../plugins/itip-formatter/itip-view.c:498
#, c-format
-msgid "<b>%s</b> has canceled the following assigned task:"
-msgstr "<b>%s</b> has cancelled the following assigned task:"
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "%s through %s has cancelled the following assigned task:"
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:500
#, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
-msgstr ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid "%s has canceled the following assigned task:"
+msgstr "%s has cancelled the following assigned task:"
-#: ../plugins/itip-formatter/itip-view.c:490
+#: ../plugins/itip-formatter/itip-view.c:504
#, c-format
-msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "<b>%s</b> has proposed the following task assignment changes:"
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr "%s through %s has proposed the following task assignment changes:"
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:506
#, c-format
-msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr "<b>%s</b> through %s has declined the following assigned task:"
+msgid "%s has proposed the following task assignment changes:"
+msgstr "%s has proposed the following task assignment changes:"
-#: ../plugins/itip-formatter/itip-view.c:496
+#: ../plugins/itip-formatter/itip-view.c:510
#, c-format
-msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b> has declined the following assigned task:"
+msgid "%s through %s has declined the following assigned task:"
+msgstr "%s through %s has declined the following assigned task:"
-#: ../plugins/itip-formatter/itip-view.c:533
+#: ../plugins/itip-formatter/itip-view.c:512
#, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "<b>%s</b> through %s has published the following memo:"
+msgid "%s has declined the following assigned task:"
+msgstr "%s has declined the following assigned task:"
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:549
#, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> has published the following memo:"
+msgid "%s through %s has published the following memo:"
+msgstr "%s through %s has published the following memo:"
-#: ../plugins/itip-formatter/itip-view.c:540
+#: ../plugins/itip-formatter/itip-view.c:551
+#,, c-format
+msgid "%s has published the following memo:"
+msgstr "%s has published the following memo:"
+
+#: ../plugins/itip-formatter/itip-view.c:556
#, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
-msgstr "<b>%s</b> through %s wishes to add to an existing memo:"
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr "%s through %s wishes to add to an existing memo:"
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:558
#, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b> wishes to add to an existing memo:"
+msgid "%s wishes to add to an existing memo:"
+msgstr "%s wishes to add to an existing memo:"
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../plugins/itip-formatter/itip-view.c:562
#, c-format
-msgid "<b>%s</b> through %s has canceled the following shared memo:"
-msgstr "<b>%s</b> through %s has cancelled the following shared memo:"
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "%s through %s has cancelled the following shared memo:"
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:564
#, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
-msgstr "<b>%s</b> has cancelled the following shared memo:"
+msgid "%s has canceled the following shared memo:"
+msgstr "%s has cancelled the following shared memo:"
-#: ../plugins/itip-formatter/itip-view.c:672
+#: ../plugins/itip-formatter/itip-view.c:688
msgid "All day:"
msgstr "All day:"
-#: ../plugins/itip-formatter/itip-view.c:682
+#: ../plugins/itip-formatter/itip-view.c:698
msgid "Start day:"
msgstr "Start day:"
#. Start time
-#: ../plugins/itip-formatter/itip-view.c:682
-#: ../plugins/itip-formatter/itip-view.c:1037
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1053
msgid "Start time:"
msgstr "Start time:"
-#: ../plugins/itip-formatter/itip-view.c:694
+#: ../plugins/itip-formatter/itip-view.c:710
msgid "End day:"
msgstr "End day:"
#. End time
-#: ../plugins/itip-formatter/itip-view.c:694
-#: ../plugins/itip-formatter/itip-view.c:1048
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:1064
msgid "End time:"
msgstr "End time:"
#. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:843
msgid "_Open Calendar"
msgstr "_Open Calendar"
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:843
-#: ../plugins/itip-formatter/itip-view.c:860
-#: ../plugins/itip-formatter/itip-view.c:865
+#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:876
+#: ../plugins/itip-formatter/itip-view.c:881
msgid "_Decline"
msgstr "_Decline"
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:839
-#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:855
#: ../plugins/itip-formatter/itip-view.c:862
-#: ../plugins/itip-formatter/itip-view.c:867
-msgid "_Accept"
-msgstr "_Accept"
+#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:883
+msgid "A_ccept"
+msgstr "A_ccept"
-#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:853
msgid "_Decline all"
msgstr "_Decline all"
-#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:854
msgid "_Tentative all"
msgstr "_Tentative all"
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:844
-#: ../plugins/itip-formatter/itip-view.c:861
-#: ../plugins/itip-formatter/itip-view.c:866
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:882
msgid "_Tentative"
msgstr "_Tentative"
-#: ../plugins/itip-formatter/itip-view.c:839
-msgid "_Accept all"
-msgstr "_Accept all"
+#: ../plugins/itip-formatter/itip-view.c:855
+msgid "A_ccept all"
+msgstr "A_ccept all"
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:866
msgid "_Send Information"
msgstr "_Send Information"
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:870
msgid "_Update Attendee Status"
msgstr "_Update Attendee Status"
-#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:873
msgid "_Update"
msgstr "_Update"
#. Comment
-#: ../plugins/itip-formatter/itip-view.c:1068
-#: ../plugins/itip-formatter/itip-view.c:1122
+#: ../plugins/itip-formatter/itip-view.c:1084
+#: ../plugins/itip-formatter/itip-view.c:1138
msgid "Comment:"
msgstr "Comment:"
-#: ../plugins/itip-formatter/itip-view.c:1107
+#: ../plugins/itip-formatter/itip-view.c:1123
msgid "Send _reply to sender"
msgstr "Send _reply to sender"
-#: ../plugins/itip-formatter/itip-view.c:1137
+#: ../plugins/itip-formatter/itip-view.c:1153
msgid "Send _updates to attendees"
msgstr "Send _updates to attendees"
-#: ../plugins/itip-formatter/itip-view.c:1146
+#: ../plugins/itip-formatter/itip-view.c:1162
msgid "_Apply to all instances"
msgstr "_Apply to all instances"
-#: ../plugins/itip-formatter/itip-view.c:1155
+#: ../plugins/itip-formatter/itip-view.c:1171
msgid "Show time as _free"
msgstr "Show time as _free"
-#: ../plugins/itip-formatter/itip-view.c:1158
+#: ../plugins/itip-formatter/itip-view.c:1174
msgid "_Preserve my reminder"
msgstr "_Preserve my reminder"
#. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1164
+#: ../plugins/itip-formatter/itip-view.c:1180
msgid "_Inherit reminder"
msgstr "_Inherit reminder"
-#: ../plugins/itip-formatter/itip-view.c:1907
+#: ../plugins/itip-formatter/itip-view.c:1923
msgid "_Tasks:"
msgstr "_Tasks:"
-#: ../plugins/itip-formatter/itip-view.c:1909
+#: ../plugins/itip-formatter/itip-view.c:1925
msgid "_Memos:"
msgstr "_Memos:"
@@ -17707,18 +18163,14 @@ msgid "Itip Formatter"
msgstr "Itip Formatter"
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-""{0}" has delegated the meeting. Do you want to add the delegate "
-""{1}"?"
-msgstr ""
-""{0}" has delegated the meeting. Do you want to add the delegate "
-""{1}"?"
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgstr "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
msgid "This meeting has been delegated"
msgstr "This meeting has been delegated"
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
msgid ""
"This response is not from a current attendee. Add the sender as an attendee?"
msgstr ""
@@ -17800,16 +18252,15 @@ msgstr "Whether the icon should blink or not."
msgid "Whether to notify new messages in Inbox folder only."
msgstr "Whether to notify new messages in Inbox folder only."
-#: ../plugins/mail-notification/mail-notification.c:343
+#: ../plugins/mail-notification/mail-notification.c:369
msgid "Evolution's Mail Notification"
msgstr "Evolution's Mail Notification"
-#: ../plugins/mail-notification/mail-notification.c:365
+#: ../plugins/mail-notification/mail-notification.c:391
msgid "Mail Notification Properties"
msgstr "Mail Notification Properties"
-#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:496
+#: ../plugins/mail-notification/mail-notification.c:527
#, c-format
msgid ""
"You have received %d new message\n"
@@ -17824,67 +18275,69 @@ msgstr[1] ""
"You have received %d new messages\n"
"in %s."
-#. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:507
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:539
#, c-format
msgid "From: %s"
msgstr "From: %s"
-#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:519
+#. Translators: "Subject:" is preceding a new mail
+#. * subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:552
#, c-format
msgid "Subject: %s"
msgstr "Subject: %s"
-#: ../plugins/mail-notification/mail-notification.c:528
+#: ../plugins/mail-notification/mail-notification.c:562
#, c-format
msgid "You have received %d new message."
msgid_plural "You have received %d new messages."
msgstr[0] "You have received %d new message."
msgstr[1] "You have received %d new messages."
-#: ../plugins/mail-notification/mail-notification.c:546
-#: ../plugins/mail-notification/mail-notification.c:551
+#: ../plugins/mail-notification/mail-notification.c:584
+#: ../plugins/mail-notification/mail-notification.c:591
msgid "New email"
msgstr "New e-mail"
-#: ../plugins/mail-notification/mail-notification.c:605
+#: ../plugins/mail-notification/mail-notification.c:652
msgid "Show icon in _notification area"
msgstr "Show icon in _notification area"
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:680
msgid "B_link icon in notification area"
msgstr "B_link icon in notification area"
-#: ../plugins/mail-notification/mail-notification.c:643
+#: ../plugins/mail-notification/mail-notification.c:690
msgid "Popup _message together with the icon"
msgstr "Popup _message together with the icon"
-#: ../plugins/mail-notification/mail-notification.c:828
+#: ../plugins/mail-notification/mail-notification.c:877
msgid "_Play sound when new messages arrive"
msgstr "_Play sound when new messages arrive"
-#: ../plugins/mail-notification/mail-notification.c:857
+#: ../plugins/mail-notification/mail-notification.c:906
msgid "_Beep"
msgstr "_Beep"
-#: ../plugins/mail-notification/mail-notification.c:870
+#: ../plugins/mail-notification/mail-notification.c:919
msgid "Use sound _theme"
msgstr "Use sound _theme"
-#: ../plugins/mail-notification/mail-notification.c:889
+#: ../plugins/mail-notification/mail-notification.c:938
msgid "Play _file:"
msgstr "Play _file:"
-#: ../plugins/mail-notification/mail-notification.c:900
+#: ../plugins/mail-notification/mail-notification.c:949
msgid "Select sound file"
msgstr "Select sound file"
-#: ../plugins/mail-notification/mail-notification.c:958
+#: ../plugins/mail-notification/mail-notification.c:1007
msgid "Notify new messages for _Inbox only"
msgstr "Notify new messages for _Inbox only"
-#: ../plugins/mail-notification/mail-notification.c:967
+#: ../plugins/mail-notification/mail-notification.c:1016
msgid "Generate a _D-Bus message"
msgstr "Generate a _D-Bus message"
@@ -17929,7 +18382,10 @@ msgstr ""
"Selected memo list contains memo '%s' already. Would you like to edit the "
"old memo?"
-#: ../plugins/mail-to-task/mail-to-task.c:512
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:515
msgid ""
"Selected calendar contains some events for the given mails already. Would "
"you like to create new events anyway?"
@@ -17937,7 +18393,10 @@ msgstr ""
"Selected calendar contains some events for the given mails already. Would "
"you like to create new events anyway?"
-#: ../plugins/mail-to-task/mail-to-task.c:515
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:521
msgid ""
"Selected task list contains some tasks for the given mails already. Would "
"you like to create new tasks anyway?"
@@ -17945,7 +18404,10 @@ msgstr ""
"Selected task list contains some tasks for the given mails already. Would "
"you like to create new tasks anyway?"
-#: ../plugins/mail-to-task/mail-to-task.c:518
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:527
msgid ""
"Selected memo list contains some memos for the given mails already. Would "
"you like to create new memos anyway?"
@@ -17953,7 +18415,10 @@ msgstr ""
"Selected memo list contains some memos for the given mails already. Would "
"you like to create new memos anyway?"
-#: ../plugins/mail-to-task/mail-to-task.c:536
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:548
msgid ""
"Selected calendar contains an event for the given mail already. Would you "
"like to create new event anyway?"
@@ -17967,7 +18432,10 @@ msgstr[1] ""
"Selected calendar contains events for the given mails already. Would you "
"like to create new events anyway?"
-#: ../plugins/mail-to-task/mail-to-task.c:542
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:557
msgid ""
"Selected task list contains a task for the given mail already. Would you "
"like to create new task anyway?"
@@ -17981,7 +18449,10 @@ msgstr[1] ""
"Selected task list contains tasks for the given mails already. Would you "
"like to create new tasks anyway?"
-#: ../plugins/mail-to-task/mail-to-task.c:548
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:566
msgid ""
"Selected memo list contains a memo for the given mail already. Would you "
"like to create new memo anyway?"
@@ -17995,25 +18466,25 @@ msgstr[1] ""
"Selected memo list contains memos for the given mails already. Would you "
"like to create new memos anyway?"
-#: ../plugins/mail-to-task/mail-to-task.c:607
+#: ../plugins/mail-to-task/mail-to-task.c:625
msgid "[No Summary]"
msgstr "[No Summary]"
-#: ../plugins/mail-to-task/mail-to-task.c:618
+#: ../plugins/mail-to-task/mail-to-task.c:636
msgid "Invalid object returned from a server"
msgstr "Invalid object returned from a server"
-#: ../plugins/mail-to-task/mail-to-task.c:689
+#: ../plugins/mail-to-task/mail-to-task.c:707
#, c-format
msgid "An error occurred during processing: %s"
msgstr "An error occurred during processing: %s"
-#: ../plugins/mail-to-task/mail-to-task.c:718
+#: ../plugins/mail-to-task/mail-to-task.c:736
#, c-format
msgid "Cannot open calendar. %s"
msgstr "Cannot open calendar. %s"
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:743
msgid ""
"Selected source is read only, thus cannot create event there. Select other "
"source, please."
@@ -18021,7 +18492,7 @@ msgstr ""
"Selected source is read only, thus cannot create event there. Select other "
"source, please."
-#: ../plugins/mail-to-task/mail-to-task.c:728
+#: ../plugins/mail-to-task/mail-to-task.c:746
msgid ""
"Selected source is read only, thus cannot create task there. Select other "
"source, please."
@@ -18029,7 +18500,7 @@ msgstr ""
"Selected source is read only, thus cannot create task there. Select other "
"source, please."
-#: ../plugins/mail-to-task/mail-to-task.c:731
+#: ../plugins/mail-to-task/mail-to-task.c:749
msgid ""
"Selected source is read only, thus cannot create memo there. Select other "
"source, please."
@@ -18037,40 +18508,40 @@ msgstr ""
"Selected source is read only, thus cannot create memo there. Select other "
"source, please."
-#: ../plugins/mail-to-task/mail-to-task.c:934
+#: ../plugins/mail-to-task/mail-to-task.c:952
#, c-format
msgid "Cannot get source list. %s"
msgstr "Cannot get source list. %s"
-#: ../plugins/mail-to-task/mail-to-task.c:1053
+#: ../plugins/mail-to-task/mail-to-task.c:1071
msgid "Create an _Event"
msgstr "Create an _Event"
-#: ../plugins/mail-to-task/mail-to-task.c:1055
+#: ../plugins/mail-to-task/mail-to-task.c:1073
msgid "Create a new event from the selected message"
msgstr "Create a new event from the selected message"
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1078
msgid "Create a Mem_o"
msgstr "Create a Mem_o"
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1080
msgid "Create a new memo from the selected message"
msgstr "Create a new memo from the selected message"
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1085
msgid "Create a _Task"
msgstr "Create a _Task"
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1087
msgid "Create a new task from the selected message"
msgstr "Create a new task from the selected message"
-#: ../plugins/mail-to-task/mail-to-task.c:1077
+#: ../plugins/mail-to-task/mail-to-task.c:1095
msgid "Create a _Meeting"
msgstr "Create a _Meeting"
-#: ../plugins/mail-to-task/mail-to-task.c:1079
+#: ../plugins/mail-to-task/mail-to-task.c:1097
msgid "Create a new meeting from the selected message"
msgstr "Create a new meeting from the selected message"
@@ -18078,55 +18549,55 @@ msgstr "Create a new meeting from the selected message"
msgid "Convert a mail message to a task."
msgstr "Convert a mail message to a task."
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:279
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:291
msgid "Get List _Archive"
msgstr "Get List _Archive"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:281
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
msgid "Get an archive of the list this message belongs to"
msgstr "Get an archive of the list this message belongs to"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:298
msgid "Get List _Usage Information"
msgstr "Get List _Usage Information"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
msgid "Get information about the usage of the list this message belongs to"
msgstr "Get information about the usage of the list this message belongs to"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:305
msgid "Contact List _Owner"
msgstr "Contact List _Owner"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
msgid "Contact the owner of the mailing list this message belongs to"
msgstr "Contact the owner of the mailing list this message belongs to"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:312
msgid "_Post Message to List"
msgstr "_Post Message to List"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
msgid "Post a message to the mailing list this message belongs to"
msgstr "Post a message to the mailing list this message belongs to"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:319
msgid "_Subscribe to List"
msgstr "_Subscribe to List"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
msgid "Subscribe to the mailing list this message belongs to"
msgstr "Subscribe to the mailing list this message belongs to"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:326
msgid "_Unsubscribe from List"
msgstr "_Unsubscribe from List"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:328
msgid "Unsubscribe from the mailing list this message belongs to"
msgstr "Unsubscribe from the mailing list this message belongs to"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:335
msgid "Mailing _List"
msgstr "Mailing _List"
@@ -18218,11 +18689,11 @@ msgstr "_Edit message"
msgid "_Send message"
msgstr "_Send message"
-#: ../plugins/mark-all-read/mark-all-read.c:41
+#: ../plugins/mark-all-read/mark-all-read.c:42
msgid "Also mark messages in subfolders?"
msgstr "Also mark messages in subfolders?"
-#: ../plugins/mark-all-read/mark-all-read.c:43
+#: ../plugins/mark-all-read/mark-all-read.c:44
msgid ""
"Do you want to mark messages as read in the current folder only, or in the "
"current folder as well as all subfolders?"
@@ -18230,15 +18701,15 @@ msgstr ""
"Do you want to mark messages as read in the current folder only, or in the "
"current folder as well as all subfolders?"
-#: ../plugins/mark-all-read/mark-all-read.c:168
+#: ../plugins/mark-all-read/mark-all-read.c:194
msgid "In Current Folder and _Subfolders"
msgstr "In Current Folder and _Subfolders"
-#: ../plugins/mark-all-read/mark-all-read.c:182
+#: ../plugins/mark-all-read/mark-all-read.c:208
msgid "In Current _Folder Only"
msgstr "In Current _Folder Only"
-#: ../plugins/mark-all-read/mark-all-read.c:402
+#: ../plugins/mark-all-read/mark-all-read.c:437
msgid "Mark Me_ssages as Read"
msgstr "Mark Me_ssages as Read"
@@ -18357,31 +18828,35 @@ msgstr "Outlook PST import"
msgid "Outlook personal folders (.pst)"
msgstr "Outlook personal folders (.pst)"
-#: ../plugins/pst-import/pst-importer.c:289
+#: ../plugins/pst-import/pst-importer.c:295
msgid "_Mail"
msgstr "_Mail"
-#. Address book
#: ../plugins/pst-import/pst-importer.c:307
+msgid "Destination folder:"
+msgstr "Destination folder:"
+
+#. Address book
+#: ../plugins/pst-import/pst-importer.c:313
msgid "_Address Book"
msgstr "_Address Book"
#. Appointments
-#: ../plugins/pst-import/pst-importer.c:314
+#: ../plugins/pst-import/pst-importer.c:320
msgid "A_ppointments"
msgstr "A_ppointments"
#. Tasks
-#: ../plugins/pst-import/pst-importer.c:320 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:326 ../views/tasks/galview.xml.h:3
msgid "_Tasks"
msgstr "_Tasks"
#. Journal
-#: ../plugins/pst-import/pst-importer.c:326
+#: ../plugins/pst-import/pst-importer.c:332
msgid "_Journal entries"
msgstr "_Journal entries"
-#: ../plugins/pst-import/pst-importer.c:341
+#: ../plugins/pst-import/pst-importer.c:347
msgid "Importing Outlook data"
msgstr "Importing Outlook data"
@@ -18547,47 +19022,47 @@ msgstr "New Location"
msgid "Edit Location"
msgstr "Edit Location"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:120
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
#, c-format
msgid "SpamAssassin not found, code: %d"
msgstr "SpamAssassin not found, code: %d"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:129
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
#, c-format
msgid "Failed to create pipe: %s"
msgstr "Failed to create pipe: %s"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:175
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:176
#, c-format
msgid "Error after fork: %s"
msgstr "Error after fork: %s"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:230
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
#, c-format
msgid "SpamAssassin child process does not respond, killing..."
msgstr "SpamAssassin child process does not respond; killingâ?¦"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:234
#, c-format
msgid "Wait for SpamAssassin child process interrupted, terminating..."
msgstr "Wait for SpamAssassin child process interrupted; terminatingâ?¦"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
#, c-format
msgid "Pipe to SpamAssassin failed, error code: %d"
msgstr "Pipe to SpamAssassin failed, error code: %d"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:504
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:506
#, c-format
msgid "SpamAssassin is not available. Please install it first."
msgstr "SpamAssassin is not available. Please install it first."
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:924
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:927
msgid "This will make SpamAssassin more reliable, but slower"
msgstr "This will make SpamAssassin more reliable, but slower"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:935
msgid "I_nclude remote tests"
msgstr "I_nclude remote tests"
@@ -18704,77 +19179,26 @@ msgstr "%FT%T"
msgid "RDF format (.rdf)"
msgstr "RDF format (.rdf)"
-#: ../plugins/save-calendar/save-calendar.c:111
+#: ../plugins/save-calendar/save-calendar.c:120
msgid "_Format:"
msgstr "_Format:"
-#: ../plugins/save-calendar/save-calendar.c:172
+#: ../plugins/save-calendar/save-calendar.c:181
msgid "Select destination file"
msgstr "Select destination file"
-#: ../plugins/save-calendar/save-calendar.c:325
+#: ../plugins/save-calendar/save-calendar.c:334
msgid "Save the selected calendar to disk"
msgstr "Save the selected calendar to disk"
-#: ../plugins/save-calendar/save-calendar.c:356
+#: ../plugins/save-calendar/save-calendar.c:365
msgid "Save the selected memo list to disk"
msgstr "Save the selected memo list to disk"
-#: ../plugins/save-calendar/save-calendar.c:387
+#: ../plugins/save-calendar/save-calendar.c:396
msgid "Save the selected task list to disk"
msgstr "Save the selected task list to disk"
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "Guides you through your initial account setup."
-msgstr "Guides you through your initial account setup."
-
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Setup Assistant"
-msgstr "Setup Assistant"
-
-#: ../plugins/startup-wizard/startup-wizard.c:110
-msgid "Evolution Setup Assistant"
-msgstr "Evolution Setup Assistant"
-
-#: ../plugins/startup-wizard/startup-wizard.c:115
-msgid "Welcome"
-msgstr "Welcome"
-
-#: ../plugins/startup-wizard/startup-wizard.c:118
-msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your e-mail accounts, and to import files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
-
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../widgets/misc/e-import-assistant.c:385
-msgid "Please select the information that you would like to import:"
-msgstr "Please select the information that you would like to import:"
-
-#: ../plugins/startup-wizard/startup-wizard.c:168
-#: ../widgets/misc/e-import-assistant.c:542
-#, c-format
-msgid "From %s:"
-msgstr "From %s:"
-
-#: ../plugins/startup-wizard/startup-wizard.c:185
-msgid "Importing files"
-msgstr "Importing files"
-
-#: ../plugins/startup-wizard/startup-wizard.c:251
-msgid "Importing data."
-msgstr "Importing data."
-
-#: ../plugins/startup-wizard/startup-wizard.c:257
-msgid "Please wait"
-msgstr "Please wait"
-
#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
msgid "Sort mail message threads by subject."
msgstr "Sort mail message threads by subject."
@@ -18788,7 +19212,7 @@ msgid "Thread messages by subject"
msgstr "Thread messages by subject"
#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:56
+#: ../plugins/subject-thread/subject-thread.c:63
msgid "F_all back to threading messages by subject"
msgstr "F_all back to threading messages by subject"
@@ -18804,15 +19228,15 @@ msgstr ""
msgid "Drafts based template plugin"
msgstr "Drafts-based template plugin"
-#: ../plugins/templates/templates.c:613
+#: ../plugins/templates/templates.c:620
msgid "No Title"
msgstr "No Title"
-#: ../plugins/templates/templates.c:684
+#: ../plugins/templates/templates.c:691
msgid "Save as _Template"
msgstr "Save as _Template"
-#: ../plugins/templates/templates.c:686
+#: ../plugins/templates/templates.c:693
msgid "Save as Template"
msgstr "Save as Template"
@@ -18832,27 +19256,27 @@ msgstr "Inline vCards"
msgid "Show vCards directly in mail messages."
msgstr "Show vCards directly in mail messages."
-#: ../plugins/vcard-inline/vcard-inline.c:157
-#: ../plugins/vcard-inline/vcard-inline.c:242
+#: ../plugins/vcard-inline/vcard-inline.c:181
+#: ../plugins/vcard-inline/vcard-inline.c:266
msgid "Show Full vCard"
msgstr "Show Full vCard"
-#: ../plugins/vcard-inline/vcard-inline.c:160
+#: ../plugins/vcard-inline/vcard-inline.c:184
msgid "Show Compact vCard"
msgstr "Show Compact vCard"
-#: ../plugins/vcard-inline/vcard-inline.c:221
+#: ../plugins/vcard-inline/vcard-inline.c:245
msgid "There is one other contact."
msgstr "There is one other contact."
-#: ../plugins/vcard-inline/vcard-inline.c:230
+#: ../plugins/vcard-inline/vcard-inline.c:254
#, c-format
msgid "There is %d other contact."
msgid_plural "There are %d other contacts."
msgstr[0] "There is %d other contact."
msgstr[1] "There are %d other contacts."
-#: ../plugins/vcard-inline/vcard-inline.c:251
+#: ../plugins/vcard-inline/vcard-inline.c:275
msgid "Save in Address Book"
msgstr "Save in Address Book"
@@ -18868,11 +19292,11 @@ msgstr "WebDAV contacts"
msgid "WebDAV"
msgstr "WebDAV"
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
msgid "URL:"
msgstr "URL:"
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
msgstr "_Avoid IfMatch (needed on Apache < 2.2.8)"
@@ -19036,7 +19460,7 @@ msgstr "Sidebar is visible"
msgid "Skip development warning dialog"
msgstr "Skip development warning dialogue"
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:307
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:331
msgid "Start in offline mode"
msgstr "Start in offline mode"
@@ -19193,11 +19617,11 @@ msgstr "Window button style"
msgid "Window buttons are visible"
msgstr "Window buttons are visible"
-#: ../shell/e-shell-content.c:502 ../shell/e-shell-content.c:503
+#: ../shell/e-shell-content.c:523 ../shell/e-shell-content.c:524
msgid "Searches"
msgstr "Searches"
-#: ../shell/e-shell-content.c:545
+#: ../shell/e-shell-content.c:566
msgid "Save Search"
msgstr "Save Search"
@@ -19205,19 +19629,19 @@ msgstr "Save Search"
#. * allows the user to filter the current view. Examples of
#. * items that appear in the combo box are "Unread Messages",
#. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:918
+#: ../shell/e-shell-searchbar.c:924
msgid "Sho_w:"
msgstr "Sho_w:"
#. Translators: This is part of the quick search interface.
#. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:949
+#: ../shell/e-shell-searchbar.c:955
msgid "Sear_ch:"
msgstr "Sear_ch:"
#. Translators: This is part of the quick search interface.
#. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1010
+#: ../shell/e-shell-searchbar.c:1016
msgid "i_n"
msgstr "i_n"
@@ -19248,316 +19672,301 @@ msgstr ""
msgid "Evolution Website"
msgstr "Evolution Website"
-#: ../shell/e-shell-window-actions.c:1228
+#: ../shell/e-shell-window-actions.c:1236
msgid "Bug Buddy is not installed."
msgstr "Bug Buddy is not installed."
-#: ../shell/e-shell-window-actions.c:1230
+#: ../shell/e-shell-window-actions.c:1238
msgid "Bug Buddy could not be run."
msgstr "Bug Buddy could not be run."
-#: ../shell/e-shell-window-actions.c:1347
-msgid "GNOME Pilot is not installed."
-msgstr "GNOME Pilot is not installed."
-
-#: ../shell/e-shell-window-actions.c:1349
-msgid "GNOME Pilot could not be run."
-msgstr "GNOME Pilot could not be run."
-
-#: ../shell/e-shell-window-actions.c:1443
+#: ../shell/e-shell-window-actions.c:1419
msgid "Show information about Evolution"
msgstr "Show information about Evolution"
-#: ../shell/e-shell-window-actions.c:1448
+#: ../shell/e-shell-window-actions.c:1424
+#: ../shell/e-shell-window-actions.c:1438
msgid "_Close Window"
msgstr "_Close Window"
-#: ../shell/e-shell-window-actions.c:1455
+#: ../shell/e-shell-window-actions.c:1445
msgid "_Contents"
msgstr "_Contents"
-#: ../shell/e-shell-window-actions.c:1457
+#: ../shell/e-shell-window-actions.c:1447
msgid "Open the Evolution User Guide"
msgstr "Open the Evolution User Guide"
-#: ../shell/e-shell-window-actions.c:1483
+#: ../shell/e-shell-window-actions.c:1473
msgid "Evolution _FAQ"
msgstr "Evolution _FAQ"
-#: ../shell/e-shell-window-actions.c:1485
+#: ../shell/e-shell-window-actions.c:1475
msgid "Open the Frequently Asked Questions webpage"
msgstr "Open the Frequently Asked Questions webpage"
-#: ../shell/e-shell-window-actions.c:1490
+#: ../shell/e-shell-window-actions.c:1480
msgid "_Forget Passwords"
msgstr "_Forget Passwords"
-#: ../shell/e-shell-window-actions.c:1492
+#: ../shell/e-shell-window-actions.c:1482
msgid "Forget all remembered passwords"
msgstr "Forget all remembered passwords"
-#: ../shell/e-shell-window-actions.c:1497
+#: ../shell/e-shell-window-actions.c:1487
msgid "I_mport..."
msgstr "I_mportâ?¦"
-#: ../shell/e-shell-window-actions.c:1499
+#: ../shell/e-shell-window-actions.c:1489
msgid "Import data from other programs"
msgstr "Import data from other programs"
-#: ../shell/e-shell-window-actions.c:1504
+#: ../shell/e-shell-window-actions.c:1494
msgid "New _Window"
msgstr "New _Window"
-#: ../shell/e-shell-window-actions.c:1506
+#: ../shell/e-shell-window-actions.c:1496
msgid "Create a new window displaying this view"
msgstr "Create a new window displaying this view"
-#: ../shell/e-shell-window-actions.c:1520
+#: ../shell/e-shell-window-actions.c:1510
msgid "Configure Evolution"
msgstr "Configure Evolution"
-#: ../shell/e-shell-window-actions.c:1525
+#: ../shell/e-shell-window-actions.c:1515
msgid "_Quick Reference"
msgstr "_Quick Reference"
-#: ../shell/e-shell-window-actions.c:1527
+#: ../shell/e-shell-window-actions.c:1517
msgid "Show Evolution's shortcut keys"
msgstr "Show Evolution's shortcut keys"
-#: ../shell/e-shell-window-actions.c:1534
+#: ../shell/e-shell-window-actions.c:1524
msgid "Exit the program"
msgstr "Exit the program"
-#: ../shell/e-shell-window-actions.c:1539
+#: ../shell/e-shell-window-actions.c:1529
msgid "_Advanced Search..."
msgstr "_Advanced Searchâ?¦"
-#: ../shell/e-shell-window-actions.c:1541
+#: ../shell/e-shell-window-actions.c:1531
msgid "Construct a more advanced search"
msgstr "Construct a more advanced search"
-#: ../shell/e-shell-window-actions.c:1548
+#: ../shell/e-shell-window-actions.c:1538
msgid "Clear the current search parameters"
msgstr "Clear the current search parameters"
-#: ../shell/e-shell-window-actions.c:1553
+#: ../shell/e-shell-window-actions.c:1543
msgid "_Edit Saved Searches..."
msgstr "_Edit Saved Searchesâ?¦"
-#: ../shell/e-shell-window-actions.c:1555
+#: ../shell/e-shell-window-actions.c:1545
msgid "Manage your saved searches"
msgstr "Manage your saved searches"
-#: ../shell/e-shell-window-actions.c:1562
+#: ../shell/e-shell-window-actions.c:1552
msgid "Click here to change the search type"
msgstr "Click here to change the search type"
-#: ../shell/e-shell-window-actions.c:1567
+#: ../shell/e-shell-window-actions.c:1557
msgid "_Find Now"
msgstr "_Find Now"
#. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1569
+#: ../shell/e-shell-window-actions.c:1559
msgid "Execute the current search parameters"
msgstr "Execute the current search parameters"
-#: ../shell/e-shell-window-actions.c:1574
+#: ../shell/e-shell-window-actions.c:1564
msgid "_Save Search..."
msgstr "_Save Searchâ?¦"
-#: ../shell/e-shell-window-actions.c:1576
+#: ../shell/e-shell-window-actions.c:1566
msgid "Save the current search parameters"
msgstr "Save the current search parameters"
-#: ../shell/e-shell-window-actions.c:1588
+#: ../shell/e-shell-window-actions.c:1578
msgid "Send / _Receive"
msgstr "Send / _Receive"
-#: ../shell/e-shell-window-actions.c:1590
+#: ../shell/e-shell-window-actions.c:1580
msgid "Send queued items and retrieve new items"
msgstr "Send queued items and retrieve new items"
-#: ../shell/e-shell-window-actions.c:1595
+#: ../shell/e-shell-window-actions.c:1585
msgid "Submit _Bug Report..."
msgstr "Submit _Bug Reportâ?¦"
-#: ../shell/e-shell-window-actions.c:1597
+#: ../shell/e-shell-window-actions.c:1587
msgid "Submit a bug report using Bug Buddy"
msgstr "Submit a bug report using Bug Buddy"
-#: ../shell/e-shell-window-actions.c:1602
-msgid "GNOME Pilot _Synchronization..."
-msgstr "GNOME Pilot _Synchronisationâ?¦"
-
-#: ../shell/e-shell-window-actions.c:1604
-msgid "Set up GNOME Pilot configuration"
-msgstr "Set up GNOME Pilot configuration"
-
-#: ../shell/e-shell-window-actions.c:1609
+#: ../shell/e-shell-window-actions.c:1592
msgid "_Work Offline"
msgstr "_Work Offline"
-#: ../shell/e-shell-window-actions.c:1611
+#: ../shell/e-shell-window-actions.c:1594
msgid "Put Evolution into offline mode"
msgstr "Put Evolution into offline mode"
-#: ../shell/e-shell-window-actions.c:1616
+#: ../shell/e-shell-window-actions.c:1599
msgid "_Work Online"
msgstr "_Work Online"
-#: ../shell/e-shell-window-actions.c:1618
+#: ../shell/e-shell-window-actions.c:1601
msgid "Put Evolution into online mode"
msgstr "Put Evolution into online mode"
-#: ../shell/e-shell-window-actions.c:1646
+#: ../shell/e-shell-window-actions.c:1629
msgid "Lay_out"
msgstr "Lay_out"
-#: ../shell/e-shell-window-actions.c:1653
+#: ../shell/e-shell-window-actions.c:1636
msgid "_New"
msgstr "_New"
-#: ../shell/e-shell-window-actions.c:1660
+#: ../shell/e-shell-window-actions.c:1643
msgid "_Search"
msgstr "_Search"
-#: ../shell/e-shell-window-actions.c:1667
+#: ../shell/e-shell-window-actions.c:1650
msgid "_Switcher Appearance"
msgstr "_Switcher Appearance"
-#: ../shell/e-shell-window-actions.c:1681
+#: ../shell/e-shell-window-actions.c:1664
msgid "_Window"
msgstr "_Window"
-#: ../shell/e-shell-window-actions.c:1710
+#: ../shell/e-shell-window-actions.c:1693
msgid "Show Side _Bar"
msgstr "Show Side _Bar"
-#: ../shell/e-shell-window-actions.c:1712
+#: ../shell/e-shell-window-actions.c:1695
msgid "Show the side bar"
msgstr "Show the side bar"
-#: ../shell/e-shell-window-actions.c:1718
+#: ../shell/e-shell-window-actions.c:1701
msgid "Show _Buttons"
msgstr "Show _Buttons"
-#: ../shell/e-shell-window-actions.c:1720
+#: ../shell/e-shell-window-actions.c:1703
msgid "Show the switcher buttons"
msgstr "Show the switcher buttons"
-#: ../shell/e-shell-window-actions.c:1726
+#: ../shell/e-shell-window-actions.c:1709
msgid "Show _Status Bar"
msgstr "Show _Status Bar"
-#: ../shell/e-shell-window-actions.c:1728
+#: ../shell/e-shell-window-actions.c:1711
msgid "Show the status bar"
msgstr "Show the status bar"
-#: ../shell/e-shell-window-actions.c:1734
+#: ../shell/e-shell-window-actions.c:1717
msgid "Show _Tool Bar"
msgstr "Show _Tool Bar"
-#: ../shell/e-shell-window-actions.c:1736
+#: ../shell/e-shell-window-actions.c:1719
msgid "Show the tool bar"
msgstr "Show the tool bar"
-#: ../shell/e-shell-window-actions.c:1758
+#: ../shell/e-shell-window-actions.c:1741
msgid "_Icons Only"
msgstr "_Icons Only"
-#: ../shell/e-shell-window-actions.c:1760
+#: ../shell/e-shell-window-actions.c:1743
msgid "Display window buttons with icons only"
msgstr "Display window buttons with icons only"
-#: ../shell/e-shell-window-actions.c:1765
+#: ../shell/e-shell-window-actions.c:1748
msgid "_Text Only"
msgstr "_Text Only"
-#: ../shell/e-shell-window-actions.c:1767
+#: ../shell/e-shell-window-actions.c:1750
msgid "Display window buttons with text only"
msgstr "Display window buttons with text only"
-#: ../shell/e-shell-window-actions.c:1772
+#: ../shell/e-shell-window-actions.c:1755
msgid "Icons _and Text"
msgstr "Icons _and Text"
-#: ../shell/e-shell-window-actions.c:1774
+#: ../shell/e-shell-window-actions.c:1757
msgid "Display window buttons with icons and text"
msgstr "Display window buttons with icons and text"
-#: ../shell/e-shell-window-actions.c:1779
+#: ../shell/e-shell-window-actions.c:1762
msgid "Tool_bar Style"
msgstr "Tool_bar Style"
-#: ../shell/e-shell-window-actions.c:1781
+#: ../shell/e-shell-window-actions.c:1764
msgid "Display window buttons using the desktop toolbar setting"
msgstr "Display window buttons using the desktop toolbar setting"
-#: ../shell/e-shell-window-actions.c:1789
+#: ../shell/e-shell-window-actions.c:1772
msgid "Define Views..."
msgstr "Define Viewsâ?¦"
-#: ../shell/e-shell-window-actions.c:1791
+#: ../shell/e-shell-window-actions.c:1774
msgid "Create or edit views"
msgstr "Create or edit views"
-#: ../shell/e-shell-window-actions.c:1796
+#: ../shell/e-shell-window-actions.c:1779
msgid "Save Custom View..."
msgstr "Save Custom Viewâ?¦"
-#: ../shell/e-shell-window-actions.c:1798
+#: ../shell/e-shell-window-actions.c:1781
msgid "Save current custom view"
msgstr "Save current custom view"
-#: ../shell/e-shell-window-actions.c:1805
+#: ../shell/e-shell-window-actions.c:1788
msgid "C_urrent View"
msgstr "C_urrent View"
-#: ../shell/e-shell-window-actions.c:1815
+#: ../shell/e-shell-window-actions.c:1798
msgid "Custom View"
msgstr "Custom View"
-#: ../shell/e-shell-window-actions.c:1817
+#: ../shell/e-shell-window-actions.c:1800
msgid "Current view is a customized view"
msgstr "Current view is a customised view"
-#: ../shell/e-shell-window-actions.c:1827
+#: ../shell/e-shell-window-actions.c:1810
msgid "Change the page settings for your current printer"
msgstr "Change the page settings for your current printer"
-#: ../shell/e-shell-window-actions.c:2204
+#: ../shell/e-shell-window-actions.c:2183
#, c-format
msgid "Switch to %s"
msgstr "Switch to %s"
-#: ../shell/e-shell-window-actions.c:2417
+#: ../shell/e-shell-window-actions.c:2396
msgid "Execute these search parameters"
msgstr "Execute these search parameters"
#. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:571
+#: ../shell/e-shell-window-private.c:576
#, c-format
msgid "%s - Evolution"
msgstr "%s â?? Evolution"
-#: ../shell/e-shell-window.c:382
+#: ../shell/e-shell-window.c:419
msgid "New"
msgstr "New"
-#: ../shell/e-shell.c:218
+#: ../shell/e-shell.c:229
msgid "Preparing to go offline..."
msgstr "Preparing to go offlineâ?¦"
-#: ../shell/e-shell.c:268
+#: ../shell/e-shell.c:279
msgid "Preparing to go online..."
msgstr "Preparing to go onlineâ?¦"
-#: ../shell/e-shell.c:336
+#: ../shell/e-shell.c:338
msgid "Preparing to quit..."
msgstr "Preparing to quitâ?¦"
#. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:164
+#: ../shell/main.c:180
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -19592,7 +20001,7 @@ msgstr ""
"We hope that you enjoy the results of our hard work, and we\n"
"eagerly await your contributions!\n"
-#: ../shell/main.c:188
+#: ../shell/main.c:204
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -19600,55 +20009,55 @@ msgstr ""
"Thanks\n"
"The Evolution Team\n"
-#: ../shell/main.c:195
+#: ../shell/main.c:211
msgid "Do not tell me again"
msgstr "Do not tell me again"
-#: ../shell/main.c:303
+#: ../shell/main.c:327
msgid "Start Evolution activating the specified component"
msgstr "Start Evolution activating the specified component"
-#: ../shell/main.c:305
+#: ../shell/main.c:329
msgid "Apply the given geometry to the main window"
msgstr "Apply the given geometry to the main window"
-#: ../shell/main.c:309
+#: ../shell/main.c:333
msgid "Start in online mode"
msgstr "Start in online mode"
-#: ../shell/main.c:311
+#: ../shell/main.c:335
msgid "Start in \"express\" mode"
msgstr "Start in \"express\" mode"
-#: ../shell/main.c:314
+#: ../shell/main.c:338
msgid "Forcibly shut down Evolution"
msgstr "Forcibly shut down Evolution"
-#: ../shell/main.c:317
+#: ../shell/main.c:341
msgid "Send the debugging output of all components to a file."
msgstr "Send the debugging output of all components to a file."
-#: ../shell/main.c:319
+#: ../shell/main.c:343
msgid "Disable loading of any plugins."
msgstr "Disable loading of any plugins."
-#: ../shell/main.c:321
+#: ../shell/main.c:345
msgid "Disable preview pane of Mail, Contacts and Tasks."
msgstr "Disable preview pane of Mail, Contacts and Tasks."
-#: ../shell/main.c:325
+#: ../shell/main.c:349
msgid "Import URIs or file names given as rest of arguments."
msgstr "Import URIs or file names given as rest of arguments."
-#: ../shell/main.c:327
+#: ../shell/main.c:351
msgid "Request a running Evolution process to quit"
msgstr "Request a running Evolution process to quit"
-#: ../shell/main.c:442
+#: ../shell/main.c:475 ../shell/main.c:483
msgid "- The Evolution PIM and Email Client"
msgstr "- The Evolution PIM and E-mail Client"
-#: ../shell/main.c:468
+#: ../shell/main.c:545
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -19825,57 +20234,65 @@ msgstr ""
"certificate, then you do not trust the authenticity of this certificate "
"unless otherwise indicated here"
-#: ../smime/gui/certificate-manager.c:135
-#: ../smime/gui/certificate-manager.c:382
-#: ../smime/gui/certificate-manager.c:610
+#: ../smime/gui/certificate-manager.c:148
+#: ../smime/gui/certificate-manager.c:460
+#: ../smime/gui/certificate-manager.c:697
msgid "Select a certificate to import..."
msgstr "Select a certificate to importâ?¦"
-#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:157
msgid "All PKCS12 files"
msgstr "All PKCS12 files"
-#: ../smime/gui/certificate-manager.c:150
-#: ../smime/gui/certificate-manager.c:397
-#: ../smime/gui/certificate-manager.c:624
+#: ../smime/gui/certificate-manager.c:163
+#: ../smime/gui/certificate-manager.c:475
+#: ../smime/gui/certificate-manager.c:711
msgid "All files"
msgstr "All files"
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:487
-#: ../smime/gui/certificate-manager.c:712
+#: ../smime/gui/certificate-manager.c:182
+msgid "Failed to import user's certificate"
+msgstr "Failed to import user's certificate"
+
+#: ../smime/gui/certificate-manager.c:352
+#: ../smime/gui/certificate-manager.c:574
+#: ../smime/gui/certificate-manager.c:808
msgid "Certificate Name"
msgstr "Certificate Name"
-#: ../smime/gui/certificate-manager.c:283
-#: ../smime/gui/certificate-manager.c:505
+#: ../smime/gui/certificate-manager.c:361
+#: ../smime/gui/certificate-manager.c:592
msgid "Purposes"
msgstr "Purposes"
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
#: ../smime/lib/e-cert.c:566
msgid "Serial Number"
msgstr "Serial Number"
-#: ../smime/gui/certificate-manager.c:300
+#: ../smime/gui/certificate-manager.c:378
msgid "Expires"
msgstr "Expires"
-#: ../smime/gui/certificate-manager.c:391
+#: ../smime/gui/certificate-manager.c:469
msgid "All email certificate files"
msgstr "All e-mail certificate files"
-#: ../smime/gui/certificate-manager.c:496
+#: ../smime/gui/certificate-manager.c:502
+msgid "Failed to import contact's certificate"
+msgstr "Failed to import contact's certificate"
+
+#: ../smime/gui/certificate-manager.c:583
msgid "E-Mail Address"
msgstr "E-Mail Address"
-#: ../smime/gui/certificate-manager.c:619
+#: ../smime/gui/certificate-manager.c:706
msgid "All CA certificate files"
msgstr "All CA certificate files"
-#: ../smime/gui/certificate-manager.c:1052
-msgid "Certificates"
-msgstr "Certificates"
+#: ../smime/gui/certificate-manager.c:737
+msgid "Failed to import certificate authority's certificate"
+msgstr "Failed to import certificate authority's certificate"
#: ../smime/gui/certificate-viewer.c:338
#, c-format
@@ -19928,14 +20345,10 @@ msgid "Authorities"
msgstr "Authorities"
#: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup"
-msgstr "Backup"
+msgid "Backup _All"
+msgstr "Back Up _All"
#: ../smime/gui/smime-ui.ui.h:4
-msgid "Backup All"
-msgstr "Backup All"
-
-#: ../smime/gui/smime-ui.ui.h:5
msgid ""
"Before trusting this CA for any purpose, you should examine its certificate "
"and its policy and procedures (if available)."
@@ -19943,162 +20356,153 @@ msgstr ""
"Before trusting this CA for any purpose, you should examine its certificate "
"and its policy and procedures (if available)."
-#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1077
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
msgid "Certificate"
msgstr "Certificate"
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:6
msgid "Certificate Authority Trust"
msgstr "Certificate Authority Trust"
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../smime/gui/smime-ui.ui.h:7
msgid "Certificate Fields"
msgstr "Certificate Fields"
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../smime/gui/smime-ui.ui.h:8
msgid "Certificate Hierarchy"
msgstr "Certificate Hierarchy"
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:9
msgid "Certificate details"
msgstr "Certificate details"
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:10
msgid "Certificates Table"
msgstr "Certificates Table"
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:11
msgid "Common Name (CN)"
msgstr "Common Name (CN)"
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:12
msgid "Contact Certificates"
msgstr "Contact Certificates"
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:14
msgid "Do not trust the authenticity of this certificate"
msgstr "Do not trust the authenticity of this certificate"
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Edit"
-msgstr "Edit"
-
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:15
msgid "Email Certificate Trust Settings"
msgstr "E-mail Certificate Trust Settings"
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:16
msgid "Email Recipient Certificate"
msgstr "E-mail Recipient Certificate"
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:17
msgid "Email Signer Certificate"
msgstr "E-mail Signer Certificate"
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:18
msgid "Expires On"
msgstr "Expires On"
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/smime-ui.ui.h:19
msgid "Field Value"
msgstr "Field Value"
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:20
msgid "Fingerprints"
msgstr "Fingerprints"
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Import"
-msgstr "Import"
-
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:23
msgid "Issued By"
msgstr "Issued By"
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:24
msgid "Issued On"
msgstr "Issued On"
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:25
msgid "Issued To"
msgstr "Issued To"
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:26
msgid "MD5 Fingerprint"
msgstr "MD5 Fingerprint"
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:27
msgid "Organization (O)"
msgstr "Organisation (O)"
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:28
msgid "Organizational Unit (OU)"
msgstr "Organisational Unit (OU)"
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:29
msgid "SHA1 Fingerprint"
msgstr "SHA1 Fingerprint"
-#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
msgid "SSL Client Certificate"
msgstr "SSL Client Certificate"
-#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
msgid "SSL Server Certificate"
msgstr "SSL Server Certificate"
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:33
msgid "This certificate has been verified for the following uses:"
msgstr "This certificate has been verified for the following uses:"
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:34
msgid "Trust the authenticity of this certificate"
msgstr "Trust the authenticity of this certificate"
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:35
msgid "Trust this CA to identify email users."
msgstr "Trust this CA to identify e-mail users."
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:36
msgid "Trust this CA to identify software developers."
msgstr "Trust this CA to identify software developers."
-#: ../smime/gui/smime-ui.ui.h:39
-msgid "Trust this CA to identify web sites."
+#: ../smime/gui/smime-ui.ui.h:37
+msgid "Trust this CA to identify websites."
msgstr "Trust this CA to identify websites."
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:38
msgid "Validity"
msgstr "Validity"
-#: ../smime/gui/smime-ui.ui.h:41
-msgid "View"
-msgstr "View"
-
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:39
msgid "You have certificates from these organizations that identify you:"
msgstr "You have certificates from these organisations that identify you:"
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../smime/gui/smime-ui.ui.h:40
msgid ""
"You have certificates on file that identify these certificate authorities:"
msgstr ""
"You have certificates on file that identify these certificate authorities:"
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:41
msgid "You have certificates on file that identify these people:"
msgstr "You have certificates on file that identify these people:"
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:42
msgid "Your Certificates"
msgstr "Your Certificates"
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.ui.h:43
+msgid "_Backup"
+msgstr "_Backup"
+
+#: ../smime/gui/smime-ui.ui.h:44
msgid "_Edit CA Trust"
msgstr "_Edit CA Trust"
-#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:711
+#: ../smime/lib/e-cert-db.c:906
msgid "Certificate already exists"
msgstr "Certificate already exists"
@@ -20143,100 +20547,112 @@ msgstr "PKCS #1 MD5 With RSA Encryption"
msgid "PKCS #1 SHA-1 With RSA Encryption"
msgstr "PKCS #1 SHA-1 With RSA Encryption"
-#: ../smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:639
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "PKCS #1 SHA-256 With RSA Encryption"
+
+#: ../smime/lib/e-cert.c:642
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "PKCS #1 SHA-384 With RSA Encryption"
+
+#: ../smime/lib/e-cert.c:645
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "PKCS #1 SHA-512 With RSA Encryption"
+
+#: ../smime/lib/e-cert.c:672
msgid "PKCS #1 RSA Encryption"
msgstr "PKCS #1 RSA Encryption"
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:675
msgid "Certificate Key Usage"
msgstr "Certificate Key Usage"
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:678
msgid "Netscape Certificate Type"
msgstr "Netscape Certificate Type"
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:681
msgid "Certificate Authority Key Identifier"
msgstr "Certificate Authority Key Identifier"
-#: ../smime/lib/e-cert.c:684
+#: ../smime/lib/e-cert.c:693
#, c-format
msgid "Object Identifier (%s)"
msgstr "Object Identifier (%s)"
-#: ../smime/lib/e-cert.c:735
+#: ../smime/lib/e-cert.c:744
msgid "Algorithm Identifier"
msgstr "Algorithm Identifier"
-#: ../smime/lib/e-cert.c:743
+#: ../smime/lib/e-cert.c:752
msgid "Algorithm Parameters"
msgstr "Algorithm Parameters"
-#: ../smime/lib/e-cert.c:765
+#: ../smime/lib/e-cert.c:774
msgid "Subject Public Key Info"
msgstr "Subject Public Key Info"
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:779
msgid "Subject Public Key Algorithm"
msgstr "Subject Public Key Algorithm"
-#: ../smime/lib/e-cert.c:785
+#: ../smime/lib/e-cert.c:794
msgid "Subject's Public Key"
msgstr "Subject's Public Key"
-#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
+#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
msgid "Error: Unable to process extension"
msgstr "Error: Unable to process extension"
-#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
msgid "Object Signer"
msgstr "Object Signer"
-#: ../smime/lib/e-cert.c:831
+#: ../smime/lib/e-cert.c:840
msgid "SSL Certificate Authority"
msgstr "SSL Certificate Authority"
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:844
msgid "Email Certificate Authority"
msgstr "E-mail Certificate Authority"
-#: ../smime/lib/e-cert.c:863
+#: ../smime/lib/e-cert.c:872
msgid "Signing"
msgstr "Signing"
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:876
msgid "Non-repudiation"
msgstr "Non-repudiation"
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:880
msgid "Key Encipherment"
msgstr "Key Encipherment"
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:884
msgid "Data Encipherment"
msgstr "Data Encipherment"
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:888
msgid "Key Agreement"
msgstr "Key Agreement"
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:892
msgid "Certificate Signer"
msgstr "Certificate Signer"
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:896
msgid "CRL Signer"
msgstr "CRL Signer"
-#: ../smime/lib/e-cert.c:935
+#: ../smime/lib/e-cert.c:944
msgid "Critical"
msgstr "Critical"
-#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
+#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
msgid "Not Critical"
msgstr "Not Critical"
-#: ../smime/lib/e-cert.c:961
+#: ../smime/lib/e-cert.c:970
msgid "Extensions"
msgstr "Extensions"
@@ -20246,28 +20662,28 @@ msgstr "Extensions"
#. need to change this string, unless changing the order of name and value.
#. As a result example: "OU = VeriSign Trust Network"
#.
-#: ../smime/lib/e-cert.c:1036
+#: ../smime/lib/e-cert.c:1045
#, c-format
msgid "%s = %s"
msgstr "%s = %s"
-#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
msgid "Certificate Signature Algorithm"
msgstr "Certificate Signature Algorithm"
-#: ../smime/lib/e-cert.c:1100
+#: ../smime/lib/e-cert.c:1109
msgid "Issuer"
msgstr "Issuer"
-#: ../smime/lib/e-cert.c:1155
+#: ../smime/lib/e-cert.c:1164
msgid "Issuer Unique ID"
msgstr "Issuer Unique ID"
-#: ../smime/lib/e-cert.c:1174
+#: ../smime/lib/e-cert.c:1183
msgid "Subject Unique ID"
msgstr "Subject Unique ID"
-#: ../smime/lib/e-cert.c:1220
+#: ../smime/lib/e-cert.c:1229
msgid "Certificate Signature Value"
msgstr "Certificate Signature Value"
@@ -20356,11 +20772,11 @@ msgid "With _Status"
msgstr "With _Status"
#. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:778
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
msgid "UTC"
msgstr "UTC"
@@ -20390,14 +20806,14 @@ msgstr ""
msgid "_Selection"
msgstr "_Selection"
-#: ../widgets/menus/gal-define-views-dialog.c:339
+#: ../widgets/menus/gal-define-views-dialog.c:346
#: ../widgets/menus/gal-define-views.ui.h:4
#, no-c-format
msgid "Define Views for %s"
msgstr "Define Views for %s"
-#: ../widgets/menus/gal-define-views-dialog.c:347
-#: ../widgets/menus/gal-define-views-dialog.c:349
+#: ../widgets/menus/gal-define-views-dialog.c:354
+#: ../widgets/menus/gal-define-views-dialog.c:356
msgid "Define Views"
msgstr "Define Views"
@@ -20410,7 +20826,7 @@ msgstr "Define Views for \"%s\""
msgid "Table"
msgstr "Table"
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:274
msgid "Save Current View"
msgstr "Save Current View"
@@ -20438,118 +20854,122 @@ msgstr "Type of View"
msgid "Type of view:"
msgstr "Type of view:"
-#: ../widgets/misc/e-account-manager.c:348
+#: ../widgets/misc/e-account-manager.c:351
msgid "De_fault"
msgstr "De_fault"
-#: ../widgets/misc/e-account-tree-view.c:224
-msgid "Account Name"
-msgstr "Account Name"
-
-#: ../widgets/misc/e-account-tree-view.c:255
+#: ../widgets/misc/e-account-tree-view.c:261
msgid "Protocol"
msgstr "Protocol"
-#: ../widgets/misc/e-attachment-dialog.c:305
+#: ../widgets/misc/e-attachment-dialog.c:307
msgid "Attachment Properties"
msgstr "Attachment Properties"
-#: ../widgets/misc/e-attachment-dialog.c:328
+#: ../widgets/misc/e-attachment-dialog.c:330
msgid "_Filename:"
msgstr "_Filename:"
-#: ../widgets/misc/e-attachment-dialog.c:363
+#: ../widgets/misc/e-attachment-dialog.c:365
msgid "MIME Type:"
msgstr "MIME Type:"
-#: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:550
+#: ../widgets/misc/e-attachment-dialog.c:373
+#: ../widgets/misc/e-attachment-store.c:525
msgid "_Suggest automatic display of attachment"
msgstr "_Suggest automatic display of attachment"
-#: ../widgets/misc/e-attachment-handler-image.c:97
+#: ../widgets/misc/e-attachment-handler-image.c:100
msgid "Could not set as background"
msgstr "Could not set as background"
-#: ../widgets/misc/e-attachment-handler-image.c:149
+#: ../widgets/misc/e-attachment-handler-image.c:152
msgid "Set as _Background"
msgstr "Set as _Background"
-#: ../widgets/misc/e-attachment-handler-sendto.c:87
+#: ../widgets/misc/e-attachment-handler-sendto.c:90
msgid "Could not send attachment"
msgid_plural "Could not send attachments"
msgstr[0] "Could not send attachment"
msgstr[1] "Could not send attachments"
-#: ../widgets/misc/e-attachment-handler-sendto.c:129
+#: ../widgets/misc/e-attachment-handler-sendto.c:132
msgid "_Send To..."
msgstr "_Send Toâ?¦"
-#: ../widgets/misc/e-attachment-handler-sendto.c:131
+#: ../widgets/misc/e-attachment-handler-sendto.c:134
msgid "Send the selected attachments somewhere"
msgstr "Send the selected attachments somewhere"
-#: ../widgets/misc/e-attachment-icon-view.c:480
-#: ../widgets/misc/e-attachment-tree-view.c:517
+#: ../widgets/misc/e-attachment-icon-view.c:506
+#: ../widgets/misc/e-attachment-tree-view.c:545
msgid "Loading"
msgstr "Loading"
-#: ../widgets/misc/e-attachment-icon-view.c:492
-#: ../widgets/misc/e-attachment-tree-view.c:529
+#: ../widgets/misc/e-attachment-icon-view.c:518
+#: ../widgets/misc/e-attachment-tree-view.c:557
msgid "Saving"
msgstr "Saving"
-#: ../widgets/misc/e-attachment-paned.c:87
+#: ../widgets/misc/e-attachment-paned.c:98
msgid "Hide Attachment _Bar"
msgstr "Hide Attachment _Bar"
-#: ../widgets/misc/e-attachment-paned.c:89
-#: ../widgets/misc/e-attachment-paned.c:636
+#: ../widgets/misc/e-attachment-paned.c:100
+#: ../widgets/misc/e-attachment-paned.c:631
msgid "Show Attachment _Bar"
msgstr "Show Attachment _Bar"
-#: ../widgets/misc/e-attachment-store.c:538
+#: ../widgets/misc/e-attachment-store.c:513
msgid "Add Attachment"
msgstr "Add Attachment"
-#: ../widgets/misc/e-attachment-store.c:541
+#: ../widgets/misc/e-attachment-store.c:516
msgid "A_ttach"
msgstr "A_ttach"
-#: ../widgets/misc/e-attachment-store.c:604
+#: ../widgets/misc/e-attachment-store.c:579
msgid "Save Attachment"
msgid_plural "Save Attachments"
msgstr[0] "Save Attachment"
msgstr[1] "Save Attachments"
#. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
+#: ../widgets/misc/e-attachment-store.c:608
+#: ../widgets/misc/e-attachment.c:1785 ../widgets/misc/e-attachment.c:2327
msgid "attachment.dat"
msgstr "attachment.dat"
-#: ../widgets/misc/e-attachment-view.c:299
+#: ../widgets/misc/e-attachment-view.c:351
msgid "S_ave All"
msgstr "S_ave All"
-#: ../widgets/misc/e-attachment-view.c:325
+#: ../widgets/misc/e-attachment-view.c:377
msgid "A_dd Attachment..."
msgstr "A_dd Attachmentâ?¦"
-#: ../widgets/misc/e-attachment-view.c:349
+#: ../widgets/misc/e-attachment-view.c:401
msgid "_Hide"
msgstr "_Hide"
-#: ../widgets/misc/e-attachment-view.c:356
+#: ../widgets/misc/e-attachment-view.c:408
+msgid "Hid_e All"
+msgstr "Hid_e All"
+
+#: ../widgets/misc/e-attachment-view.c:415
msgid "_View Inline"
msgstr "_View Inline"
-#: ../widgets/misc/e-attachment-view.c:638
+#: ../widgets/misc/e-attachment-view.c:422
+msgid "Vie_w All Inline"
+msgstr "Vie_w All Inline"
+
+#: ../widgets/misc/e-attachment-view.c:739
#, c-format
msgid "Open with \"%s\""
msgstr "Open with \"%s\""
-#: ../widgets/misc/e-attachment-view.c:641
+#: ../widgets/misc/e-attachment-view.c:742
#, c-format
msgid "Open this attachment in %s"
msgstr "Open this attachment in %s"
@@ -20558,48 +20978,48 @@ msgstr "Open this attachment in %s"
#. * message when, for example, attaching it to a composer. When the
#. * message to be attached has also filled Subject, then this text is
#. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:994
+#: ../widgets/misc/e-attachment.c:997
msgid "Attached message"
msgstr "Attached message"
-#: ../widgets/misc/e-attachment.c:1814 ../widgets/misc/e-attachment.c:2615
+#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
msgid "A load operation is already in progress"
msgstr "A load operation is already in progress"
-#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2623
+#: ../widgets/misc/e-attachment.c:1836 ../widgets/misc/e-attachment.c:2637
msgid "A save operation is already in progress"
msgstr "A save operation is already in progress"
-#: ../widgets/misc/e-attachment.c:1914
+#: ../widgets/misc/e-attachment.c:1928
#, c-format
msgid "Could not load '%s'"
msgstr "Could not load '%s'"
-#: ../widgets/misc/e-attachment.c:1917
+#: ../widgets/misc/e-attachment.c:1931
#, c-format
msgid "Could not load the attachment"
msgstr "Could not load the attachment"
-#: ../widgets/misc/e-attachment.c:2193
+#: ../widgets/misc/e-attachment.c:2207
#, c-format
msgid "Could not open '%s'"
msgstr "Could not open '%s'"
-#: ../widgets/misc/e-attachment.c:2196
+#: ../widgets/misc/e-attachment.c:2210
#, c-format
msgid "Could not open the attachment"
msgstr "Could not open the attachment"
-#: ../widgets/misc/e-attachment.c:2631
+#: ../widgets/misc/e-attachment.c:2645
msgid "Attachment contents not loaded"
msgstr "Attachment contents not loaded"
-#: ../widgets/misc/e-attachment.c:2707
+#: ../widgets/misc/e-attachment.c:2721
#, c-format
msgid "Could not save '%s'"
msgstr "Could not save '%s'"
-#: ../widgets/misc/e-attachment.c:2710
+#: ../widgets/misc/e-attachment.c:2724
#, c-format
msgid "Could not save the attachment"
msgstr "Could not save the attachment"
@@ -20610,72 +21030,72 @@ msgid "Ctrl-click to open a link"
msgstr "Ctrl-click to open a link"
#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1254
+#: ../widgets/misc/e-calendar-item.c:1258
msgid "%B %Y"
msgstr "%B %Y"
-#: ../widgets/misc/e-calendar.c:217
+#: ../widgets/misc/e-calendar.c:220
msgid "Month Calendar"
msgstr "Month Calendar"
-#: ../widgets/misc/e-charset-combo-box.c:93
+#: ../widgets/misc/e-charset-combo-box.c:96
msgid "Character Encoding"
msgstr "Character Encoding"
-#: ../widgets/misc/e-charset-combo-box.c:117
+#: ../widgets/misc/e-charset-combo-box.c:120
msgid "Enter the character set to use"
msgstr "Enter the character set to use"
-#: ../widgets/misc/e-charset-combo-box.c:336
+#: ../widgets/misc/e-charset-combo-box.c:339
msgid "Other..."
msgstr "Otherâ?¦"
-#: ../widgets/misc/e-dateedit.c:502
+#: ../widgets/misc/e-dateedit.c:505
msgid "Date and Time"
msgstr "Date and Time"
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:526
msgid "Text entry to input date"
msgstr "Text entry to input date"
-#: ../widgets/misc/e-dateedit.c:545
+#: ../widgets/misc/e-dateedit.c:548
msgid "Click this button to show a calendar"
msgstr "Click this button to show a calendar"
-#: ../widgets/misc/e-dateedit.c:591
+#: ../widgets/misc/e-dateedit.c:594
msgid "Drop-down combination box to select time"
msgstr "Drop-down combination box to select time"
-#: ../widgets/misc/e-dateedit.c:663
+#: ../widgets/misc/e-dateedit.c:666
msgid "No_w"
msgstr "No_w"
-#: ../widgets/misc/e-dateedit.c:669
+#: ../widgets/misc/e-dateedit.c:672
msgid "_Today"
msgstr "_Today"
#. Note that we don't show this here, since by default a 'None' date
#. is not permitted.
-#: ../widgets/misc/e-dateedit.c:677
+#: ../widgets/misc/e-dateedit.c:680
msgid "_None"
msgstr "_None"
#. Translators: "None" for date field of a date edit, shown when
#. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
+#: ../widgets/misc/e-dateedit.c:1685 ../widgets/misc/e-dateedit.c:1917
msgctxt "date"
msgid "None"
msgstr "None"
-#: ../widgets/misc/e-dateedit.c:1809
+#: ../widgets/misc/e-dateedit.c:1812
msgid "Invalid Date Value"
msgstr "Invalid Date Value"
-#: ../widgets/misc/e-dateedit.c:1853
+#: ../widgets/misc/e-dateedit.c:1856
msgid "Invalid Time Value"
msgstr "Invalid Time Value"
-#: ../widgets/misc/e-import-assistant.c:238
+#: ../widgets/misc/e-import-assistant.c:249
msgid ""
"Choose the file that you want to import into Evolution, and select what type "
"of file it is from the list."
@@ -20683,40 +21103,37 @@ msgstr ""
"Choose the file that you want to import into Evolution, and select what type "
"of file it is from the list."
-#: ../widgets/misc/e-import-assistant.c:255
+#: ../widgets/misc/e-import-assistant.c:266
msgid "F_ilename:"
msgstr "F_ilename:"
-#: ../widgets/misc/e-import-assistant.c:265
+#: ../widgets/misc/e-import-assistant.c:276
msgid "Select a file"
msgstr "Select a file"
-#: ../widgets/misc/e-import-assistant.c:279
-#: ../widgets/misc/e-import-assistant.c:455
+#: ../widgets/misc/e-import-assistant.c:290
+#: ../widgets/misc/e-import-assistant.c:465
msgid "File _type:"
msgstr "File _type:"
-#: ../widgets/misc/e-import-assistant.c:322
+#: ../widgets/misc/e-import-assistant.c:333
+#: ../widgets/misc/e-import-assistant.c:916
msgid "Choose the destination for this import"
msgstr "Choose the destination for this import"
-#: ../widgets/misc/e-import-assistant.c:347
+#: ../widgets/misc/e-import-assistant.c:358
msgid "Choose the type of importer to run:"
msgstr "Choose the type of importer to run:"
-#: ../widgets/misc/e-import-assistant.c:355
+#: ../widgets/misc/e-import-assistant.c:366
msgid "Import data and settings from _older programs"
msgstr "Import data and settings from _older programs"
-#: ../widgets/misc/e-import-assistant.c:363
+#: ../widgets/misc/e-import-assistant.c:374
msgid "Import a _single file"
msgstr "Import a _single file"
-#: ../widgets/misc/e-import-assistant.c:439
-msgid "Select what type of file you want to import from the list."
-msgstr "Select what type of file you want to import from the list."
-
-#: ../widgets/misc/e-import-assistant.c:516
+#: ../widgets/misc/e-import-assistant.c:526
msgid ""
"Evolution checked for settings to import from the following applications: "
"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -20726,17 +21143,38 @@ msgstr ""
"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
"like to try again, please click the \"Back\" button."
-#: ../widgets/misc/e-import-assistant.c:1187
-#: ../widgets/misc/e-import-assistant.c:1214
+#. Install a custom "Cancel Import" button.
+#: ../widgets/misc/e-import-assistant.c:773
+msgid "_Cancel Import"
+msgstr "_Cancel Import"
+
+#: ../widgets/misc/e-import-assistant.c:915
+msgid "Preview data to be imported"
+msgstr "Preview data to be imported"
+
+#: ../widgets/misc/e-import-assistant.c:921
+#: ../widgets/misc/e-import-assistant.c:934
+#: ../widgets/misc/e-import-assistant.c:1284
+#: ../widgets/misc/e-import-assistant.c:1350
+#: ../widgets/misc/e-import-assistant.c:1359
+msgid "Import Data"
+msgstr "Import Data"
+
+#: ../widgets/misc/e-import-assistant.c:929
+msgid "Select what type of file you want to import from the list."
+msgstr "Select what type of file you want to import from the list."
+
+#: ../widgets/misc/e-import-assistant.c:1274
+#: ../widgets/misc/e-import-assistant.c:1308
msgid "Evolution Import Assistant"
msgstr "Evolution Import Assistant"
-#: ../widgets/misc/e-import-assistant.c:1196
-#: ../widgets/misc/e-import-assistant.c:1248
+#: ../widgets/misc/e-import-assistant.c:1291
+#: ../widgets/misc/e-import-assistant.c:1338
msgid "Import Location"
msgstr "Import Location"
-#: ../widgets/misc/e-import-assistant.c:1207
+#: ../widgets/misc/e-import-assistant.c:1302
msgid ""
"Welcome to the Evolution Import Assistant.\n"
"With this assistant you will be guided through the process of importing "
@@ -20746,32 +21184,27 @@ msgstr ""
"With this assistant you will be guided through the process of importing "
"external files into Evolution."
-#: ../widgets/misc/e-import-assistant.c:1223
+#: ../widgets/misc/e-import-assistant.c:1316
msgid "Importer Type"
msgstr "Importer Type"
-#: ../widgets/misc/e-import-assistant.c:1232
+#: ../widgets/misc/e-import-assistant.c:1324
msgid "Select Information to Import"
msgstr "Select Information to Import"
-#: ../widgets/misc/e-import-assistant.c:1240
+#: ../widgets/misc/e-import-assistant.c:1331
msgid "Select a File"
msgstr "Select a File"
-#: ../widgets/misc/e-import-assistant.c:1255
+#: ../widgets/misc/e-import-assistant.c:1345
msgid "Click \"Apply\" to begin importing the file into Evolution."
msgstr "Click \"Apply\" to begin importing the file into Evolution."
-#: ../widgets/misc/e-import-assistant.c:1261
-#: ../widgets/misc/e-import-assistant.c:1271
-msgid "Import Data"
-msgstr "Import Data"
-
-#: ../widgets/misc/e-map.c:621
+#: ../widgets/misc/e-map.c:557
msgid "World Map"
msgstr "World Map"
-#: ../widgets/misc/e-map.c:623
+#: ../widgets/misc/e-map.c:559
msgid ""
"Mouse-based interactive map widget for selecting timezone. Keyboard users "
"should instead select the timezone from the drop-down combination box below."
@@ -20791,68 +21224,56 @@ msgstr "Evolution is currently offline. Click this button to work online."
msgid "Evolution is currently offline because the network is unavailable."
msgstr "Evolution is currently offline because the network is unavailable."
-#: ../widgets/misc/e-pilot-settings.c:95
-msgid "Sync with:"
-msgstr "Sync with:"
-
-#: ../widgets/misc/e-pilot-settings.c:103
-msgid "Sync Private Records:"
-msgstr "Sync Private Records:"
-
-#: ../widgets/misc/e-pilot-settings.c:112
-msgid "Sync Categories:"
-msgstr "Sync Categories:"
-
-#: ../widgets/misc/e-preferences-window.c:218
+#: ../widgets/misc/e-preferences-window.c:278
msgid "Evolution Preferences"
msgstr "Evolution Preferences"
-#: ../widgets/misc/e-search-bar.c:77
+#: ../widgets/misc/e-search-bar.c:81
#, c-format
msgid "Matches: %d"
msgstr "Matches: %d"
-#: ../widgets/misc/e-search-bar.c:554
+#: ../widgets/misc/e-search-bar.c:557
msgid "Close the find bar"
msgstr "Close the find bar"
-#: ../widgets/misc/e-search-bar.c:562
+#: ../widgets/misc/e-search-bar.c:565
msgid "Fin_d:"
msgstr "Fin_d:"
-#: ../widgets/misc/e-search-bar.c:574
+#: ../widgets/misc/e-search-bar.c:577
msgid "Clear the search"
msgstr "Clear the search"
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:600
msgid "_Previous"
msgstr "_Previous"
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:606
msgid "Find the previous occurrence of the phrase"
msgstr "Find the previous occurrence of the phrase"
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:616
msgid "_Next"
msgstr "_Next"
-#: ../widgets/misc/e-search-bar.c:619
+#: ../widgets/misc/e-search-bar.c:622
msgid "Find the next occurrence of the phrase"
msgstr "Find the next occurrence of the phrase"
-#: ../widgets/misc/e-search-bar.c:629
+#: ../widgets/misc/e-search-bar.c:632
msgid "Mat_ch case"
msgstr "Mat_ch case"
-#: ../widgets/misc/e-search-bar.c:657
+#: ../widgets/misc/e-search-bar.c:660
msgid "Reached bottom of page, continued from top"
msgstr "Reached bottom of page, continued from top"
-#: ../widgets/misc/e-search-bar.c:679
+#: ../widgets/misc/e-search-bar.c:682
msgid "Reached top of page, continued from bottom"
msgstr "Reached top of page, continued from bottom"
-#: ../widgets/misc/e-send-options.c:515
+#: ../widgets/misc/e-send-options.c:516
msgid "When de_leted:"
msgstr "When de_leted:"
@@ -20873,132 +21294,148 @@ msgid "Delivery Options"
msgstr "Delivery Options"
#: ../widgets/misc/e-send-options.ui.h:6
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_Until"
+
+#: ../widgets/misc/e-send-options.ui.h:7
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_After"
+
+#: ../widgets/misc/e-send-options.ui.h:8
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "days"
+
+#: ../widgets/misc/e-send-options.ui.h:9
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "Wi_thin"
+
+#: ../widgets/misc/e-send-options.ui.h:10
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "days"
+
+#: ../widgets/misc/e-send-options.ui.h:11
msgid "For Your Eyes Only"
msgstr "For Your Eyes Only"
-#: ../widgets/misc/e-send-options.ui.h:7
+#: ../widgets/misc/e-send-options.ui.h:12
msgid "Gene_ral Options"
msgstr "Gene_ral Options"
-#: ../widgets/misc/e-send-options.ui.h:10
+#: ../widgets/misc/e-send-options.ui.h:15
msgid "Mail Receipt"
msgstr "Mail Receipt"
-#: ../widgets/misc/e-send-options.ui.h:14
+#: ../widgets/misc/e-send-options.ui.h:17
msgid "Proprietary"
msgstr "Proprietary"
-#: ../widgets/misc/e-send-options.ui.h:15
+#: ../widgets/misc/e-send-options.ui.h:18
msgid "R_eply requested"
msgstr "R_eply requested"
-#: ../widgets/misc/e-send-options.ui.h:17
+#: ../widgets/misc/e-send-options.ui.h:20
msgid "Return Notification"
msgstr "Return Notification"
-#: ../widgets/misc/e-send-options.ui.h:20
+#: ../widgets/misc/e-send-options.ui.h:23
msgid "Sta_tus Tracking"
msgstr "Sta_tus Tracking"
-#: ../widgets/misc/e-send-options.ui.h:21
+#: ../widgets/misc/e-send-options.ui.h:24
msgid "Standard"
msgstr "Standard"
-#: ../widgets/misc/e-send-options.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:25
msgid "Status Tracking"
msgstr "Status Tracking"
-#: ../widgets/misc/e-send-options.ui.h:23
+#: ../widgets/misc/e-send-options.ui.h:26
msgid "Top Secret"
msgstr "Top Secret"
-#: ../widgets/misc/e-send-options.ui.h:25
+#: ../widgets/misc/e-send-options.ui.h:28
msgid "When acce_pted:"
msgstr "When acce_pted:"
-#: ../widgets/misc/e-send-options.ui.h:26
+#: ../widgets/misc/e-send-options.ui.h:29
msgid "When co_mpleted:"
msgstr "When co_mpleted:"
-#: ../widgets/misc/e-send-options.ui.h:27
+#: ../widgets/misc/e-send-options.ui.h:30
msgid "When decli_ned:"
msgstr "When decli_ned:"
-#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "Wi_thin"
-msgstr "Wi_thin"
-
-#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
#: ../widgets/misc/e-send-options.ui.h:31
-msgid "_After"
-msgstr "_After"
-
-#: ../widgets/misc/e-send-options.ui.h:32
msgid "_All information"
msgstr "_All information"
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:32
msgid "_Classification:"
msgstr "_Classification:"
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:33
msgid "_Delay message delivery"
msgstr "_Delay message delivery"
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:34
msgid "_Delivered"
msgstr "_Delivered"
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:36
msgid "_Set expiration date"
msgstr "_Set expiration date"
-#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
-#: ../widgets/misc/e-send-options.ui.h:39
-msgid "_Until"
-msgstr "_Until"
-
-#: ../widgets/misc/e-send-options.ui.h:40
+#: ../widgets/misc/e-send-options.ui.h:37
msgid "_When convenient"
msgstr "_When convenient"
-#: ../widgets/misc/e-send-options.ui.h:41
+#: ../widgets/misc/e-send-options.ui.h:38
msgid "_When opened:"
msgstr "_When opened:"
-#: ../widgets/misc/e-signature-editor.c:133
-#: ../widgets/misc/e-signature-editor.c:549
-#: ../widgets/misc/e-signature-manager.c:349
-#: ../widgets/misc/e-signature-script-dialog.c:218
+#. Translators: Used in send options dialog
+#: ../widgets/misc/e-send-options.ui.h:40
+msgctxt "send-options"
+msgid "None"
+msgstr "None"
+
+#: ../widgets/misc/e-signature-editor.c:136
+#: ../widgets/misc/e-signature-editor.c:524
+#: ../widgets/misc/e-signature-manager.c:353
+#: ../widgets/misc/e-signature-script-dialog.c:220
msgid "Unnamed"
msgstr "Unnamed"
-#: ../widgets/misc/e-signature-editor.c:210
+#: ../widgets/misc/e-signature-editor.c:213
msgid "_Save and Close"
msgstr "_Save and Close"
-#: ../widgets/misc/e-signature-editor.c:389
+#: ../widgets/misc/e-signature-editor.c:391
msgid "Edit Signature"
msgstr "Edit Signature"
-#: ../widgets/misc/e-signature-editor.c:404
+#: ../widgets/misc/e-signature-editor.c:406
msgid "_Signature Name:"
msgstr "_Signature Name:"
-#: ../widgets/misc/e-signature-manager.c:294
+#: ../widgets/misc/e-signature-manager.c:298
msgid "Add Signature Script"
msgstr "Add Signature Script"
-#: ../widgets/misc/e-signature-manager.c:359
+#: ../widgets/misc/e-signature-manager.c:363
msgid "Edit Signature Script"
msgstr "Edit Signature Script"
-#: ../widgets/misc/e-signature-manager.c:576
+#: ../widgets/misc/e-signature-manager.c:579
msgid "Add _Script"
msgstr "Add _Script"
-#: ../widgets/misc/e-signature-script-dialog.c:266
+#: ../widgets/misc/e-signature-script-dialog.c:268
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -21008,53 +21445,53 @@ msgstr ""
"signature. The name you specify will be used\n"
"for display purposes only."
-#: ../widgets/misc/e-signature-script-dialog.c:311
+#: ../widgets/misc/e-signature-script-dialog.c:313
msgid "S_cript:"
msgstr "S_cript:"
-#: ../widgets/misc/e-signature-script-dialog.c:342
+#: ../widgets/misc/e-signature-script-dialog.c:344
msgid "Script file must be executable."
msgstr "Script file must be executable."
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-url-entry.c:78
msgid "Click here to go to URL"
msgstr "Click here to go to URL"
-#: ../widgets/misc/e-web-view.c:359
+#: ../widgets/misc/e-web-view.c:374
msgid "_Copy Link Location"
msgstr "_Copy Link Location"
-#: ../widgets/misc/e-web-view.c:361
+#: ../widgets/misc/e-web-view.c:376
msgid "Copy the link to the clipboard"
msgstr "Copy the link to the clipboard"
-#: ../widgets/misc/e-web-view.c:369
+#: ../widgets/misc/e-web-view.c:384
msgid "_Open Link in Browser"
msgstr "_Open Link in Browser"
-#: ../widgets/misc/e-web-view.c:371
+#: ../widgets/misc/e-web-view.c:386
msgid "Open the link in a web browser"
msgstr "Open the link in a web browser"
-#: ../widgets/misc/e-web-view.c:379
+#: ../widgets/misc/e-web-view.c:394
msgid "_Copy Email Address"
msgstr "_Copy E-mail Address"
-#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1063
+#: ../widgets/misc/e-web-view.c:423 ../widgets/misc/e-web-view.c:1078
msgid "Select all text and images"
msgstr "Select all text and images"
-#: ../widgets/misc/e-web-view.c:840 ../widgets/misc/e-web-view.c:842
-#: ../widgets/misc/e-web-view.c:844
+#: ../widgets/misc/e-web-view.c:855 ../widgets/misc/e-web-view.c:857
+#: ../widgets/misc/e-web-view.c:859
#, c-format
msgid "Click to call %s"
msgstr "Click to call %s"
-#: ../widgets/misc/e-web-view.c:846
+#: ../widgets/misc/e-web-view.c:861
msgid "Click to hide/unhide addresses"
msgstr "Click to hide/unhide addresses"
-#: ../widgets/misc/e-web-view.c:848
+#: ../widgets/misc/e-web-view.c:863
#, c-format
msgid "Click to open %s"
msgstr "Click to open %s"
@@ -21073,7 +21510,7 @@ msgstr "Calendar: from %s to %s"
msgid "evolution calendar item"
msgstr "evolution calendar item"
-#: ../widgets/table/e-cell-combo.c:178
+#: ../widgets/table/e-cell-combo.c:174
msgid "popup list"
msgstr "popup list"
@@ -21136,7 +21573,7 @@ msgid "A_vailable Fields:"
msgstr "A_vailable Fields:"
#: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1697
+#: ../widgets/table/e-table-header-item.c:1702
msgid "Ascending"
msgstr "Ascending"
@@ -21149,7 +21586,7 @@ msgid "Clear _All"
msgstr "Clear _All"
#: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1697
+#: ../widgets/table/e-table-header-item.c:1702
msgid "Descending"
msgstr "Descending"
@@ -21248,60 +21685,60 @@ msgid_plural "%s (%d items)"
msgstr[0] "%s (%d item)"
msgstr[1] "%s (%d items)"
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1546
msgid "Customize Current View"
msgstr "Customise Current View"
-#: ../widgets/table/e-table-header-item.c:1562
+#: ../widgets/table/e-table-header-item.c:1567
msgid "Sort _Ascending"
msgstr "Sort _Ascending"
-#: ../widgets/table/e-table-header-item.c:1565
+#: ../widgets/table/e-table-header-item.c:1570
msgid "Sort _Descending"
msgstr "Sort _Descending"
-#: ../widgets/table/e-table-header-item.c:1568
+#: ../widgets/table/e-table-header-item.c:1573
msgid "_Unsort"
msgstr "_Unsort"
-#: ../widgets/table/e-table-header-item.c:1571
+#: ../widgets/table/e-table-header-item.c:1576
msgid "Group By This _Field"
msgstr "Group By This _Field"
-#: ../widgets/table/e-table-header-item.c:1574
+#: ../widgets/table/e-table-header-item.c:1579
msgid "Group By _Box"
msgstr "Group By _Box"
-#: ../widgets/table/e-table-header-item.c:1578
+#: ../widgets/table/e-table-header-item.c:1583
msgid "Remove This _Column"
msgstr "Remove This _Column"
-#: ../widgets/table/e-table-header-item.c:1581
+#: ../widgets/table/e-table-header-item.c:1586
msgid "Add a C_olumn..."
msgstr "Add a C_olumnâ?¦"
-#: ../widgets/table/e-table-header-item.c:1585
+#: ../widgets/table/e-table-header-item.c:1590
msgid "A_lignment"
msgstr "A_lignment"
-#: ../widgets/table/e-table-header-item.c:1588
+#: ../widgets/table/e-table-header-item.c:1593
msgid "B_est Fit"
msgstr "B_est Fit"
-#: ../widgets/table/e-table-header-item.c:1591
+#: ../widgets/table/e-table-header-item.c:1596
msgid "Format Column_s..."
msgstr "Format Column_sâ?¦"
-#: ../widgets/table/e-table-header-item.c:1595
+#: ../widgets/table/e-table-header-item.c:1600
msgid "Custo_mize Current View..."
msgstr "Custo_mise Current Viewâ?¦"
-#: ../widgets/table/e-table-header-item.c:1654
+#: ../widgets/table/e-table-header-item.c:1659
msgid "_Sort By"
msgstr "_Sort By"
#. Custom
-#: ../widgets/table/e-table-header-item.c:1672
+#: ../widgets/table/e-table-header-item.c:1677
msgid "_Custom"
msgstr "_Custom"
@@ -21342,14 +21779,255 @@ msgstr "click"
msgid "sort"
msgstr "sort"
-#: ../widgets/text/e-text.c:2474
+#: ../widgets/text/e-text.c:2533
msgid "Select All"
msgstr "Select All"
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2545
msgid "Input Methods"
msgstr "Input Methods"
+#~ msgid "Default Sync Address:"
+#~ msgstr "Default Sync Address:"
+
+#~ msgid "Could not load address book"
+#~ msgstr "Could not load address book"
+
+#~ msgid "Could not read pilot's Address application block"
+#~ msgstr "Could not read pilot's Address application block"
+
+#~ msgid "Success"
+#~ msgstr "Success"
+
+#~ msgid "Backend busy"
+#~ msgstr "Backend busy"
+
+#~ msgid "Repository offline"
+#~ msgstr "Repository offline"
+
+#~ msgid "Address Book does not exist"
+#~ msgstr "Address Book does not exist"
+
+#~ msgid "No Self Contact defined"
+#~ msgstr "No Self Contact defined"
+
+#~ msgid "Permission denied"
+#~ msgstr "Permission denied"
+
+#~ msgid "Contact not found"
+#~ msgstr "Contact not found"
+
+#~ msgid "Contact ID already exists"
+#~ msgstr "Contact ID already exists"
+
+#~ msgid "Protocol not supported"
+#~ msgstr "Protocol not supported"
+
+#~ msgid "Could not cancel"
+#~ msgstr "Could not cancel"
+
+#~ msgid "Authentication Failed"
+#~ msgstr "Authentication Failed"
+
+#~ msgid "Authentication Required"
+#~ msgstr "Authentication Required"
+
+#~ msgid "TLS not Available"
+#~ msgstr "TLS not Available"
+
+#~ msgid "No such source"
+#~ msgstr "No such source"
+
+#~ msgid "Not available in offline mode"
+#~ msgstr "Not available in offline mode"
+
+#~ msgid "Other error"
+#~ msgstr "Other error"
+
+#~ msgid "Invalid server version"
+#~ msgstr "Invalid server version"
+
+#~ msgid "Unsupported authentication method"
+#~ msgstr "Unsupported authentication method"
+
+#~ msgid "Split Multi-Day Events:"
+#~ msgstr "Split Multi-Day Events:"
+
+#~ msgid "Could not start evolution-data-server"
+#~ msgstr "Could not start evolution-data-server"
+
+#~ msgid "Could not read pilot's Calendar application block"
+#~ msgstr "Could not read pilot's Calendar application block"
+
+#~ msgid "Could not read pilot's Memo application block"
+#~ msgstr "Could not read pilot's Memo application block"
+
+#~ msgid "Could not write pilot's Memo application block"
+#~ msgstr "Could not write pilot's Memo application block"
+
+#~ msgid "Default Priority:"
+#~ msgstr "Default Priority:"
+
+#~ msgid "Could not read pilot's ToDo application block"
+#~ msgstr "Could not read pilot's ToDo application block"
+
+#~ msgid "Could not write pilot's ToDo application block"
+#~ msgstr "Could not write pilot's ToDo application block"
+
+#~ msgid "Check this to use system timezone in Evolution."
+#~ msgstr "Check this to use system timezone in Evolution."
+
+#~ msgid "Show week numbers in date navigator"
+#~ msgstr "Show week numbers in date navigator"
+
+#~ msgid "Whether to show week number in the Day and Work Week View."
+#~ msgstr "Whether to show week number in the Day and Work Week View."
+
+#~ msgid "Show week n_umber in Day and Work Week View"
+#~ msgstr "Show week n_umber in Day and Work Week View"
+
+#~ msgid "Save"
+#~ msgstr "Save"
+
+#~ msgid "The event could not be deleted due to a corba error"
+#~ msgstr "The event could not be deleted due to a corba error"
+
+#~ msgid "The task could not be deleted due to a corba error"
+#~ msgstr "The task could not be deleted due to a corba error"
+
+#~ msgid "The memo could not be deleted due to a corba error"
+#~ msgstr "The memo could not be deleted due to a corba error"
+
+#~ msgid "The item could not be deleted due to a corba error"
+#~ msgstr "The item could not be deleted due to a corba error"
+
+#~ msgid "Appoint_ment"
+#~ msgstr "Appoint_ment"
+
+#~ msgid "_Task"
+#~ msgstr "_Task"
+
+#~ msgid "_From Field"
+#~ msgstr "_From Field"
+
+#~ msgid "Toggles whether the From chooser is displayed"
+#~ msgstr "Toggles whether the From chooser is displayed"
+
+#~ msgid "Show"
+#~ msgstr "Show"
+
+#~ msgid "Hide"
+#~ msgstr "Hide"
+
+#~ msgid "address card"
+#~ msgstr "address card"
+
+#~ msgid "calendar information"
+#~ msgstr "calendar information"
+
+#~ msgid "Could not parse PGP message: Unknown error"
+#~ msgstr "Could not parse PGP message: Unknown error"
+
+#~ msgid "Show \"From\" field when sending a mail message"
+#~ msgstr "Show \"From\" field when sending a mail message"
+
+#~ msgid ""
+#~ "Show the \"From\" field when sending a mail message. This is controlled "
+#~ "from the View menu when a mail account is chosen."
+#~ msgstr ""
+#~ "Show the \"From\" field when sending a mail message. This is controlled "
+#~ "from the View menu when a mail account is chosen."
+
+#~ msgid "<b>Top Posting Option</b> (Not Recommended)"
+#~ msgstr "<b>Top Posting Option</b> (Not Recommended)"
+
+#~ msgid "Do not d_elete"
+#~ msgstr "Do not d_elete"
+
+#~ msgid ""
+#~ "Evolution backup can start only when Evolution is not running. Please "
+#~ "make sure that you save and close all your unsaved windows before "
+#~ "proceeding. If you want Evolution to restart automatically after backup, "
+#~ "please enable the toggle button."
+#~ msgstr ""
+#~ "Evolution backup can start only when Evolution is not running. Please "
+#~ "make sure that you save and close all your unsaved windows before "
+#~ "proceeding. If you want Evolution to restart automatically after backup, "
+#~ "please enable the toggle button."
+
+#~ msgid ""
+#~ "This will delete all your current Evolution data and settings and restore "
+#~ "them from your backup. Evolution restore can start only when Evolution is "
+#~ "not running. Please make sure that you close all your unsaved windows "
+#~ "before you proceed. If you want Evolution to restart automatically "
+#~ "restart after restore, please enable the toggle button."
+#~ msgstr ""
+#~ "This will delete all your current Evolution data and settings and restore "
+#~ "them from your backup. Evolution restore can start only when Evolution is "
+#~ "not running. Please make sure that you close all your unsaved windows "
+#~ "before you proceed. If you want Evolution to restart automatically "
+#~ "restart after restore, please enable the toggle button."
+
+#~ msgid "Check whether Evolution is the default mail client on startup."
+#~ msgstr "Check whether Evolution is the default mail client on startup."
+
+#~ msgid "Default Mail Client"
+#~ msgstr "Default Mail Client"
+
+#~ msgid "<b>Server</b>"
+#~ msgstr "<b>Server</b>"
+
+#~ msgid "<b>Users:</b>"
+#~ msgstr "<b>Users:</b>"
+
+#~ msgid "<b>Account Name</b>"
+#~ msgstr "<b>Account Name</b>"
+
+#~ msgid "_Accept"
+#~ msgstr "_Accept"
+
+#~ msgid "Guides you through your initial account setup."
+#~ msgstr "Guides you through your initial account setup."
+
+#~ msgid "Setup Assistant"
+#~ msgstr "Setup Assistant"
+
+#~ msgid "Importing data."
+#~ msgstr "Importing data."
+
+#~ msgid "Please wait"
+#~ msgstr "Please wait"
+
+#~ msgid "GNOME Pilot is not installed."
+#~ msgstr "GNOME Pilot is not installed."
+
+#~ msgid "GNOME Pilot could not be run."
+#~ msgstr "GNOME Pilot could not be run."
+
+#~ msgid "GNOME Pilot _Synchronization..."
+#~ msgstr "GNOME Pilot _Synchronisationâ?¦"
+
+#~ msgid "Set up GNOME Pilot configuration"
+#~ msgstr "Set up GNOME Pilot configuration"
+
+#~ msgid "Edit"
+#~ msgstr "Edit"
+
+#~ msgid "Import"
+#~ msgstr "Import"
+
+#~ msgid "View"
+#~ msgstr "View"
+
+#~ msgid "Sync with:"
+#~ msgstr "Sync with:"
+
+#~ msgid "Sync Private Records:"
+#~ msgstr "Sync Private Records:"
+
+#~ msgid "Sync Categories:"
+#~ msgstr "Sync Categories:"
+
#~ msgid "{0}"
#~ msgstr "{0}"
@@ -22250,9 +22928,6 @@ msgstr "Input Methods"
#~ msgid "expand"
#~ msgstr "expand"
-#~ msgid "collapse"
-#~ msgstr "collapse"
-
#~ msgid "Event Processor"
#~ msgstr "Event Processor"
@@ -22710,13 +23385,6 @@ msgstr "Input Methods"
#~ msgid "Save Message..."
#~ msgstr "Save Messageâ?¦"
-#~ msgid ""
-#~ "It disables/enables the repeated prompts to ask if offline sync is "
-#~ "required before going into offline mode."
-#~ msgstr ""
-#~ "It disables/enables the repeated prompts to ask if offline "
-#~ "synchronisation is required before going into offline mode."
-
#~ msgid "Prompt to check if the user wants to go offline immediately"
#~ msgstr "Prompt to check if the user wants to go offline immediately"
@@ -23533,9 +24201,6 @@ msgstr "Input Methods"
#~ msgid "Please restart Evolution for changes to take effect"
#~ msgstr "Please restart Evolution for changes to take effect"
-#~ msgid "Please select a user."
-#~ msgstr "Please select a user."
-
#~ msgid "Server rejected password because it is too weak."
#~ msgstr "Server rejected password because it is too weak."
@@ -24373,9 +25038,6 @@ msgstr "Input Methods"
#~ msgid "Click OK to close these connections and go offline"
#~ msgstr "Click OK to close these connections and go offline"
-#~ msgid "_Import"
-#~ msgstr "_Import"
-
#~ msgid "The GNOME Pilot tools do not appear to be installed on this system."
#~ msgstr "The GNOME Pilot tools do not appear to be installed on this system."
@@ -24403,9 +25065,6 @@ msgstr "Input Methods"
#~ msgid "New Test"
#~ msgstr "New Test"
-#~ msgid "Cannot start Evolution"
-#~ msgstr "Cannot start Evolution"
-
#~ msgid "Evolution can not start."
#~ msgstr "Evolution can not start."
@@ -25451,9 +26110,6 @@ msgstr "Input Methods"
#~ msgid "Orientation"
#~ msgstr "Orientation"
-#~ msgid "Page"
-#~ msgstr "Page"
-
#~ msgid "Page Setup:"
#~ msgstr "Page Setup:"
@@ -26132,9 +26788,6 @@ msgstr "Input Methods"
#~ "run. As a precautionary measure, all preview panes will be hidden.\n"
#~ "You can restore the preview panes from the View menu.\n"
-#~ msgid "_Do not show this message again"
-#~ msgstr "_Do not show this message again"
-
#~ msgid "All Day Event"
#~ msgstr "All Day Event"
@@ -26401,9 +27054,6 @@ msgstr "Input Methods"
#~ msgid "Calendar Group"
#~ msgstr "Calendar Group"
-#~ msgid "Calendar Name"
-#~ msgstr "Calendar Name"
-
#~ msgid "<b>Task List Options</b>"
#~ msgstr "<b>Task List Options</b>"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
