[evolution] Update British English translation
- From: Translations User D-L <translations src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Update British English translation
- Date: Sun, 25 Feb 2018 11:30:47 +0000 (UTC)
commit af2b4bc78456edca33c859fcff7b11fc80959d27
Author: Bruce Cowan <bruce bcowan eu>
Date: Sun Feb 25 11:30:35 2018 +0000
Update British English translation
po/en_GB.po | 5587 +++++++++++++++++++++++++++--------------------------------
1 files changed, 2566 insertions(+), 3021 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 851b362..edbb4ae 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,16 +4,16 @@
# Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004.
# Philip Withnall <philip tecnocode co uk>, 2010.
# Chris Leonard <cjlhomeaddress gmail com>, 2012.
-# Bruce Cowan <bruce bcowan eu>, 2009, 2010, 2011, 2012, 2013, 2016, 2017.
+# Bruce Cowan <bruce bcowan eu>, 2009, 2010, 2011, 2012, 2013, 2016, 2017, 2018.
#
-#: ../src/shell/main.c:519
+#: ../src/shell/main.c:526
msgid ""
msgstr ""
"Project-Id-Version: evolution\n"
"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
"product=evolution&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-08-04 08:14+0000\n"
-"PO-Revision-Date: 2017-09-08 11:55+0100\n"
+"POT-Creation-Date: 2018-01-31 11:35+0000\n"
+"PO-Revision-Date: 2018-02-25 11:28+0000\n"
"Last-Translator: Bruce Cowan <bruce bcowan eu>\n"
"Language-Team: British English <en li org>\n"
"Language: en_GB\n"
@@ -24,119 +24,6 @@ msgstr ""
"X-Generator: Gtranslator 2.91.7\n"
"X-Project-Style: gnome\n"
-#: ../evolution.appdata.xml.in.h:1 ../data/evolution.desktop.in.in.h:1
-#: ../src/mail/e-mail-browser.c:1098
-#: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
-#: ../src/shell/e-shell-window-private.c:240
-msgid "Evolution"
-msgstr "Evolution"
-
-#: ../evolution.appdata.xml.in.h:2 ../data/evolution.desktop.in.in.h:4
-msgid "Manage your email, contacts and schedule"
-msgstr "Manage your e-mail, contacts and schedule"
-
-#: ../evolution.appdata.xml.in.h:3
-msgid ""
-"Evolution is a personal information management application that provides "
-"integrated mail, calendaring and address book functionality."
-msgstr ""
-"Evolution is a personal information management application that provides "
-"integrated mail, calendaring and address book functionality."
-
-#: ../evolution.appdata.xml.in.h:4
-#| msgid ""
-#| "Evolution supports a wide range of industry standard data formats and "
-#| "network protocols for information exchange, with an emphasis on standards "
-#| "compliance and security. Evolution can also integrate smoothly with "
-#| "Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) "
-#| "extension."
-msgid ""
-"Evolution supports a wide range of industry standard data formats and "
-"network protocols for information exchange, with an emphasis on standards "
-"compliance and security. Evolution can also integrate smoothly with "
-"Microsoft Exchange by way of the “Exchange Web Services†(EWS) extension."
-msgstr ""
-"Evolution supports a wide range of industry standard data formats and "
-"network protocols for information exchange, with an emphasis on standards "
-"compliance and security. Evolution can also integrate smoothly with "
-"Microsoft Exchange by way of the “Exchange Web Services†(EWS) extension."
-
-#: ../data/evolution-alarm-notify.desktop.in.in.h:1
-msgid "Evolution Alarm Notify"
-msgstr "Evolution Alarm Notify"
-
-#: ../data/evolution-alarm-notify.desktop.in.in.h:2
-msgid "Calendar event notifications"
-msgstr "Calendar event notifications"
-
-#: ../data/evolution.desktop.in.in.h:2 ../src/shell/e-shell-utils.c:428
-msgid "Groupware Suite"
-msgstr "Groupware Suite"
-
-#: ../data/evolution.desktop.in.in.h:3
-msgid "Evolution Mail and Calendar"
-msgstr "Evolution Mail and Calendar"
-
-#: ../data/evolution.desktop.in.in.h:5
-msgid "email;calendar;contact;addressbook;task;"
-msgstr "email;calendar;contact;addressbook;task;"
-
-#: ../data/evolution.desktop.in.in.h:6
-msgid "New Window"
-msgstr "New Window"
-
-#: ../data/evolution.desktop.in.in.h:7
-#| msgid "Compose Message"
-msgid "Compose a Message"
-msgstr "Compose a Message"
-
-#: ../data/evolution.desktop.in.in.h:8
-#: ../src/e-util/e-name-selector-dialog.c:448
-#: ../src/modules/addressbook/e-book-shell-backend.c:307
-#: ../src/modules/addressbook/e-book-shell-view.c:371
-msgid "Contacts"
-msgstr "Contacts"
-
-#: ../data/evolution.desktop.in.in.h:9
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:845
-#: ../src/e-util/e-send-options.c:544 ../src/e-util/e-webdav-browser.c:469
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:197
-#: ../src/modules/calendar/e-cal-shell-view.c:582
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:21
-msgid "Calendar"
-msgstr "Calendar"
-
-#: ../data/evolution.desktop.in.in.h:10 ../src/e-util/e-send-options.c:536
-#: ../src/mail/importers/elm-importer.c:330
-#: ../src/mail/importers/kmail-importer.c:251
-#: ../src/mail/importers/pine-importer.c:423
-#: ../src/modules/mail/e-mail-shell-view.c:1247
-#: ../src/smime/gui/certificate-manager.c:1682
-msgid "Mail"
-msgstr "Mail"
-
-#: ../data/evolution.desktop.in.in.h:11 ../src/calendar/gui/e-memo-table.c:368
-#: ../src/e-util/e-webdav-browser.c:459
-#: ../src/modules/calendar/e-cal-shell-content.c:1719
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:194
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:209
-#: ../src/modules/calendar/e-memo-shell-view.c:313
-msgid "Memos"
-msgstr "Memos"
-
-#: ../data/evolution.desktop.in.in.h:12 ../src/calendar/gui/e-task-table.c:696
-#: ../src/calendar/gui/print.c:2408
-#: ../src/calendar/importers/icalendar-importer.c:77
-#: ../src/calendar/importers/icalendar-importer.c:1114
-#: ../src/e-util/e-webdav-browser.c:460
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
-#: ../src/modules/calendar/e-cal-shell-content.c:1679
-#: ../src/modules/calendar/e-task-shell-view-actions.c:218
-#: ../src/modules/calendar/e-task-shell-view-actions.c:233
-#: ../src/modules/calendar/e-task-shell-view.c:471
-msgid "Tasks"
-msgstr "Tasks"
-
#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
msgid "Enable address formatting"
msgstr "Enable address formatting"
@@ -186,11 +73,6 @@ msgid "Contact layout style"
msgstr "Contact layout style"
#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
-#| msgid ""
-#| "The layout style determines where to place the preview pane in relation "
-#| "to the contact list. \"0\" (Classic View) places the preview pane below "
-#| "the contact list. \"1\" (Vertical View) places the preview pane next to "
-#| "the contact list."
msgid ""
"The layout style determines where to place the preview pane in relation to "
"the contact list. “0†(Classic View) places the preview pane below the "
@@ -231,9 +113,6 @@ msgid "Primary address book"
msgstr "Primary address book"
#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:18
-#| msgid ""
-#| "The UID of the selected (or \"primary\") address book in the sidebar of "
-#| "the \"Contacts\" view"
msgid ""
"The UID of the selected (or “primaryâ€) address book in the sidebar of the "
"“Contacts†view"
@@ -298,7 +177,6 @@ msgid "Whether to show Certificates tab in the editor"
msgstr "Whether to show Certificates tab in the editor"
#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:33
-#| msgid "Create a new contact list"
msgid "Where to open contact locations"
msgstr "Where to open contact locations"
@@ -357,9 +235,6 @@ msgid "Birthday and anniversary reminder units"
msgstr "Birthday and anniversary reminder units"
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:6
-#| msgid ""
-#| "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-#| "\"days\""
msgid ""
"Units for a birthday or anniversary reminder, “minutesâ€, “hours†or “daysâ€"
msgstr ""
@@ -522,9 +397,6 @@ msgid "The second timezone for a Day View"
msgstr "The second timezone for a Day View"
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
-#| msgid ""
-#| "Shows the second time zone in a Day View, if set. Value is similar to one "
-#| "used in a 'timezone' key"
msgid ""
"Shows the second time zone in a Day View, if set. Value is similar to one "
"used in a “timezone†key"
@@ -545,9 +417,6 @@ msgid "Maximum number of recently used timezones to remember"
msgstr "Maximum number of recently used timezones to remember"
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
-#| msgid ""
-#| "Maximum number of recently used timezones to remember in a 'day-second-"
-#| "zones' list"
msgid ""
"Maximum number of recently used timezones to remember in a “day-second-"
"zones†list"
@@ -568,7 +437,6 @@ msgid "Default reminder units"
msgstr "Default reminder units"
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
-#| msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
msgid "Units for a default reminder, “minutesâ€, “hours†or “daysâ€"
msgstr "Units for a default reminder, “minutesâ€, “hours†or “daysâ€"
@@ -645,9 +513,6 @@ msgid "Hide task units"
msgstr "Hide task units"
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
-#| msgid ""
-#| "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days"
-#| "\""
msgid "Units for determining when to hide tasks, “minutesâ€, “hours†or “daysâ€"
msgstr "Units for determining when to hide tasks, “minutesâ€, “hours†or “daysâ€"
@@ -680,8 +545,6 @@ msgid "Time the last reminder ran, in time_t"
msgstr "Time the last reminder ran, in time_t"
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
-#| msgctxt "iCalImp"
-#| msgid "has reminders"
msgid "Allow past reminders"
msgstr "Allow past reminders"
@@ -692,7 +555,6 @@ msgstr ""
"Whether can show reminders for events/tasks/memos which already happened"
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
-#| msgid "Marcus Bains Line Color - Day View"
msgid "Marcus Bains Line Color — Day View"
msgstr "Marcus Bains Line Colour — Day View"
@@ -701,7 +563,6 @@ msgid "Color to draw the Marcus Bains line in the Day View"
msgstr "Colour to draw the Marcus Bains line in the Day View"
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
-#| msgid "Marcus Bains Line Color - Time bar"
msgid "Marcus Bains Line Color — Time bar"
msgstr "Marcus Bains Line Colour — Time bar"
@@ -733,11 +594,6 @@ msgid "Memo layout style"
msgstr "Memo layout style"
#: ../data/org.gnome.evolution.calendar.gschema.xml.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 list. \"1\" (Vertical View) places the preview pane next to the memo "
-#| "list"
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 "
@@ -792,7 +648,6 @@ msgid "Whether or not to use the notification tray for display reminders"
msgstr "Whether or not to use the notification tray for display reminders"
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
-#| msgid "Sh_ow reminder notifications"
msgid "Show reminder notification dialog always on top"
msgstr "Show reminder notification dialogue always on top"
@@ -818,9 +673,6 @@ msgid "Primary calendar"
msgstr "Primary calendar"
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
-#| msgid ""
-#| "The UID of the selected (or \"primary\") calendar in the sidebar of the "
-#| "\"Calendar\" view"
msgid ""
"The UID of the selected (or “primaryâ€) calendar in the sidebar of the "
"“Calendar†view"
@@ -833,9 +685,6 @@ msgid "Primary memo list"
msgstr "Primary memo list"
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
-#| msgid ""
-#| "The UID of the selected (or \"primary\") memo list in the sidebar of the "
-#| "\"Memos\" view"
msgid ""
"The UID of the selected (or “primaryâ€) memo list in the sidebar of the "
"“Memos†view"
@@ -848,9 +697,6 @@ msgid "Primary task list"
msgstr "Primary task list"
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
-#| msgid ""
-#| "The UID of the selected (or \"primary\") task list in the sidebar of the "
-#| "\"Tasks\" view"
msgid ""
"The UID of the selected (or “primaryâ€) task list in the sidebar of the "
"“Tasks†view"
@@ -914,7 +760,6 @@ msgid "Show the memo preview pane"
msgstr "Show the memo preview pane"
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
-#| msgid "If \"true\", show the memo preview pane in the main window"
msgid "If “trueâ€, show the memo preview pane in the main window"
msgstr "If “trueâ€, show the memo preview pane in the main window"
@@ -923,7 +768,6 @@ msgid "Show the task preview pane"
msgstr "Show the task preview pane"
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
-#| msgid "If \"true\", show the task preview pane in the main window"
msgid "If “trueâ€, show the task preview pane in the main window"
msgstr "If “trueâ€, show the task preview pane in the main window"
@@ -955,9 +799,6 @@ msgid "Tasks due today color"
msgstr "Tasks due today colour"
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
-#| msgid ""
-#| "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
-#| "together with task-due-today-highlight"
msgid ""
"Background color of tasks that are due today, in “#rrggbb†format. Used "
"together with task-due-today-highlight"
@@ -974,11 +815,6 @@ msgid "Task layout style"
msgstr "Task layout style"
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
-#| 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 list. \"1\" (Vertical View) places the preview pane next to the task "
-#| "list"
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 "
@@ -1023,9 +859,6 @@ msgid "Overdue tasks color"
msgstr "Overdue tasks colour"
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
-#| msgid ""
-#| "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
-#| "together with task-overdue-highlight."
msgid ""
"Background color of tasks that are overdue, in “#rrggbb†format. Used "
"together with task-overdue-highlight."
@@ -1046,9 +879,6 @@ msgid "Timezone"
msgstr "Timezone"
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
-#| msgid ""
-#| "The default timezone to use for dates and times in the calendar, as an "
-#| "untranslated Olson timezone database location like \"America/New York\""
msgid ""
"The default timezone to use for dates and times in the calendar, as an "
"untranslated Olson timezone database location like “America/New Yorkâ€"
@@ -1126,13 +956,22 @@ msgid "Create events, memos and tasks as Private by default"
msgstr "Create events, memos and tasks as Private by default"
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:160
+msgid "Draw events as flat, not shaded."
+msgstr "Draw events as flat, not shaded."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:161
+msgid ""
+"Whether to order days in the Week View from left to right, rather than from "
+"top to bottom."
+msgstr ""
+"Whether to order days in the Week View from left to right, rather than from "
+"top to bottom."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:162
msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
msgstr "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:161
-#| msgid ""
-#| "This key was deprecated in version 3.10 and should no longer be used. Use "
-#| "\"week-start-day-name\" instead."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:163
msgid ""
"This key was deprecated in version 3.10 and should no longer be used. Use "
"“week-start-day-name†instead."
@@ -1140,15 +979,11 @@ msgstr ""
"This key was deprecated in version 3.10 and should no longer be used. Use "
"“week-start-day-name†instead."
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:164
msgid "(Deprecated) Work days"
msgstr "(Deprecated) Work days"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:163
-#| msgid ""
-#| "Days on which the start and end of work hours should be indicated. (This "
-#| "key was deprecated in version 3.10 and should no longer be used. Use the "
-#| "\"work-day-monday\", \"work-day-tuesday\", etc. keys instead.)"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:165
msgid ""
"Days on which the start and end of work hours should be indicated. (This key "
"was deprecated in version 3.10 and should no longer be used. Use the “work-"
@@ -1163,10 +998,6 @@ msgid "Previous Evolution version"
msgstr "Previous Evolution version"
#: ../data/org.gnome.evolution.gschema.xml.in.h:2
-#| msgid ""
-#| "The most recently used version of Evolution, expressed as \"major.minor."
-#| "micro\". This is used for data and settings migration from older to newer "
-#| "versions."
msgid ""
"The most recently used version of Evolution, expressed as “major.minor."
"microâ€. This is used for data and settings migration from older to newer "
@@ -1185,22 +1016,18 @@ msgid "The list of disabled plugins in Evolution"
msgstr "The list of disabled plugins in Evolution"
#: ../data/org.gnome.evolution.gschema.xml.in.h:5
-#| msgid "The window's X coordinate"
msgid "The window’s X coordinate"
msgstr "The window’s X coordinate"
#: ../data/org.gnome.evolution.gschema.xml.in.h:6
-#| msgid "The window's Y coordinate"
msgid "The window’s Y coordinate"
msgstr "The window’s Y coordinate"
#: ../data/org.gnome.evolution.gschema.xml.in.h:7
-#| msgid "The window's width in pixels"
msgid "The window’s width in pixels"
msgstr "The window’s width in pixels"
#: ../data/org.gnome.evolution.gschema.xml.in.h:8
-#| msgid "The window's height in pixels"
msgid "The window’s height in pixels"
msgstr "The window’s height in pixels"
@@ -1209,22 +1036,18 @@ msgid "Whether the window is maximized"
msgstr "Whether the window is maximised"
#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:1
-#| msgid "Gnome Calendar's calendar import done"
msgid "GNOME Calendar’s calendar import done"
msgstr "GNOME Calendar’s calendar import done"
#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:2
-#| msgid "Whether calendar from Gnome Calendar has been imported or not"
msgid "Whether calendar from GNOME Calendar has been imported or not"
msgstr "Whether calendar from GNOME Calendar has been imported or not"
#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:3
-#| msgid "Gnome Calendar's tasks import done"
msgid "GNOME Calendar’s tasks import done"
msgstr "GNOME Calendar’s tasks import done"
#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:4
-#| msgid "Whether tasks from Gnome Calendar have been imported or not"
msgid "Whether tasks from GNOME Calendar have been imported or not"
msgstr "Whether tasks from GNOME Calendar have been imported or not"
@@ -1250,9 +1073,6 @@ msgid "Name of the editor to prefer in the message composer"
msgstr "Name of the editor to prefer in the message composer"
#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
-#| msgid ""
-#| "If the name doesn't correspond to any known editor, then the built-in "
-#| "WebKit editor is used."
msgid ""
"If the name doesn’t correspond to any known editor, then the built-in WebKit "
"editor is used."
@@ -1265,10 +1085,6 @@ msgid "Path where picture gallery should search for its content"
msgstr "Path where picture gallery should search for its content"
#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
-#| msgid ""
-#| "This value can be an empty string, which means it'll use the system "
-#| "Picture folder, usually set to ~/Pictures. This folder will be also used "
-#| "when the set path is not pointing to the existent folder"
msgid ""
"This value can be an empty string, which means it’ll use the system Picture "
"folder, usually set to ~/Pictures. This folder will be also used when the "
@@ -1355,11 +1171,6 @@ msgid "Group Reply replies to list"
msgstr "Group Reply replies to list"
#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
-#| 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."
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 "
@@ -1410,14 +1221,10 @@ msgid "List of dictionary language codes used for spell checking."
msgstr "List of dictionary language codes used for spell checking."
#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
-#| msgid "Show \"Bcc\" field when sending a mail message"
msgid "Show “Bcc†field when sending a mail message"
msgstr "Show “Bcc†field when sending a mail message"
#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
-#| msgid ""
-#| "Show the \"Bcc\" field when sending a mail message. This is controlled "
-#| "from the View menu when a mail account is chosen."
msgid ""
"Show the “Bcc†field when sending a mail message. This is controlled from "
"the View menu when a mail account is chosen."
@@ -1426,14 +1233,10 @@ msgstr ""
"the View menu when a mail account is chosen."
#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
-#| msgid "Show \"Cc\" field when sending a mail message"
msgid "Show “Cc†field when sending a mail message"
msgstr "Show “Cc†field when sending a mail message"
#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
-#| msgid ""
-#| "Show the \"Cc\" field when sending a mail message. This is controlled "
-#| "from the View menu when a mail account is chosen."
msgid ""
"Show the “Cc†field when sending a mail message. This is controlled from the "
"View menu when a mail account is chosen."
@@ -1442,14 +1245,10 @@ msgstr ""
"View menu when a mail account is chosen."
#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
-#| msgid "Show \"From\" override field when sending a mail message"
msgid "Show “From†override field when sending a mail message"
msgstr "Show “From†override field when sending a mail message"
#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
-#| msgid ""
-#| "Show the \"From\" override field when sending a mail message. This is "
-#| "controlled from the View menu when a mail account is chosen."
msgid ""
"Show the “From†override field when sending a mail message. This is "
"controlled from the View menu when a mail account is chosen."
@@ -1458,14 +1257,10 @@ msgstr ""
"controlled from the View menu when a mail account is chosen."
#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
-#| msgid "Show \"Reply To\" field when sending a mail message"
msgid "Show “Reply To†field when sending a mail message"
msgstr "Show “Reply To†field when sending a mail message"
#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
-#| msgid ""
-#| "Show the \"Reply To\" field when sending a mail message. This is "
-#| "controlled from the View menu when a mail account is chosen."
msgid ""
"Show the “Reply To†field when sending a mail message. This is controlled "
"from the View menu when a mail account is chosen."
@@ -1474,14 +1269,10 @@ msgstr ""
"from the View menu when a mail account is chosen."
#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
-#| msgid "Show \"From\" field when posting to a newsgroup"
msgid "Show “From†field when posting to a newsgroup"
msgstr "Show “From†field when posting to a newsgroup"
#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
-#| msgid ""
-#| "Show the \"From\" field when posting to a newsgroup. This is controlled "
-#| "from the View menu when a news account is chosen."
msgid ""
"Show the “From†field when posting to a newsgroup. This is controlled from "
"the View menu when a news account is chosen."
@@ -1490,14 +1281,10 @@ msgstr ""
"the View menu when a news account is chosen."
#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
-#| msgid "Show \"Reply To\" field when posting to a newsgroup"
msgid "Show “Reply To†field when posting to a newsgroup"
msgstr "Show “Reply To†field when posting to a newsgroup"
#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
-#| msgid ""
-#| "Show the \"Reply To\" field when posting to a newsgroup. This is "
-#| "controlled from the View menu when a news account is chosen."
msgid ""
"Show the “Reply To†field when posting to a newsgroup. This is controlled "
"from the View menu when a news account is chosen."
@@ -1584,18 +1371,22 @@ msgstr ""
"signature when composing a mail."
#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+msgid "Keep original message signature in replies"
+msgstr "Keep original message signature in replies"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+msgid ""
+"When set to TRUE, keep original message signature in replies, otherwise "
+"strip the signature and everything below it when replying to the message."
+msgstr ""
+"When set to TRUE, keep original message signature in replies, otherwise "
+"strip the signature and everything below it when replying to the message."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
msgid "Ignore list Reply-To:"
msgstr "Ignore list Reply-To:"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
-#| 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."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
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. "
@@ -1613,16 +1404,11 @@ msgstr ""
"it will do that. It works by comparing the Reply-To: header with a List-"
"Post: header, if there is one."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
-#| msgid "List of localized 'Re'"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
msgid "List of localized “Reâ€"
msgstr "List of localized “Reâ€"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
-#| msgid ""
-#| "Comma-separated list of localized 'Re' abbreviations to skip in a subject "
-#| "text when replying to a message, as an addition to the standard \"Re\" "
-#| "prefix. An example is 'SV,AV'."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
msgid ""
"Comma-separated list of localized “Re†abbreviations to skip in a subject "
"text when replying to a message, as an addition to the standard “Re†prefix. "
@@ -1632,16 +1418,11 @@ msgstr ""
"text when replying to a message, as an addition to the standard “Re†prefix. "
"An example is “SV,AVâ€."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
-#| msgid "List of localized 'Re'"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
msgid "List of localized “Re†separators"
msgstr "List of localised “Re†separators"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
-#| msgid ""
-#| "Comma-separated list of localized 'Re' abbreviations to skip in a subject "
-#| "text when replying to a message, as an addition to the standard \"Re\" "
-#| "prefix. An example is 'SV,AV'."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
msgid ""
"A list of localized “Re†separators, used to skip in a subject text when "
"replying to a message, as an addition to the standard “:†and the Unicode "
@@ -1651,37 +1432,45 @@ msgstr ""
"replying to a message, as an addition to the standard “:†and the Unicode "
"“︰†separators."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+msgid "Use localized “Fwdâ€/“Re†in message Subject"
+msgstr "Use localised “Fwdâ€/“Re†in message Subject"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+msgid ""
+"When set to true, uses localized “Fwdâ€/“Re†in message Subject on reply and "
+"forward as provided by current locale translation, otherwise uses "
+"unlocalized version."
+msgstr ""
+"When set to true, uses localised “Fwdâ€/“Re†in message Subject on reply and "
+"forward as provided by current locale translation, otherwise uses "
+"unlocalised version."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
msgid "Number of characters for wrapping"
msgstr "Number of characters for wrapping"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
msgid "Will autowrap lines after given number of characters."
msgstr "Will autowrap lines after given number of characters."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
-#| msgid ""
-#| "Number of To and CC recipients to ask 'prompt-on-many-to-cc-recips' from"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
msgid ""
"Number of To and CC recipients to ask “prompt-on-many-to-cc-recips†from"
msgstr ""
"Number of To and CC recipients to ask “prompt-on-many-to-cc-recips†from"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
msgid ""
"When to ask, when the number of To and CC recipients reaches this value."
msgstr ""
"When to ask, when the number of To and CC recipients reaches this value."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
msgstr "Whether to always show Sign and Encrypt buttons on the toolbar"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
-#| msgid ""
-#| "If set to 'true', the Sign and Encrypt buttons for either PGP or S/MIME "
-#| "are always shown in the composer's toolbar. Otherwise they are shown only "
-#| "when being used."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
msgid ""
"If set to “trueâ€, the Sign and Encrypt buttons for either PGP or S/MIME are "
"always shown in the composer’s toolbar. Otherwise they are shown only when "
@@ -1691,23 +1480,19 @@ msgstr ""
"always shown in the composer’s toolbar. Otherwise they are shown only when "
"being used."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
msgid "Wrap quoted text in replies"
msgstr "Wrap quoted text in replies"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
-#| msgid "If set to 'true' quoted text in replies will be wrapped."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
msgid "If set to “true†quoted text in replies will be wrapped."
msgstr "If set to “true†quoted text in replies will be wrapped."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
msgid "Whether to obey Content-Disposition:inline message header hint"
msgstr "Whether to obey Content-Disposition:inline message header hint"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
-#| msgid ""
-#| "Set to 'false' to block automatic display of attachments with Content-"
-#| "Disposition: inline."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
msgid ""
"Set to “false†to block automatic display of attachments with Content-"
"Disposition: inline."
@@ -1715,20 +1500,19 @@ msgstr ""
"Set to “false†to block automatic display of attachments with Content-"
"Disposition: inline."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
msgid "Save file format for drag-and-drop operation"
msgstr "Save file format for drag-and-drop operation"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
-#| msgid "Can be either 'mbox' or 'pdf'."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
msgid "Can be either “mbox†or “pdfâ€."
msgstr "Can be either “mbox†or “pdfâ€."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
msgid "Show image animations"
msgstr "Show image animations"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
msgid ""
"Enable animated images in HTML mail. Many users find animated images "
"annoying and prefer to see a static image instead."
@@ -1736,11 +1520,11 @@ msgstr ""
"Enable animated images in HTML mail. Many users find animated images "
"annoying and prefer to see a static image instead."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
msgid "Enable or disable type ahead search feature"
msgstr "Enable or disable type ahead search feature"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
msgid ""
"Enable the side bar search feature to allow interactive searching of folder "
"names."
@@ -1748,11 +1532,11 @@ msgstr ""
"Enable the side bar search feature to allow interactive searching of folder "
"names."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
msgid "Enable or disable magic space bar"
msgstr "Enable or disable magic space bar"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
msgid ""
"Enable this to use Space bar key to scroll in message preview, message list "
"and folders."
@@ -1760,57 +1544,55 @@ msgstr ""
"Enable this to use Space bar key to scroll in message preview, message list "
"and folders."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
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"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
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."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
-#| msgid "Mark citations in the message \"Preview\""
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
msgid "Mark citations in the message “Previewâ€"
msgstr "Mark citations in the message “Previewâ€"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
-#| msgid "Mark citations in the message \"Preview\"."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
msgid "Mark citations in the message “Previewâ€."
msgstr "Mark citations in the message “Previewâ€."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
msgid "Citation highlight color"
msgstr "Citation highlight colour"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
msgid "Citation highlight color."
msgstr "Citation highlight colour."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
msgid "Enable/disable caret mode"
msgstr "Enable/disable caret mode"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
msgid "Enable caret mode, so that you can see a cursor when reading mail."
msgstr "Enable caret mode, so that you can see a cursor when reading mail."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
msgid "Default charset in which to display messages"
msgstr "Default charset in which to display messages"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
msgid "Default charset in which to display messages."
msgstr "Default charset in which to display messages."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
msgid "Automatically load images for HTML messages over HTTP"
msgstr "Automatically load images for HTML messages over HTTP"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
msgid "Show notification about missing remote content"
msgstr "Show notification about missing remote content"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
msgid ""
"When the message preview shows a message which requires to download remote "
"content, while the download is not allowed for the user or the site, then "
@@ -1820,27 +1602,27 @@ msgstr ""
"content, while the download is not allowed for the user or the site, then "
"show a notification about it on top of the preview panel."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
msgid "Show Animations"
msgstr "Show Animations"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
msgid "Show animated images as animations."
msgstr "Show animated images as animations."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
msgid "Show all message headers"
msgstr "Show all message headers"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
msgid "Show all the headers when viewing a messages."
msgstr "Show all the headers when viewing a messages."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
msgid "List of headers to show when viewing a message."
msgstr "List of headers to show when viewing a message."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
msgid ""
"Each header is represented as a pair: the header name, and a boolean "
"indicating whether the header is enabled. Disabled headers are not shown "
@@ -1850,35 +1632,35 @@ msgstr ""
"indicating whether the header is enabled. Disabled headers are not shown "
"when viewing a message, but are still listed in Preferences."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
msgid "Show photo of the sender"
msgstr "Show photo of the sender"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
msgid "Show the photo of the sender in the message reading pane."
msgstr "Show the photo of the sender in the message reading pane."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
msgid "Search gravatar.com for photo of the sender"
msgstr "Search gravatar.com for photo of the sender"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
msgid "Allow searching also at gravatar.com for photo of the sender."
msgstr "Allow searching also at gravatar.com for photo of the sender."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
msgid "Mark as Seen after specified timeout"
msgstr "Mark as Seen after specified timeout"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
msgid "Mark as Seen after specified timeout."
msgstr "Mark as Seen after specified timeout."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
msgid "Mark as Seen always after specified timeout"
msgstr "Mark as Seen always after specified timeout"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
msgid ""
"If set to true, the selected message will be set as unread after the timeout "
"also after the folder change."
@@ -1886,19 +1668,19 @@ msgstr ""
"If set to true, the selected message will be set as unread after the timeout "
"also after the folder change."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
msgid "Timeout for marking messages as seen"
msgstr "Timeout for marking messages as seen"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
msgid "Timeout in milliseconds for marking messages as seen."
msgstr "Timeout in milliseconds for marking messages as seen."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
msgid "Show Attachment Bar"
msgstr "Show Attachment Bar"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
msgid ""
"Show Attachment Bar below the message preview pane when the message has "
"attachments."
@@ -1906,11 +1688,11 @@ msgstr ""
"Show Attachment Bar below the message preview pane when the message has "
"attachments."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
msgid "Sender email-address column in the message list"
msgstr "Sender e-mail address column in the message list"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
msgid ""
"Show the email-address of the sender in a separate column in the message "
"list."
@@ -1918,27 +1700,27 @@ msgstr ""
"Show the e-mail address of the sender in a separate column in the message "
"list."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
msgid "Show deleted messages in the message-list"
msgstr "Show deleted messages in the message-list"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
msgid "Show deleted messages (with a strike-through) in the message-list."
msgstr "Show deleted messages (with a strike-through) in the message-list."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
msgid "Show junk messages in the message-list"
msgstr "Show junk messages in the message-list"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
msgid "Show junk messages (with a red strike-through) in the message-list."
msgstr "Show junk messages (with a red strike-through) in the message-list."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
msgid "Enable Unmatched search folder"
msgstr "Enable Unmatched search folder"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
msgid ""
"Enable Unmatched search folder within Search Folders. It does nothing if "
"Search Folders are disabled."
@@ -1946,14 +1728,11 @@ msgstr ""
"Enable Unmatched search folder within Search Folders. It does nothing if "
"Search Folders are disabled."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
msgid "Hides the per-folder preview and removes the selection"
msgstr "Hides the per-folder preview and removes the selection"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
-#| 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."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
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."
@@ -1961,36 +1740,31 @@ 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."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
msgid "Height of the message-list pane"
msgstr "Height of the message-list pane"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
msgid "Height of the message-list pane."
msgstr "Height of the message-list pane."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
msgid "Whether message headers are collapsed in the user interface"
msgstr "Whether message headers are collapsed in the user interface"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
msgid "Width of the message-list pane"
msgstr "Width of the message-list pane"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
msgid "Width of the message-list pane."
msgstr "Width of the message-list pane."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
msgid "Layout style"
msgstr "Layout style"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
-#| 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 message list. \"1\" (Vertical View) places the preview pane next to "
-#| "the message list."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
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 "
@@ -2002,35 +1776,35 @@ msgstr ""
"message list. “1†(Vertical View) places the preview pane next to the "
"message list."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
msgid "Variable width font"
msgstr "Variable width font"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
msgid "The variable width font for mail display."
msgstr "The variable width font for mail display."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
msgid "Terminal font"
msgstr "Terminal font"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
msgid "The terminal font for mail display."
msgstr "The terminal font for mail display."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
msgid "Use custom fonts"
msgstr "Use custom fonts"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
msgid "Use custom fonts for displaying mail."
msgstr "Use custom fonts for displaying mail."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
msgid "Compress display of addresses in TO/CC/BCC"
msgstr "Compress display of addresses in To/Cc/Bcc"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
msgid ""
"Compress display of addresses in TO/CC/BCC to the number specified in "
"address_count."
@@ -2038,14 +1812,11 @@ msgstr ""
"Compress display of addresses in To/Cc/Bcc to the number specified in "
"address_count."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
msgid "Number of addresses to display in TO/CC/BCC"
msgstr "Number of addresses to display in To/Cc/Bcc"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
-#| msgid ""
-#| "This sets the number of addresses to show in default message list view, "
-#| "beyond which a '...' is shown."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
msgid ""
"This sets the number of addresses to show in default message list view, "
"beyond which a “...†is shown."
@@ -2053,11 +1824,11 @@ msgstr ""
"This sets the number of addresses to show in default message list view, "
"beyond which a “...†is shown."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
msgid "Thread the message-list based on Subject"
msgstr "Thread the message-list based on Subject"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
msgid ""
"Whether or not to fall back on threading by subjects when the messages do "
"not contain In-Reply-To or References headers."
@@ -2065,11 +1836,11 @@ msgstr ""
"Whether to fall back on threading by subjects when the messages do not "
"contain In-Reply-To or References headers."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
msgid "Default value for thread expand state"
msgstr "Default value for thread expand state"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
msgid ""
"This setting specifies whether the threads should be in expanded or "
"collapsed state by default. Evolution requires a restart."
@@ -2077,15 +1848,11 @@ msgstr ""
"This setting specifies whether the threads should be in expanded or "
"collapsed state by default. Evolution requires a restart."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
msgid "Whether sort threads based on latest message in that thread"
msgstr "Whether sort threads based on latest message in that thread"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
-#| 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 restart."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
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 "
@@ -2095,11 +1862,11 @@ msgstr ""
"message in each thread, rather than by message’s date. Evolution requires a "
"restart."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
msgid "Whether sort thread children always ascending"
msgstr "Whether sort thread children always ascending"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
msgid ""
"This setting specifies whether the thread children should be sorted always "
"ascending, rather than using the same sort order as in the thread root level."
@@ -2107,11 +1874,11 @@ msgstr ""
"This setting specifies whether the thread children should be sorted always "
"ascending, rather than using the same sort order as in the thread root level."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
msgid "Sort accounts alphabetically in a folder tree"
msgstr "Sort accounts alphabetically in a folder tree"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
msgid ""
"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
"true accounts are sorted alphabetically, with an exception of On This "
@@ -2123,19 +1890,19 @@ msgstr ""
"Computer and Search folders, otherwise accounts are sorted based on an order "
"given by a user"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
msgid "Log filter actions"
msgstr "Log filter actions"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
msgid "Log filter actions to the specified log file."
msgstr "Log filter actions to the specified log file."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
msgid "Logfile to log filter actions"
msgstr "Logfile to log filter actions"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
msgid ""
"If not set, or being “stdoutâ€, then the logging is done to stdout, instead "
"to a file."
@@ -2143,15 +1910,11 @@ msgstr ""
"If not set, or being “stdoutâ€, then the logging is done to stdout, instead "
"to a file."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
msgid "Flush Outbox after filtering"
msgstr "Flush Outbox after filtering"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
-#| 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."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
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 "
@@ -2161,19 +1924,19 @@ msgstr ""
"only when there was used any “Forward to†filter action and approximately "
"one minute after the last action invocation."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
msgid "Default forward style"
msgstr "Default forward style"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
msgid "Default reply style"
msgstr "Default reply style"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
msgstr "Prompt on send when using key accelerator (Ctrl+Enter)"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
msgid ""
"Prompt the user when he or she tries to send a message with a key "
"accelerator."
@@ -2181,47 +1944,45 @@ msgstr ""
"Prompt the user when he or she tries to send a message with a key "
"accelerator."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
msgid "Prompt on empty subject"
msgstr "Prompt on empty subject"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
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."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
msgid "Prompt when emptying the trash"
msgstr "Prompt when emptying the wastebasket"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
msgid "Prompt the user when he or she tries to empty the trash."
msgstr "Prompt the user when he or she tries to empty the wastebasket."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
msgid "Prompt when user expunges"
msgstr "Prompt when user expunges"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
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."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
-#| msgid "Prompt when user expunges"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
msgid "Prompt when user calls Empty Junk"
msgstr "Prompt when user calls Empty Junk"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
-#| msgid "Prompt the user when he or she tries to expunge a folder."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
msgid "Prompt the user when he or she tries to Empty a Junk folder."
msgstr "Prompt the user when he or she tries to Empty a Junk folder."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
msgid "Prompt before sending to recipients not entered as mail addresses"
msgstr "Prompt before sending to recipients not entered as mail addresses"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
msgid ""
"It disables/enables the repeated prompts to warn that you are trying to send "
"a message to recipients not entered as mail addresses"
@@ -2229,19 +1990,19 @@ msgstr ""
"It disables/enables the repeated prompts to warn that you are trying to send "
"a message to recipients not entered as mail addresses"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
msgid "Prompt when user only fills Bcc"
msgstr "Prompt when user only fills Bcc"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
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."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
msgid "Prompt when user tries to send unwanted HTML"
msgstr "Prompt when user tries to send unwanted HTML"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
msgid ""
"Prompt when user tries to send HTML mail to recipients that may not want to "
"receive HTML mail."
@@ -2249,11 +2010,11 @@ msgstr ""
"Prompt when user tries to send HTML mail to recipients that may not want to "
"receive HTML mail."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
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"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
msgid ""
"If a user tries to open 10 or more messages at one time, ask the user if "
"they really want to do it."
@@ -2261,19 +2022,19 @@ msgstr ""
"If a user tries to open 10 or more messages at one time, ask the user if "
"they really want to do it."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
msgid "Prompt while marking multiple messages"
msgstr "Prompt while marking multiple messages"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
msgid "Enable or disable the prompt whilst marking multiple messages."
msgstr "Enable or disable the prompt whilst marking multiple messages."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
msgid "Prompt when deleting messages in search folder"
msgstr "Prompt when deleting messages in search folder"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
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 "
@@ -2283,16 +2044,11 @@ msgstr ""
"a search folder permanently deletes the message, not simply removing it from "
"the search results."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
msgid "Asks whether to copy a folder by drag & drop in the folder tree"
msgstr "Asks whether to copy a folder by drag & drop in the folder tree"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
-#| msgid ""
-#| "Possible values are: 'never' - do not allow copy with drag & drop of "
-#| "folders in folder tree, 'always' - allow copy with drag & drop of "
-#| "folders in folder tree without asking, or 'ask' - (or any other value) "
-#| "will ask user."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
msgid ""
"Possible values are: “never†— do not allow copy with drag & drop of "
"folders in folder tree, “always†— allow copy with drag & drop of "
@@ -2304,16 +2060,11 @@ msgstr ""
"folders in folder tree without asking, or “ask†— (or any other value) will "
"ask user."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
msgid "Asks whether to move a folder by drag & drop in the folder tree"
msgstr "Asks whether to move a folder by drag & drop in the folder tree"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
-#| msgid ""
-#| "Possible values are: 'never' - do not allow move with drag & drop of "
-#| "folders in folder tree, 'always' - allow move with drag & drop of "
-#| "folders in folder tree without asking, or 'ask' - (or any other value) "
-#| "will ask user."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
msgid ""
"Possible values are: “never†— do not allow move with drag & drop of "
"folders in folder tree, “always†— allow move with drag & drop of "
@@ -2325,11 +2076,11 @@ msgstr ""
"folders in folder tree without asking, or “ask†— (or any other value) will "
"ask user."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
msgid "Prompt when replying privately to list messages"
msgstr "Prompt when replying privately to list messages"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
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."
@@ -2337,11 +2088,11 @@ 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."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
msgid "Prompt when mailing list hijacks private replies"
msgstr "Prompt when mailing list hijacks private replies"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
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 "
@@ -2351,11 +2102,11 @@ msgstr ""
"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."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
msgid "Prompt when replying to many recipients"
msgstr "Prompt when replying to many recipients"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
msgid ""
"It disables/enables the repeated prompts to warn that you are sending a "
"reply to many people."
@@ -2363,10 +2114,7 @@ msgstr ""
"It disables/enables the repeated prompts to warn that you are sending a "
"reply to many people."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
-#| msgid ""
-#| "Prompt when switching composer mode and the content needs to lose its "
-#| "formatting"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
msgid ""
"Prompt when switching composer format and the content needs to lose its "
"formatting"
@@ -2374,10 +2122,7 @@ msgstr ""
"Prompt when switching composer format and the content needs to lose its "
"formatting"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
-#| msgid ""
-#| "It disables/enables the repeated prompts to warn that you are switching "
-#| "composer mode and the content needs to lose its formatting."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
msgid ""
"It disables/enables the repeated prompts to warn that you are switching "
"composer format and the content needs to lose its formatting."
@@ -2385,14 +2130,11 @@ msgstr ""
"It disables/enables the repeated prompts to warn that you are switching "
"composer format and the content needs to lose its formatting."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
msgid "Prompt when sending to many To and CC recipients"
msgstr "Prompt when sending to many To and CC recipients"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
-#| msgid ""
-#| "Enable or disable the prompt when sending to many To and CC recipients. "
-#| "The 'composer-many-to-cc-recips-num' defines the threshold."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
msgid ""
"Enable or disable the prompt when sending to many To and CC recipients. The "
"“composer-many-to-cc-recips-num†defines the threshold."
@@ -2400,7 +2142,7 @@ msgstr ""
"Enable or disable the prompt when sending to many To and CC recipients. The "
"“composer-many-to-cc-recips-num†defines the threshold."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
msgid ""
"Policy for automatically closing the message browser window when forwarding "
"or replying to the displayed message."
@@ -2408,45 +2150,42 @@ msgstr ""
"Policy for automatically closing the message browser window when forwarding "
"or replying to the displayed message."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
msgid "Empty Trash folders on exit"
msgstr "Empty Wastebasket folders on exit"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
msgid "Empty all Trash folders when exiting Evolution."
msgstr "Empty all Wastebasket folders when exiting Evolution."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
msgid "Minimum days between emptying the trash on exit"
msgstr "Minimum number of days between emptying the wastebasket on exit"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
msgid "Minimum time between emptying the trash on exit, in days."
msgstr "Minimum time between emptying the wastebasket on exit, in days."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
msgid "Last time Empty Trash was run"
msgstr "Last time Empty Wastebasket was run"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
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)."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
msgid "Amount of time in seconds the error should be shown on the status bar."
msgstr "Amount of time in seconds the error should be shown on the status bar."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
msgid "Level beyond which the message should be logged."
msgstr "Level beyond which the message should be logged."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
-#| msgid ""
-#| "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-#| "debug messages."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
msgid ""
"This can have three possible values. “0†for errors. “1†for warnings. “2†"
"for debug messages."
@@ -2454,16 +2193,11 @@ msgstr ""
"This can have three possible values. “0†for errors. “1†for warnings. “2†"
"for debug messages."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
-#| msgid "Show original \"Date\" header value."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
msgid "Show original “Date†header value."
msgstr "Show original “Date†header value."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
-#| 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 format and local time zone."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
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 "
@@ -2473,11 +2207,11 @@ msgstr ""
"differs). Otherwise always show “Date†header value in a user preferred "
"format and local time zone."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
msgid "List of Labels and their associated colors"
msgstr "List of Labels and their associated colours"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
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."
@@ -2485,49 +2219,45 @@ 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."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
msgid "Check incoming mail being junk"
msgstr "Check incoming mail being junk"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
msgid "Run junk test on incoming mail."
msgstr "Run junk test on incoming mail."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
msgid "Empty Junk folders on exit"
msgstr "Empty Junk folders on exit"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
msgid "Empty all Junk folders when exiting Evolution."
msgstr "Empty all Junk folders when exiting Evolution."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
msgid "Minimum days between emptying the junk on exit"
msgstr "Minimum days between emptying the junk on exit"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
msgid "Minimum time between emptying the junk on exit, in days."
msgstr "Minimum time between emptying the junk on exit, in days."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
msgid "Last time Empty Junk was run"
msgstr "Last time Empty Junk was run"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
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)."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
msgid "The default plugin for Junk hook"
msgstr "The default plugin for Junk hook"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
-#| 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 to the other available plugins."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
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 "
@@ -2537,16 +2267,11 @@ msgstr ""
"enabled. If the default listed plugin is disabled, then it won’t fall back "
"to the other available plugins."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
msgid "Determines whether to lookup in address book for sender email"
msgstr "Determines whether to look up in address book for sender e-mail"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
-#| msgid ""
-#| "Determines whether to lookup the sender email in 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."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
msgid ""
"Determines whether to lookup the sender email in address book. If found, it "
"shouldn’t be a spam. It looks up in the books marked for autocompletion. It "
@@ -2558,7 +2283,7 @@ msgstr ""
"can be slow, if remote address books (like LDAP) are marked for "
"autocompletion."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
msgid ""
"Determines whether to look up addresses for junk filtering in local address "
"book only"
@@ -2566,7 +2291,7 @@ msgstr ""
"Determines whether to look up addresses for junk filtering in local address "
"book only"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
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 "
@@ -2576,11 +2301,11 @@ msgstr ""
"determine whether to look up addresses in local address book only to exclude "
"mail sent by known contacts from junk filtering."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
msgid "Determines whether to use custom headers to check for junk"
msgstr "Determines whether to use custom headers to check for junk"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
msgid ""
"Determines whether to use custom headers to check for junk. If this option "
"is enabled and the headers are mentioned, it will be improve the junk "
@@ -2590,14 +2315,11 @@ msgstr ""
"is enabled and the headers are mentioned, it will be improve the junk "
"checking speed."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
msgid "Custom headers to use while checking for junk."
msgstr "Custom headers to use while checking for junk."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
-#| msgid ""
-#| "Custom headers to use while checking for junk. The list elements are "
-#| "string in the format \"headername=value\"."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
msgid ""
"Custom headers to use while checking for junk. The list elements are string "
"in the format “headername=valueâ€."
@@ -2605,31 +2327,31 @@ msgstr ""
"Custom headers to use while checking for junk. The list elements are string "
"in the format “headername=valueâ€."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
msgid "UID string of the default account."
msgstr "UID string of the default account."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
msgid "Save directory"
msgstr "Save directory"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
msgid "Directory for saving mail component files."
msgstr "Directory for saving mail component files."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
msgid "Composer load/attach directory"
msgstr "Composer load/attach directory"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
msgid "Directory for loading/attaching files to composer."
msgstr "Directory for loading/attaching files to composer."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
msgid "Check for new messages on start"
msgstr "Check for new messages on start"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
msgid ""
"Whether to check for new messages when Evolution is started. This includes "
"also sending messages from Outbox."
@@ -2637,16 +2359,11 @@ msgstr ""
"Whether to check for new messages when Evolution is started. This includes "
"also sending messages from Outbox."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
msgid "Check for new messages in all active accounts"
msgstr "Check for new messages in all active accounts"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
-#| msgid ""
-#| "Whether to check for new messages in all active accounts regardless of "
-#| "the account \"Check for new messages every X minutes\" option when "
-#| "Evolution is started. This option is used only together with "
-#| "'send_recv_on_start' option."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
msgid ""
"Whether to check for new messages in all active accounts regardless of the "
"account “Check for new messages every X minutes†option when Evolution is "
@@ -2656,11 +2373,11 @@ msgstr ""
"account “Check for new messages every X minutes†option when Evolution is "
"started. This option is used only together with “send_recv_on_start†option."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
msgid "Server synchronization interval"
msgstr "Server synchronisation interval"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
msgid ""
"Controls how frequently local changes are synchronized with the remote mail "
"server. The interval must be at least 30 seconds."
@@ -2668,16 +2385,11 @@ msgstr ""
"Controls how frequently local changes are synchronised with the remote mail "
"server. The interval must be at least 30 seconds."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
msgid "Allow expunge in virtual folders"
msgstr "Allow expunge in virtual folders"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
-#| msgid ""
-#| "Enables Expunge in virtual folders, which means that the Folder->Expunge "
-#| "will be callable in virtual folders, while the expunge itself will be "
-#| "done in all folders for all deleted messages within the virtual folder, "
-#| "not only for deleted messages belonging to the virtual folder."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
msgid ""
"Enables Expunge in virtual folders, which means that the Folder→Expunge will "
"be callable in virtual folders, while the expunge itself will be done in all "
@@ -2689,13 +2401,12 @@ msgstr ""
"folders for all deleted messages within the virtual folder, not only for "
"deleted messages belonging to the virtual folder."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
#: ../src/mail/mail-config.ui.h:9
-#| msgid "Inherit theme colors in HTML mode"
msgid "Inherit theme colors in HTML format"
msgstr "Inherit theme colours in HTML format"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
msgid ""
"When enabled the theme colors for background, text and links are sent in "
"resulting HTML formatted message."
@@ -2703,11 +2414,11 @@ msgstr ""
"When enabled the theme colours for background, text and links are sent in "
"resulting HTML formatted message."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
msgid "An Archive folder for On This Computer folders."
msgstr "An Archive folder for On This Computer folders."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
msgid ""
"An Archive folder to use for Messages|Archive... feature when in an On This "
"Computer folder."
@@ -2715,70 +2426,105 @@ msgstr ""
"An Archive folder to use for Messages|Archive... feature when in an On This "
"Computer folder."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
-#| msgid "Whether to show icons of events in the month view"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
msgid "Whether the To Do bar is visible in the main window"
msgstr "Whether the To Do bar is visible in the main window"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
-#| msgid "If \"true\", show the memo preview pane in the main window."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
msgid "Stores whether the To Do bar is visible in the main window."
msgstr "Stores whether the To Do bar is visible in the main window."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
-#| msgid "If \"true\", show the memo preview pane in the main window"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
msgid "Width of the To Do bar in the main window"
msgstr "Width of the To Do bar in the main window"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
-#| msgid "The default Y coordinate for the main window."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
msgid "Holds the width of the To Do bar for the main window."
msgstr "Holds the width of the To Do bar for the main window."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
-#| msgid "Whether the shell window's tool bar is visible"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
msgid "Whether the To Do bar is visible in a sub-window"
msgstr "Whether the To Do bar is visible in a sub-window"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
msgid "Stores whether the To Do bar is visible in a sub-window."
msgstr "Stores whether the To Do bar is visible in a sub-window."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
msgid "Width of the To Do bar in a sub-window"
msgstr "Width of the To Do bar in a sub-window"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
-#| msgid "Default width of the mail browser window."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
msgid "Holds the width of the To Do bar for a sub-window."
msgstr "Holds the width of the To Do bar for a sub-window."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
-#| msgid "Whether the toolbar should be visible."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
msgid "Whether the To Do bar should show also completed tasks"
msgstr "Whether the To Do bar should show also completed tasks"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
msgid "Stores whether the To Do bar should show also completed tasks."
msgstr "Stores whether the To Do bar should show also completed tasks."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
-#| msgid "Startup wizard"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
+#| msgid "Whether the To Do bar should show also completed tasks"
+msgid "Whether the To Do bar should show also tasks without Due date"
+msgstr "Whether the To Do bar should show also tasks without Due date"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
+#| msgid "Stores whether the To Do bar should show also completed tasks."
+msgid "Stores whether the To Do bar should show also tasks without Due date."
+msgstr "Stores whether the To Do bar should show also tasks without Due date."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
msgid "Show start up wizard"
msgstr "Show start up wizard"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:259
msgid "Whether show start up wizard when there is no mail account configured."
msgstr "Whether show start up wizard when there is no mail account configured."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
+#| msgid "Whether to group messages by threads"
+msgid "Whether go to the previous message after message deletion"
+msgstr "Whether go to the previous message after message deletion"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
+msgid ""
+"If set to true, goes to the previous message when the selected is deleted; "
+"or to the next message, when it’s set to false."
+msgstr ""
+"If set to true, goes to the previous message when the selected is deleted; "
+"or to the next message, when it’s set to false."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
+msgid "Show Subject above Sender in Messages column"
+msgstr "Show Subject above Sender in Messages column"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
+msgid ""
+"Whether to show Subject above Sender (From/To) in the Messages column, "
+"usually shown in the Vertical/Wide view of the message list"
+msgstr ""
+"Whether to show Subject above Sender (From/To) in the Messages column, "
+"usually shown in the Vertical/Wide view of the message list"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
+msgid "Visually wrap long lines in composer"
+msgstr "Visually wrap long lines in composer"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
+#: ../src/composer/e-composer-actions.c:552
+msgid ""
+"Whether to visually wrap long lines of text to avoid horizontal scrolling"
+msgstr ""
+"Whether to visually wrap long lines of text to avoid horizontal scrolling"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:266
msgid "(Deprecated) Default forward style"
msgstr "(Deprecated) Default forward style"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
-#| msgid ""
-#| "This key was deprecated in version 3.10 and should no longer be used. Use "
-#| "\"forward-style-name\" instead."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:267
msgid ""
"This key was deprecated in version 3.10 and should no longer be used. Use "
"“forward-style-name†instead."
@@ -2786,14 +2532,11 @@ msgstr ""
"This key was deprecated in version 3.10 and should no longer be used. Use "
"“forward-style-name†instead."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:268
msgid "(Deprecated) Default reply style"
msgstr "(Deprecated) Default reply style"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
-#| msgid ""
-#| "This key was deprecated in version 3.10 and should no longer be used. Use "
-#| "\"reply-style-name\" instead."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
msgid ""
"This key was deprecated in version 3.10 and should no longer be used. Use "
"“reply-style-name†instead."
@@ -2801,14 +2544,11 @@ msgstr ""
"This key was deprecated in version 3.10 and should no longer be used. Use "
"“reply-style-name†instead."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:270
msgid "(Deprecated) List of custom headers and whether they are enabled."
msgstr "(Deprecated) List of custom headers and whether they are enabled."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:259
-#| msgid ""
-#| "This key was deprecated in version 3.10 and should no longer be used. Use "
-#| "\"show-headers\" instead."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:271
msgid ""
"This key was deprecated in version 3.10 and should no longer be used. Use "
"“show-headers†instead."
@@ -2816,14 +2556,11 @@ msgstr ""
"This key was deprecated in version 3.10 and should no longer be used. Use "
"“show-headers†instead."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:272
msgid "(Deprecated) Load images for HTML messages over HTTP"
msgstr "(Deprecated) Load images for HTML messages over HTTP"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
-#| msgid ""
-#| "This key was deprecated in version 3.10 and should no longer be used. Use "
-#| "\"image-loading-policy\" instead."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:273
msgid ""
"This key was deprecated in version 3.10 and should no longer be used. Use "
"“image-loading-policy†instead."
@@ -2831,7 +2568,7 @@ msgstr ""
"This key was deprecated in version 3.10 and should no longer be used. Use "
"“image-loading-policy†instead."
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:274
msgid ""
"(Deprecated) Asks whether to close the message window when the user forwards "
"or replies to the message shown in the window"
@@ -2839,10 +2576,7 @@ msgstr ""
"(Deprecated) Asks whether to close the message window when the user forwards "
"or replies to the message shown in the window"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
-#| msgid ""
-#| "This key was deprecated in version 3.10 and should no longer be used. Use "
-#| "\"browser-close-on-reply-policy\" instead."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:275
msgid ""
"This key was deprecated in version 3.10 and should no longer be used. Use "
"“browser-close-on-reply-policy†instead."
@@ -2894,8 +2628,6 @@ msgid "Enable autocontacts"
msgstr "Enable autocontacts"
#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
-#| msgid ""
-#| "Whether contacts should be automatically added to the user's address book."
msgid ""
"Whether contacts should be automatically added to the user’s address book."
msgstr ""
@@ -2940,11 +2672,6 @@ msgid "List of Custom Headers"
msgstr "List of Custom Headers"
#: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:2
-#| msgid ""
-#| "The key specifies the list of custom headers that you can add to an "
-#| "outgoing message. The format for specifying a Header and Header value is: "
-#| "Name of the custom header followed by \"=\" and the values separated by "
-#| "\";\""
msgid ""
"The key specifies the list of custom headers that you can add to an outgoing "
"message. The format for specifying a Header and Header value is: Name of the "
@@ -3027,10 +2754,6 @@ msgid "Enable audible notifications when new messages arrive."
msgstr "Enable audible notifications when new messages arrive."
#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
-#| msgid ""
-#| "Whether to make a sound of any kind when new messages arrive. If \"false"
-#| "\", the \"notify-sound-beep\", \"notify-sound-file\", \"notify-sound-play-"
-#| "file\" and \"notify-sound-use-theme\" keys are disregarded."
msgid ""
"Whether to make a sound of any kind when new messages arrive. If “falseâ€, "
"the “notify-sound-beepâ€, “notify-sound-fileâ€, “notify-sound-play-file†and "
@@ -3053,9 +2776,6 @@ msgid "Sound filename to be played."
msgstr "Sound filename to be played."
#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
-#| msgid ""
-#| "Sound file to be played when new messages arrive, if \"notify-sound-play-"
-#| "file\" is \"true\"."
msgid ""
"Sound file to be played when new messages arrive, if “notify-sound-play-"
"file†is “trueâ€."
@@ -3068,9 +2788,6 @@ msgid "Whether to play a sound file."
msgstr "Whether to play a sound file."
#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
-#| msgid ""
-#| "Whether to play a sound file when new messages arrive. The name of the "
-#| "sound file is given by the 'notify-sound-file' key."
msgid ""
"Whether to play a sound file when new messages arrive. The name of the sound "
"file is given by the “notify-sound-file†key."
@@ -3091,12 +2808,6 @@ msgid "Mode to use when displaying mails"
msgstr "Mode to use when displaying mails"
#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:2
-#| msgid ""
-#| "The mode to use for displaying mails. \"normal\" makes Evolution choose "
-#| "the best part to show, \"prefer_plain\" makes it use the text part, if "
-#| "present, \"prefer_source\" makes it use the text part, if present, "
-#| "otherwise shows HTML source, and \"only_plain\" forces Evolution to only "
-#| "show plain text"
msgid ""
"The mode to use for displaying mails. “normal†makes Evolution choose the "
"best part to show, “prefer_plain†makes it use the text part, if present, "
@@ -3147,9 +2858,6 @@ msgid "Initial attachment view"
msgstr "Initial attachment view"
#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
-#| msgid ""
-#| "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is "
-#| "List View."
msgid ""
"Initial view for attachment bar widgets. “0†is Icon View, “1†is List View."
msgstr ""
@@ -3184,7 +2892,7 @@ msgstr ""
"Compression filter used when compressing attached directories with autoar."
#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
-#: ../src/shell/main.c:320
+#: ../src/shell/main.c:317
msgid "Start in offline mode"
msgstr "Start in offline mode"
@@ -3216,9 +2924,6 @@ msgid "List of button names to hide in the window switcher"
msgstr "List of button names to hide in the window switcher"
#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
-#| msgid ""
-#| "Valid values are 'mail', 'addressbook', 'calendar', 'tasks' and 'memos'. "
-#| "Change of this requires restart of the application."
msgid ""
"Valid values are “mailâ€, “addressbookâ€, “calendarâ€, “tasks†and “memosâ€. "
"Change of this requires restart of the application."
@@ -3239,10 +2944,6 @@ msgid "Window button style"
msgstr "Window button style"
#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
-#| msgid ""
-#| "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-#| "\"toolbar\". If \"toolbar\" is set, the style of the buttons is "
-#| "determined by the GNOME toolbar setting."
msgid ""
"The style of the window buttons. Can be “textâ€, “iconsâ€, “bothâ€, “toolbarâ€. "
"If “toolbar†is set, the style of the buttons is determined by the GNOME "
@@ -3253,12 +2954,10 @@ msgstr ""
"toolbar setting."
#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
-#| msgid "Sidebar is visible"
msgid "Menubar is visible"
msgstr "Menubar is visible"
#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
-#| msgid "Whether the sidebar should be visible."
msgid "Whether the menubar should be visible."
msgstr "Whether the menubar should be visible."
@@ -3306,6 +3005,18 @@ msgstr "Enable special WebKit developer features"
msgid "Any change of this option requires restart of Evolution."
msgstr "Any change of this option requires restart of Evolution."
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:36
+msgid "The last extension being used when backing up Evolution data."
+msgstr "The last extension being used when backing up Evolution data."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:37
+msgid ""
+"It can be either “.gz†or “.xz†and it influences what extension will be "
+"preselected in the file chooser."
+msgstr ""
+"It can be either “.gz†or “.xz†and it influences what extension will be "
+"preselected in the file chooser."
+
#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
msgid "Use only local spam tests."
msgstr "Use only local spam tests."
@@ -3356,6 +3067,116 @@ msgstr ""
"and then the value to one of them. The change requires only re-format of the "
"message part to take into effect, like using right-click→Format As→...."
+#: ../data/org.gnome.Evolution.appdata.xml.in.h:1
+#: ../data/org.gnome.Evolution.desktop.in.in.h:1
+#: ../src/mail/e-mail-browser.c:1112
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
+#: ../src/shell/e-shell-window-private.c:240
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../data/org.gnome.Evolution.appdata.xml.in.h:2
+#: ../data/org.gnome.Evolution.desktop.in.in.h:4
+msgid "Manage your email, contacts and schedule"
+msgstr "Manage your e-mail, contacts and schedule"
+
+#: ../data/org.gnome.Evolution.appdata.xml.in.h:3
+msgid ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
+msgstr ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
+
+#: ../data/org.gnome.Evolution.appdata.xml.in.h:4
+msgid ""
+"Evolution supports a wide range of industry standard data formats and "
+"network protocols for information exchange, with an emphasis on standards "
+"compliance and security. Evolution can also integrate smoothly with "
+"Microsoft Exchange by way of the “Exchange Web Services†(EWS) extension."
+msgstr ""
+"Evolution supports a wide range of industry standard data formats and "
+"network protocols for information exchange, with an emphasis on standards "
+"compliance and security. Evolution can also integrate smoothly with "
+"Microsoft Exchange by way of the “Exchange Web Services†(EWS) extension."
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:2
+#: ../src/shell/e-shell-utils.c:428
+msgid "Groupware Suite"
+msgstr "Groupware Suite"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:3
+msgid "Evolution Mail and Calendar"
+msgstr "Evolution Mail and Calendar"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:5
+msgid "email;calendar;contact;addressbook;task;"
+msgstr "email;calendar;contact;addressbook;task;"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:6
+msgid "New Window"
+msgstr "New Window"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:7
+msgid "Compose a Message"
+msgstr "Compose a Message"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:8
+#: ../src/e-util/e-name-selector-dialog.c:448
+#: ../src/modules/addressbook/e-book-shell-backend.c:307
+#: ../src/modules/addressbook/e-book-shell-view.c:371
+msgid "Contacts"
+msgstr "Contacts"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:9
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:845
+#: ../src/e-util/e-collection-account-wizard.c:559
+#: ../src/e-util/e-send-options.c:544 ../src/e-util/e-webdav-browser.c:469
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:197
+#: ../src/modules/calendar/e-cal-shell-view.c:582
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:22
+msgid "Calendar"
+msgstr "Calendar"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:10
+#: ../src/e-util/e-send-options.c:536 ../src/mail/importers/elm-importer.c:330
+#: ../src/mail/importers/kmail-importer.c:251
+#: ../src/mail/importers/pine-importer.c:423
+#: ../src/modules/mail/e-mail-shell-view.c:1249
+#: ../src/smime/gui/certificate-manager.c:1682
+msgid "Mail"
+msgstr "Mail"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:11
+#: ../src/calendar/gui/e-memo-table.c:368 ../src/e-util/e-webdav-browser.c:459
+#: ../src/modules/calendar/e-cal-shell-content.c:1719
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:194
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:209
+#: ../src/modules/calendar/e-memo-shell-view.c:313
+msgid "Memos"
+msgstr "Memos"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:12
+#: ../src/calendar/gui/e-task-table.c:697 ../src/calendar/gui/print.c:2408
+#: ../src/calendar/importers/icalendar-importer.c:77
+#: ../src/calendar/importers/icalendar-importer.c:1110
+#: ../src/e-util/e-webdav-browser.c:460
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
+#: ../src/modules/calendar/e-cal-shell-content.c:1679
+#: ../src/modules/calendar/e-task-shell-view-actions.c:218
+#: ../src/modules/calendar/e-task-shell-view-actions.c:233
+#: ../src/modules/calendar/e-task-shell-view.c:471
+msgid "Tasks"
+msgstr "Tasks"
+
+#: ../data/org.gnome.Evolution-alarm-notify.desktop.in.in.h:1
+msgid "Evolution Alarm Notify"
+msgstr "Evolution Alarm Notify"
+
+#: ../data/org.gnome.Evolution-alarm-notify.desktop.in.in.h:2
+msgid "Calendar event notifications"
+msgstr "Calendar event notifications"
+
#: ../data/views/addressbook/galview.xml.h:1
msgid "_Address Cards"
msgstr "_Address Cards"
@@ -3439,82 +3260,49 @@ msgid "This address book could not be opened."
msgstr "This address book could not be opened."
#: ../src/addressbook/addressbook.error.xml.h:2
-msgid ""
-"This address book server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
-msgstr ""
-"This address book server might be unreachable, the server name may be "
-"misspelt, or your network connection could be down."
+#| msgid "Failed to authenticate with LDAP server."
+msgid "Failed to communicate with LDAP server."
+msgstr "Failed to communicate with LDAP server."
#: ../src/addressbook/addressbook.error.xml.h:3
-msgid "Failed to authenticate with LDAP server."
-msgstr "Failed to authenticate with LDAP server."
-
-#: ../src/addressbook/addressbook.error.xml.h:4
-msgid ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
-msgstr ""
-"Check to make sure your password is spelt correctly and that you are using a "
-"supported login method. Remember that many passwords are case-sensitive; "
-"your caps lock might be on."
-
-#: ../src/addressbook/addressbook.error.xml.h:5
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:ldap-search-base secondary
-#: ../src/addressbook/addressbook.error.xml.h:6
-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 "
-"supported search bases."
-msgstr ""
-"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 "
-"supported search bases."
-
-#: ../src/addressbook/addressbook.error.xml.h:7
+#: ../src/addressbook/addressbook.error.xml.h:4
msgid "This server does not support LDAPv3 schema information."
msgstr "This server does not support LDAPv3 schema information."
-#: ../src/addressbook/addressbook.error.xml.h:8
+#: ../src/addressbook/addressbook.error.xml.h:5
msgid "Could not get schema information for LDAP server."
msgstr "Could not get schema information for LDAP server."
-#: ../src/addressbook/addressbook.error.xml.h:9
+#: ../src/addressbook/addressbook.error.xml.h:6
msgid "LDAP server did not respond with valid schema information."
msgstr "LDAP server did not respond with valid schema information."
-#: ../src/addressbook/addressbook.error.xml.h:10
+#: ../src/addressbook/addressbook.error.xml.h:7
msgid "Could not remove address book."
msgstr "Could not remove address book."
-#: ../src/addressbook/addressbook.error.xml.h:11
-#| msgid "Are you sure you want to delete the memo '{0}'?"
+#: ../src/addressbook/addressbook.error.xml.h:8
msgid "Are you sure you want to delete address book “{0}�"
msgstr "Are you sure you want to delete address book “{0}�"
-#: ../src/addressbook/addressbook.error.xml.h:12
+#: ../src/addressbook/addressbook.error.xml.h:9
msgid "This address book will be removed permanently."
msgstr "This address book will be removed permanently."
-#: ../src/addressbook/addressbook.error.xml.h:13
+#: ../src/addressbook/addressbook.error.xml.h:10
#: ../src/calendar/calendar.error.xml.h:7 ../src/e-util/e-system.error.xml.h:27
#: ../src/mail/mail.error.xml.h:69
msgid "Do _Not Delete"
msgstr "Do _Not Delete"
-#: ../src/addressbook/addressbook.error.xml.h:14
-#| msgid "Delete remote address book "{0}"?"
+#: ../src/addressbook/addressbook.error.xml.h:11
msgid "Delete remote address book “{0}�"
msgstr "Delete remote address book “{0}�"
-#: ../src/addressbook/addressbook.error.xml.h:15
-#| msgid ""
-#| "This will permanently remove the address book "{0}" from the "
-#| "server. Are you sure you want to proceed?"
+#: ../src/addressbook/addressbook.error.xml.h:12
msgid ""
"This will permanently remove the address book “{0}†from the server. Are you "
"sure you want to proceed?"
@@ -3522,35 +3310,33 @@ msgstr ""
"This will permanently remove the address book “{0}†from the server. Are you "
"sure you want to proceed?"
-#: ../src/addressbook/addressbook.error.xml.h:16
+#: ../src/addressbook/addressbook.error.xml.h:13
#: ../src/calendar/calendar.error.xml.h:65
#: ../src/e-util/e-system.error.xml.h:28
msgid "_Delete From Server"
msgstr "_Delete From Server"
-#: ../src/addressbook/addressbook.error.xml.h:17
+#: ../src/addressbook/addressbook.error.xml.h:14
msgid "Category editor not available."
msgstr "Category editor not available."
-#: ../src/addressbook/addressbook.error.xml.h:18
-#| msgid "Unable to open address book '{0}'"
+#: ../src/addressbook/addressbook.error.xml.h:15
msgid "Unable to open address book “{0}â€"
msgstr "Unable to open address book “{0}â€"
-#: ../src/addressbook/addressbook.error.xml.h:19
+#: ../src/addressbook/addressbook.error.xml.h:16
msgid "Unable to perform search."
msgstr "Unable to perform search."
-#: ../src/addressbook/addressbook.error.xml.h:20
-#| msgid "Failed to refresh address book '{0}'"
+#: ../src/addressbook/addressbook.error.xml.h:17
msgid "Failed to refresh address book “{0}â€"
msgstr "Failed to refresh address book “{0}â€"
-#: ../src/addressbook/addressbook.error.xml.h:21
+#: ../src/addressbook/addressbook.error.xml.h:18
msgid "Would you like to save your changes?"
msgstr "Would you like to save your changes?"
-#: ../src/addressbook/addressbook.error.xml.h:22
+#: ../src/addressbook/addressbook.error.xml.h:19
msgid ""
"You have made modifications to this contact. Do you want to save these "
"changes?"
@@ -3558,15 +3344,15 @@ msgstr ""
"You have made modifications to this contact. Do you want to save these "
"changes?"
-#: ../src/addressbook/addressbook.error.xml.h:23
+#: ../src/addressbook/addressbook.error.xml.h:20
msgid "_Discard"
msgstr "_Discard"
-#: ../src/addressbook/addressbook.error.xml.h:24
+#: ../src/addressbook/addressbook.error.xml.h:21
msgid "Cannot move contact."
msgstr "Cannot move contact."
-#: ../src/addressbook/addressbook.error.xml.h:25
+#: ../src/addressbook/addressbook.error.xml.h:22
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?"
@@ -3574,38 +3360,37 @@ 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?"
-#: ../src/addressbook/addressbook.error.xml.h:26
+#: ../src/addressbook/addressbook.error.xml.h:23
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?"
-#: ../src/addressbook/addressbook.error.xml.h:27
+#: ../src/addressbook/addressbook.error.xml.h:24
msgid "_Resize"
msgstr "_Resize"
-#: ../src/addressbook/addressbook.error.xml.h:28
+#: ../src/addressbook/addressbook.error.xml.h:25
msgid "_Use as it is"
msgstr "_Use as it is"
-#: ../src/addressbook/addressbook.error.xml.h:29
+#: ../src/addressbook/addressbook.error.xml.h:26
msgid "_Do not save"
msgstr "_Do not save"
-#: ../src/addressbook/addressbook.error.xml.h:30
+#: ../src/addressbook/addressbook.error.xml.h:27
msgid "Unable to save {0}."
msgstr "Unable to save {0}."
-#: ../src/addressbook/addressbook.error.xml.h:31
+#: ../src/addressbook/addressbook.error.xml.h:28
msgid "Error saving {0} to {1}: {2}"
msgstr "Error saving {0} to {1}: {2}"
-#: ../src/addressbook/addressbook.error.xml.h:32
-#| msgid "Address '{0}' already exists."
+#: ../src/addressbook/addressbook.error.xml.h:29
msgid "Address “{0}†already exists."
msgstr "Address “{0}†already exists."
-#: ../src/addressbook/addressbook.error.xml.h:33
+#: ../src/addressbook/addressbook.error.xml.h:30
msgid ""
"A contact already exists with this address. Would you like to add a new card "
"with the same address anyway?"
@@ -3613,13 +3398,13 @@ msgstr ""
"A contact already exists with this address. Would you like to add a new card "
"with the same address anyway?"
-#: ../src/addressbook/addressbook.error.xml.h:34
+#: ../src/addressbook/addressbook.error.xml.h:31
#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
#: ../src/addressbook/gui/widgets/eab-contact-merging.c:721
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1355
-#: ../src/e-util/e-accounts-window.c:1540
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1359
+#: ../src/e-util/e-accounts-window.c:1526
#: ../src/e-util/e-mail-signature-manager.c:328
-#: ../src/e-util/e-name-selector-dialog.c:1033 ../src/e-util/filter.ui.h:23
+#: ../src/e-util/e-name-selector-dialog.c:1033 ../src/e-util/filter.ui.h:25
#: ../src/mail/e-mail-account-manager.c:719
#: ../src/mail/e-mail-label-manager.c:371
#: ../src/mail/em-folder-properties.c:1031
@@ -3628,16 +3413,16 @@ msgstr ""
#: ../src/modules/mail/em-composer-prefs.c:422
#: ../src/plugins/attachment-reminder/attachment-reminder.c:543
#: ../src/plugins/email-custom-header/email-custom-header.c:837
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:32
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
#: ../src/plugins/templates/templates.c:463
msgid "_Add"
msgstr "_Add"
-#: ../src/addressbook/addressbook.error.xml.h:35
+#: ../src/addressbook/addressbook.error.xml.h:32
msgid "Some addresses already exist in this contact list."
msgstr "Some addresses already exist in this contact list."
-#: ../src/addressbook/addressbook.error.xml.h:36
+#: ../src/addressbook/addressbook.error.xml.h:33
msgid ""
"You are trying to add addresses that are part of this list already. Would "
"you like to add them anyway?"
@@ -3645,23 +3430,19 @@ msgstr ""
"You are trying to add addresses that are part of this list already. Would "
"you like to add them anyway?"
-#: ../src/addressbook/addressbook.error.xml.h:37
+#: ../src/addressbook/addressbook.error.xml.h:34
msgid "Skip duplicates"
msgstr "Skip duplicates"
-#: ../src/addressbook/addressbook.error.xml.h:38
+#: ../src/addressbook/addressbook.error.xml.h:35
msgid "Add with duplicates"
msgstr "Add with duplicates"
-#: ../src/addressbook/addressbook.error.xml.h:39
-#| msgid "List '{0}' is already in this contact list."
+#: ../src/addressbook/addressbook.error.xml.h:36
msgid "List “{0}†is already in this contact list."
msgstr "List “{0}†is already in this contact list."
-#: ../src/addressbook/addressbook.error.xml.h:40
-#| msgid ""
-#| "A contact list named '{0}' is already in this contact list. Would you "
-#| "like to add it anyway?"
+#: ../src/addressbook/addressbook.error.xml.h:37
msgid ""
"A contact list named “{0}†is already in this contact list. Would you like "
"to add it anyway?"
@@ -3669,24 +3450,21 @@ msgstr ""
"A contact list named “{0}†is already in this contact list. Would you like "
"to add it anyway?"
-#: ../src/addressbook/addressbook.error.xml.h:41
+#: ../src/addressbook/addressbook.error.xml.h:38
#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1280
msgid "Failed to delete contact"
msgstr "Failed to delete contact"
-#: ../src/addressbook/addressbook.error.xml.h:42
+#: ../src/addressbook/addressbook.error.xml.h:39
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."
-#: ../src/addressbook/addressbook.error.xml.h:43
+#: ../src/addressbook/addressbook.error.xml.h:40
msgid "Cannot add new contact"
msgstr "Cannot add new contact"
#. For Translators: {0} is the name of the address book source
-#: ../src/addressbook/addressbook.error.xml.h:45
-#| msgid ""
-#| "'{0}' is a read-only address book and cannot be modified. Please select a "
-#| "different address book from the side bar in the Contacts view."
+#: ../src/addressbook/addressbook.error.xml.h:42
msgid ""
"“{0}†is a read-only address book and cannot be modified. Please select a "
"different address book from the side bar in the Contacts view."
@@ -3694,15 +3472,12 @@ msgstr ""
"“{0}†is a read-only address book and cannot be modified. Please select a "
"different address book from the side bar in the Contacts view."
-#: ../src/addressbook/addressbook.error.xml.h:46
+#: ../src/addressbook/addressbook.error.xml.h:43
msgid "Cannot save a contact, address book is still opening"
msgstr "Cannot save a contact, address book is still opening"
#. For Translators: {0} is the name of the address book source
-#: ../src/addressbook/addressbook.error.xml.h:48
-#| msgid ""
-#| "Cannot save a contact to the address book '{0}', because it is still "
-#| "opening. Either wait till it's opened, or select a different address book."
+#: ../src/addressbook/addressbook.error.xml.h:45
msgid ""
"Cannot save a contact to the address book “{0}â€, because it is still "
"opening. Either wait till it’s opened, or select a different address book."
@@ -3710,12 +3485,11 @@ msgstr ""
"Cannot save a contact to the address book “{0}â€, because it is still "
"opening. Either wait till it’s opened, or select a different address book."
-#: ../src/addressbook/addressbook.error.xml.h:49
-#| msgid "Search for text in the displayed contact"
+#: ../src/addressbook/addressbook.error.xml.h:46
msgid "Something has gone wrong when displaying the contact"
msgstr "Something has gone wrong when displaying the contact"
-#: ../src/addressbook/addressbook.error.xml.h:50
+#: ../src/addressbook/addressbook.error.xml.h:47
msgid ""
"A WebKitWebProcess crashed when displaying the contact. You can try again by "
"moving to another contact and back. If the issue persists, please file a bug "
@@ -3777,7 +3551,7 @@ msgid "Contact Editor"
msgstr "Contact Editor"
#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1996
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1976
#: ../src/mail/mail-config.ui.h:38
msgid "Options"
msgstr "Options"
@@ -3798,12 +3572,14 @@ msgstr "Options"
#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1360
#: ../src/calendar/gui/e-cal-dialogs.c:694
#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:301
-#: ../src/composer/e-composer-actions.c:227 ../src/e-util/e-activity-bar.c:357
+#: ../src/composer/e-composer-actions.c:229 ../src/e-util/e-activity-bar.c:357
#: ../src/e-util/e-attachment-dialog.c:309
#: ../src/e-util/e-attachment-store.c:664
#: ../src/e-util/e-attachment-store.c:832 ../src/e-util/e-attachment-view.c:302
#: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:140
#: ../src/e-util/e-category-editor.c:211 ../src/e-util/e-charset-combo-box.c:99
+#: ../src/e-util/e-collection-account-wizard.c:1563
+#: ../src/e-util/e-collection-account-wizard.c:1798
#: ../src/e-util/e-color-chooser-widget.c:125
#: ../src/e-util/e-filter-datespec.c:289
#: ../src/e-util/e-html-editor-actions.c:321
@@ -3811,25 +3587,26 @@ msgstr "Options"
#: ../src/e-util/e-image-chooser-dialog.c:169
#: ../src/e-util/e-mail-signature-script-dialog.c:366
#: ../src/e-util/e-passwords.c:468 ../src/e-util/e-rule-context.c:813
-#: ../src/e-util/e-rule-editor.c:178 ../src/e-util/e-rule-editor.c:280
-#: ../src/e-util/e-rule-editor.c:789 ../src/e-util/e-send-options.ui.h:16
+#: ../src/e-util/e-rule-editor.c:187 ../src/e-util/e-rule-editor.c:298
+#: ../src/e-util/e-rule-editor.c:930 ../src/e-util/e-send-options.ui.h:16
#: ../src/e-util/e-source-config-dialog.c:360
#: ../src/e-util/e-source-selector-dialog.c:370
#: ../src/e-util/e-table-config.c:548 ../src/e-util/e-table-config.ui.h:3
#: ../src/e-util/e-timezone-dialog.ui.h:2
-#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4096
+#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4118
#: ../src/e-util/gal-view-instance-save-as-dialog.c:267
#: ../src/mail/e-mail-config-window.c:334 ../src/mail/e-mail-label-dialog.c:194
#: ../src/mail/e-mail-tag-editor.c:168 ../src/mail/em-folder-selector.c:318
#: ../src/mail/mail-config.ui.h:2 ../src/mail/mail.error.xml.h:16
-#: ../src/mail/mail-send-recv.c:747 ../src/mail/mail-send-recv.c:829
+#: ../src/mail/mail-send-recv.c:867 ../src/mail/mail-send-recv.c:949
#: ../src/mail/mail-vfolder-ui.c:149 ../src/mail/mail-vfolder-ui.c:271
#: ../src/modules/accounts-window/e-accounts-window-editors.c:277
-#: ../src/modules/backup-restore/evolution-backup-tool.c:932
+#: ../src/modules/backup-restore/evolution-backup-tool.c:936
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:409
#: ../src/modules/calendar/e-cal-attachment-handler.c:283
#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
#: ../src/plugins/face/face.c:295
-#: ../src/plugins/publish-calendar/publish-calendar.c:788
+#: ../src/plugins/publish-calendar/publish-calendar.c:789
#: ../src/plugins/publish-calendar/url-editor-dialog.c:419
#: ../src/plugins/save-calendar/save-calendar.c:185
#: ../src/shell/e-shell-content.c:639 ../src/shell/e-shell-content.c:746
@@ -3848,11 +3625,11 @@ msgstr "_Cancel"
#: ../src/addressbook/gui/widgets/eab-contact-merging.c:719
#: ../src/calendar/calendar.error.xml.h:47
#: ../src/calendar/gui/e-comp-editor.c:2115
-#: ../src/composer/e-composer-actions.c:228
-#: ../src/composer/e-composer-actions.c:348
+#: ../src/composer/e-composer-actions.c:230
+#: ../src/composer/e-composer-actions.c:350
#: ../src/e-util/e-attachment-store.c:833
#: ../src/e-util/e-mail-signature-script-dialog.c:370
-#: ../src/e-util/e-webdav-browser.c:2467 ../src/e-util/e-web-view.c:4097
+#: ../src/e-util/e-webdav-browser.c:2467 ../src/e-util/e-web-view.c:4119
#: ../src/e-util/gal-view-instance-save-as-dialog.c:268
#: ../src/shell/e-shell-content.c:640 ../src/shell/e-shell-utils.c:140
#: ../src/smime/gui/certificate-manager.c:666
@@ -3871,6 +3648,7 @@ msgid "_Help"
msgstr "_Help"
#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../src/e-util/e-misc-utils.c:3493
msgid "Image"
msgstr "Image"
@@ -3928,8 +3706,8 @@ msgid "_Home Page:"
msgstr "_Home Page:"
#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../src/calendar/gui/e-comp-editor-event.c:727
-#: ../src/modules/itip-formatter/itip-view.c:2045
+#: ../src/calendar/gui/e-comp-editor-event.c:725
+#: ../src/modules/itip-formatter/itip-view.c:2048
msgid "_Calendar:"
msgstr "_Calendar:"
@@ -4019,14 +3797,14 @@ msgstr "_Anniversary:"
#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:52
#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:893
#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../src/calendar/gui/e-calendar-view.c:2045
+#: ../src/calendar/gui/e-calendar-view.c:2056
msgid "Anniversary"
msgstr "Anniversary"
#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:53
#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:892
#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../src/calendar/gui/e-calendar-view.c:2044
+#: ../src/calendar/gui/e-calendar-view.c:2055
msgid "Birthday"
msgstr "Birthday"
@@ -4082,7 +3860,7 @@ msgstr "Work"
#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:84
#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:525
#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:927
-#: ../src/calendar/gui/e-cal-model.c:3825
+#: ../src/calendar/gui/e-cal-model.c:3805
msgid "Other"
msgstr "Other"
@@ -4106,19 +3884,19 @@ msgstr "Add _X.509"
#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:69
#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1371
-#: ../src/e-util/e-attachment-view.c:356 ../src/e-util/e-filter-rule.c:223
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1375
+#: ../src/e-util/e-attachment-view.c:356 ../src/e-util/e-filter-rule.c:409
#: ../src/e-util/e-mail-signature-manager.c:368
#: ../src/e-util/e-name-selector-dialog.c:1037
-#: ../src/e-util/filter.error.xml.h:18 ../src/e-util/filter.ui.h:25
+#: ../src/e-util/filter.error.xml.h:18 ../src/e-util/filter.ui.h:27
#: ../src/mail/e-mail-config-identity-page.c:871
-#: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:438
+#: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:678
#: ../src/mail/em-folder-properties.c:1037
#: ../src/mail/em-vfolder-editor-rule.c:631 ../src/mail/mail-config.ui.h:62
#: ../src/plugins/attachment-reminder/attachment-reminder.c:553
#: ../src/plugins/email-custom-header/email-custom-header.c:847
-#: ../src/plugins/publish-calendar/publish-calendar.c:789
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
+#: ../src/plugins/publish-calendar/publish-calendar.c:790
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:35
#: ../src/plugins/templates/templates.c:473
msgid "_Remove"
msgstr "_Remove"
@@ -4174,7 +3952,6 @@ msgstr "Error removing contact"
#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:741
#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3102
#, c-format
-#| msgid "Contact Editor - %s"
msgid "Contact Editor — %s"
msgstr "Contact Editor — %s"
@@ -4261,26 +4038,22 @@ msgstr ""
#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4676
#, c-format
-#| msgid "'%s' has an invalid format"
msgid "“%s†has an invalid format"
msgstr "“%s†has an invalid format"
#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4684
#, c-format
-#| msgid "'%s' cannot be a future date"
msgid "“%s†cannot be a future date"
msgstr "“%s†cannot be a future date"
#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4692
#, c-format
-#| msgid "%s'%s' has an invalid format"
msgid "%s“%s†has an invalid format"
msgstr "%s“%s†has an invalid format"
#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4705
#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4719
#, c-format
-#| msgid "%s'%s' is empty"
msgid "%s“%s†is empty"
msgstr "%s“%s†is empty"
@@ -4300,8 +4073,8 @@ msgstr "Invalid contact."
#: ../src/e-util/e-filter-datespec.c:290
#: ../src/e-util/e-html-editor-link-dialog.c:255
#: ../src/e-util/e-passwords.c:469 ../src/e-util/e-rule-context.c:814
-#: ../src/e-util/e-rule-editor.c:179 ../src/e-util/e-rule-editor.c:281
-#: ../src/e-util/e-rule-editor.c:790 ../src/e-util/e-send-options.ui.h:17
+#: ../src/e-util/e-rule-editor.c:188 ../src/e-util/e-rule-editor.c:299
+#: ../src/e-util/e-rule-editor.c:931 ../src/e-util/e-send-options.ui.h:17
#: ../src/e-util/e-source-config-dialog.c:361
#: ../src/e-util/e-source-selector-dialog.c:371
#: ../src/e-util/e-table-config.c:549 ../src/e-util/e-table-config.ui.h:4
@@ -4314,7 +4087,7 @@ msgstr "Invalid contact."
#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
#: ../src/plugins/publish-calendar/url-editor-dialog.c:420
#: ../src/shell/e-shell-content.c:641 ../src/shell/e-shell-content.c:747
-#: ../src/shell/main.c:180 ../src/smime/gui/certificate-manager.c:1349
+#: ../src/shell/main.c:177 ../src/smime/gui/certificate-manager.c:1349
#: ../src/smime/gui/e-cert-selector.c:236 ../src/smime/gui/smime-ui.ui.h:18
msgid "_OK"
msgstr "_OK"
@@ -4447,22 +4220,22 @@ msgid "Insert email addresses from Address Book"
msgstr "Insert email addresses from Address Book"
#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
-#: ../src/e-util/filter.ui.h:26
+#: ../src/e-util/filter.ui.h:28
msgid "_Top"
msgstr "_Top"
#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
-#: ../src/e-util/e-source-selector.c:3469 ../src/e-util/filter.ui.h:27
+#: ../src/e-util/e-source-selector.c:3469 ../src/e-util/filter.ui.h:29
msgid "_Up"
msgstr "_Up"
#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
-#: ../src/e-util/e-source-selector.c:3470 ../src/e-util/filter.ui.h:28
+#: ../src/e-util/e-source-selector.c:3470 ../src/e-util/filter.ui.h:30
msgid "_Down"
msgstr "_Down"
#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
-#: ../src/e-util/filter.ui.h:29
+#: ../src/e-util/filter.ui.h:31
msgid "_Bottom"
msgstr "_Bottom"
@@ -4518,29 +4291,28 @@ msgid "Copy _Email Address"
msgstr "Copy _E-mail Address"
#: ../src/addressbook/gui/widgets/eab-contact-display.c:187
-#: ../src/e-util/e-web-view.c:368
+#: ../src/e-util/e-web-view.c:370
msgid "Copy the email address to the clipboard"
msgstr "Copy the e-mail address to the clipboard"
#: ../src/addressbook/gui/widgets/eab-contact-display.c:192
-#: ../src/e-util/e-web-view.c:380
+#: ../src/e-util/e-web-view.c:382
msgid "_Send New Message To..."
msgstr "_Send New Message To…"
#: ../src/addressbook/gui/widgets/eab-contact-display.c:194
-#: ../src/e-util/e-web-view.c:382
+#: ../src/e-util/e-web-view.c:384
msgid "Send a mail message to this address"
msgstr "Send a mail message to this address"
#: ../src/addressbook/gui/widgets/eab-contact-display.c:321
-#: ../src/e-util/e-web-view.c:1349
+#: ../src/e-util/e-web-view.c:1374
#, c-format
msgid "Click to mail %s"
msgstr "Click to mail %s"
#: ../src/addressbook/gui/widgets/eab-contact-display.c:335
#, c-format
-#| msgid "Click to open %s"
msgid "Click to open map for %s"
msgstr "Click to open map for %s"
@@ -4700,10 +4472,10 @@ msgstr "Blog"
#: ../src/calendar/gui/e-cal-component-preview.c:308
#: ../src/calendar/gui/e-cal-model-tasks.c:314
#: ../src/calendar/gui/e-cal-model-tasks.c:556
-#: ../src/calendar/gui/e-task-table.c:209
-#: ../src/calendar/gui/e-task-table.c:224
-#: ../src/calendar/gui/e-task-table.c:634 ../src/calendar/gui/print.c:3586
-#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:966
+#: ../src/calendar/gui/e-task-table.c:210
+#: ../src/calendar/gui/e-task-table.c:225
+#: ../src/calendar/gui/e-task-table.c:635 ../src/calendar/gui/print.c:3586
+#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:1086
msgid "Cancelled"
msgstr "Cancelled"
@@ -4935,7 +4707,7 @@ msgstr "Are you sure you want to delete this contact (%s)?"
#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1361
#: ../src/calendar/gui/e-comp-editor.c:2005
-#: ../src/e-util/e-accounts-window.c:1727 ../src/e-util/e-focus-tracker.c:783
+#: ../src/e-util/e-accounts-window.c:1714 ../src/e-util/e-focus-tracker.c:783
#: ../src/e-util/evolution-source-viewer.c:806
#: ../src/e-util/e-webdav-browser.c:2688
#: ../src/mail/e-mail-account-manager.c:737
@@ -4943,7 +4715,7 @@ msgstr "Are you sure you want to delete this contact (%s)?"
#: ../src/modules/calendar/e-cal-shell-view-actions.c:1524
#: ../src/modules/calendar/e-memo-shell-view-actions.c:676
#: ../src/modules/calendar/e-task-shell-view-actions.c:830
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1678
#: ../src/shell/e-shell-window-actions.c:852
#: ../src/smime/gui/certificate-manager.c:1672 ../src/smime/gui/smime-ui.ui.h:8
msgid "_Delete"
@@ -4966,7 +4738,6 @@ msgstr[1] ""
"Do you really want to display all of these contacts?"
#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1516
-#| msgid "_Don't Display"
msgid "_Don’t Display"
msgstr "_Don’t Display"
@@ -5144,7 +4915,7 @@ msgstr "Zoom _In"
#. Zoom-out button
#: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
-#: ../src/mail/e-mail-reader.c:2415
+#: ../src/mail/e-mail-reader.c:2500
msgid "Zoom _Out"
msgstr "Zoom _Out"
@@ -5218,14 +4989,13 @@ msgstr ""
#: ../src/addressbook/importers/evolution-ldif-importer.c:547
#: ../src/addressbook/importers/evolution-vcard-importer.c:247
#: ../src/calendar/importers/icalendar-importer.c:479
-#: ../src/calendar/importers/icalendar-importer.c:976
-#: ../src/calendar/importers/icalendar-importer.c:1016
+#: ../src/calendar/importers/icalendar-importer.c:972
+#: ../src/calendar/importers/icalendar-importer.c:1012
#: ../src/shell/shell.error.xml.h:1
msgid "Importing..."
msgstr "Importing…"
#: ../src/addressbook/importers/evolution-csv-importer.c:927
-#| msgid "Can't open .csv file"
msgid "Can’t open .csv file"
msgstr "Can’t open .csv file"
@@ -5254,7 +5024,6 @@ msgid "Evolution Contacts CSV and Tab Importer"
msgstr "Evolution Contacts CSV and Tab Importer"
#: ../src/addressbook/importers/evolution-ldif-importer.c:717
-#| msgid "Can't open .ldif file"
msgid "Can’t open .ldif file"
msgstr "Can’t open .ldif file"
@@ -5399,30 +5168,30 @@ msgctxt "addressbook-label"
msgid "Phone"
msgstr "Phone"
-#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:103
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:105
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minute"
msgstr[1] "minutes"
-#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:116
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:118
msgid "hour"
msgid_plural "hours"
msgstr[0] "hour"
msgstr[1] "hours"
-#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:129
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:131
msgid "day"
msgid_plural "days"
msgstr[0] "day"
msgstr[1] "days"
-#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:357
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:373
msgid "Start time"
msgstr "Start time"
#: ../src/calendar/alarm-notify/alarm-notify.ui.h:1
-#: ../src/calendar/alarm-notify/alarm-queue.c:1988
+#: ../src/calendar/alarm-notify/alarm-queue.c:2002
msgid "Appointments"
msgstr "Appointments"
@@ -5435,19 +5204,19 @@ msgid "_Snooze"
msgstr "_Snooze"
#: ../src/calendar/alarm-notify/alarm-notify.ui.h:4
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1363
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2239
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1367
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2222
#: ../src/calendar/gui/e-comp-editor.c:2070
-#: ../src/e-util/e-accounts-window.c:1719
+#: ../src/e-util/e-accounts-window.c:1706
#: ../src/e-util/e-html-editor-actions.c:922
#: ../src/e-util/e-mail-signature-manager.c:358
-#: ../src/e-util/e-webdav-browser.c:2681 ../src/e-util/filter.ui.h:24
-#: ../src/mail/e-mail-account-manager.c:728 ../src/mail/e-mail-browser.c:171
+#: ../src/e-util/e-webdav-browser.c:2681 ../src/e-util/filter.ui.h:26
+#: ../src/mail/e-mail-account-manager.c:728 ../src/mail/e-mail-browser.c:172
#: ../src/mail/e-mail-label-manager.c:380
#: ../src/mail/em-folder-properties.c:1034 ../src/mail/mail-config.ui.h:66
#: ../src/plugins/attachment-reminder/attachment-reminder.c:548
#: ../src/plugins/email-custom-header/email-custom-header.c:842
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
#: ../src/plugins/templates/templates.c:468
#: ../src/shell/e-shell-window-actions.c:980 ../src/smime/gui/smime-ui.ui.h:11
msgid "_Edit"
@@ -5463,11 +5232,11 @@ msgid "_Dismiss"
msgstr "_Dismiss"
#: ../src/calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../src/calendar/alarm-notify/alarm-queue.c:1955
-#: ../src/calendar/alarm-notify/alarm-queue.c:1965
+#: ../src/calendar/alarm-notify/alarm-queue.c:1969
+#: ../src/calendar/alarm-notify/alarm-queue.c:1979
#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../src/modules/itip-formatter/itip-view.c:1678
-#: ../src/modules/itip-formatter/itip-view.c:1789
+#: ../src/modules/itip-formatter/itip-view.c:1681
+#: ../src/modules/itip-formatter/itip-view.c:1792
msgid "Location:"
msgstr "Location:"
@@ -5484,7 +5253,7 @@ msgstr "Snooze _time:"
#: ../src/calendar/alarm-notify/alarm-notify.ui.h:10
#: ../src/e-util/e-interval-chooser.c:144 ../src/e-util/filter.ui.h:8
#: ../src/modules/calendar/e-cal-shell-view-actions.c:342
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:6
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:7
msgid "days"
msgstr "days"
@@ -5499,47 +5268,47 @@ msgstr "hours"
msgid "minutes"
msgstr "minutes"
-#: ../src/calendar/alarm-notify/alarm-queue.c:1756
-#: ../src/calendar/alarm-notify/alarm-queue.c:1936
+#: ../src/calendar/alarm-notify/alarm-queue.c:1770
+#: ../src/calendar/alarm-notify/alarm-queue.c:1950
msgid "No summary available."
msgstr "No summary available."
-#: ../src/calendar/alarm-notify/alarm-queue.c:1765
-#: ../src/calendar/alarm-notify/alarm-queue.c:1767
+#: ../src/calendar/alarm-notify/alarm-queue.c:1779
+#: ../src/calendar/alarm-notify/alarm-queue.c:1781
msgid "No description available."
msgstr "No description available."
-#: ../src/calendar/alarm-notify/alarm-queue.c:1775
+#: ../src/calendar/alarm-notify/alarm-queue.c:1789
msgid "No location information available."
msgstr "No location information available."
-#: ../src/calendar/alarm-notify/alarm-queue.c:1780
-#: ../src/calendar/alarm-notify/alarm-queue.c:1927
-#: ../src/calendar/alarm-notify/alarm-queue.c:2278
+#: ../src/calendar/alarm-notify/alarm-queue.c:1794
+#: ../src/calendar/alarm-notify/alarm-queue.c:1941
+#: ../src/calendar/alarm-notify/alarm-queue.c:2292
msgid "Evolution Reminders"
msgstr "Evolution Reminders"
-#: ../src/calendar/alarm-notify/alarm-queue.c:1823
+#: ../src/calendar/alarm-notify/alarm-queue.c:1837
#, c-format
msgid "You have %d reminder"
msgid_plural "You have %d reminders"
msgstr[0] "You have %d reminder"
msgstr[1] "You have %d reminders"
-#: ../src/calendar/alarm-notify/alarm-queue.c:2096
+#: ../src/calendar/alarm-notify/alarm-queue.c:2110
msgid "Warning"
msgstr "Warning"
-#: ../src/calendar/alarm-notify/alarm-queue.c:2097
+#: ../src/calendar/alarm-notify/alarm-queue.c:2111
#: ../src/mail/mail-dialogs.ui.h:20
msgid "_No"
msgstr "_No"
-#: ../src/calendar/alarm-notify/alarm-queue.c:2098
+#: ../src/calendar/alarm-notify/alarm-queue.c:2112
msgid "_Yes"
msgstr "_Yes"
-#: ../src/calendar/alarm-notify/alarm-queue.c:2102
+#: ../src/calendar/alarm-notify/alarm-queue.c:2116
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -5556,7 +5325,7 @@ msgstr ""
"\n"
"Are you sure you want to run this program?"
-#: ../src/calendar/alarm-notify/alarm-queue.c:2117
+#: ../src/calendar/alarm-notify/alarm-queue.c:2131
msgid "Do not ask me about this program again."
msgstr "Do not ask me about this program again."
@@ -5675,12 +5444,10 @@ msgid "All information on this memo will be deleted and can not be restored."
msgstr "All information on this memo will be deleted and can not be restored."
#: ../src/calendar/calendar.error.xml.h:15
-#| msgid "Are you sure you want to delete the meeting titled '{0}'?"
msgid "Are you sure you want to delete the meeting titled “{0}�"
msgstr "Are you sure you want to delete the meeting titled “{0}�"
#: ../src/calendar/calendar.error.xml.h:16
-#| msgid "Are you sure you want to delete the appointment titled '{0}'?"
msgid "Are you sure you want to delete the appointment titled “{0}�"
msgstr "Are you sure you want to delete the appointment titled “{0}�"
@@ -5695,12 +5462,10 @@ msgid "Are you sure you want to delete this appointment?"
msgstr "Are you sure you want to delete this appointment?"
#: ../src/calendar/calendar.error.xml.h:19
-#| msgid "Are you sure you want to delete the '{0}' task?"
msgid "Are you sure you want to delete the “{0}†task?"
msgstr "Are you sure you want to delete the “{0}†task?"
#: ../src/calendar/calendar.error.xml.h:20
-#| msgid "Are you sure you want to delete the memo '{0}'?"
msgid "Are you sure you want to delete the memo “{0}�"
msgstr "Are you sure you want to delete the memo “{0}�"
@@ -5753,7 +5518,7 @@ msgid "_Save Changes"
msgstr "_Save Changes"
#: ../src/calendar/calendar.error.xml.h:31
-#: ../src/composer/mail-composer.error.xml.h:13
+#: ../src/composer/mail-composer.error.xml.h:15
msgid "_Discard Changes"
msgstr "_Discard Changes"
@@ -5796,7 +5561,7 @@ msgstr ""
"E-mail invitations will be sent to all participants and allow them to reply."
#: ../src/calendar/calendar.error.xml.h:40
-#: ../src/composer/mail-composer.error.xml.h:38 ../src/mail/mail.error.xml.h:8
+#: ../src/composer/mail-composer.error.xml.h:40 ../src/mail/mail.error.xml.h:8
#: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
msgid "_Send"
msgstr "_Send"
@@ -5890,7 +5655,6 @@ msgid "Editor could not be loaded."
msgstr "Editor could not be loaded."
#: ../src/calendar/calendar.error.xml.h:57
-#| msgid "Are you sure you want to delete the '{0}' task?"
msgid "Are you sure you want to delete calendar “{0}�"
msgstr "Are you sure you want to delete calendar “{0}�"
@@ -5899,7 +5663,6 @@ msgid "This calendar will be removed permanently."
msgstr "This calendar will be removed permanently."
#: ../src/calendar/calendar.error.xml.h:59
-#| msgid "Are you sure you want to delete the memo '{0}'?"
msgid "Are you sure you want to delete task list “{0}�"
msgstr "Are you sure you want to delete task list “{0}�"
@@ -5908,7 +5671,6 @@ msgid "This task list will be removed permanently."
msgstr "This task list will be removed permanently."
#: ../src/calendar/calendar.error.xml.h:61
-#| msgid "Are you sure you want to delete the memo '{0}'?"
msgid "Are you sure you want to delete memo list “{0}�"
msgstr "Are you sure you want to delete memo list “{0}�"
@@ -5917,14 +5679,10 @@ msgid "This memo list will be removed permanently."
msgstr "This memo list will be removed permanently."
#: ../src/calendar/calendar.error.xml.h:63
-#| msgid "Are you sure you want to delete the memo '{0}'?"
msgid "Are you sure you want to delete remote calendar “{0}�"
msgstr "Are you sure you want to delete remote calendar “{0}�"
#: ../src/calendar/calendar.error.xml.h:64
-#| msgid ""
-#| "This will permanently remove the calendar '{0}' from the server. Are you "
-#| "sure you want to proceed?"
msgid ""
"This will permanently remove the calendar “{0}†from the server. Are you "
"sure you want to proceed?"
@@ -5933,14 +5691,10 @@ msgstr ""
"sure you want to proceed?"
#: ../src/calendar/calendar.error.xml.h:66
-#| msgid "Are you sure you want to delete these contact lists?"
msgid "Are you sure you want to delete remote task list “{0}�"
msgstr "Are you sure you want to delete remote task list “{0}�"
#: ../src/calendar/calendar.error.xml.h:67
-#| msgid ""
-#| "This will permanently remove the task list '{0}' from the server. Are you "
-#| "sure you want to proceed?"
msgid ""
"This will permanently remove the task list “{0}†from the server. Are you "
"sure you want to proceed?"
@@ -5949,14 +5703,10 @@ msgstr ""
"sure you want to proceed?"
#: ../src/calendar/calendar.error.xml.h:68
-#| msgid "Are you sure you want to delete the memo '{0}'?"
msgid "Are you sure you want to delete remote memo list “{0}�"
msgstr "Are you sure you want to delete remote memo list “{0}�"
#: ../src/calendar/calendar.error.xml.h:69
-#| msgid ""
-#| "This will permanently remove the memo list '{0}' from the server. Are you "
-#| "sure you want to proceed?"
msgid ""
"This will permanently remove the memo list “{0}†from the server. Are you "
"sure you want to proceed?"
@@ -5994,7 +5744,6 @@ msgstr "Are you sure you want to save the memo without a summary?"
#. Translators: {0} is the name of the calendar.
#: ../src/calendar/calendar.error.xml.h:76
-#| msgid "Error loading calendar '{0}'"
msgid "Error loading calendar “{0}â€"
msgstr "Error loading calendar “{0}â€"
@@ -6008,9 +5757,6 @@ msgstr "Cannot save event"
#. Translators: {0} is the name of the calendar source
#: ../src/calendar/calendar.error.xml.h:80
-#| msgid ""
-#| "'{0}' is a read-only calendar and cannot be modified. Please select a "
-#| "different calendar that can accept appointments."
msgid ""
"“{0}†is a read-only calendar and cannot be modified. Please select a "
"different calendar that can accept appointments."
@@ -6024,9 +5770,6 @@ msgstr "Cannot save task"
#. Translators: {0} is the name of the calendar source
#: ../src/calendar/calendar.error.xml.h:83
-#| msgid ""
-#| "'{0}' does not support assigned tasks, please select a different task "
-#| "list."
msgid ""
"“{0}†does not support assigned tasks, please select a different task list."
msgstr ""
@@ -6034,7 +5777,6 @@ msgstr ""
#. Translators: {0} is the name of the task list.
#: ../src/calendar/calendar.error.xml.h:85
-#| msgid "Error loading task list '{0}'"
msgid "Error loading task list “{0}â€"
msgstr "Error loading task list “{0}â€"
@@ -6044,7 +5786,6 @@ msgstr "The task list is not marked for offline usage."
#. Translators: {0} is the name of the memo list.
#: ../src/calendar/calendar.error.xml.h:88
-#| msgid "Error loading memo list '{0}'"
msgid "Error loading memo list “{0}â€"
msgstr "Error loading memo list “{0}â€"
@@ -6054,7 +5795,6 @@ msgstr "The memo list is not marked for offline usage."
#. Translators: {0} is the name of the calendar/memo list/task list.
#: ../src/calendar/calendar.error.xml.h:91
-#| msgid "Failed to add timezone to '{0}'"
msgid "Failed to add timezone to “{0}â€"
msgstr "Failed to add timezone to “{0}â€"
@@ -6065,235 +5805,196 @@ msgstr "Failed to save attachments"
#. Translators: {0} is the name of the calendar.
#: ../src/calendar/calendar.error.xml.h:95
-#| msgid "Failed to open calendar '{0}'"
msgid "Failed to open calendar “{0}â€"
msgstr "Failed to open calendar “{0}â€"
#. Translators: {0} is the name of the memo list.
#: ../src/calendar/calendar.error.xml.h:97
-#| msgid "Failed to open memo list '{0}'"
msgid "Failed to open memo list “{0}â€"
msgstr "Failed to open memo list “{0}â€"
#. Translators: {0} is the name of the task list.
#: ../src/calendar/calendar.error.xml.h:99
-#| msgid "Failed to open task list '{0}'"
msgid "Failed to open task list “{0}â€"
msgstr "Failed to open task list “{0}â€"
#. Translators: {0} is the name of the calendar.
#: ../src/calendar/calendar.error.xml.h:101
-#| msgid "Failed to create an event in the calendar '{0}'"
msgid "Failed to create an event in the calendar “{0}â€"
msgstr "Failed to create an event in the calendar “{0}â€"
#. Translators: {0} is the name of the memo list.
#: ../src/calendar/calendar.error.xml.h:103
-#| msgid "Failed to create a memo in the memo list '{0}'"
msgid "Failed to create a memo in the memo list “{0}â€"
msgstr "Failed to create a memo in the memo list “{0}â€"
#. Translators: {0} is the name of the task list.
#: ../src/calendar/calendar.error.xml.h:105
-#| msgid "Failed to create a task in the task list '{0}'"
msgid "Failed to create a task in the task list “{0}â€"
msgstr "Failed to create a task in the task list “{0}â€"
#. Translators: {0} is the name of the calendar.
#: ../src/calendar/calendar.error.xml.h:107
-#| msgid "Failed to modify an event in the calendar '{0}'"
msgid "Failed to modify an event in the calendar “{0}â€"
msgstr "Failed to modify an event in the calendar “{0}â€"
#. Translators: {0} is the name of the memo list.
#: ../src/calendar/calendar.error.xml.h:109
-#| msgid "Failed to modify a memo in the memo list '{0}'"
msgid "Failed to modify a memo in the memo list “{0}â€"
msgstr "Failed to modify a memo in the memo list “{0}â€"
#. Translators: {0} is the name of the task list.
#: ../src/calendar/calendar.error.xml.h:111
-#| msgid "Failed to modify a task in the task list '{0}'"
msgid "Failed to modify a task in the task list “{0}â€"
msgstr "Failed to modify a task in the task list “{0}â€"
#. Translators: {0} is the name of the calendar.
#: ../src/calendar/calendar.error.xml.h:113
-#| msgid "Failed to delete an event in the calendar '{0}'"
msgid "Failed to delete an event in the calendar “{0}â€"
msgstr "Failed to delete an event in the calendar “{0}â€"
#. Translators: {0} is the name of the memo list.
#: ../src/calendar/calendar.error.xml.h:115
-#| msgid "Failed to delete a memo in the memo list '{0}'"
msgid "Failed to delete a memo in the memo list “{0}â€"
msgstr "Failed to delete a memo in the memo list “{0}â€"
#. Translators: {0} is the name of the task list.
#: ../src/calendar/calendar.error.xml.h:117
-#| msgid "Failed to delete a task in the task list '{0}'"
msgid "Failed to delete a task in the task list “{0}â€"
msgstr "Failed to delete a task in the task list “{0}â€"
#. Translators: {0} is the name of the calendar.
#: ../src/calendar/calendar.error.xml.h:119
-#| msgid "Failed to update an event in the calendar '{0}'"
msgid "Failed to update an event in the calendar “{0}â€"
msgstr "Failed to update an event in the calendar “{0}â€"
#. Translators: {0} is the name of the memo list.
#: ../src/calendar/calendar.error.xml.h:121
-#| msgid "Failed to update a memo in the memo list '{0}'"
msgid "Failed to update a memo in the memo list “{0}â€"
msgstr "Failed to update a memo in the memo list “{0}â€"
#. Translators: {0} is the name of the task list.
#: ../src/calendar/calendar.error.xml.h:123
-#| msgid "Failed to update a task in the task list '{0}'"
msgid "Failed to update a task in the task list “{0}â€"
msgstr "Failed to update a task in the task list “{0}â€"
#. Translators: {0} is the name of the calendar.
#: ../src/calendar/calendar.error.xml.h:125
-#| msgid "Failed to send an event to the calendar '{0}'"
msgid "Failed to send an event to the calendar “{0}â€"
msgstr "Failed to send an event to the calendar “{0}â€"
#. Translators: {0} is the name of the memo list.
#: ../src/calendar/calendar.error.xml.h:127
-#| msgid "Failed to send a memo to the memo list '{0}'"
msgid "Failed to send a memo to the memo list “{0}â€"
msgstr "Failed to send a memo to the memo list “{0}â€"
#. Translators: {0} is the name of the task list.
#: ../src/calendar/calendar.error.xml.h:129
-#| msgid "Failed to send a task to the task list '{0}'"
msgid "Failed to send a task to the task list “{0}â€"
msgstr "Failed to send a task to the task list “{0}â€"
#. Translators: {0} is the name of the calendar.
#: ../src/calendar/calendar.error.xml.h:131
-#| msgid "Error creating view for the calendar '{0}'"
msgid "Error creating view for the calendar “{0}â€"
msgstr "Error creating view for the calendar “{0}â€"
#. Translators: {0} is the name of the task list.
#: ../src/calendar/calendar.error.xml.h:133
-#| msgid "Error creating view for the task list '{0}'"
msgid "Error creating view for the task list “{0}â€"
msgstr "Error creating view for the task list “{0}â€"
#. Translators: {0} is the name of the memo list.
#: ../src/calendar/calendar.error.xml.h:135
-#| msgid "Error creating view for the memo list '{0}'"
msgid "Error creating view for the memo list “{0}â€"
msgstr "Error creating view for the memo list “{0}â€"
#. Translators: {0} is the name of the calendar.
#: ../src/calendar/calendar.error.xml.h:137
-#| msgid "Failed to copy an event into the calendar '{0}'"
msgid "Failed to copy an event into the calendar “{0}â€"
msgstr "Failed to copy an event into the calendar “{0}â€"
#. Translators: {0} is the name of the task list.
#: ../src/calendar/calendar.error.xml.h:139
-#| msgid "Failed to copy a task into the task list '{0}'"
msgid "Failed to copy a task into the task list “{0}â€"
msgstr "Failed to copy a task into the task list “{0}â€"
#. Translators: {0} is the name of the memo list.
#: ../src/calendar/calendar.error.xml.h:141
-#| msgid "Failed to copy a memo into the memo list '{0}'"
msgid "Failed to copy a memo into the memo list “{0}â€"
msgstr "Failed to copy a memo into the memo list “{0}â€"
#. Translators: {0} is the name of the calendar.
#: ../src/calendar/calendar.error.xml.h:143
-#| msgid "Failed to move an event into the calendar '{0}'"
msgid "Failed to move an event into the calendar “{0}â€"
msgstr "Failed to move an event into the calendar “{0}â€"
#. Translators: {0} is the name of the task list.
#: ../src/calendar/calendar.error.xml.h:145
-#| msgid "Failed to move a task into the task list '{0}'"
msgid "Failed to move a task into the task list “{0}â€"
msgstr "Failed to move a task into the task list “{0}â€"
#. Translators: {0} is the name of the memo list.
#: ../src/calendar/calendar.error.xml.h:147
-#| msgid "Failed to move a memo into the memo list '{0}'"
msgid "Failed to move a memo into the memo list “{0}â€"
msgstr "Failed to move a memo into the memo list “{0}â€"
#. Translators: {0} is the name of the calendar.
#: ../src/calendar/calendar.error.xml.h:149
-#| msgid "Failed to get an event from the calendar '{0}'"
msgid "Failed to get an event from the calendar “{0}â€"
msgstr "Failed to get an event from the calendar “{0}â€"
#. Translators: {0} is the name of the task list.
#: ../src/calendar/calendar.error.xml.h:151
-#| msgid "Failed to get a task from the task list '{0}'"
msgid "Failed to get a task from the task list “{0}â€"
msgstr "Failed to get a task from the task list “{0}â€"
#. Translators: {0} is the name of the memo list.
#: ../src/calendar/calendar.error.xml.h:153
-#| msgid "Failed to get a memo from the memo list '{0}'"
msgid "Failed to get a memo from the memo list “{0}â€"
msgstr "Failed to get a memo from the memo list “{0}â€"
#. Translators: {0} is the name of the calendar.
#: ../src/calendar/calendar.error.xml.h:155
-#| msgid "Copying an event into the calendar '{0}'"
msgid "Copying an event into the calendar “{0}â€"
msgstr "Copying an event into the calendar “{0}â€"
#. Translators: {0} is the name of the task list.
#: ../src/calendar/calendar.error.xml.h:157
-#| msgid "Copying a task into the task list '{0}'"
msgid "Copying a task into the task list “{0}â€"
msgstr "Copying a task into the task list “{0}â€"
#. Translators: {0} is the name of the memo list.
#: ../src/calendar/calendar.error.xml.h:159
-#| msgid "Copying a memo into the memo list '{0}'"
msgid "Copying a memo into the memo list “{0}â€"
msgstr "Copying a memo into the memo list “{0}â€"
#. Translators: {0} is the name of the calendar.
#: ../src/calendar/calendar.error.xml.h:161
-#| msgid "Moving an event into the calendar '{0}'"
msgid "Moving an event into the calendar “{0}â€"
msgstr "Moving an event into the calendar “{0}â€"
#. Translators: {0} is the name of the task list.
#: ../src/calendar/calendar.error.xml.h:163
-#| msgid "Moving a task into the task list '{0}'"
msgid "Moving a task into the task list “{0}â€"
msgstr "Moving a task into the task list “{0}â€"
#. Translators: {0} is the name of the memo list.
#: ../src/calendar/calendar.error.xml.h:165
-#| msgid "Moving a memo into the memo list '{0}'"
msgid "Moving a memo into the memo list “{0}â€"
msgstr "Moving a memo into the memo list “{0}â€"
#. Translators: {0} is the name of the calendar.
#: ../src/calendar/calendar.error.xml.h:167
-#| msgid "Failed to refresh calendar '{0}'"
msgid "Failed to refresh calendar “{0}â€"
msgstr "Failed to refresh calendar “{0}â€"
#. Translators: {0} is the name of the task list.
#: ../src/calendar/calendar.error.xml.h:169
-#| msgid "Failed to refresh task list '{0}'"
msgid "Failed to refresh task list “{0}â€"
msgstr "Failed to refresh task list “{0}â€"
#. Translators: {0} is the name of the memo list.
#: ../src/calendar/calendar.error.xml.h:171
-#| msgid "Failed to refresh memo list '{0}'"
msgid "Failed to refresh memo list “{0}â€"
msgstr "Failed to refresh memo list “{0}â€"
@@ -6302,7 +6003,6 @@ msgid "Failed to make an occurrence movable"
msgstr "Failed to make an occurrence movable"
#: ../src/calendar/calendar.error.xml.h:173
-#| msgid "Create a new window displaying this view"
msgid "Something has gone wrong when displaying the event"
msgstr "Something has gone wrong when displaying the event"
@@ -6317,7 +6017,6 @@ msgstr ""
"report in the GNOME bugzilla."
#: ../src/calendar/calendar.error.xml.h:175
-#| msgid "Create a new window displaying this view"
msgid "Something has gone wrong when displaying the memo"
msgstr "Something has gone wrong when displaying the memo"
@@ -6332,7 +6031,6 @@ msgstr ""
"report in the GNOME bugzilla."
#: ../src/calendar/calendar.error.xml.h:177
-#| msgid "Mode to use when displaying mails"
msgid "Something has gone wrong when displaying the task"
msgstr "Something has gone wrong when displaying the task"
@@ -6375,6 +6073,7 @@ msgstr "does not contain"
#: ../src/calendar/gui/memotypes.xml.in.h:4
#: ../src/calendar/gui/tasktypes.xml.in.h:4
#: ../src/e-util/e-attachment-tree-view.c:147
+#: ../src/e-util/e-collection-account-wizard.c:1655
#: ../src/e-util/e-table-config.ui.h:20
#: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
msgid "Description"
@@ -6408,21 +6107,21 @@ msgstr "is not"
#: ../src/calendar/gui/caltypes.xml.in.h:9
#: ../src/calendar/gui/e-cal-list-view.c:238
#: ../src/calendar/gui/e-cal-model.c:303 ../src/calendar/gui/e-cal-model.c:310
-#: ../src/calendar/gui/e-task-table.c:522
+#: ../src/calendar/gui/e-task-table.c:523
#: ../src/calendar/gui/memotypes.xml.in.h:10
msgid "Public"
msgstr "Public"
#: ../src/calendar/gui/caltypes.xml.in.h:10
#: ../src/calendar/gui/e-cal-list-view.c:239
-#: ../src/calendar/gui/e-cal-model.c:312 ../src/calendar/gui/e-task-table.c:523
+#: ../src/calendar/gui/e-cal-model.c:312 ../src/calendar/gui/e-task-table.c:524
#: ../src/calendar/gui/memotypes.xml.in.h:11
msgid "Private"
msgstr "Private"
#: ../src/calendar/gui/caltypes.xml.in.h:11
#: ../src/calendar/gui/e-cal-list-view.c:240
-#: ../src/calendar/gui/e-cal-model.c:314 ../src/calendar/gui/e-task-table.c:524
+#: ../src/calendar/gui/e-cal-model.c:314 ../src/calendar/gui/e-task-table.c:525
#: ../src/calendar/gui/memotypes.xml.in.h:12
#: ../src/e-util/e-html-editor-page-dialog.c:113
#: ../src/e-util/e-send-options.ui.h:7
@@ -6444,8 +6143,8 @@ msgstr "Attendee"
#: ../src/calendar/gui/caltypes.xml.in.h:14
#: ../src/calendar/gui/e-cal-list-view.etspec.h:5
#: ../src/mail/message-list.etspec.h:14
-#: ../src/plugins/publish-calendar/publish-calendar.c:860
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:22
+#: ../src/plugins/publish-calendar/publish-calendar.c:861
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:23
#: ../src/plugins/save-calendar/csv-format.c:387
msgid "Location"
msgstr "Location"
@@ -6484,7 +6183,7 @@ msgid "Do Not Exist"
msgstr "Do Not Exist"
#: ../src/calendar/gui/caltypes.xml.in.h:19
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2003
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2002
msgid "Recurrence"
msgstr "Recurrence"
@@ -6516,6 +6215,20 @@ msgstr "Summary Contains"
msgid "Description Contains"
msgstr "Description Contains"
+#: ../src/calendar/gui/comp-util.c:1490
+#: ../src/modules/itip-formatter/itip-view.c:2365
+#, c-format
+msgid "with one guest"
+msgid_plural "with %d guests"
+msgstr[0] "with one guest"
+msgstr[1] "with %d guests"
+
+#: ../src/calendar/gui/comp-util.c:1546
+#, c-format
+#| msgid "Comment:"
+msgid "Comments: %s"
+msgstr "Comments: %s"
+
#: ../src/calendar/gui/ea-cal-view.c:281
msgid "New Appointment"
msgstr "New Appointment"
@@ -6627,28 +6340,28 @@ msgstr[1] "%d weeks"
#. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
#: ../src/calendar/gui/e-alarm-list.c:419
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1827
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1811
msgctxt "cal-reminders"
msgid "Play a sound"
msgstr "Play a sound"
#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
#: ../src/calendar/gui/e-alarm-list.c:423
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1825
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1809
msgctxt "cal-reminders"
msgid "Pop up an alert"
msgstr "Pop up an alert"
#. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
#: ../src/calendar/gui/e-alarm-list.c:427
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1831
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1815
msgctxt "cal-reminders"
msgid "Send an email"
msgstr "Send an e-mail"
#. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
#: ../src/calendar/gui/e-alarm-list.c:431
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1829
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1813
msgctxt "cal-reminders"
msgid "Run a program"
msgstr "Run a program"
@@ -6741,7 +6454,7 @@ msgid "calendar view for one or more weeks"
msgstr "calendar view for one or more weeks"
#: ../src/calendar/gui/e-cal-component-preview.c:214
-#: ../src/e-util/e-filter-rule.c:770 ../src/mail/e-mail-config-page.c:124
+#: ../src/e-util/e-filter-rule.c:985 ../src/mail/e-mail-config-page.c:124
msgid "Untitled"
msgstr "Untitled"
@@ -6766,8 +6479,8 @@ msgid "Due Date:"
msgstr "Due Date:"
#: ../src/calendar/gui/e-cal-component-preview.c:298
-#: ../src/modules/itip-formatter/itip-view.c:1681
-#: ../src/modules/itip-formatter/itip-view.c:1798
+#: ../src/modules/itip-formatter/itip-view.c:1684
+#: ../src/modules/itip-formatter/itip-view.c:1801
msgid "Status:"
msgstr "Status:"
@@ -6775,9 +6488,9 @@ msgstr "Status:"
#: ../src/calendar/gui/e-cal-model-tasks.c:310
#: ../src/calendar/gui/e-cal-model-tasks.c:552
#: ../src/calendar/gui/e-cal-model-tasks.c:633
-#: ../src/calendar/gui/e-task-table.c:205
-#: ../src/calendar/gui/e-task-table.c:220
-#: ../src/calendar/gui/e-task-table.c:632 ../src/calendar/gui/print.c:3580
+#: ../src/calendar/gui/e-task-table.c:206
+#: ../src/calendar/gui/e-task-table.c:221
+#: ../src/calendar/gui/e-task-table.c:633 ../src/calendar/gui/print.c:3580
msgid "In Progress"
msgstr "In Progress"
@@ -6786,9 +6499,9 @@ msgstr "In Progress"
#: ../src/calendar/gui/e-cal-model-tasks.c:554
#: ../src/calendar/gui/e-meeting-store.c:202
#: ../src/calendar/gui/e-meeting-store.c:225
-#: ../src/calendar/gui/e-task-table.c:207
-#: ../src/calendar/gui/e-task-table.c:222
-#: ../src/calendar/gui/e-task-table.c:633 ../src/calendar/gui/print.c:3583
+#: ../src/calendar/gui/e-task-table.c:208
+#: ../src/calendar/gui/e-task-table.c:223
+#: ../src/calendar/gui/e-task-table.c:634 ../src/calendar/gui/print.c:3583
#: ../src/calendar/gui/tasktypes.xml.in.h:13
#: ../src/plugins/save-calendar/csv-format.c:377
msgid "Completed"
@@ -6797,9 +6510,9 @@ msgstr "Completed"
#: ../src/calendar/gui/e-cal-component-preview.c:312
#: ../src/calendar/gui/e-cal-model-tasks.c:308
#: ../src/calendar/gui/e-cal-model-tasks.c:550
-#: ../src/calendar/gui/e-task-table.c:203
-#: ../src/calendar/gui/e-task-table.c:218
-#: ../src/calendar/gui/e-task-table.c:631 ../src/calendar/gui/print.c:3577
+#: ../src/calendar/gui/e-task-table.c:204
+#: ../src/calendar/gui/e-task-table.c:219
+#: ../src/calendar/gui/e-task-table.c:632 ../src/calendar/gui/print.c:3577
#: ../src/calendar/gui/tasktypes.xml.in.h:11
msgid "Not Started"
msgstr "Not Started"
@@ -6809,24 +6522,24 @@ msgid "Priority:"
msgstr "Priority:"
#: ../src/calendar/gui/e-cal-component-preview.c:327
-#: ../src/calendar/gui/e-task-table.c:548
+#: ../src/calendar/gui/e-task-table.c:549
#: ../src/calendar/gui/tasktypes.xml.in.h:19
-#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:322
+#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:327
msgid "High"
msgstr "High"
#: ../src/calendar/gui/e-cal-component-preview.c:329
#: ../src/calendar/gui/e-cal-model.c:1890
-#: ../src/calendar/gui/e-task-table.c:549
+#: ../src/calendar/gui/e-task-table.c:550
#: ../src/calendar/gui/tasktypes.xml.in.h:20
-#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:321
+#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:326
msgid "Normal"
msgstr "Normal"
#: ../src/calendar/gui/e-cal-component-preview.c:331
-#: ../src/calendar/gui/e-task-table.c:550
+#: ../src/calendar/gui/e-task-table.c:551
#: ../src/calendar/gui/tasktypes.xml.in.h:21
-#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:320
+#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:325
msgid "Low"
msgstr "Low"
@@ -6841,19 +6554,16 @@ msgstr "Web Page:"
#: ../src/calendar/gui/e-cal-data-model.c:1631
#, c-format
-#| msgid "Creating view for calendar '%s'"
msgid "Creating view for calendar “%sâ€"
msgstr "Creating view for calendar “%sâ€"
#: ../src/calendar/gui/e-cal-data-model.c:1635
#, c-format
-#| msgid "Creating view for task list '%s'"
msgid "Creating view for task list “%sâ€"
msgstr "Creating view for task list “%sâ€"
#: ../src/calendar/gui/e-cal-data-model.c:1639
#, c-format
-#| msgid "Creating view for memo list '%s'"
msgid "Creating view for memo list “%sâ€"
msgstr "Creating view for memo list “%sâ€"
@@ -6863,24 +6573,20 @@ msgstr "Destination is read only"
#: ../src/calendar/gui/e-cal-dialogs.c:299
#, c-format
-#| msgid "Copying events to the calendar '%s'"
msgid "Copying events to the calendar “%sâ€"
msgstr "Copying events to the calendar “%sâ€"
#: ../src/calendar/gui/e-cal-dialogs.c:305
#, c-format
-#| msgid "Copying memos to the memo list '%s'"
msgid "Copying memos to the memo list “%sâ€"
msgstr "Copying memos to the memo list “%sâ€"
#: ../src/calendar/gui/e-cal-dialogs.c:311
#, c-format
-#| msgid "Copying tasks to the task list '%s'"
msgid "Copying tasks to the task list “%sâ€"
msgstr "Copying tasks to the task list “%sâ€"
#: ../src/calendar/gui/e-cal-dialogs.c:530
-#| msgid "_Delete this item from all other recipient's mailboxes?"
msgid "_Delete this item from all other recipient’s mailboxes?"
msgstr "_Delete this item from all other recipient’s mailboxes?"
@@ -7008,7 +6714,6 @@ msgid "Delete selected events"
msgstr "Delete selected events"
#: ../src/calendar/gui/e-calendar-view.c:853
-#| msgid "Pasted text doesn't contain valid iCalendar data"
msgid "Pasted text doesn’t contain valid iCalendar data"
msgstr "Pasted text doesn’t contain valid iCalendar data"
@@ -7042,7 +6747,7 @@ msgstr "Pasting iCalendar data"
#. * "Organizer: NameOfTheUser <email ofuser com>"
#: ../src/calendar/gui/e-calendar-view.c:1831
#: ../src/calendar/gui/e-memo-table.c:493
-#: ../src/calendar/gui/e-task-table.c:818
+#: ../src/calendar/gui/e-task-table.c:819
#, c-format
msgid "Organizer: %s <%s>"
msgstr "Organiser: %s <%s>"
@@ -7052,7 +6757,7 @@ msgstr "Organiser: %s <%s>"
#. * organizer.value.
#: ../src/calendar/gui/e-calendar-view.c:1835
#: ../src/calendar/gui/e-memo-table.c:498
-#: ../src/calendar/gui/e-task-table.c:822
+#: ../src/calendar/gui/e-task-table.c:823
#, c-format
msgid "Organizer: %s"
msgstr "Organiser: %s"
@@ -7060,8 +6765,8 @@ msgstr "Organiser: %s"
#. To Translators: It will display "Location: PlaceOfTheMeeting"
#. Translators: It will display "Location: LocationOfTheAppointment"
#: ../src/calendar/gui/e-calendar-view.c:1851
-#: ../src/calendar/gui/e-meeting-time-sel.c:2731
-#: ../src/calendar/gui/e-to-do-pane.c:343 ../src/calendar/gui/print.c:3531
+#: ../src/calendar/gui/e-meeting-time-sel.c:2671
+#: ../src/calendar/gui/e-to-do-pane.c:346 ../src/calendar/gui/print.c:3531
#, c-format
msgid "Location: %s"
msgstr "Location: %s"
@@ -7069,15 +6774,15 @@ msgstr "Location: %s"
#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
#. Translators: It will display "Time: StartDateAndTime (Duration)"
#: ../src/calendar/gui/e-calendar-view.c:1891
-#: ../src/calendar/gui/e-to-do-pane.c:411
+#: ../src/calendar/gui/e-to-do-pane.c:438
#, c-format
msgid "Time: %s %s"
msgstr "Time: %s %s"
-#: ../src/calendar/gui/e-calendar-view.c:2277
-#: ../src/calendar/gui/e-calendar-view.c:2284
-#: ../src/calendar/gui/e-calendar-view.c:2291
-#: ../src/calendar/gui/e-calendar-view.c:2294
+#: ../src/calendar/gui/e-calendar-view.c:2288
+#: ../src/calendar/gui/e-calendar-view.c:2295
+#: ../src/calendar/gui/e-calendar-view.c:2302
+#: ../src/calendar/gui/e-calendar-view.c:2305
msgid "%d %b %Y"
msgstr "%d %b %Y"
@@ -7086,14 +6791,14 @@ msgstr "%d %b %Y"
#. strftime format %d = day of month, %b = abbreviated
#. * month name. You can change the order but don't
#. * change the specifiers or add anything.
-#: ../src/calendar/gui/e-calendar-view.c:2282
-#: ../src/calendar/gui/e-day-view.c:3078
-#: ../src/calendar/gui/e-day-view-top-item.c:849
+#: ../src/calendar/gui/e-calendar-view.c:2293
+#: ../src/calendar/gui/e-day-view.c:3104
+#: ../src/calendar/gui/e-day-view-top-item.c:865
#: ../src/calendar/gui/e-week-view-main-item.c:228
msgid "%d %b"
msgstr "%d %b"
-#: ../src/calendar/gui/e-calendar-view.c:2304
+#: ../src/calendar/gui/e-calendar-view.c:2315
msgid "%A %d %b %Y"
msgstr "%A %d %b %Y"
@@ -7103,16 +6808,16 @@ msgstr "%A %d %b %Y"
#. * %d = day of month, %b = abbreviated month name.
#. * You can change the order but don't change the
#. * specifiers or add anything.
-#: ../src/calendar/gui/e-calendar-view.c:2308
-#: ../src/calendar/gui/e-day-view.c:3062
-#: ../src/calendar/gui/e-day-view-top-item.c:845
+#: ../src/calendar/gui/e-calendar-view.c:2319
+#: ../src/calendar/gui/e-day-view.c:3088
+#: ../src/calendar/gui/e-day-view-top-item.c:861
#: ../src/calendar/gui/e-week-view-main-item.c:214
msgid "%a %d %b"
msgstr "%a %d %b"
-#: ../src/calendar/gui/e-calendar-view.c:2311
-#: ../src/calendar/gui/e-calendar-view.c:2317
-#: ../src/calendar/gui/e-calendar-view.c:2320
+#: ../src/calendar/gui/e-calendar-view.c:2322
+#: ../src/calendar/gui/e-calendar-view.c:2328
+#: ../src/calendar/gui/e-calendar-view.c:2331
msgid "%a %d %b %Y"
msgstr "%a %d %b %Y"
@@ -7152,17 +6857,16 @@ msgstr "Source"
#: ../src/calendar/gui/e-meeting-store.c:167
#: ../src/calendar/gui/e-meeting-store.c:230 ../src/calendar/gui/print.c:1247
#: ../src/calendar/gui/print.c:1264 ../src/e-util/e-charset.c:49
-#: ../src/modules/itip-formatter/itip-view.c:3412
-#: ../src/modules/itip-formatter/itip-view.c:6082
+#: ../src/modules/itip-formatter/itip-view.c:3559
+#: ../src/modules/itip-formatter/itip-view.c:6301
#: ../src/modules/plugin-manager/evolution-plugin-manager.c:97
msgid "Unknown"
msgstr "Unknown"
#: ../src/calendar/gui/e-cal-model.c:1402 ../src/calendar/gui/e-cal-ops.c:614
#: ../src/calendar/gui/e-cal-ops.c:1250
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:289
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:388
#, c-format
-#| msgid "Source with UID '%s' not found"
msgid "Source with UID “%s†not found"
msgstr "Source with UID “%s†not found"
@@ -7205,45 +6909,45 @@ msgstr "Yes"
msgid "No"
msgstr "No"
-#: ../src/calendar/gui/e-cal-model.c:3820
+#: ../src/calendar/gui/e-cal-model.c:3800
#: ../src/calendar/gui/e-meeting-list-view.c:219
#: ../src/calendar/gui/e-meeting-store.c:194
#: ../src/calendar/gui/e-meeting-store.c:217
-#: ../src/modules/itip-formatter/itip-view.c:6070
+#: ../src/modules/itip-formatter/itip-view.c:6289
msgid "Accepted"
msgstr "Accepted"
-#: ../src/calendar/gui/e-cal-model.c:3821
+#: ../src/calendar/gui/e-cal-model.c:3801
#: ../src/calendar/gui/e-meeting-list-view.c:220
#: ../src/calendar/gui/e-meeting-store.c:196
#: ../src/calendar/gui/e-meeting-store.c:219
-#: ../src/modules/itip-formatter/itip-view.c:6076
+#: ../src/modules/itip-formatter/itip-view.c:6295
msgid "Declined"
msgstr "Declined"
-#: ../src/calendar/gui/e-cal-model.c:3822
+#: ../src/calendar/gui/e-cal-model.c:3802
#: ../src/calendar/gui/e-meeting-list-view.c:221
#: ../src/calendar/gui/e-meeting-store.c:198
#: ../src/calendar/gui/e-meeting-store.c:221
-#: ../src/calendar/gui/e-meeting-time-sel.c:533
+#: ../src/calendar/gui/e-meeting-time-sel.c:523
msgid "Tentative"
msgstr "Tentative"
-#: ../src/calendar/gui/e-cal-model.c:3823
+#: ../src/calendar/gui/e-cal-model.c:3803
#: ../src/calendar/gui/e-meeting-list-view.c:222
#: ../src/calendar/gui/e-meeting-store.c:200
#: ../src/calendar/gui/e-meeting-store.c:223
-#: ../src/modules/itip-formatter/itip-view.c:6079
+#: ../src/modules/itip-formatter/itip-view.c:6298
msgid "Delegated"
msgstr "Delegated"
-#: ../src/calendar/gui/e-cal-model.c:3824
+#: ../src/calendar/gui/e-cal-model.c:3804
msgid "Needs action"
msgstr "Needs action"
#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
#. * Status: Accepted: X Declined: Y ...
-#: ../src/calendar/gui/e-cal-model.c:3879
+#: ../src/calendar/gui/e-cal-model.c:3859
#: ../src/calendar/gui/e-meeting-list-view.c:687
#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
#: ../src/calendar/gui/e-task-table.etspec.h:11
@@ -7254,13 +6958,13 @@ msgid "Status"
msgstr "Status"
#: ../src/calendar/gui/e-cal-model-calendar.c:148
-#: ../src/calendar/gui/e-task-table.c:606
+#: ../src/calendar/gui/e-task-table.c:607
msgid "Free"
msgstr "Free"
#: ../src/calendar/gui/e-cal-model-calendar.c:151
-#: ../src/calendar/gui/e-meeting-time-sel.c:534
-#: ../src/calendar/gui/e-task-table.c:607
+#: ../src/calendar/gui/e-meeting-time-sel.c:524
+#: ../src/calendar/gui/e-task-table.c:608
msgid "Busy"
msgstr "Busy"
@@ -7292,15 +6996,15 @@ msgstr "Modifying a memo"
msgid "Modifying a task"
msgstr "Modifying a task"
-#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1812
+#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1918
msgid "Removing an event"
msgstr "Removing an event"
-#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1816
+#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1922
msgid "Removing a memo"
msgstr "Removing a memo"
-#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1820
+#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1926
msgid "Removing a task"
msgstr "Removing a task"
@@ -7360,37 +7064,31 @@ msgstr "Updating a task"
#: ../src/calendar/gui/e-cal-ops.c:967
#, c-format
-#| msgid "Getting events to purge in the calendar '%s'"
msgid "Getting events to purge in the calendar “%sâ€"
msgstr "Getting events to purge in the calendar “%sâ€"
#: ../src/calendar/gui/e-cal-ops.c:971
#, c-format
-#| msgid "Getting memos to purge in the memo list '%s'"
msgid "Getting memos to purge in the memo list “%sâ€"
msgstr "Getting memos to purge in the memo list “%sâ€"
#: ../src/calendar/gui/e-cal-ops.c:975
#, c-format
-#| msgid "Getting tasks to purge in the task list '%s'"
msgid "Getting tasks to purge in the task list “%sâ€"
msgstr "Getting tasks to purge in the task list “%sâ€"
#: ../src/calendar/gui/e-cal-ops.c:1001
#, c-format
-#| msgid "Purging events in the calendar '%s'"
msgid "Purging events in the calendar “%sâ€"
msgstr "Purging events in the calendar “%sâ€"
#: ../src/calendar/gui/e-cal-ops.c:1005
#, c-format
-#| msgid "Purging memos in the memo list '%s'"
msgid "Purging memos in the memo list “%sâ€"
msgstr "Purging memos in the memo list “%sâ€"
#: ../src/calendar/gui/e-cal-ops.c:1009
#, c-format
-#| msgid "Purging tasks in the task list '%s'"
msgid "Purging tasks in the task list “%sâ€"
msgstr "Purging tasks in the task list “%sâ€"
@@ -7472,7 +7170,6 @@ msgstr ""
"%s"
#: ../src/calendar/gui/e-comp-editor-event.c:99
-#| msgid "Event's time is in the past"
msgid "Event’s time is in the past"
msgstr "Event’s time is in the past"
@@ -7504,8 +7201,10 @@ msgstr "Start time is not a valid time"
#: ../src/calendar/gui/e-comp-editor-page-attachments.c:206
#: ../src/calendar/gui/e-comp-editor.c:338
#: ../src/em-format/e-mail-part-secure-button.c:93
-#: ../src/mail/e-mail-display.c:2116 ../src/mail/e-mail-reader-utils.c:806
-#: ../src/mail/mail-send-recv.c:490 ../src/mail/mail-send-recv.c:1288
+#: ../src/e-util/e-misc-utils.c:4136 ../src/e-util/e-misc-utils.c:4148
+#: ../src/e-util/e-misc-utils.c:4162 ../src/mail/e-mail-display.c:2191
+#: ../src/mail/e-mail-reader-utils.c:806 ../src/mail/mail-send-recv.c:569
+#: ../src/mail/mail-send-recv.c:1422
#: ../src/modules/accounts-window/e-accounts-window-editors.c:172
#: ../src/plugins/face/face.c:174 ../src/shell/e-shell.c:1073
#: ../src/shell/e-shell.c:1097 ../src/smime/gui/certificate-manager.c:357
@@ -7520,122 +7219,120 @@ msgstr "End date is not a valid date"
msgid "End time is not a valid time"
msgstr "End time is not a valid time"
-#: ../src/calendar/gui/e-comp-editor-event.c:586
+#: ../src/calendar/gui/e-comp-editor-event.c:584
#: ../src/calendar/gui/e-comp-editor-memo.c:126
#: ../src/calendar/gui/e-comp-editor-task.c:591
msgid "_Categories"
msgstr "_Categories"
-#: ../src/calendar/gui/e-comp-editor-event.c:588
+#: ../src/calendar/gui/e-comp-editor-event.c:586
#: ../src/calendar/gui/e-comp-editor-memo.c:128
#: ../src/calendar/gui/e-comp-editor-task.c:593
msgid "Toggles whether to display categories"
msgstr "Toggles whether to display categories"
-#: ../src/calendar/gui/e-comp-editor-event.c:594
+#: ../src/calendar/gui/e-comp-editor-event.c:592
#: ../src/calendar/gui/e-comp-editor-task.c:599
msgid "Time _Zone"
msgstr "Time _Zone"
-#: ../src/calendar/gui/e-comp-editor-event.c:596
+#: ../src/calendar/gui/e-comp-editor-event.c:594
#: ../src/calendar/gui/e-comp-editor-task.c:601
msgid "Toggles whether the time zone is displayed"
msgstr "Toggles whether the time zone is displayed"
-#: ../src/calendar/gui/e-comp-editor-event.c:602
+#: ../src/calendar/gui/e-comp-editor-event.c:600
msgid "All _Day Event"
msgstr "All _Day Event"
-#: ../src/calendar/gui/e-comp-editor-event.c:604
+#: ../src/calendar/gui/e-comp-editor-event.c:602
msgid "Toggles whether to have All Day Event"
msgstr "Toggles whether to have All Day Event"
-#: ../src/calendar/gui/e-comp-editor-event.c:610
+#: ../src/calendar/gui/e-comp-editor-event.c:608
msgid "Show Time as _Busy"
msgstr "Show Time as _Busy"
-#: ../src/calendar/gui/e-comp-editor-event.c:612
+#: ../src/calendar/gui/e-comp-editor-event.c:610
msgid "Toggles whether to show time as busy"
msgstr "Toggles whether to show time as busy"
-#: ../src/calendar/gui/e-comp-editor-event.c:621
+#: ../src/calendar/gui/e-comp-editor-event.c:619
msgid "Pu_blic"
msgstr "Pu_blic"
-#: ../src/calendar/gui/e-comp-editor-event.c:623
+#: ../src/calendar/gui/e-comp-editor-event.c:621
msgid "Classify as public"
msgstr "Classify as public"
-#: ../src/calendar/gui/e-comp-editor-event.c:628
+#: ../src/calendar/gui/e-comp-editor-event.c:626
msgid "_Private"
msgstr "_Private"
-#: ../src/calendar/gui/e-comp-editor-event.c:630
+#: ../src/calendar/gui/e-comp-editor-event.c:628
msgid "Classify as private"
msgstr "Classify as private"
-#: ../src/calendar/gui/e-comp-editor-event.c:635
+#: ../src/calendar/gui/e-comp-editor-event.c:633
msgid "_Confidential"
msgstr "_Confidential"
-#: ../src/calendar/gui/e-comp-editor-event.c:637
+#: ../src/calendar/gui/e-comp-editor-event.c:635
msgid "Classify as confidential"
msgstr "Classify as confidential"
-#: ../src/calendar/gui/e-comp-editor-event.c:738
+#: ../src/calendar/gui/e-comp-editor-event.c:736
msgctxt "ECompEditor"
msgid "_Start time:"
msgstr "_Start time:"
-#: ../src/calendar/gui/e-comp-editor-event.c:743
+#: ../src/calendar/gui/e-comp-editor-event.c:741
msgctxt "ECompEditor"
msgid "_End time:"
msgstr "_End time:"
-#: ../src/calendar/gui/e-comp-editor-event.c:753
+#: ../src/calendar/gui/e-comp-editor-event.c:751
msgctxt "ECompEditor"
msgid "All da_y event"
msgstr "All da_y event"
-#: ../src/calendar/gui/e-comp-editor-event.c:806
+#: ../src/calendar/gui/e-comp-editor-event.c:804
#: ../src/calendar/gui/e-comp-editor-memo.c:213
#: ../src/calendar/gui/e-comp-editor-task.c:765
msgctxt "ECompEditorPage"
msgid "General"
msgstr "General"
-#: ../src/calendar/gui/e-comp-editor-event.c:809
+#: ../src/calendar/gui/e-comp-editor-event.c:807
#: ../src/calendar/gui/e-comp-editor-task.c:782
msgctxt "ECompEditorPage"
msgid "Reminders"
msgstr "Reminders"
-#: ../src/calendar/gui/e-comp-editor-event.c:812
+#: ../src/calendar/gui/e-comp-editor-event.c:810
msgctxt "ECompEditorPage"
msgid "Recurrence"
msgstr "Recurrence"
-#: ../src/calendar/gui/e-comp-editor-event.c:815
+#: ../src/calendar/gui/e-comp-editor-event.c:813
#: ../src/calendar/gui/e-comp-editor-memo.c:216
#: ../src/calendar/gui/e-comp-editor-task.c:785
msgctxt "ECompEditorPage"
msgid "Attachments"
msgstr "Attachments"
-#: ../src/calendar/gui/e-comp-editor-event.c:825
+#: ../src/calendar/gui/e-comp-editor-event.c:823
msgctxt "ECompEditorPage"
msgid "Schedule"
msgstr "Schedule"
-#: ../src/calendar/gui/e-comp-editor-event.c:857
+#: ../src/calendar/gui/e-comp-editor-event.c:855
#, c-format
-#| msgid "Meeting - %s"
msgid "Meeting — %s"
msgstr "Meeting — %s"
-#: ../src/calendar/gui/e-comp-editor-event.c:858
+#: ../src/calendar/gui/e-comp-editor-event.c:856
#, c-format
-#| msgid "Appointment - %s"
msgid "Appointment — %s"
msgstr "Appointment — %s"
@@ -7666,13 +7363,11 @@ msgstr "Sta_rt date:"
#: ../src/calendar/gui/e-comp-editor-memo.c:247
#, c-format
-#| msgid "Assigned Memo - %s"
msgid "Assigned Memo — %s"
msgstr "Assigned Memo — %s"
#: ../src/calendar/gui/e-comp-editor-memo.c:248
#, c-format
-#| msgid "Memo - %s"
msgid "Memo — %s"
msgstr "Memo — %s"
@@ -7690,7 +7385,6 @@ msgstr[1] "Attachments"
#: ../src/calendar/gui/e-comp-editor-page-attachments.c:201
#: ../src/e-util/e-attachment.c:2442
#, c-format
-#| msgid "Could not load '%s'"
msgid "Could not load “%sâ€"
msgstr "Could not load “%sâ€"
@@ -7710,25 +7404,22 @@ msgstr ""
#: ../src/calendar/gui/e-comp-editor-page-attachments.c:452
#, c-format
-#| msgid "Attachment '%s' cannot be found, remove it from the list, please"
msgid "Attachment “%s†cannot be found, remove it from the list, please"
msgstr "Attachment “%s†cannot be found, remove it from the list, please"
#: ../src/calendar/gui/e-comp-editor-page-attachments.c:469
#, c-format
-#| msgid ""
-#| "Attachment '%s' doesn't have valid URI, remove it from the list, please"
msgid "Attachment “%s†doesn’t have valid URI, remove it from the list, please"
msgstr ""
"Attachment “%s†doesn’t have valid URI, remove it from the list, please"
#: ../src/calendar/gui/e-comp-editor-page-attachments.c:647
-#: ../src/composer/e-composer-actions.c:320
+#: ../src/composer/e-composer-actions.c:322
msgid "_Attachment..."
msgstr "_Attachment…"
#: ../src/calendar/gui/e-comp-editor-page-attachments.c:649
-#: ../src/composer/e-composer-actions.c:322
+#: ../src/composer/e-composer-actions.c:324
#: ../src/e-util/e-attachment-view.c:344
msgid "Attach a file"
msgstr "Attach a file"
@@ -7742,24 +7433,22 @@ msgid "Show attachments"
msgstr "Show attachments"
#: ../src/calendar/gui/e-comp-editor-page-attachments.c:811
-#: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:725
+#: ../src/e-util/e-attachment-bar.c:764 ../src/e-util/e-attachment-paned.c:725
msgid "Icon View"
msgstr "Icon View"
#: ../src/calendar/gui/e-comp-editor-page-attachments.c:813
-#: ../src/e-util/e-attachment-bar.c:768 ../src/e-util/e-attachment-paned.c:727
+#: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:727
msgid "List View"
msgstr "List View"
#: ../src/calendar/gui/e-comp-editor-page-general.c:311
#, c-format
-#| msgid "Cannot find attendee '%s' in the list of attendees"
msgid "Cannot find attendee “%s†in the list of attendees"
msgstr "Cannot find attendee “%s†in the list of attendees"
#: ../src/calendar/gui/e-comp-editor-page-general.c:318
#, c-format
-#| msgid "Not enough rights to delete attendee '%s'"
msgid "Not enough rights to delete attendee “%sâ€"
msgstr "Not enough rights to delete attendee “%sâ€"
@@ -7769,60 +7458,65 @@ msgid_plural "Failed to delete selected attendees"
msgstr[0] "Failed to delete selected attendee"
msgstr[1] "Failed to delete selected attendees"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:581
+#: ../src/calendar/gui/e-comp-editor-page-general.c:434
+#| msgid "Email Address is not a valid email"
+msgid "Organizer address is not a valid user mail address"
+msgstr "Organiser address is not a valid user mail address"
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:584
msgid "A_ttendees"
msgstr "A_ttendees"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:583
+#: ../src/calendar/gui/e-comp-editor-page-general.c:586
msgid "Toggles whether the Attendees are displayed"
msgstr "Toggles whether the Attendees are displayed"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:592
+#: ../src/calendar/gui/e-comp-editor-page-general.c:595
msgid "R_ole Field"
msgstr "R_ole Field"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:594
+#: ../src/calendar/gui/e-comp-editor-page-general.c:597
msgid "Toggles whether the Role field is displayed"
msgstr "Toggles whether the Role field is displayed"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:600
+#: ../src/calendar/gui/e-comp-editor-page-general.c:603
msgid "_RSVP"
msgstr "_RSVP"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:602
+#: ../src/calendar/gui/e-comp-editor-page-general.c:605
msgid "Toggles whether the RSVP field is displayed"
msgstr "Toggles whether the RSVP field is displayed"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:608
+#: ../src/calendar/gui/e-comp-editor-page-general.c:611
msgid "_Status Field"
msgstr "_Status Field"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:610
+#: ../src/calendar/gui/e-comp-editor-page-general.c:613
msgid "Toggles whether the Status field is displayed"
msgstr "Toggles whether the Status field is displayed"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:616
+#: ../src/calendar/gui/e-comp-editor-page-general.c:619
msgid "_Type Field"
msgstr "_Type Field"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:618
+#: ../src/calendar/gui/e-comp-editor-page-general.c:621
msgid "Toggles whether the Attendee Type is displayed"
msgstr "Toggles whether the Attendee Type is displayed"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:943
+#: ../src/calendar/gui/e-comp-editor-page-general.c:947
msgid "An organizer is required."
msgstr "An organiser is required."
-#: ../src/calendar/gui/e-comp-editor-page-general.c:953
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1084
+#: ../src/calendar/gui/e-comp-editor-page-general.c:957
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1088
msgid "At least one attendee is required."
msgstr "At least one attendee is required."
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1207
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1211
msgid "Or_ganizer:"
msgstr "Or_ganiser:"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1286
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1290
msgctxt "ECompEditor"
msgid "Atte_ndees..."
msgstr "Atte_ndees..."
@@ -7987,116 +7681,116 @@ msgid "occurrences"
msgstr "occurrences"
#. Translators: Entire string is for example: 'This appointment
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1485
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2015
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1484
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2014
msgctxt "ECompEditorPageRecur"
msgid "This appointment rec_urs"
msgstr "This appointment rec_urs"
#. Translators: Entire string is for example: 'This task recurs/Every[x][day(s)][for][1]occurrences'
(combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1490
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1489
msgctxt "ECompEditorPageRecur"
msgid "This task rec_urs"
msgstr "This task rec_urs"
#. Translators: Entire string is for example: 'This memo recurs/Every[x][day(s)][for][1]occurrences'
(combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1495
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1494
msgctxt "ECompEditorPageRecur"
msgid "This memo rec_urs"
msgstr "This memo rec_urs"
#. Translators: Entire string is for example: 'This component
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1500
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1499
msgctxt "ECompEditorPageRecur"
msgid "This component rec_urs"
msgstr "This component rec_urs"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1861
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1860
msgid "Recurrence exception date is invalid"
msgstr "Recurrence exception date is invalid"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1909
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1908
msgid "End time of the recurrence is before the start"
msgstr "End time of the recurrence is before the start"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1952
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1951
msgid "R_ecurrence"
msgstr "R_ecurrence"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1954
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1953
msgid "Set or unset recurrence"
msgstr "Set or unset recurrence"
#. Translators: Entire string is for example: 'This appointment
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2055
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2046
msgctxt "ECompEditorPageRecur"
msgid "Every"
msgstr "Every"
#. Translators: Entire string is for example: 'This appointment
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2090
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2081
msgctxt "ECompEditorPageRecur"
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])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2092
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2083
msgctxt "ECompEditorPageRecur"
msgid "week(s)"
msgstr "week(s)"
#. Translators: Entire string is for example: 'This appointment
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2094
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2085
msgctxt "ECompEditorPageRecur"
msgid "month(s)"
msgstr "month(s)"
#. Translators: Entire string is for example: 'This appointment
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2096
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2087
msgctxt "ECompEditorPageRecur"
msgid "year(s)"
msgstr "year(s)"
#. Translators: Entire string is for example: 'This appointment
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2125
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2116
msgctxt "ECompEditorPageRecur"
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])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2127
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2118
msgctxt "ECompEditorPageRecur"
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])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2129
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2120
msgctxt "ECompEditorPageRecur"
msgid "forever"
msgstr "forever"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2145
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2136
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr "This appointment contains recurrences that Evolution cannot edit."
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2162
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2149
msgid "Exceptions"
msgstr "Exceptions"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2231
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1777
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2214
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1765
#: ../src/mail/e-mail-config-identity-page.c:853
#: ../src/mail/mail-config.ui.h:65
msgid "A_dd"
msgstr "A_dd"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2247
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1785
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2230
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1773
#: ../src/mail/mail-config.ui.h:67
msgid "Re_move"
msgstr "Re_move"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2255
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2238
msgid "Preview"
msgstr "Preview"
@@ -8104,38 +7798,38 @@ msgstr "Preview"
msgid "Send To"
msgstr "Send To"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1554
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1550
msgid "_Reminders"
msgstr "_Reminders"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1556
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1552
msgid "Set or unset reminders"
msgstr "Set or unset reminders"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1609
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1605
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
msgid "Reminders"
msgstr "Reminders"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1638
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1630
msgid "_Reminder"
msgstr "_Reminder"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1671
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1663
#, c-format
msgid "%d day before"
msgid_plural "%d days before"
msgstr[0] "%d day before"
msgstr[1] "%d days before"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1678
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1670
#, c-format
msgid "%d hour before"
msgid_plural "%d hours before"
msgstr[0] "%d hour before"
msgstr[1] "%d hours before"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1685
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1677
#, c-format
msgid "%d minute before"
msgid_plural "%d minutes before"
@@ -8143,131 +7837,131 @@ msgstr[0] "%d minute before"
msgstr[1] "%d minutes before"
#. Translators: "None" for "No reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1693
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1685
msgctxt "cal-reminders"
msgid "None"
msgstr "None"
#. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1695
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1687
msgctxt "cal-reminders"
msgid "15 minutes before"
msgstr "15 minutes before"
#. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1697
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1689
msgctxt "cal-reminders"
msgid "1 hour before"
msgstr "1 hour before"
#. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1699
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1691
msgctxt "cal-reminders"
msgid "1 day before"
msgstr "1 day before"
#. Translators: "Custom" for "Custom reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1711
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1703
msgctxt "cal-reminders"
msgid "Custom"
msgstr "Custom"
#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1862
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1846
msgctxt "cal-reminders"
msgid "minute(s)"
msgstr "minute(s)"
#. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1864
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1848
msgctxt "cal-reminders"
msgid "hour(s)"
msgstr "hour(s)"
#. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1866
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1850
msgctxt "cal-reminders"
msgid "day(s)"
msgstr "day(s)"
#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1883
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1867
msgctxt "cal-reminders"
msgid "before"
msgstr "before"
#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1885
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1869
msgctxt "cal-reminders"
msgid "after"
msgstr "after"
#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1901
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1885
msgctxt "cal-reminders"
msgid "start"
msgstr "start"
#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1903
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1887
msgctxt "cal-reminders"
msgid "end"
msgstr "end"
#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1926
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1906
msgid "Re_peat the reminder"
msgstr "Re_peat the reminder"
#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1951
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1931
msgctxt "cal-reminders"
msgid "extra times every"
msgstr "extra times every"
#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1988
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1968
msgctxt "cal-reminders"
msgid "minutes"
msgstr "minutes"
#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1990
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1970
msgctxt "cal-reminders"
msgid "hours"
msgstr "hours"
#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1992
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1972
msgctxt "cal-reminders"
msgid "days"
msgstr "days"
#. page_reminders->priv->custom_email_entry is initialized on demand
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2033
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2190
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2009
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2166
msgctxt "cal-reminders"
msgid "Custom _message"
msgstr "Custom _message"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2077
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2053
msgctxt "cal-reminders"
msgid "Custom reminder _sound"
msgstr "Custom reminder _sound"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2088
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2064
msgid "Select a sound file"
msgstr "Select a sound file"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2116
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2092
msgid "_Program:"
msgstr "_Program:"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2141
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2117
msgid "_Arguments:"
msgstr "_Arguments:"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2173
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2149
msgid "_Send To:"
msgstr "_Send To:"
@@ -8299,113 +7993,111 @@ msgctxt "ECompEditor"
msgid "_Description:"
msgstr "_Description:"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:686
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:687
msgctxt "ECompEditor"
msgid "_Web page:"
msgstr "_Web page:"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1057
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1058
msgctxt "ECompEditor"
msgid "D_ue date:"
msgstr "D_ue date:"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1117
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1118
msgctxt "ECompEditor"
msgid "Date _completed:"
msgstr "Date _completed:"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1133
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1134
msgctxt "ECompEditor"
msgid "Public"
msgstr "Public"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1134
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1135
msgctxt "ECompEditor"
msgid "Private"
msgstr "Private"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1135
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1136
msgctxt "ECompEditor"
msgid "Confidential"
msgstr "Confidential"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1151
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1152
msgctxt "ECompEditor"
msgid "C_lassification:"
msgstr "C_lassification:"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1170
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1171
msgctxt "ECompEditor"
msgid "Not Started"
msgstr "Not Started"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1171
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1172
msgctxt "ECompEditor"
msgid "In Progress"
msgstr "In Progress"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1172
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1173
msgctxt "ECompEditor"
msgid "Completed"
msgstr "Completed"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1173
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1174
msgctxt "ECompEditor"
msgid "Cancelled"
msgstr "Cancelled"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1182
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1183
msgctxt "ECompEditor"
msgid "_Status:"
msgstr "_Status:"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1212
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1213
msgctxt "ECompEditor"
msgid "Undefined"
msgstr "Undefined"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1213
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1214
msgctxt "ECompEditor"
msgid "High"
msgstr "High"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1214
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1215
msgctxt "ECompEditor"
msgid "Normal"
msgstr "Normal"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1215
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1216
msgctxt "ECompEditor"
msgid "Low"
msgstr "Low"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1224
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1225
msgctxt "ECompEditor"
msgid "Priorit_y:"
msgstr "Priorit_y:"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1278
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1279
msgctxt "ECompEditor"
msgid "Percent complete:"
msgstr "Percent complete:"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1359
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1360
msgctxt "ECompEditor"
msgid "Time _zone:"
msgstr "Time _zone:"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1484
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1485
msgctxt "ECompEditor"
msgid "Show time as _busy"
msgstr "Show time as _busy"
#: ../src/calendar/gui/e-comp-editor-task.c:224
-#| msgid "Task's start date is in the past"
msgid "Task’s start date is in the past"
msgstr "Task’s start date is in the past"
#: ../src/calendar/gui/e-comp-editor-task.c:232
-#| msgid "Task's due date is in the past"
msgid "Task’s due date is in the past"
msgstr "Task’s due date is in the past"
@@ -8436,24 +8128,20 @@ msgid "Completed date cannot be in the future"
msgstr "Completed date cannot be in the future"
#: ../src/calendar/gui/e-comp-editor-task.c:607
-#| msgid "All _Day Event"
msgid "All _Day Task"
msgstr "All _Day Task"
#: ../src/calendar/gui/e-comp-editor-task.c:609
-#| msgid "Toggles whether to have All Day Event"
msgid "Toggles whether to have All Day Task"
msgstr "Toggles whether to have All Day Task"
#: ../src/calendar/gui/e-comp-editor-task.c:818
#, c-format
-#| msgid "Assigned Task - %s"
msgid "Assigned Task — %s"
msgstr "Assigned Task — %s"
#: ../src/calendar/gui/e-comp-editor-task.c:819
#, c-format
-#| msgid "Task - %s"
msgid "Task — %s"
msgstr "Task — %s"
@@ -8476,16 +8164,16 @@ msgstr "No Summary"
#. == Button box ==
#: ../src/calendar/gui/e-comp-editor.c:1984
-#: ../src/composer/e-composer-actions.c:327
-#: ../src/e-util/e-accounts-window.c:1743
+#: ../src/composer/e-composer-actions.c:329
+#: ../src/e-util/e-accounts-window.c:1730
#: ../src/e-util/e-html-editor-dialog.c:194
#: ../src/e-util/e-mail-signature-editor.c:309
#: ../src/e-util/e-name-selector-dialog.c:548
#: ../src/e-util/e-preferences-window.c:399
#: ../src/e-util/e-table-field-chooser-dialog.c:205
-#: ../src/mail/e-mail-browser.c:127 ../src/mail/e-mail-notes.c:931
+#: ../src/mail/e-mail-browser.c:128 ../src/mail/e-mail-notes.c:931
#: ../src/mail/em-folder-properties.c:1158
-#: ../src/mail/em-subscription-editor.c:1765
+#: ../src/mail/em-subscription-editor.c:1737
#: ../src/modules/plugin-manager/evolution-plugin-manager.c:254
#: ../src/shell/e-shell-window-actions.c:296
#: ../src/shell/e-shell-window-actions.c:817
@@ -8499,31 +8187,31 @@ msgstr "Close the current window"
#. copy menu item
#: ../src/calendar/gui/e-comp-editor.c:1991 ../src/e-util/e-focus-tracker.c:773
-#: ../src/e-util/e-html-editor-actions.c:878 ../src/e-util/e-text.c:2110
-#: ../src/e-util/e-web-view.c:407 ../src/mail/e-mail-browser.c:134
+#: ../src/e-util/e-html-editor-actions.c:878 ../src/e-util/e-text.c:2080
+#: ../src/e-util/e-web-view.c:409 ../src/mail/e-mail-browser.c:135
#: ../src/mail/mail.error.xml.h:146 ../src/shell/e-shell-window-actions.c:838
msgid "_Copy"
msgstr "_Copy"
#: ../src/calendar/gui/e-comp-editor.c:1993 ../src/e-util/e-focus-tracker.c:173
#: ../src/e-util/e-focus-tracker.c:229 ../src/e-util/e-focus-tracker.c:282
-#: ../src/e-util/e-focus-tracker.c:774 ../src/e-util/e-web-view.c:409
-#: ../src/e-util/e-web-view.c:1977 ../src/mail/e-mail-browser.c:136
+#: ../src/e-util/e-focus-tracker.c:774 ../src/e-util/e-web-view.c:411
+#: ../src/e-util/e-web-view.c:2003 ../src/mail/e-mail-browser.c:137
#: ../src/shell/e-shell-window-actions.c:840
msgid "Copy the selection"
msgstr "Copy the selection"
#. cut menu item
#: ../src/calendar/gui/e-comp-editor.c:1998 ../src/e-util/e-focus-tracker.c:768
-#: ../src/e-util/e-html-editor-actions.c:885 ../src/e-util/e-text.c:2096
-#: ../src/mail/e-mail-browser.c:141 ../src/shell/e-shell-window-actions.c:845
+#: ../src/e-util/e-html-editor-actions.c:885 ../src/e-util/e-text.c:2066
+#: ../src/mail/e-mail-browser.c:142 ../src/shell/e-shell-window-actions.c:845
msgid "Cu_t"
msgstr "Cu_t"
#: ../src/calendar/gui/e-comp-editor.c:2000 ../src/e-util/e-focus-tracker.c:166
#: ../src/e-util/e-focus-tracker.c:222 ../src/e-util/e-focus-tracker.c:276
-#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:1986
-#: ../src/mail/e-mail-browser.c:143 ../src/shell/e-shell-window-actions.c:847
+#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:2012
+#: ../src/mail/e-mail-browser.c:144 ../src/shell/e-shell-window-actions.c:847
msgid "Cut the selection"
msgstr "Cut the selection"
@@ -8539,26 +8227,26 @@ msgstr "View help"
#. paste menu item
#: ../src/calendar/gui/e-comp-editor.c:2019 ../src/e-util/e-focus-tracker.c:778
-#: ../src/e-util/e-html-editor-actions.c:892 ../src/e-util/e-text.c:2122
-#: ../src/mail/e-mail-browser.c:148 ../src/shell/e-shell-window-actions.c:873
+#: ../src/e-util/e-html-editor-actions.c:892 ../src/e-util/e-text.c:2092
+#: ../src/mail/e-mail-browser.c:149 ../src/shell/e-shell-window-actions.c:873
msgid "_Paste"
msgstr "_Paste"
#: ../src/calendar/gui/e-comp-editor.c:2021 ../src/e-util/e-focus-tracker.c:180
#: ../src/e-util/e-focus-tracker.c:236 ../src/e-util/e-focus-tracker.c:288
-#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:1995
-#: ../src/mail/e-mail-browser.c:150 ../src/shell/e-shell-window-actions.c:875
+#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:2021
+#: ../src/mail/e-mail-browser.c:151 ../src/shell/e-shell-window-actions.c:875
msgid "Paste the clipboard"
msgstr "Paste the clipboard"
#: ../src/calendar/gui/e-comp-editor.c:2026
-#: ../src/composer/e-composer-actions.c:381 ../src/mail/e-mail-reader.c:2317
+#: ../src/composer/e-composer-actions.c:383 ../src/mail/e-mail-reader.c:2402
#: ../src/modules/addressbook/e-book-shell-view-actions.c:1235
#: ../src/modules/addressbook/e-book-shell-view-actions.c:1249
msgid "_Print..."
msgstr "_Print…"
-#: ../src/calendar/gui/e-comp-editor.c:2033 ../src/mail/e-mail-reader.c:2324
+#: ../src/calendar/gui/e-comp-editor.c:2033 ../src/mail/e-mail-reader.c:2409
#: ../src/modules/addressbook/e-book-shell-view-actions.c:1242
#: ../src/modules/calendar/e-cal-shell-view-actions.c:1744
#: ../src/modules/calendar/e-memo-shell-view-actions.c:813
@@ -8567,14 +8255,14 @@ msgid "Pre_view..."
msgstr "Pre_view..."
#: ../src/calendar/gui/e-comp-editor.c:2040 ../src/e-util/e-focus-tracker.c:788
-#: ../src/e-util/e-html-editor-actions.c:906 ../src/e-util/e-web-view.c:417
-#: ../src/mail/e-mail-browser.c:155 ../src/shell/e-shell-window-actions.c:950
+#: ../src/e-util/e-html-editor-actions.c:906 ../src/e-util/e-web-view.c:419
+#: ../src/mail/e-mail-browser.c:156 ../src/shell/e-shell-window-actions.c:950
msgid "Select _All"
msgstr "Select _All"
#: ../src/calendar/gui/e-comp-editor.c:2042 ../src/e-util/e-focus-tracker.c:194
#: ../src/e-util/e-focus-tracker.c:250 ../src/e-util/e-focus-tracker.c:789
-#: ../src/mail/e-mail-browser.c:157 ../src/shell/e-shell-window-actions.c:952
+#: ../src/mail/e-mail-browser.c:158 ../src/shell/e-shell-window-actions.c:952
msgid "Select all text"
msgstr "Select all text"
@@ -8584,7 +8272,7 @@ msgstr "_Classification"
#: ../src/calendar/gui/e-comp-editor.c:2077
#: ../src/e-util/e-html-editor-actions.c:929
-#: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:164
+#: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:165
#: ../src/mail/e-mail-notes.c:945 ../src/shell/e-shell-window-actions.c:987
msgid "_File"
msgstr "_File"
@@ -8595,12 +8283,12 @@ msgid "_Insert"
msgstr "_Insert"
#: ../src/calendar/gui/e-comp-editor.c:2098
-#: ../src/composer/e-composer-actions.c:371
+#: ../src/composer/e-composer-actions.c:373
msgid "_Options"
msgstr "_Options"
#: ../src/calendar/gui/e-comp-editor.c:2105
-#: ../src/e-util/e-html-editor-actions.c:971 ../src/mail/e-mail-browser.c:178
+#: ../src/e-util/e-html-editor-actions.c:971 ../src/mail/e-mail-browser.c:179
#: ../src/shell/e-shell-window-actions.c:1030
#: ../src/smime/gui/certificate-manager.c:1662 ../src/smime/gui/smime-ui.ui.h:3
msgid "_View"
@@ -8620,16 +8308,16 @@ msgid "Save current changes and close editor"
msgstr "Save current changes and close editor"
#. String to use in 12-hour time format for times in the morning.
-#: ../src/calendar/gui/e-day-view.c:2130 ../src/calendar/gui/e-to-do-pane.c:239
-#: ../src/calendar/gui/e-week-view.c:1726 ../src/calendar/gui/print.c:1070
+#: ../src/calendar/gui/e-day-view.c:2156 ../src/calendar/gui/e-to-do-pane.c:241
+#: ../src/calendar/gui/e-week-view.c:1781 ../src/calendar/gui/print.c:1070
#: ../src/calendar/gui/print.c:1089 ../src/calendar/gui/print.c:2626
#: ../src/calendar/gui/print.c:2646
msgid "am"
msgstr "am"
#. String to use in 12-hour time format for times in the afternoon.
-#: ../src/calendar/gui/e-day-view.c:2133 ../src/calendar/gui/e-to-do-pane.c:243
-#: ../src/calendar/gui/e-week-view.c:1729 ../src/calendar/gui/print.c:1075
+#: ../src/calendar/gui/e-day-view.c:2159 ../src/calendar/gui/e-to-do-pane.c:245
+#: ../src/calendar/gui/e-week-view.c:1784 ../src/calendar/gui/print.c:1075
#: ../src/calendar/gui/print.c:1091 ../src/calendar/gui/print.c:2631
#: ../src/calendar/gui/print.c:2648
msgid "pm"
@@ -8641,15 +8329,15 @@ msgstr "pm"
#. * month, %B = full month name. You can change the
#. * order but don't change the specifiers or add
#. * anything.
-#: ../src/calendar/gui/e-day-view.c:3045
-#: ../src/calendar/gui/e-day-view-top-item.c:841
+#: ../src/calendar/gui/e-day-view.c:3071
+#: ../src/calendar/gui/e-day-view-top-item.c:857
#: ../src/calendar/gui/e-week-view-main-item.c:205
#: ../src/calendar/gui/print.c:2093
msgid "%A %d %B"
msgstr "%A %d %B"
#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../src/calendar/gui/e-day-view.c:3770
+#: ../src/calendar/gui/e-day-view.c:3792
#, c-format
msgid "Week %d"
msgstr "Week %d"
@@ -8770,8 +8458,9 @@ msgstr "Attendee "
#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:4
#: ../src/calendar/gui/e-memo-table.etspec.h:3
#: ../src/calendar/gui/e-task-table.etspec.h:3
-#: ../src/e-util/e-accounts-window.c:1370
+#: ../src/e-util/e-accounts-window.c:1407
#: ../src/e-util/e-attachment-tree-view.c:205
+#: ../src/e-util/e-collection-account-wizard.c:1696
#: ../src/e-util/e-webdav-browser.c:2381
#: ../src/mail/e-mail-account-tree-view.c:158
msgid "Type"
@@ -8799,76 +8488,77 @@ msgid "Failure reason: %s"
msgstr "Failure reason: %s"
#: ../src/calendar/gui/e-meeting-store.c:1914
-#: ../src/plugins/publish-calendar/publish-calendar.c:349
+#: ../src/e-util/e-collection-account-wizard.c:268
+#: ../src/plugins/publish-calendar/publish-calendar.c:350
#: ../src/smime/gui/component.c:61
msgid "Enter password"
msgstr "Enter password"
-#: ../src/calendar/gui/e-meeting-time-sel.c:535
+#: ../src/calendar/gui/e-meeting-time-sel.c:525
msgid "Out of Office"
msgstr "Out of Office"
-#: ../src/calendar/gui/e-meeting-time-sel.c:537
+#: ../src/calendar/gui/e-meeting-time-sel.c:527
msgid "No Information"
msgstr "No Information"
-#: ../src/calendar/gui/e-meeting-time-sel.c:553
+#: ../src/calendar/gui/e-meeting-time-sel.c:543
msgid "Atte_ndees..."
msgstr "Atte_ndees…"
-#: ../src/calendar/gui/e-meeting-time-sel.c:572
+#: ../src/calendar/gui/e-meeting-time-sel.c:562
msgid "O_ptions"
msgstr "O_ptions"
-#: ../src/calendar/gui/e-meeting-time-sel.c:593
+#: ../src/calendar/gui/e-meeting-time-sel.c:583
msgid "Show _only working hours"
msgstr "Show _only working hours"
-#: ../src/calendar/gui/e-meeting-time-sel.c:606
+#: ../src/calendar/gui/e-meeting-time-sel.c:596
msgid "Show _zoomed out"
msgstr "Show _zoomed out"
-#: ../src/calendar/gui/e-meeting-time-sel.c:624
+#: ../src/calendar/gui/e-meeting-time-sel.c:614
msgid "_Update free/busy"
msgstr "_Update free/busy"
-#: ../src/calendar/gui/e-meeting-time-sel.c:641
+#: ../src/calendar/gui/e-meeting-time-sel.c:631
msgid "_<<"
msgstr "_<<"
-#: ../src/calendar/gui/e-meeting-time-sel.c:661
+#: ../src/calendar/gui/e-meeting-time-sel.c:651
msgid "_Autopick"
msgstr "_Autopick"
-#: ../src/calendar/gui/e-meeting-time-sel.c:678
+#: ../src/calendar/gui/e-meeting-time-sel.c:668
msgid ">_>"
msgstr ">_>"
-#: ../src/calendar/gui/e-meeting-time-sel.c:700
+#: ../src/calendar/gui/e-meeting-time-sel.c:690
msgid "_All people and resources"
msgstr "_All people and resources"
-#: ../src/calendar/gui/e-meeting-time-sel.c:711
+#: ../src/calendar/gui/e-meeting-time-sel.c:701
msgid "All _people and one resource"
msgstr "All _people and one resource"
-#: ../src/calendar/gui/e-meeting-time-sel.c:722
+#: ../src/calendar/gui/e-meeting-time-sel.c:712
msgid "_Required people"
msgstr "_Required people"
-#: ../src/calendar/gui/e-meeting-time-sel.c:732
+#: ../src/calendar/gui/e-meeting-time-sel.c:722
msgid "Required people and _one resource"
msgstr "Required people and _one resource"
-#: ../src/calendar/gui/e-meeting-time-sel.c:771
+#: ../src/calendar/gui/e-meeting-time-sel.c:761
msgid "_Start time:"
msgstr "_Start time:"
-#: ../src/calendar/gui/e-meeting-time-sel.c:800
+#: ../src/calendar/gui/e-meeting-time-sel.c:790
msgid "_End time:"
msgstr "_End time:"
-#: ../src/calendar/gui/e-meeting-time-sel.c:2727
+#: ../src/calendar/gui/e-meeting-time-sel.c:2667
#, c-format
msgid ""
"Summary: %s\n"
@@ -8877,7 +8567,7 @@ msgstr ""
"Summary: %s\n"
"Location: %s"
-#: ../src/calendar/gui/e-meeting-time-sel.c:2729
+#: ../src/calendar/gui/e-meeting-time-sel.c:2669
#: ../src/calendar/gui/print.c:3520
#, c-format
msgid "Summary: %s"
@@ -8908,19 +8598,19 @@ msgid "Language"
msgstr "Language"
#: ../src/calendar/gui/e-memo-table.c:455
-#: ../src/calendar/gui/e-task-table.c:781
+#: ../src/calendar/gui/e-task-table.c:782
msgid "* No Summary *"
msgstr "* No Summary *"
#. Translators: This is followed by an event's start date/time
#: ../src/calendar/gui/e-memo-table.c:540
-#: ../src/calendar/gui/e-task-table.c:863
+#: ../src/calendar/gui/e-task-table.c:864
msgid "Start: "
msgstr "Start: "
#. Translators: This is followed by an event's due date/time
#: ../src/calendar/gui/e-memo-table.c:560
-#: ../src/calendar/gui/e-task-table.c:882
+#: ../src/calendar/gui/e-task-table.c:883
msgid "Due: "
msgstr "Due: "
@@ -8949,7 +8639,7 @@ msgstr "Select all visible memos"
msgid "Click to add a memo"
msgstr "Click to add a memo"
-#: ../src/calendar/gui/e-task-table.c:551
+#: ../src/calendar/gui/e-task-table.c:552
#: ../src/calendar/gui/tasktypes.xml.in.h:22
#: ../src/e-util/e-send-options.ui.h:1
msgid "Undefined"
@@ -8959,29 +8649,29 @@ msgstr "Undefined"
#. * %d is the actual value, %% is replaced with a percent sign.
#. * Result values will be 0%, 10%, 20%, ... 100%
#.
-#: ../src/calendar/gui/e-task-table.c:579
+#: ../src/calendar/gui/e-task-table.c:580
#, c-format
msgid "%d%%"
msgstr "%d%%"
-#: ../src/calendar/gui/e-task-table.c:1084
+#: ../src/calendar/gui/e-task-table.c:1096
msgid "Cut selected tasks to the clipboard"
msgstr "Cut selected tasks to the clipboard"
-#: ../src/calendar/gui/e-task-table.c:1090
+#: ../src/calendar/gui/e-task-table.c:1102
msgid "Copy selected tasks to the clipboard"
msgstr "Copy selected tasks to the clipboard"
-#: ../src/calendar/gui/e-task-table.c:1096
+#: ../src/calendar/gui/e-task-table.c:1108
msgid "Paste tasks from the clipboard"
msgstr "Paste tasks from the clipboard"
-#: ../src/calendar/gui/e-task-table.c:1102
+#: ../src/calendar/gui/e-task-table.c:1114
#: ../src/modules/calendar/e-task-shell-view-actions.c:684
msgid "Delete selected tasks"
msgstr "Delete selected tasks"
-#: ../src/calendar/gui/e-task-table.c:1108
+#: ../src/calendar/gui/e-task-table.c:1120
msgid "Select all visible tasks"
msgstr "Select all visible tasks"
@@ -8997,7 +8687,8 @@ msgstr "Start date"
msgid "Completion date"
msgstr "Completion date"
-#: ../src/calendar/gui/e-task-table.etspec.h:6 ../src/mail/mail-send-recv.c:968
+#: ../src/calendar/gui/e-task-table.etspec.h:6
+#: ../src/mail/mail-send-recv.c:1088
msgid "Complete"
msgstr "Complete"
@@ -9020,75 +8711,84 @@ msgstr "Priority"
msgid "Select Timezone"
msgstr "Select Timezone"
+#. Translators: It will display "Start: StartDateAndTime"
+#: ../src/calendar/gui/e-to-do-pane.c:370
+#, c-format
+#| msgid "Start: "
+msgid "Start: %s"
+msgstr "Start: %s"
+
#. Translators: It will display "Due: DueDateAndTime"
-#: ../src/calendar/gui/e-to-do-pane.c:365
+#: ../src/calendar/gui/e-to-do-pane.c:390
#, c-format
-#| msgid "Due: "
msgid "Due: %s"
msgstr "Due: %s"
#. Translators: It will display "Completed: DateAndTimeWhenCompleted"
-#: ../src/calendar/gui/e-to-do-pane.c:377
+#: ../src/calendar/gui/e-to-do-pane.c:404
#, c-format
-#| msgid "Completed: "
msgid "Completed: %s"
msgstr "Completed: %s"
#. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1328 ../src/e-util/e-cell-date-edit.c:328
+#: ../src/calendar/gui/e-to-do-pane.c:1424 ../src/e-util/e-cell-date-edit.c:328
#: ../src/e-util/e-datetime-format.c:206
#: ../src/modules/calendar/e-cal-shell-view-actions.c:1842
-#: ../src/modules/itip-formatter/itip-view.c:253
+#: ../src/modules/itip-formatter/itip-view.c:254
msgid "Today"
msgstr "Today"
#. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1330
+#: ../src/calendar/gui/e-to-do-pane.c:1426
#: ../src/e-util/e-datetime-format.c:217
-#: ../src/modules/itip-formatter/itip-view.c:281
+#: ../src/modules/itip-formatter/itip-view.c:282
msgid "Tomorrow"
msgstr "Tomorrow"
-#: ../src/calendar/gui/e-to-do-pane.c:1892
+#: ../src/calendar/gui/e-to-do-pane.c:1436
+#| msgid "With _Due Date"
+msgid "Tasks without Due date"
+msgstr "Tasks without Due date"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2009
#: ../src/modules/calendar/e-cal-shell-view-actions.c:1449
msgid "New _Appointment..."
msgstr "New _Appointment…"
-#: ../src/calendar/gui/e-to-do-pane.c:1900
+#: ../src/calendar/gui/e-to-do-pane.c:2017
#: ../src/modules/calendar/e-cal-shell-view-actions.c:1435
msgid "New _Meeting..."
msgstr "New _Meeting…"
-#: ../src/calendar/gui/e-to-do-pane.c:1908
-#| msgid "New _Task"
+#: ../src/calendar/gui/e-to-do-pane.c:2025
msgid "New _Task..."
msgstr "New _Task..."
-#: ../src/calendar/gui/e-to-do-pane.c:1916
-#| msgid "New assigned task"
+#: ../src/calendar/gui/e-to-do-pane.c:2033
msgid "_New Assigned Task..."
msgstr "_New Assigned Task..."
-#: ../src/calendar/gui/e-to-do-pane.c:1929
+#: ../src/calendar/gui/e-to-do-pane.c:2046
msgid "_Open..."
msgstr "_Open..."
-#: ../src/calendar/gui/e-to-do-pane.c:1943
-#| msgid "Delete This _Occurrence"
+#: ../src/calendar/gui/e-to-do-pane.c:2060
msgid "_Delete This Instance..."
msgstr "_Delete This Instance..."
-#: ../src/calendar/gui/e-to-do-pane.c:1951
-#| msgid "All Instances"
+#: ../src/calendar/gui/e-to-do-pane.c:2068
msgid "D_elete All Instances..."
msgstr "D_elete All Instances..."
-#: ../src/calendar/gui/e-to-do-pane.c:1959
-#| msgid "_Delete"
+#: ../src/calendar/gui/e-to-do-pane.c:2076
msgid "_Delete..."
msgstr "_Delete..."
-#: ../src/calendar/gui/e-to-do-pane.c:2249
+#: ../src/calendar/gui/e-to-do-pane.c:2093
+msgid "_Show Tasks without Due date"
+msgstr "_Show Tasks without Due date"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2379
msgid "To Do"
msgstr "To Do"
@@ -9100,32 +8800,32 @@ msgstr "To Do"
msgid "%d %B"
msgstr "%d %B"
-#: ../src/calendar/gui/itip-utils.c:793 ../src/calendar/gui/itip-utils.c:855
-#: ../src/calendar/gui/itip-utils.c:989
+#: ../src/calendar/gui/itip-utils.c:785 ../src/calendar/gui/itip-utils.c:847
+#: ../src/calendar/gui/itip-utils.c:981
msgid "An organizer must be set."
msgstr "An organiser must be set."
-#: ../src/calendar/gui/itip-utils.c:846
+#: ../src/calendar/gui/itip-utils.c:838
msgid "At least one attendee is necessary"
msgstr "At least one attendee is necessary"
-#: ../src/calendar/gui/itip-utils.c:1077 ../src/calendar/gui/itip-utils.c:1238
+#: ../src/calendar/gui/itip-utils.c:1069 ../src/calendar/gui/itip-utils.c:1230
msgid "Event information"
msgstr "Event information"
-#: ../src/calendar/gui/itip-utils.c:1080 ../src/calendar/gui/itip-utils.c:1241
+#: ../src/calendar/gui/itip-utils.c:1072 ../src/calendar/gui/itip-utils.c:1233
msgid "Task information"
msgstr "Task information"
-#: ../src/calendar/gui/itip-utils.c:1083 ../src/calendar/gui/itip-utils.c:1244
+#: ../src/calendar/gui/itip-utils.c:1075 ../src/calendar/gui/itip-utils.c:1236
msgid "Memo information"
msgstr "Memo information"
-#: ../src/calendar/gui/itip-utils.c:1086 ../src/calendar/gui/itip-utils.c:1262
+#: ../src/calendar/gui/itip-utils.c:1078 ../src/calendar/gui/itip-utils.c:1254
msgid "Free/Busy information"
msgstr "Free/Busy information"
-#: ../src/calendar/gui/itip-utils.c:1089
+#: ../src/calendar/gui/itip-utils.c:1081
msgid "Calendar information"
msgstr "Calendar information"
@@ -9133,7 +8833,7 @@ msgstr "Calendar information"
#. * line of a meeting request or update email.
#. * The full subject line would be:
#. * "Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1126
+#: ../src/calendar/gui/itip-utils.c:1118
msgctxt "Meeting"
msgid "Accepted"
msgstr "Accepted"
@@ -9142,7 +8842,7 @@ msgstr "Accepted"
#. * line of a meeting request or update email.
#. * The full subject line would be:
#. * "Tentatively Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1133
+#: ../src/calendar/gui/itip-utils.c:1125
msgctxt "Meeting"
msgid "Tentatively Accepted"
msgstr "Tentatively Accepted"
@@ -9154,7 +8854,7 @@ msgstr "Tentatively Accepted"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Declined: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1140 ../src/calendar/gui/itip-utils.c:1188
+#: ../src/calendar/gui/itip-utils.c:1132 ../src/calendar/gui/itip-utils.c:1180
msgctxt "Meeting"
msgid "Declined"
msgstr "Declined"
@@ -9163,7 +8863,7 @@ msgstr "Declined"
#. * line of a meeting request or update email.
#. * The full subject line would be:
#. * "Delegated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1147
+#: ../src/calendar/gui/itip-utils.c:1139
msgctxt "Meeting"
msgid "Delegated"
msgstr "Delegated"
@@ -9171,7 +8871,7 @@ msgstr "Delegated"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Updated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1160
+#: ../src/calendar/gui/itip-utils.c:1152
msgctxt "Meeting"
msgid "Updated"
msgstr "Updated"
@@ -9179,7 +8879,7 @@ msgstr "Updated"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Cancel: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1167
+#: ../src/calendar/gui/itip-utils.c:1159
msgctxt "Meeting"
msgid "Cancel"
msgstr "Cancel"
@@ -9187,7 +8887,7 @@ msgstr "Cancel"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Refresh: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1174
+#: ../src/calendar/gui/itip-utils.c:1166
msgctxt "Meeting"
msgid "Refresh"
msgstr "Refresh"
@@ -9195,204 +8895,80 @@ msgstr "Refresh"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Counter-proposal: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1181
+#: ../src/calendar/gui/itip-utils.c:1173
msgctxt "Meeting"
msgid "Counter-proposal"
msgstr "Counter-proposal"
-#: ../src/calendar/gui/itip-utils.c:1259
+#: ../src/calendar/gui/itip-utils.c:1251
#, c-format
msgid "Free/Busy information (%s to %s)"
msgstr "Free/Busy information (%s to %s)"
-#: ../src/calendar/gui/itip-utils.c:1267
+#: ../src/calendar/gui/itip-utils.c:1259
msgid "iCalendar information"
msgstr "iCalendar information"
-#: ../src/calendar/gui/itip-utils.c:1296
+#: ../src/calendar/gui/itip-utils.c:1288
#, c-format
msgid "Unable to book a resource, the new event collides with some other."
msgstr "Unable to book a resource, the new event collides with some other."
-#: ../src/calendar/gui/itip-utils.c:1301
+#: ../src/calendar/gui/itip-utils.c:1293
msgid "Unable to book a resource, error: "
msgstr "Unable to book a resource, error: "
-#: ../src/calendar/gui/itip-utils.c:1472
+#: ../src/calendar/gui/itip-utils.c:1464
msgid "You must be an attendee of the event."
msgstr "You must be an attendee of the event."
-#: ../src/calendar/gui/itip-utils.c:2153
+#: ../src/calendar/gui/itip-utils.c:2209
msgid "Sending an event"
msgstr "Sending an event"
-#: ../src/calendar/gui/itip-utils.c:2157
+#: ../src/calendar/gui/itip-utils.c:2213
msgid "Sending a memo"
msgstr "Sending a memo"
-#: ../src/calendar/gui/itip-utils.c:2161
+#: ../src/calendar/gui/itip-utils.c:2217
msgid "Sending a task"
msgstr "Sending a task"
-#: ../src/calendar/gui/print.c:661
-msgid "1st"
-msgstr "1st"
-
-#: ../src/calendar/gui/print.c:661
-msgid "2nd"
-msgstr "2nd"
-
-#: ../src/calendar/gui/print.c:661
-msgid "3rd"
-msgstr "3rd"
-
-#: ../src/calendar/gui/print.c:661
-msgid "4th"
-msgstr "4th"
-
-#: ../src/calendar/gui/print.c:661
-msgid "5th"
-msgstr "5th"
-
-#: ../src/calendar/gui/print.c:662
-msgid "6th"
-msgstr "6th"
-
-#: ../src/calendar/gui/print.c:662
-msgid "7th"
-msgstr "7th"
-
-#: ../src/calendar/gui/print.c:662
-msgid "8th"
-msgstr "8th"
-
-#: ../src/calendar/gui/print.c:662
-msgid "9th"
-msgstr "9th"
-
-#: ../src/calendar/gui/print.c:662
-msgid "10th"
-msgstr "10th"
-
-#: ../src/calendar/gui/print.c:663
-msgid "11th"
-msgstr "11th"
-
-#: ../src/calendar/gui/print.c:663
-msgid "12th"
-msgstr "12th"
-
-#: ../src/calendar/gui/print.c:663
-msgid "13th"
-msgstr "13th"
-
-#: ../src/calendar/gui/print.c:663
-msgid "14th"
-msgstr "14th"
-
-#: ../src/calendar/gui/print.c:663
-msgid "15th"
-msgstr "15th"
-
-#: ../src/calendar/gui/print.c:664
-msgid "16th"
-msgstr "16th"
-
-#: ../src/calendar/gui/print.c:664
-msgid "17th"
-msgstr "17th"
-
-#: ../src/calendar/gui/print.c:664
-msgid "18th"
-msgstr "18th"
-
-#: ../src/calendar/gui/print.c:664
-msgid "19th"
-msgstr "19th"
-
-#: ../src/calendar/gui/print.c:664
-msgid "20th"
-msgstr "20th"
-
-#: ../src/calendar/gui/print.c:665
-msgid "21st"
-msgstr "21st"
-
-#: ../src/calendar/gui/print.c:665
-msgid "22nd"
-msgstr "22nd"
-
-#: ../src/calendar/gui/print.c:665
-msgid "23rd"
-msgstr "23rd"
-
-#: ../src/calendar/gui/print.c:665
-msgid "24th"
-msgstr "24th"
-
-#: ../src/calendar/gui/print.c:665
-msgid "25th"
-msgstr "25th"
-
-#: ../src/calendar/gui/print.c:666
-msgid "26th"
-msgstr "26th"
-
-#: ../src/calendar/gui/print.c:666
-msgid "27th"
-msgstr "27th"
-
-#: ../src/calendar/gui/print.c:666
-msgid "28th"
-msgstr "28th"
-
-#: ../src/calendar/gui/print.c:666
-msgid "29th"
-msgstr "29th"
-
-#: ../src/calendar/gui/print.c:666
-msgid "30th"
-msgstr "30th"
-
-#: ../src/calendar/gui/print.c:667
-msgid "31st"
-msgstr "31st"
-
#. G_DATE_BAD_WEEKDAY
#. Translators: These are workday abbreviations,
#. * e.g. Su=Sunday and Th=thursday
#. G_DATE_MONDAY
-#: ../src/calendar/gui/print.c:727
+#: ../src/calendar/gui/print.c:721
msgid "Mo"
msgstr "Mo"
#. G_DATE_TUESDAY
-#: ../src/calendar/gui/print.c:728
+#: ../src/calendar/gui/print.c:722
msgid "Tu"
msgstr "Tu"
#. G_DATE_WEDNESDAY
-#: ../src/calendar/gui/print.c:729
+#: ../src/calendar/gui/print.c:723
msgid "We"
msgstr "We"
#. G_DATE_THURSDAY
-#: ../src/calendar/gui/print.c:730
+#: ../src/calendar/gui/print.c:724
msgid "Th"
msgstr "Th"
#. G_DATE_FRIDAY
-#: ../src/calendar/gui/print.c:731
+#: ../src/calendar/gui/print.c:725
msgid "Fr"
msgstr "Fr"
#. G_DATE_SATURDAY
-#: ../src/calendar/gui/print.c:732
+#: ../src/calendar/gui/print.c:726
msgid "Sa"
msgstr "Sa"
#. G_DATE_SUNDAY
-#: ../src/calendar/gui/print.c:733
+#: ../src/calendar/gui/print.c:727
msgid "Su"
msgstr "Su"
@@ -9499,15 +9075,16 @@ msgid "Appointments and Meetings"
msgstr "Appointments and Meetings"
#: ../src/calendar/importers/icalendar-importer.c:306
-#: ../src/modules/accounts-window/e-accounts-window-editors.c:432
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:181
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:480
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:76
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:280
#: ../src/modules/calendar/e-cal-shell-view-actions.c:178
msgid "New Calendar"
msgstr "New Calendar"
#: ../src/calendar/importers/icalendar-importer.c:309
-#: ../src/modules/accounts-window/e-accounts-window-editors.c:440
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:189
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:488
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:288
#: ../src/modules/calendar/e-task-shell-view-actions.c:202
msgid "New Task List"
msgstr "New Task List"
@@ -9521,183 +9098,183 @@ msgid "Cre_ate new task list"
msgstr "Cre_ate new task list"
#: ../src/calendar/importers/icalendar-importer.c:501
-#: ../src/calendar/importers/icalendar-importer.c:944
+#: ../src/calendar/importers/icalendar-importer.c:940
msgid "Opening calendar"
msgstr "Opening calendar"
-#: ../src/calendar/importers/icalendar-importer.c:652
+#: ../src/calendar/importers/icalendar-importer.c:648
msgid "iCalendar files (.ics)"
msgstr "iCalendar files (.ics)"
-#: ../src/calendar/importers/icalendar-importer.c:653
+#: ../src/calendar/importers/icalendar-importer.c:649
msgid "Evolution iCalendar importer"
msgstr "Evolution iCalendar importer"
-#: ../src/calendar/importers/icalendar-importer.c:745
+#: ../src/calendar/importers/icalendar-importer.c:741
msgid "Reminder!"
msgstr "Reminder!"
-#: ../src/calendar/importers/icalendar-importer.c:830
+#: ../src/calendar/importers/icalendar-importer.c:826
msgid "vCalendar files (.vcs)"
msgstr "vCalendar files (.vcs)"
-#: ../src/calendar/importers/icalendar-importer.c:831
+#: ../src/calendar/importers/icalendar-importer.c:827
msgid "Evolution vCalendar importer"
msgstr "Evolution vCalendar importer"
-#: ../src/calendar/importers/icalendar-importer.c:1107
+#: ../src/calendar/importers/icalendar-importer.c:1103
msgid "Calendar Events"
msgstr "Calendar Events"
-#: ../src/calendar/importers/icalendar-importer.c:1150
+#: ../src/calendar/importers/icalendar-importer.c:1146
msgid "GNOME Calendar"
msgstr "GNOME Calendar"
-#: ../src/calendar/importers/icalendar-importer.c:1151
+#: ../src/calendar/importers/icalendar-importer.c:1147
msgid "Evolution Calendar intelligent importer"
msgstr "Evolution Calendar intelligent importer"
-#: ../src/calendar/importers/icalendar-importer.c:1222
-#: ../src/calendar/importers/icalendar-importer.c:1536
+#: ../src/calendar/importers/icalendar-importer.c:1218
+#: ../src/calendar/importers/icalendar-importer.c:1532
msgctxt "iCalImp"
msgid "Meeting"
msgstr "Meeting"
-#: ../src/calendar/importers/icalendar-importer.c:1222
-#: ../src/calendar/importers/icalendar-importer.c:1536
+#: ../src/calendar/importers/icalendar-importer.c:1218
+#: ../src/calendar/importers/icalendar-importer.c:1532
msgctxt "iCalImp"
msgid "Event"
msgstr "Event"
-#: ../src/calendar/importers/icalendar-importer.c:1225
-#: ../src/calendar/importers/icalendar-importer.c:1537
+#: ../src/calendar/importers/icalendar-importer.c:1221
+#: ../src/calendar/importers/icalendar-importer.c:1533
msgctxt "iCalImp"
msgid "Task"
msgstr "Task"
-#: ../src/calendar/importers/icalendar-importer.c:1228
-#: ../src/calendar/importers/icalendar-importer.c:1538
+#: ../src/calendar/importers/icalendar-importer.c:1224
+#: ../src/calendar/importers/icalendar-importer.c:1534
msgctxt "iCalImp"
msgid "Memo"
msgstr "Memo"
-#: ../src/calendar/importers/icalendar-importer.c:1237
+#: ../src/calendar/importers/icalendar-importer.c:1233
msgctxt "iCalImp"
msgid "has recurrences"
msgstr "has recurrences"
-#: ../src/calendar/importers/icalendar-importer.c:1242
+#: ../src/calendar/importers/icalendar-importer.c:1238
msgctxt "iCalImp"
msgid "is an instance"
msgstr "is an instance"
-#: ../src/calendar/importers/icalendar-importer.c:1247
+#: ../src/calendar/importers/icalendar-importer.c:1243
msgctxt "iCalImp"
msgid "has reminders"
msgstr "has reminders"
-#: ../src/calendar/importers/icalendar-importer.c:1252
+#: ../src/calendar/importers/icalendar-importer.c:1248
msgctxt "iCalImp"
msgid "has attachments"
msgstr "has attachments"
#. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1265
+#: ../src/calendar/importers/icalendar-importer.c:1261
msgctxt "iCalImp"
msgid "Public"
msgstr "Public"
#. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1268
+#: ../src/calendar/importers/icalendar-importer.c:1264
msgctxt "iCalImp"
msgid "Private"
msgstr "Private"
#. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1271
+#: ../src/calendar/importers/icalendar-importer.c:1267
msgctxt "iCalImp"
msgid "Confidential"
msgstr "Confidential"
#. Translators: Appointment's classification section name
-#: ../src/calendar/importers/icalendar-importer.c:1275
+#: ../src/calendar/importers/icalendar-importer.c:1271
msgctxt "iCalImp"
msgid "Classification"
msgstr "Classification"
#. Translators: Appointment's summary
#. Translators: Column header for a component summary
-#: ../src/calendar/importers/icalendar-importer.c:1280
-#: ../src/calendar/importers/icalendar-importer.c:1580
+#: ../src/calendar/importers/icalendar-importer.c:1276
+#: ../src/calendar/importers/icalendar-importer.c:1576
msgctxt "iCalImp"
msgid "Summary"
msgstr "Summary"
#. Translators: Appointment's location
-#: ../src/calendar/importers/icalendar-importer.c:1286
+#: ../src/calendar/importers/icalendar-importer.c:1282
msgctxt "iCalImp"
msgid "Location"
msgstr "Location"
#. Translators: Appointment's start time
#. Translators: Column header for a component start date/time
-#: ../src/calendar/importers/icalendar-importer.c:1294
-#: ../src/calendar/importers/icalendar-importer.c:1575
+#: ../src/calendar/importers/icalendar-importer.c:1290
+#: ../src/calendar/importers/icalendar-importer.c:1571
msgctxt "iCalImp"
msgid "Start"
msgstr "Start"
#. Translators: 'Due' like the time due a task should be finished
-#: ../src/calendar/importers/icalendar-importer.c:1305
+#: ../src/calendar/importers/icalendar-importer.c:1301
msgctxt "iCalImp"
msgid "Due"
msgstr "Due"
#. Translators: Appointment's end time
-#: ../src/calendar/importers/icalendar-importer.c:1317
+#: ../src/calendar/importers/icalendar-importer.c:1313
msgctxt "iCalImp"
msgid "End"
msgstr "End"
#. Translators: Appointment's categories
-#: ../src/calendar/importers/icalendar-importer.c:1327
+#: ../src/calendar/importers/icalendar-importer.c:1323
msgctxt "iCalImp"
msgid "Categories"
msgstr "Categories"
#. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../src/calendar/importers/icalendar-importer.c:1351
+#: ../src/calendar/importers/icalendar-importer.c:1347
msgctxt "iCalImp"
msgid "Completed"
msgstr "Completed"
#. Translators: Appointment's URL
-#: ../src/calendar/importers/icalendar-importer.c:1359
+#: ../src/calendar/importers/icalendar-importer.c:1355
msgctxt "iCalImp"
msgid "URL"
msgstr "URL"
#. Translators: Appointment's organizer
-#: ../src/calendar/importers/icalendar-importer.c:1370
-#: ../src/calendar/importers/icalendar-importer.c:1373
+#: ../src/calendar/importers/icalendar-importer.c:1366
+#: ../src/calendar/importers/icalendar-importer.c:1369
msgctxt "iCalImp"
msgid "Organizer"
msgstr "Organiser"
#. Translators: Appointment's attendees
-#: ../src/calendar/importers/icalendar-importer.c:1393
-#: ../src/calendar/importers/icalendar-importer.c:1396
+#: ../src/calendar/importers/icalendar-importer.c:1389
+#: ../src/calendar/importers/icalendar-importer.c:1392
msgctxt "iCalImp"
msgid "Attendees"
msgstr "Attendees"
-#: ../src/calendar/importers/icalendar-importer.c:1410
+#: ../src/calendar/importers/icalendar-importer.c:1406
msgctxt "iCalImp"
msgid "Description"
msgstr "Description"
#. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../src/calendar/importers/icalendar-importer.c:1570
+#: ../src/calendar/importers/icalendar-importer.c:1566
msgctxt "iCalImp"
msgid "Type"
msgstr "Type"
@@ -11249,145 +10826,145 @@ msgstr "Pacific/Wallis"
msgid "Pacific/Yap"
msgstr "Pacific/Yap"
-#: ../src/composer/e-composer-actions.c:225
+#: ../src/composer/e-composer-actions.c:227
msgid "Save as..."
msgstr "Save as…"
-#: ../src/composer/e-composer-actions.c:329
+#: ../src/composer/e-composer-actions.c:331
msgid "Close the current file"
msgstr "Close the current file"
-#: ../src/composer/e-composer-actions.c:334
+#: ../src/composer/e-composer-actions.c:336
msgid "New _Message"
msgstr "New _Message"
-#: ../src/composer/e-composer-actions.c:336
+#: ../src/composer/e-composer-actions.c:338
msgid "Open New Message window"
msgstr "Open New Message window"
-#: ../src/composer/e-composer-actions.c:341 ../src/shell/e-shell.c:1302
+#: ../src/composer/e-composer-actions.c:343 ../src/shell/e-shell.c:1302
#: ../src/shell/e-shell-window-actions.c:887
msgid "_Preferences"
msgstr "_Preferences"
-#: ../src/composer/e-composer-actions.c:343
+#: ../src/composer/e-composer-actions.c:345
#: ../src/shell/e-shell-window-actions.c:889
msgid "Configure Evolution"
msgstr "Configure Evolution"
-#: ../src/composer/e-composer-actions.c:350
+#: ../src/composer/e-composer-actions.c:352
msgid "Save the current file"
msgstr "Save the current file"
-#: ../src/composer/e-composer-actions.c:355
+#: ../src/composer/e-composer-actions.c:357
msgid "Save _As..."
msgstr "Save _As…"
-#: ../src/composer/e-composer-actions.c:357
+#: ../src/composer/e-composer-actions.c:359
msgid "Save the current file with a different name"
msgstr "Save the current file with a different name"
-#: ../src/composer/e-composer-actions.c:364
+#: ../src/composer/e-composer-actions.c:366
msgid "Character _Encoding"
msgstr "Character _Encoding"
-#: ../src/composer/e-composer-actions.c:388
+#: ../src/composer/e-composer-actions.c:390
msgid "Print Pre_view"
msgstr "Print Pre_view"
-#: ../src/composer/e-composer-actions.c:395
+#: ../src/composer/e-composer-actions.c:397
msgid "Save as _Draft"
msgstr "Save as _Draft"
-#: ../src/composer/e-composer-actions.c:397
+#: ../src/composer/e-composer-actions.c:399
msgid "Save as draft"
msgstr "Save as draft"
-#: ../src/composer/e-composer-actions.c:402
+#: ../src/composer/e-composer-actions.c:404
msgid "S_end"
msgstr "S_end"
-#: ../src/composer/e-composer-actions.c:404
+#: ../src/composer/e-composer-actions.c:406
msgid "Send this message"
msgstr "Send this message"
-#: ../src/composer/e-composer-actions.c:412
+#: ../src/composer/e-composer-actions.c:414
msgid "PGP _Encrypt"
msgstr "PGP _Encrypt"
-#: ../src/composer/e-composer-actions.c:414
+#: ../src/composer/e-composer-actions.c:416
msgid "Encrypt this message with PGP"
msgstr "Encrypt this message with PGP"
-#: ../src/composer/e-composer-actions.c:420
+#: ../src/composer/e-composer-actions.c:422
msgid "PGP _Sign"
msgstr "PGP _Sign"
-#: ../src/composer/e-composer-actions.c:422
+#: ../src/composer/e-composer-actions.c:424
msgid "Sign this message with your PGP key"
msgstr "Sign this message with your PGP key"
-#: ../src/composer/e-composer-actions.c:428
+#: ../src/composer/e-composer-actions.c:430
msgid "_Picture Gallery"
msgstr "_Picture Gallery"
-#: ../src/composer/e-composer-actions.c:430
+#: ../src/composer/e-composer-actions.c:432
msgid "Show a collection of pictures that you can drag to your message"
msgstr "Show a collection of pictures that you can drag to your message"
-#: ../src/composer/e-composer-actions.c:436
+#: ../src/composer/e-composer-actions.c:438
msgid "_Prioritize Message"
msgstr "_Prioritise Message"
-#: ../src/composer/e-composer-actions.c:438
+#: ../src/composer/e-composer-actions.c:440
msgid "Set the message priority to high"
msgstr "Set the message priority to high"
-#: ../src/composer/e-composer-actions.c:444
+#: ../src/composer/e-composer-actions.c:446
msgid "Re_quest Read Receipt"
msgstr "Re_quest Read Receipt"
-#: ../src/composer/e-composer-actions.c:446
+#: ../src/composer/e-composer-actions.c:448
msgid "Get delivery notification when your message is read"
msgstr "Get delivery notification when your message is read"
-#: ../src/composer/e-composer-actions.c:452
+#: ../src/composer/e-composer-actions.c:454
msgid "S/MIME En_crypt"
msgstr "S/MIME En_crypt"
-#: ../src/composer/e-composer-actions.c:454
+#: ../src/composer/e-composer-actions.c:456
msgid "Encrypt this message with your S/MIME Encryption Certificate"
msgstr "Encrypt this message with your S/MIME Encryption Certificate"
-#: ../src/composer/e-composer-actions.c:460
+#: ../src/composer/e-composer-actions.c:462
msgid "S/MIME Sig_n"
msgstr "S/MIME Sig_n"
-#: ../src/composer/e-composer-actions.c:462
+#: ../src/composer/e-composer-actions.c:464
msgid "Sign this message with your S/MIME Signature Certificate"
msgstr "Sign this message with your S/MIME Signature Certificate"
-#: ../src/composer/e-composer-actions.c:516
+#: ../src/composer/e-composer-actions.c:518
msgid "_Bcc Field"
msgstr "_Bcc Field"
-#: ../src/composer/e-composer-actions.c:518
+#: ../src/composer/e-composer-actions.c:520
msgid "Toggles whether the BCC field is displayed"
msgstr "Toggles whether the Bcc field is displayed"
-#: ../src/composer/e-composer-actions.c:524
+#: ../src/composer/e-composer-actions.c:526
msgid "_Cc Field"
msgstr "_Cc Field"
-#: ../src/composer/e-composer-actions.c:526
+#: ../src/composer/e-composer-actions.c:528
msgid "Toggles whether the CC field is displayed"
msgstr "Toggles whether the Cc field is displayed"
-#: ../src/composer/e-composer-actions.c:532
+#: ../src/composer/e-composer-actions.c:534
msgid "_From Override Field"
msgstr "_From Override Field"
-#: ../src/composer/e-composer-actions.c:534
+#: ../src/composer/e-composer-actions.c:536
msgid ""
"Toggles whether the From override field to change name or email address is "
"displayed"
@@ -11395,23 +10972,29 @@ msgstr ""
"Toggles whether the From override field to change name or e-mail address is "
"displayed"
-#: ../src/composer/e-composer-actions.c:540
+#: ../src/composer/e-composer-actions.c:542
msgid "_Reply-To Field"
msgstr "_Reply-To Field"
-#: ../src/composer/e-composer-actions.c:542
+#: ../src/composer/e-composer-actions.c:544
msgid "Toggles whether the Reply-To field is displayed"
msgstr "Toggles whether the Reply-To field is displayed"
-#: ../src/composer/e-composer-actions.c:597
+#: ../src/composer/e-composer-actions.c:550
+#| msgid "_Wrap Lines"
+msgid "Visually _Wrap Long Lines"
+msgstr "Visually _Wrap Long Lines"
+
+#: ../src/composer/e-composer-actions.c:607
msgid "Attach"
msgstr "Attach"
-#: ../src/composer/e-composer-actions.c:603
+#: ../src/composer/e-composer-actions.c:613
msgid "Save Draft"
msgstr "Save Draft"
#: ../src/composer/e-composer-from-header.c:108
+#: ../src/e-util/e-collection-account-wizard.c:1728
#: ../src/e-util/e-mail-signature-script-dialog.c:416
#: ../src/e-util/e-webdav-browser.c:2408
#: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
@@ -11478,14 +11061,14 @@ msgstr "Click here for the address book"
msgid "Click here to select folders to post to"
msgstr "Click here to select folders to post to"
-#: ../src/composer/e-msg-composer.c:854
+#: ../src/composer/e-msg-composer.c:861
#, 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"
-#: ../src/composer/e-msg-composer.c:863
+#: ../src/composer/e-msg-composer.c:870
#, c-format
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -11494,22 +11077,19 @@ msgstr ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
"account"
-#: ../src/composer/e-msg-composer.c:1622 ../src/composer/e-msg-composer.c:2294
+#: ../src/composer/e-msg-composer.c:1639 ../src/composer/e-msg-composer.c:2311
msgid "Compose Message"
msgstr "Compose Message"
-#: ../src/composer/e-msg-composer.c:4657
+#: ../src/composer/e-msg-composer.c:4696
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."
#: ../src/composer/mail-composer.error.xml.h:1
-#| msgid "You cannot attach the file "{0}" to this message."
msgid "You cannot attach the file “{0}†to this message."
msgstr "You cannot attach the file “{0}†to this message."
#: ../src/composer/mail-composer.error.xml.h:2
-#| msgid ""
-#| "The file '{0}' is not a regular file and cannot be sent in a message."
msgid "The file “{0}†is not a regular file and cannot be sent in a message."
msgstr "The file “{0}†is not a regular file and cannot be sent in a message."
@@ -11519,7 +11099,6 @@ msgstr "Could not retrieve messages to attach from {0}."
#: ../src/composer/mail-composer.error.xml.h:4
#: ../src/e-util/e-system.error.xml.h:5
-#| msgid "Because \"{1}\"."
msgid "Because “{1}â€."
msgstr "Because “{1}â€."
@@ -11544,19 +11123,27 @@ msgid "_Recover"
msgstr "_Recover"
#: ../src/composer/mail-composer.error.xml.h:9
-#| msgid "Could not save to autosave file "{0}"."
+#| msgid "Do you want to recover unfinished messages?"
+msgid "Do you want to recover last saved version of the message?"
+msgstr "Do you want to recover last saved version of the message?"
+
+#: ../src/composer/mail-composer.error.xml.h:10
+msgid ""
+"Recovering the message will allow you to continue where it had been saved "
+"the last time."
+msgstr ""
+"Recovering the message will allow you to continue where it had been saved "
+"the last time."
+
+#: ../src/composer/mail-composer.error.xml.h:11
msgid "Could not save to autosave file “{0}â€."
msgstr "Could not save to autosave file “{0}â€."
-#: ../src/composer/mail-composer.error.xml.h:10
-#| msgid "Error saving to autosave because "{1}"."
+#: ../src/composer/mail-composer.error.xml.h:12
msgid "Error saving to autosave because “{1}â€."
msgstr "Error saving to autosave because “{1}â€."
-#: ../src/composer/mail-composer.error.xml.h:11
-#| msgid ""
-#| "Are you sure you want to discard the message, titled '{0}', you are "
-#| "composing?"
+#: ../src/composer/mail-composer.error.xml.h:13
msgid ""
"Are you sure you want to discard the message, titled “{0}â€, you are "
"composing?"
@@ -11564,7 +11151,7 @@ msgstr ""
"Are you sure you want to discard the message, titled “{0}â€, you are "
"composing?"
-#: ../src/composer/mail-composer.error.xml.h:12
+#: ../src/composer/mail-composer.error.xml.h:14
msgid ""
"Closing this composer window will discard the message permanently, unless "
"you choose to save the message in your Drafts folder. This will allow you to "
@@ -11575,25 +11162,23 @@ msgstr ""
"continue the message at a later date."
#. Response codes were chosen somewhat arbitrarily.
-#: ../src/composer/mail-composer.error.xml.h:15
+#: ../src/composer/mail-composer.error.xml.h:17
msgid "_Continue Editing"
msgstr "_Continue Editing"
-#: ../src/composer/mail-composer.error.xml.h:16
+#: ../src/composer/mail-composer.error.xml.h:18
msgid "_Save Draft"
msgstr "_Save Draft"
-#: ../src/composer/mail-composer.error.xml.h:17
+#: ../src/composer/mail-composer.error.xml.h:19
msgid "Are you sure you want to discard the message you are composing?"
msgstr "Are you sure you want to discard the message you are composing?"
-#: ../src/composer/mail-composer.error.xml.h:18
+#: ../src/composer/mail-composer.error.xml.h:20
msgid "Could not create message."
msgstr "Could not create message."
-#: ../src/composer/mail-composer.error.xml.h:19
-#| msgid ""
-#| "Because "{0}", you may need to select different mail options."
+#: ../src/composer/mail-composer.error.xml.h:21
msgid ""
"You may need to select different mail options.\n"
"\n"
@@ -11603,73 +11188,63 @@ msgstr ""
"\n"
"Detailed error: {0}"
-#: ../src/composer/mail-composer.error.xml.h:22
-#| msgid "Could not read signature file "{0}"."
+#: ../src/composer/mail-composer.error.xml.h:24
msgid "Could not read signature file “{0}â€."
msgstr "Could not read signature file “{0}â€."
-#: ../src/composer/mail-composer.error.xml.h:23
+#: ../src/composer/mail-composer.error.xml.h:25
msgid "All accounts have been removed."
msgstr "All accounts have been removed."
-#: ../src/composer/mail-composer.error.xml.h:24
+#: ../src/composer/mail-composer.error.xml.h:26
msgid "You need to configure an account before you can compose mail."
msgstr "You need to configure an account before you can compose mail."
-#: ../src/composer/mail-composer.error.xml.h:25
+#: ../src/composer/mail-composer.error.xml.h:27
msgid "An error occurred while saving to your Outbox folder."
msgstr "An error occurred while saving to your Outbox folder."
-#: ../src/composer/mail-composer.error.xml.h:26
-#| msgid ""
-#| "The reported error was "{0}". The message has not been sent."
+#: ../src/composer/mail-composer.error.xml.h:28
msgid "The reported error was “{0}â€. The message has not been sent."
msgstr "The reported error was “{0}â€. The message has not been sent."
-#: ../src/composer/mail-composer.error.xml.h:27
+#: ../src/composer/mail-composer.error.xml.h:29
msgid "An error occurred while saving to your Drafts folder."
msgstr "An error occurred while saving to your Drafts folder."
-#: ../src/composer/mail-composer.error.xml.h:28
-#| msgid ""
-#| "The reported error was "{0}". The message has most likely not "
-#| "been saved."
+#: ../src/composer/mail-composer.error.xml.h:30
msgid ""
"The reported error was “{0}â€. The message has most likely not been saved."
msgstr ""
"The reported error was “{0}â€. The message has most likely not been saved."
-#: ../src/composer/mail-composer.error.xml.h:29
+#: ../src/composer/mail-composer.error.xml.h:31
msgid "An error occurred while sending. How do you want to proceed?"
msgstr "An error occurred while sending. How do you want to proceed?"
-#: ../src/composer/mail-composer.error.xml.h:30
+#: ../src/composer/mail-composer.error.xml.h:32
#: ../src/mail/mail.error.xml.h:177
-#| msgid "The reported error was "{0}"."
msgid "The reported error was “{0}â€."
msgstr "The reported error was “{0}â€."
-#: ../src/composer/mail-composer.error.xml.h:31
+#: ../src/composer/mail-composer.error.xml.h:33
msgid "_Save to Outbox"
msgstr "_Save to Outbox"
-#: ../src/composer/mail-composer.error.xml.h:32
+#: ../src/composer/mail-composer.error.xml.h:34
+#: ../src/e-util/e-collection-account-wizard.c:440
msgid "_Try Again"
msgstr "_Try Again"
-#: ../src/composer/mail-composer.error.xml.h:33
+#: ../src/composer/mail-composer.error.xml.h:35
msgid "Your message was sent, but an error occurred during post-processing."
msgstr "Your message was sent, but an error occurred during post-processing."
-#: ../src/composer/mail-composer.error.xml.h:34
+#: ../src/composer/mail-composer.error.xml.h:36
msgid "Saving message to Outbox."
msgstr "Saving message to Outbox."
-#: ../src/composer/mail-composer.error.xml.h:35
-#| msgid ""
-#| "The message will be saved to your local Outbox folder, because the "
-#| "destination service is currently unavailable. You can send the message by "
-#| "clicking the Send/Receive button in Evolution's toolbar."
+#: ../src/composer/mail-composer.error.xml.h:37
msgid ""
"The message will be saved to your local Outbox folder, because the "
"destination service is currently unavailable. You can send the message by "
@@ -11679,11 +11254,11 @@ msgstr ""
"destination service is currently unavailable. You can send the message by "
"clicking the Send/Receive button in Evolution’s toolbar."
-#: ../src/composer/mail-composer.error.xml.h:36
+#: ../src/composer/mail-composer.error.xml.h:38
msgid "Are you sure you want to send the message?"
msgstr "Are you sure you want to send the message?"
-#: ../src/composer/mail-composer.error.xml.h:37
+#: ../src/composer/mail-composer.error.xml.h:39
msgid ""
"A keyboard accelerator to send the message has been pressed. Either cancel "
"sending the message, if it was done by an accident, or send the message."
@@ -11691,15 +11266,11 @@ msgstr ""
"A keyboard accelerator to send the message has been pressed. Either cancel "
"sending the message, if it was done by an accident, or send the message."
-#: ../src/composer/mail-composer.error.xml.h:39
-#| msgid "Are you sure you want to change the composer mode?"
+#: ../src/composer/mail-composer.error.xml.h:41
msgid "Are you sure you want to change the composer format?"
msgstr "Are you sure you want to change the composer format?"
-#: ../src/composer/mail-composer.error.xml.h:40
-#| msgid ""
-#| "Turning HTML mode off will cause the text to lose all formatting. Do you "
-#| "want to continue?"
+#: ../src/composer/mail-composer.error.xml.h:42
msgid ""
"Switching to Plain Text format will cause the text to lose all the HTML "
"formatting. Do you want to continue?"
@@ -11707,25 +11278,23 @@ msgstr ""
"Switching to Plain Text format will cause the text to lose all the HTML "
"formatting. Do you want to continue?"
-#: ../src/composer/mail-composer.error.xml.h:41
-#| msgid "_Don't lose formatting"
+#: ../src/composer/mail-composer.error.xml.h:43
msgid "_Don’t lose formatting"
msgstr "_Don’t lose formatting"
-#: ../src/composer/mail-composer.error.xml.h:42
+#: ../src/composer/mail-composer.error.xml.h:44
msgid "Lose _formatting"
msgstr "Lose _formatting"
-#: ../src/composer/mail-composer.error.xml.h:43
+#: ../src/composer/mail-composer.error.xml.h:45
msgid "An error occurred while saving to your Templates folder."
msgstr "An error occurred while saving to your Templates folder."
-#: ../src/composer/mail-composer.error.xml.h:44
-#| msgid "Are you sure you want to discard the message you are composing?"
+#: ../src/composer/mail-composer.error.xml.h:46
msgid "Are you sure you want to convert the message into a meeting?"
msgstr "Are you sure you want to convert the message into a meeting?"
-#: ../src/composer/mail-composer.error.xml.h:45
+#: ../src/composer/mail-composer.error.xml.h:47
msgid ""
"By converting the message into the meeting the composed message will be "
"closed and the changes being done discarded."
@@ -11733,17 +11302,15 @@ msgstr ""
"By converting the message into the meeting the composed message will be "
"closed and the changes being done discarded."
-#: ../src/composer/mail-composer.error.xml.h:46
-#| msgid "Con_vert to Meeting"
+#: ../src/composer/mail-composer.error.xml.h:48
msgid "Convert to _Meeting"
msgstr "Convert to _Meeting"
-#: ../src/composer/mail-composer.error.xml.h:47
-#| msgid "Are you sure you want to send the message?"
+#: ../src/composer/mail-composer.error.xml.h:49
msgid "Are you sure you want to convert the event into a message?"
msgstr "Are you sure you want to convert the event into a message?"
-#: ../src/composer/mail-composer.error.xml.h:48
+#: ../src/composer/mail-composer.error.xml.h:50
msgid ""
"By converting the event into the message the editing window will be closed "
"and the changes being done discarded."
@@ -11751,17 +11318,15 @@ msgstr ""
"By converting the event into the message the editing window will be closed "
"and the changes being done discarded."
-#: ../src/composer/mail-composer.error.xml.h:49
-#| msgid "Con_vert to Meeting"
+#: ../src/composer/mail-composer.error.xml.h:51
msgid "Convert to _Message"
msgstr "Convert to _Message"
-#: ../src/composer/mail-composer.error.xml.h:50
-#| msgid "Are you sure you want to save the memo without a summary?"
+#: ../src/composer/mail-composer.error.xml.h:52
msgid "Are you sure you want to convert the memo into a message?"
msgstr "Are you sure you want to convert the memo into a message?"
-#: ../src/composer/mail-composer.error.xml.h:51
+#: ../src/composer/mail-composer.error.xml.h:53
msgid ""
"By converting the memo into the message the editing window will be closed "
"and the changes being done discarded."
@@ -11769,12 +11334,11 @@ msgstr ""
"By converting the memo into the message the editing window will be closed "
"and the changes being done discarded."
-#: ../src/composer/mail-composer.error.xml.h:52
-#| msgid "Are you sure you want to save the task without a summary?"
+#: ../src/composer/mail-composer.error.xml.h:54
msgid "Are you sure you want to convert the task into a message?"
msgstr "Are you sure you want to convert the task into a message?"
-#: ../src/composer/mail-composer.error.xml.h:53
+#: ../src/composer/mail-composer.error.xml.h:55
msgid ""
"By converting the task into the message the editing window will be closed "
"and the changes being done discarded."
@@ -11782,11 +11346,11 @@ msgstr ""
"By converting the task into the message the editing window will be closed "
"and the changes being done discarded."
-#: ../src/composer/mail-composer.error.xml.h:54
+#: ../src/composer/mail-composer.error.xml.h:56
msgid "Something has gone wrong when editing the message"
msgstr "Something has gone wrong when editing the message"
-#: ../src/composer/mail-composer.error.xml.h:55
+#: ../src/composer/mail-composer.error.xml.h:57
msgid ""
"A WebKitWebProcess crashed when editing the message. You can try again by "
"closing the composer window and opening a new one. If the issue persists, "
@@ -11827,11 +11391,11 @@ msgstr "(no subject)"
msgid "This message was sent by %s on behalf of %s"
msgstr "This message was sent by %s on behalf of %s"
-#: ../src/em-format/e-mail-formatter-image.c:168
+#: ../src/em-format/e-mail-formatter-image.c:178
msgid "Regular Image"
msgstr "Regular Image"
-#: ../src/em-format/e-mail-formatter-image.c:169
+#: ../src/em-format/e-mail-formatter-image.c:179
msgid "Display part as an image"
msgstr "Display part as an image"
@@ -11870,7 +11434,7 @@ msgstr "Subject"
#. pseudo-header
#: ../src/em-format/e-mail-formatter-quote-headers.c:197
#: ../src/em-format/e-mail-formatter-utils.c:341
-#: ../src/modules/mail/em-mailer-prefs.c:1494
+#: ../src/modules/mail/em-mailer-prefs.c:1500
msgid "Mailer"
msgstr "Mailer"
@@ -12077,7 +11641,7 @@ msgstr "S/MIME encrypted"
msgid "Security"
msgstr "Security"
-#: ../src/em-format/e-mail-parser-application-mbox.c:85
+#: ../src/em-format/e-mail-parser-application-mbox.c:125
#, c-format
msgid "Error parsing MBOX part: %s"
msgstr "Error parsing MBOX part: %s"
@@ -12109,7 +11673,6 @@ msgstr "Pointer to FTP site (%s)"
#: ../src/em-format/e-mail-parser-message-external.c:110
#, c-format
-#| msgid "Pointer to local file (%s) valid at site \"%s\""
msgid "Pointer to local file (%s) valid at site “%sâ€"
msgstr "Pointer to local file (%s) valid at site “%sâ€"
@@ -12125,7 +11688,6 @@ msgstr "Pointer to remote data (%s)"
#: ../src/em-format/e-mail-parser-message-external.c:149
#, c-format
-#| msgid "Pointer to unknown external data (\"%s\" type)"
msgid "Pointer to unknown external data (“%s†type)"
msgstr "Pointer to unknown external data (“%s†type)"
@@ -12171,7 +11733,6 @@ msgstr "Face"
#: ../src/em-format/e-mail-part-secure-button.c:92
#, c-format
-#| msgid "Failed to import certificate"
msgid "Failed to import certificate: %s"
msgstr "Failed to import certificate: %s"
@@ -12181,7 +11742,6 @@ msgid "_View Certificate"
msgstr "_View Certificate"
#: ../src/em-format/e-mail-part-secure-button.c:198
-#| msgid "Imported Certificate"
msgid "_Import Certificate"
msgstr "_Import Certificate"
@@ -12207,83 +11767,74 @@ msgstr "Calendar: from %s to %s"
msgid "evolution calendar item"
msgstr "evolution calendar item"
-#: ../src/e-util/e-accounts-window.c:509 ../src/e-util/e-accounts-window.c:624
-#: ../src/e-util/e-accounts-window.c:827
-#: ../src/modules/mail/e-mail-shell-backend.c:840
+#: ../src/e-util/e-accounts-window.c:523 ../src/e-util/e-accounts-window.c:640
+#: ../src/e-util/e-accounts-window.c:860
+#: ../src/modules/mail/e-mail-shell-backend.c:852
msgid "Mail Accounts"
msgstr "Mail Accounts"
-#: ../src/e-util/e-accounts-window.c:516 ../src/e-util/e-accounts-window.c:653
-#: ../src/e-util/e-accounts-window.c:841
-#| msgid "Address Book"
+#: ../src/e-util/e-accounts-window.c:530 ../src/e-util/e-accounts-window.c:669
+#: ../src/e-util/e-accounts-window.c:874
msgid "Address Books"
msgstr "Address Books"
-#: ../src/e-util/e-accounts-window.c:522 ../src/e-util/e-accounts-window.c:654
-#: ../src/e-util/e-accounts-window.c:842
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
-#| msgid "_Calendars"
+#: ../src/e-util/e-accounts-window.c:536 ../src/e-util/e-accounts-window.c:670
+#: ../src/e-util/e-accounts-window.c:875
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:84
msgid "Calendars"
msgstr "Calendars"
-#: ../src/e-util/e-accounts-window.c:528 ../src/e-util/e-accounts-window.c:655
-#: ../src/e-util/e-accounts-window.c:843
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:82
-#| msgctxt "New"
-#| msgid "Memo Li_st"
+#: ../src/e-util/e-accounts-window.c:542 ../src/e-util/e-accounts-window.c:671
+#: ../src/e-util/e-accounts-window.c:876
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
msgid "Memo Lists"
msgstr "Memo Lists"
-#: ../src/e-util/e-accounts-window.c:534 ../src/e-util/e-accounts-window.c:656
-#: ../src/e-util/e-accounts-window.c:844
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
-#| msgid "Task List"
+#: ../src/e-util/e-accounts-window.c:548 ../src/e-util/e-accounts-window.c:672
+#: ../src/e-util/e-accounts-window.c:877
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:86
msgid "Task Lists"
msgstr "Task Lists"
-#: ../src/e-util/e-accounts-window.c:1326
+#: ../src/e-util/e-accounts-window.c:1363 ../src/e-util/filter.ui.h:23
#: ../src/mail/e-mail-account-tree-view.c:84
#: ../src/modules/mail/em-composer-prefs.c:1305
#: ../src/modules/plugin-manager/evolution-plugin-manager.c:355
-#: ../src/plugins/publish-calendar/publish-calendar.c:853
+#: ../src/plugins/publish-calendar/publish-calendar.c:854
msgid "Enabled"
msgstr "Enabled"
-#: ../src/e-util/e-accounts-window.c:1342
+#: ../src/e-util/e-accounts-window.c:1379
#: ../src/mail/e-mail-account-tree-view.c:108
msgid "Account Name"
msgstr "Account Name"
-#. { "collection", N_("Collection _Account"), "evolution" },
-#: ../src/e-util/e-accounts-window.c:1463
-#| msgid "Mail Accounts"
+#: ../src/e-util/e-accounts-window.c:1446
+#| msgid "Evolution Accounts"
+msgid "Collection _Account"
+msgstr "Collection _Account"
+
+#: ../src/e-util/e-accounts-window.c:1447
msgid "_Mail Account"
msgstr "_Mail Account"
-#: ../src/e-util/e-accounts-window.c:1464
-#| msgctxt "New"
-#| msgid "Address _Book"
+#: ../src/e-util/e-accounts-window.c:1448
msgid "Address _Book"
msgstr "Address _Book"
-#: ../src/e-util/e-accounts-window.c:1465
-#| msgid "_Calendar:"
+#: ../src/e-util/e-accounts-window.c:1449
msgid "_Calendar"
msgstr "_Calendar"
-#: ../src/e-util/e-accounts-window.c:1466
-#| msgctxt "New"
-#| msgid "Memo Li_st"
+#: ../src/e-util/e-accounts-window.c:1450
msgid "M_emo List"
msgstr "M_emo List"
-#: ../src/e-util/e-accounts-window.c:1467
-#| msgid "Task List"
+#: ../src/e-util/e-accounts-window.c:1451
msgid "_Task List"
msgstr "_Task List"
-#: ../src/e-util/e-accounts-window.c:1659
-#| msgid "Evolution Account Assistant"
+#: ../src/e-util/e-accounts-window.c:1646
msgid "Evolution Accounts"
msgstr "Evolution Accounts"
@@ -12327,7 +11878,7 @@ msgid "%s (%d%% complete)"
msgstr "%s (%d%% complete)"
#: ../src/e-util/e-activity-proxy.c:350
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1851
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1849
msgid "Cancel"
msgstr "Cancel"
@@ -12368,7 +11919,6 @@ msgstr "A save operation is already in progress"
#: ../src/e-util/e-attachment.c:2730
#, c-format
-#| msgid "Could not open %s:"
msgid "Could not open “%sâ€"
msgstr "Could not open “%sâ€"
@@ -12383,7 +11933,6 @@ msgstr "Attachment contents not loaded"
#: ../src/e-util/e-attachment.c:3574
#, c-format
-#| msgid "Could not save '%s'"
msgid "Could not save “%sâ€"
msgstr "Could not save “%sâ€"
@@ -12503,14 +12052,13 @@ msgstr "A_dd Attachment…"
#: ../src/modules/calendar/e-cal-shell-view-actions.c:1316
#: ../src/modules/calendar/e-memo-shell-view-actions.c:605
#: ../src/modules/calendar/e-task-shell-view-actions.c:731
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1645
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1716
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1643
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1714
msgid "_Properties"
msgstr "_Properties"
#: ../src/e-util/e-attachment-view.c:778
#, c-format
-#| msgid "Open With \"%s\""
msgid "Open With “%sâ€"
msgstr "Open With “%sâ€"
@@ -12536,40 +12084,40 @@ msgstr "Copy book content locally for offline operation"
msgid "Ctrl-click to open a link"
msgstr "Ctrl-click to open a link"
-#: ../src/e-util/e-calendar.c:272
+#: ../src/e-util/e-calendar.c:267
msgid "Previous month"
msgstr "Previous month"
-#: ../src/e-util/e-calendar.c:291
+#: ../src/e-util/e-calendar.c:286
msgid "Next month"
msgstr "Next month"
-#: ../src/e-util/e-calendar.c:311
+#: ../src/e-util/e-calendar.c:306
msgid "Previous year"
msgstr "Previous year"
-#: ../src/e-util/e-calendar.c:330
+#: ../src/e-util/e-calendar.c:325
msgid "Next year"
msgstr "Next year"
-#: ../src/e-util/e-calendar.c:354
+#: ../src/e-util/e-calendar.c:349
msgid "Month Calendar"
msgstr "Month Calendar"
#. This is a strftime() format. %B = Month name.
-#: ../src/e-util/e-calendar-item.c:1338 ../src/e-util/e-calendar-item.c:2218
+#: ../src/e-util/e-calendar-item.c:1333 ../src/e-util/e-calendar-item.c:2216
msgctxt "CalItem"
msgid "%B"
msgstr "%B"
#. This is a strftime() format. %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1340
+#: ../src/e-util/e-calendar-item.c:1335
msgctxt "CalItem"
msgid "%Y"
msgstr "%Y"
#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1377
+#: ../src/e-util/e-calendar-item.c:1372
msgctxt "CalItem"
msgid "%B %Y"
msgstr "%B %Y"
@@ -12631,7 +12179,6 @@ msgstr "Icon"
#: ../src/e-util/e-category-completion.c:304
#, c-format
-#| msgid "Create category \"%s\""
msgid "Create category “%sâ€"
msgstr "Create category “%sâ€"
@@ -12657,9 +12204,6 @@ msgstr "Category Properties"
#: ../src/e-util/e-category-editor.c:275
#, c-format
-#| msgid ""
-#| "There is already a category '%s' in the configuration. Please use another "
-#| "name"
msgid ""
"There is already a category “%s†in the configuration. Please use another "
"name"
@@ -12672,7 +12216,7 @@ msgid "popup list"
msgstr "popup list"
#: ../src/e-util/e-cell-date.c:49 ../src/e-util/e-cell-date.c:137
-#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2066
+#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2109
msgid "?"
msgstr "?"
@@ -12792,10 +12336,143 @@ msgstr "Other…"
#: ../src/e-util/e-client-cache.c:1149 ../src/e-util/e-client-cache.c:1280
#, c-format
-#| msgid "Cannot create a client object from extension name '%s'"
msgid "Cannot create a client object from extension name “%sâ€"
msgstr "Cannot create a client object from extension name “%sâ€"
+#: ../src/e-util/e-collection-account-wizard.c:214
+#| msgid "Searching for user home, please wait…"
+msgid "Looking up details, please wait…"
+msgstr "Looking up details, please wait…"
+
+#. Translators: The %s is replaced with a clickable text "Enter password", thus it'll be "Requires password
to continue. Enter password." at the end.
+#: ../src/e-util/e-collection-account-wizard.c:271
+#, c-format
+#| msgid "Enter Google password for user '%s'."
+msgid "Requires password to continue. %s."
+msgstr "Requires password to continue. %s."
+
+#: ../src/e-util/e-collection-account-wizard.c:284
+#| msgid "_View Certificate"
+msgid "View certificate"
+msgstr "View certificate"
+
+#. Translators: The first %s is replaced with actual error message about site certificate invalidity,
+#. like "The signing certificate authority is not known.", the second %s is replaced with a link "View
certificate".
+#: ../src/e-util/e-collection-account-wizard.c:288
+#, c-format
+msgctxt "collection-account-wizard"
+msgid "%s %s."
+msgstr "%s %s."
+
+#: ../src/e-util/e-collection-account-wizard.c:326
+msgid ""
+"Found no candidates. It can also mean that the server doesn’t provide any "
+"information about its configuration using the selected lookup methods. Enter "
+"the account manually instead or change above settings."
+msgstr ""
+"Found no candidates. It can also mean that the server doesn’t provide any "
+"information about its configuration using the selected lookup methods. Enter "
+"the account manually instead or change above settings."
+
+#: ../src/e-util/e-collection-account-wizard.c:328
+#, c-format
+msgid "Found one candidate"
+msgid_plural "Found %d candidates"
+msgstr[0] "Found one candidate"
+msgstr[1] "Found %d candidates"
+
+#: ../src/e-util/e-collection-account-wizard.c:423
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
+#: ../src/smime/gui/certificate-manager.c:785
+msgid "_Password:"
+msgstr "_Password:"
+
+#: ../src/e-util/e-collection-account-wizard.c:434
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
+msgid "_Remember password"
+msgstr "_Remember password"
+
+#: ../src/e-util/e-collection-account-wizard.c:555
+#: ../src/e-util/e-webdav-browser.c:473
+msgid "Collection"
+msgstr "Collection"
+
+#: ../src/e-util/e-collection-account-wizard.c:556
+#| msgid "Mail Receipt"
+msgid "Mail Receive"
+msgstr "Mail Receive"
+
+#: ../src/e-util/e-collection-account-wizard.c:557
+#| msgid "Mailer"
+msgid "Mail Send"
+msgstr "Mail Send"
+
+#: ../src/e-util/e-collection-account-wizard.c:558
+#: ../src/e-util/e-name-selector-dialog.c:445
+#: ../src/mail/importers/pine-importer.c:430
+msgid "Address Book"
+msgstr "Address Book"
+
+#: ../src/e-util/e-collection-account-wizard.c:560
+#| msgid "Memo Lists"
+msgid "Memo List"
+msgstr "Memo List"
+
+#: ../src/e-util/e-collection-account-wizard.c:561
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
+msgid "Task List"
+msgstr "Task List"
+
+#: ../src/e-util/e-collection-account-wizard.c:896
+msgid "Looking up LDAP server’s search base…"
+msgstr "Looking up LDAP server’s search base…"
+
+#: ../src/e-util/e-collection-account-wizard.c:1193
+#| msgid "Searching for user home, please wait…"
+msgid "Saving account settings, please wait…"
+msgstr "Saving account settings, please wait…"
+
+#: ../src/e-util/e-collection-account-wizard.c:1337
+#| msgid "User e_mail:"
+msgid "User details"
+msgstr "User details"
+
+#: ../src/e-util/e-collection-account-wizard.c:1350
+#| msgid "Email Address cannot be empty"
+msgid "_Email Address or User name:"
+msgstr "_E-mail Address or User name:"
+
+#: ../src/e-util/e-collection-account-wizard.c:1380
+#| msgid "Advanced send options"
+msgid "_Advanced Options"
+msgstr "_Advanced Options"
+
+#: ../src/e-util/e-collection-account-wizard.c:1385
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:216
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:172
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:25
+msgid "_Server:"
+msgstr "_Server:"
+
+#: ../src/e-util/e-collection-account-wizard.c:1403
+msgid ""
+"Semicolon (“;â€) separated list of servers to look up information for, in "
+"addition to the domain of the e-mail address."
+msgstr ""
+"Semicolon (“;â€) separated list of servers to look up information for, in "
+"addition to the domain of the e-mail address."
+
+#: ../src/e-util/e-collection-account-wizard.c:1595
+#| msgid "Level beyond which the message should be logged."
+msgid "Select which parts should be configured:"
+msgstr "Select which parts should be configured:"
+
+#: ../src/e-util/e-collection-account-wizard.c:1719
+#: ../src/mail/e-mail-config-identity-page.c:541
+#: ../src/mail/e-mail-config-summary-page.c:323
+msgid "Account Information"
+msgstr "Account Information"
+
#: ../src/e-util/e-color-chooser-widget.c:122
msgid "Choose custom color"
msgstr "Choose custom colour"
@@ -12963,10 +12640,15 @@ msgstr "white"
#: ../src/e-util/e-color-combo.c:642 ../src/mail/e-mail-account-tree-view.c:135
#: ../src/mail/e-mail-config-security-page.c:404
#: ../src/mail/e-mail-config-security-page.c:568
-#: ../src/mail/e-mail-reader.c:4043 ../src/mail/mail-config.ui.h:76
+#: ../src/mail/e-mail-reader.c:4138 ../src/mail/mail-config.ui.h:76
msgid "Default"
msgstr "Default"
+#: ../src/e-util/e-config-lookup.c:817
+#| msgid "Loading…"
+msgid "Running…"
+msgstr "Running…"
+
#: ../src/e-util/e-dateedit.c:524
msgid "Date and Time"
msgstr "Date and Time"
@@ -12979,41 +12661,41 @@ msgstr "Text entry to input date"
msgid "Click this button to show a calendar"
msgstr "Click this button to show a calendar"
-#: ../src/e-util/e-dateedit.c:626
+#: ../src/e-util/e-dateedit.c:627
msgid "Drop-down combination box to select time"
msgstr "Drop-down combination box to select time"
-#: ../src/e-util/e-dateedit.c:627
+#: ../src/e-util/e-dateedit.c:628
#: ../src/modules/calendar/e-calendar-preferences.ui.h:9
msgid "Time"
msgstr "Time"
-#: ../src/e-util/e-dateedit.c:701
+#: ../src/e-util/e-dateedit.c:702
msgid "No_w"
msgstr "No_w"
-#: ../src/e-util/e-dateedit.c:708
+#: ../src/e-util/e-dateedit.c:709
msgid "_Today"
msgstr "_Today"
#. Note that we don't show this here, since by default a 'None' date
#. * is not permitted.
-#: ../src/e-util/e-dateedit.c:717
+#: ../src/e-util/e-dateedit.c:718
msgid "_None"
msgstr "_None"
#. Translators: "None" for date field of a date edit, shown when
#. * there is no date set.
-#: ../src/e-util/e-dateedit.c:1846 ../src/e-util/e-dateedit.c:2094
+#: ../src/e-util/e-dateedit.c:1877 ../src/e-util/e-dateedit.c:2125
msgctxt "date"
msgid "None"
msgstr "None"
-#: ../src/e-util/e-dateedit.c:1986
+#: ../src/e-util/e-dateedit.c:2017
msgid "Invalid Date Value"
msgstr "Invalid Date Value"
-#: ../src/e-util/e-dateedit.c:2031
+#: ../src/e-util/e-dateedit.c:2062
msgid "Invalid Time Value"
msgstr "Invalid Time Value"
@@ -13082,34 +12764,30 @@ msgstr "Next Sun"
msgid "Use locale default"
msgstr "Use locale default"
-#: ../src/e-util/e-datetime-format.c:573
+#: ../src/e-util/e-datetime-format.c:592
msgid "Format:"
msgstr "Format:"
#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ days ]"
#: ../src/e-util/e-dialog-widgets.c:181
-#| msgid "days"
msgctxt "time-unit"
msgid "days"
msgstr "days"
#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ weeks ]"
#: ../src/e-util/e-dialog-widgets.c:183
-#| msgid "weeks"
msgctxt "time-unit"
msgid "weeks"
msgstr "weeks"
#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ months ]"
#: ../src/e-util/e-dialog-widgets.c:185
-#| msgid "months"
msgctxt "time-unit"
msgid "months"
msgstr "months"
#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ years ]"
#: ../src/e-util/e-dialog-widgets.c:187
-#| msgid "years"
msgctxt "time-unit"
msgid "years"
msgstr "years"
@@ -13231,7 +12909,6 @@ msgstr "(Unknown Filename)"
#. Translators: The string value is the basename of a file.
#: ../src/e-util/e-file-utils.c:125
#, c-format
-#| msgid "Writing \"%s\""
msgid "Writing “%sâ€"
msgstr "Writing “%sâ€"
@@ -13239,7 +12916,6 @@ msgstr "Writing “%sâ€"
#. * remote file, the second string value is the hostname.
#: ../src/e-util/e-file-utils.c:130
#, c-format
-#| msgid "Writing \"%s\" to %s"
msgid "Writing “%s†to %s"
msgstr "Writing “%s†to %s"
@@ -13365,23 +13041,23 @@ msgstr "Select a time to compare against"
msgid "Choose a File"
msgstr "Choose a File"
-#: ../src/e-util/e-filter-rule.c:763
+#: ../src/e-util/e-filter-rule.c:978
msgid "R_ule name:"
msgstr "R_ule name:"
-#: ../src/e-util/e-filter-rule.c:813
+#: ../src/e-util/e-filter-rule.c:1034
msgid "all the following conditions"
msgstr "all the following conditions"
-#: ../src/e-util/e-filter-rule.c:814
+#: ../src/e-util/e-filter-rule.c:1035
msgid "any of the following conditions"
msgstr "any of the following conditions"
-#: ../src/e-util/e-filter-rule.c:820
+#: ../src/e-util/e-filter-rule.c:1041
msgid "_Find items which match:"
msgstr "_Find items which match:"
-#: ../src/e-util/e-filter-rule.c:843
+#: ../src/e-util/e-filter-rule.c:1064
msgid "Find items that meet the following conditions"
msgstr "Find items that meet the following conditions"
@@ -13389,47 +13065,48 @@ msgstr "Find items that meet the following conditions"
#. * part of "Include threads: None"
#. protocol:
#. name:
-#: ../src/e-util/e-filter-rule.c:858
+#: ../src/e-util/e-filter-rule.c:1079
#: ../src/e-util/e-html-editor-page-dialog.c:59
#: ../src/e-util/e-mail-identity-combo-box.c:694
#: ../src/e-util/e-mail-signature-combo-box.c:422
#: ../src/libemail-engine/camel-null-store.c:29
-#: ../src/mail/e-mail-autoconfig.c:644
+#: ../src/mail/e-mail-autoconfig.c:658
#: ../src/mail/e-mail-config-summary-page.c:141
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:629
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:680
msgid "None"
msgstr "None"
-#: ../src/e-util/e-filter-rule.c:859
+#: ../src/e-util/e-filter-rule.c:1080
msgid "All related"
msgstr "All related"
-#: ../src/e-util/e-filter-rule.c:860 ../src/e-util/e-send-options.ui.h:24
+#: ../src/e-util/e-filter-rule.c:1081 ../src/e-util/e-send-options.ui.h:24
msgid "Replies"
msgstr "Replies"
-#: ../src/e-util/e-filter-rule.c:861
+#: ../src/e-util/e-filter-rule.c:1082
msgid "Replies and parents"
msgstr "Replies and parents"
-#: ../src/e-util/e-filter-rule.c:862
+#: ../src/e-util/e-filter-rule.c:1083
msgid "No reply or parent"
msgstr "No reply or parent"
-#: ../src/e-util/e-filter-rule.c:865
+#: ../src/e-util/e-filter-rule.c:1086
msgid "I_nclude threads:"
msgstr "I_nclude threads:"
-#: ../src/e-util/e-filter-rule.c:944
+#: ../src/e-util/e-filter-rule.c:1164
msgid "A_dd Condition"
msgstr "A_dd Condition"
-#: ../src/e-util/e-filter-rule.c:1258 ../src/e-util/filter.ui.h:1
-#: ../src/mail/em-utils.c:166
+#: ../src/e-util/e-filter-rule.c:1478 ../src/e-util/filter.ui.h:1
+#: ../src/mail/em-filter-rule.c:1043 ../src/mail/em-utils.c:166
msgid "Incoming"
msgstr "Incoming"
-#: ../src/e-util/e-filter-rule.c:1258 ../src/mail/em-utils.c:167
+#: ../src/e-util/e-filter-rule.c:1478 ../src/mail/em-filter-rule.c:1044
+#: ../src/mail/em-utils.c:167
msgid "Outgoing"
msgstr "Outgoing"
@@ -13608,32 +13285,26 @@ msgid "_Normal"
msgstr "_Normal"
#: ../src/e-util/e-html-editor-actions.c:1102
-#| msgid "Headings"
msgid "Heading _1"
msgstr "Heading _1"
#: ../src/e-util/e-html-editor-actions.c:1109
-#| msgid "Headings"
msgid "Heading _2"
msgstr "Heading _2"
#: ../src/e-util/e-html-editor-actions.c:1116
-#| msgid "Headings"
msgid "Heading _3"
msgstr "Heading _3"
#: ../src/e-util/e-html-editor-actions.c:1123
-#| msgid "Headings"
msgid "Heading _4"
msgstr "Heading _4"
#: ../src/e-util/e-html-editor-actions.c:1130
-#| msgid "Headings"
msgid "Heading _5"
msgstr "Heading _5"
#: ../src/e-util/e-html-editor-actions.c:1137
-#| msgid "Headings"
msgid "Heading _6"
msgstr "Heading _6"
@@ -13936,19 +13607,19 @@ msgstr "_Rule"
msgid "_Table"
msgstr "_Table"
-#: ../src/e-util/e-html-editor.c:732
+#: ../src/e-util/e-html-editor.c:727
msgid "Paragraph Style"
msgstr "Paragraph Style"
-#: ../src/e-util/e-html-editor.c:746
+#: ../src/e-util/e-html-editor.c:741
msgid "Editing Mode"
msgstr "Editing Mode"
-#: ../src/e-util/e-html-editor.c:758
+#: ../src/e-util/e-html-editor.c:753
msgid "Font Color"
msgstr "Font Colour"
-#: ../src/e-util/e-html-editor.c:768
+#: ../src/e-util/e-html-editor.c:763
msgid "Font Size"
msgstr "Font Size"
@@ -14245,7 +13916,7 @@ msgid "<b>Background Image</b>"
msgstr "<b>Background Image</b>"
#: ../src/e-util/e-html-editor-page-dialog.c:473
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
msgid "_Template:"
msgstr "_Template:"
@@ -14317,7 +13988,6 @@ msgstr "Replace"
#: ../src/e-util/e-html-editor-spell-check-dialog.c:83
#, c-format
-#| msgid "<b>Suggestions for '%s'</b>"
msgid "<b>Suggestions for “%sâ€</b>"
msgstr "<b>Suggestions for “%sâ€</b>"
@@ -14417,7 +14087,7 @@ msgid "File _type:"
msgstr "File _type:"
#: ../src/e-util/e-import-assistant.c:343
-#: ../src/e-util/e-import-assistant.c:923
+#: ../src/e-util/e-import-assistant.c:948
msgid "Choose the destination for this import"
msgstr "Choose the destination for this import"
@@ -14439,10 +14109,6 @@ msgid "Please select the information that you would like to import:"
msgstr "Please select the information that you would like to import:"
#: ../src/e-util/e-import-assistant.c:536
-#| msgid ""
-#| "Evolution checked for settings to import from the following applications: "
-#| "Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If "
-#| "you would like to try again, please click the \"Back\" button."
msgid ""
"Evolution checked for settings to import from the following applications: "
"Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
@@ -14459,37 +14125,37 @@ msgid "From %s:"
msgstr "From %s:"
#. Install a custom "Cancel Import" button.
-#: ../src/e-util/e-import-assistant.c:781
+#: ../src/e-util/e-import-assistant.c:808
msgid "_Cancel Import"
msgstr "_Cancel Import"
-#: ../src/e-util/e-import-assistant.c:922
+#: ../src/e-util/e-import-assistant.c:947
msgid "Preview data to be imported"
msgstr "Preview data to be imported"
-#: ../src/e-util/e-import-assistant.c:928
-#: ../src/e-util/e-import-assistant.c:941
-#: ../src/e-util/e-import-assistant.c:1294
-#: ../src/e-util/e-import-assistant.c:1370
-#: ../src/e-util/e-import-assistant.c:1379
+#: ../src/e-util/e-import-assistant.c:953
+#: ../src/e-util/e-import-assistant.c:966
+#: ../src/e-util/e-import-assistant.c:1319
+#: ../src/e-util/e-import-assistant.c:1395
+#: ../src/e-util/e-import-assistant.c:1404
msgid "Import Data"
msgstr "Import Data"
-#: ../src/e-util/e-import-assistant.c:936
+#: ../src/e-util/e-import-assistant.c:961
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."
-#: ../src/e-util/e-import-assistant.c:1284
-#: ../src/e-util/e-import-assistant.c:1319
+#: ../src/e-util/e-import-assistant.c:1309
+#: ../src/e-util/e-import-assistant.c:1344
msgid "Evolution Import Assistant"
msgstr "Evolution Import Assistant"
-#: ../src/e-util/e-import-assistant.c:1301
-#: ../src/e-util/e-import-assistant.c:1357
+#: ../src/e-util/e-import-assistant.c:1326
+#: ../src/e-util/e-import-assistant.c:1382
msgid "Import Location"
msgstr "Import Location"
-#: ../src/e-util/e-import-assistant.c:1312
+#: ../src/e-util/e-import-assistant.c:1337
msgid ""
"Welcome to the Evolution Import Assistant.\n"
"With this assistant you will be guided through the process of importing "
@@ -14499,20 +14165,19 @@ msgstr ""
"With this assistant you will be guided through the process of importing "
"external files into Evolution."
-#: ../src/e-util/e-import-assistant.c:1329
+#: ../src/e-util/e-import-assistant.c:1354
msgid "Importer Type"
msgstr "Importer Type"
-#: ../src/e-util/e-import-assistant.c:1339
+#: ../src/e-util/e-import-assistant.c:1364
msgid "Select Information to Import"
msgstr "Select Information to Import"
-#: ../src/e-util/e-import-assistant.c:1348
+#: ../src/e-util/e-import-assistant.c:1373
msgid "Select a File"
msgstr "Select a File"
-#: ../src/e-util/e-import-assistant.c:1365
-#| msgid "Click \"Apply\" to begin importing the file into Evolution."
+#: ../src/e-util/e-import-assistant.c:1390
msgid "Click “Apply†to begin importing the file into Evolution."
msgstr "Click “Apply†to begin importing the file into Evolution."
@@ -14582,43 +14247,93 @@ msgstr ""
"Mouse-based interactive map widget for selecting timezone. Keyboard users "
"should instead select the timezone from the drop-down combination box below."
-#: ../src/e-util/e-misc-utils.c:253
+#: ../src/e-util/e-misc-utils.c:260
msgid "Could not open the link."
msgstr "Could not open the link."
-#: ../src/e-util/e-misc-utils.c:336
+#: ../src/e-util/e-misc-utils.c:343
msgid "Could not display help for Evolution."
msgstr "Could not display help for Evolution."
-#: ../src/e-util/e-misc-utils.c:2501
+#: ../src/e-util/e-misc-utils.c:2508
#, c-format
-#| msgid "Opening calendar '%s'"
msgid "Opening calendar “%sâ€"
msgstr "Opening calendar “%sâ€"
-#: ../src/e-util/e-misc-utils.c:2504
+#: ../src/e-util/e-misc-utils.c:2511
#, c-format
-#| msgid "Opening memo list '%s'"
msgid "Opening memo list “%sâ€"
msgstr "Opening memo list “%sâ€"
-#: ../src/e-util/e-misc-utils.c:2507
+#: ../src/e-util/e-misc-utils.c:2514
#, c-format
-#| msgid "Opening task list '%s'"
msgid "Opening task list “%sâ€"
msgstr "Opening task list “%sâ€"
-#: ../src/e-util/e-misc-utils.c:2510
+#: ../src/e-util/e-misc-utils.c:2517
#, c-format
-#| msgid "Opening address book '%s'"
msgid "Opening address book “%sâ€"
msgstr "Opening address book “%sâ€"
-#: ../src/e-util/e-misc-utils.c:3290
+#: ../src/e-util/e-misc-utils.c:3297
#: ../src/modules/mailto-handler/evolution-mailto-handler.c:146
msgid "_Do not show this message again"
msgstr "_Do not show this message again"
+#: ../src/e-util/e-misc-utils.c:4123
+msgid ""
+"This address book server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+"This address book server might be unreachable, the server name may be "
+"misspelt, or your network connection could be down."
+
+#: ../src/e-util/e-misc-utils.c:4135
+#, c-format
+msgid "Failed to set protocol version to LDAPv3 (%d): %s"
+msgstr "Failed to set protocol version to LDAPv3 (%d): %s"
+
+#: ../src/e-util/e-misc-utils.c:4147
+#, c-format
+#| msgid "Failed to authenticate with LDAP server."
+msgid "Failed to authenticate with LDAP server (%d): %s"
+msgstr "Failed to authenticate with LDAP server (%d): %s"
+
+# addressbook:ldap-search-base secondary
+#: ../src/e-util/e-misc-utils.c:4161
+#, c-format
+#| 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 "
+#| "supported search bases."
+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 "
+"supported search bases.\n"
+"\n"
+"Detailed error (%d): %s"
+msgstr ""
+"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 "
+"supported search bases.\n"
+"\n"
+"Detailed error (%d): %s"
+
+# addressbook:ldap-search-base secondary
+#: ../src/e-util/e-misc-utils.c:4172
+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 "
+"supported search bases."
+msgstr ""
+"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 "
+"supported search bases."
+
+#: ../src/e-util/e-misc-utils.c:4205
+msgid "Evolution had not been compiled with LDAP support"
+msgstr "Evolution had not been compiled with LDAP support"
+
#: ../src/e-util/e-name-selector-dialog.c:274
msgid "Show Contacts"
msgstr "Show Contacts"
@@ -14653,35 +14368,30 @@ msgstr "Co_ntacts"
msgid "Search"
msgstr "Search"
-#: ../src/e-util/e-name-selector-dialog.c:445
-#: ../src/mail/importers/pine-importer.c:430
-msgid "Address Book"
-msgstr "Address Book"
-
#: ../src/e-util/e-name-selector-dialog.c:573
msgid "Select Contacts from Address Book"
msgstr "Select Contacts from Address Book"
#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../src/e-util/e-name-selector-entry.c:3222
+#: ../src/e-util/e-name-selector-entry.c:3237
#, c-format
msgid "E_xpand %s Inline"
msgstr "E_xpand %s Inline"
#. Copy Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3238
+#: ../src/e-util/e-name-selector-entry.c:3253
#, c-format
msgid "Cop_y %s"
msgstr "Cop_y %s"
#. Cut Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3249
+#: ../src/e-util/e-name-selector-entry.c:3264
#, c-format
msgid "C_ut %s"
msgstr "C_ut %s"
#. Edit Contact item
-#: ../src/e-util/e-name-selector-entry.c:3267
+#: ../src/e-util/e-name-selector-entry.c:3282
#, c-format
msgid "_Edit %s"
msgstr "_Edit %s"
@@ -14731,15 +14441,15 @@ msgstr "_Remember this password for the remainder of this session"
msgid "Evolution Preferences"
msgstr "Evolution Preferences"
-#: ../src/e-util/e-print.c:158
+#: ../src/e-util/e-print.c:164
msgid "An error occurred while printing"
msgstr "An error occurred while printing"
-#: ../src/e-util/e-print.c:165
+#: ../src/e-util/e-print.c:171
msgid "The printing system reported the following details about the error:"
msgstr "The printing system reported the following details about the error:"
-#: ../src/e-util/e-print.c:171
+#: ../src/e-util/e-print.c:177
msgid ""
"The printing system did not report any additional details about the error."
msgstr ""
@@ -14825,11 +14535,11 @@ msgstr "Create a new proxy profile"
msgid "Delete the selected proxy profile"
msgstr "Delete the selected proxy profile"
-#: ../src/e-util/e-rule-editor.c:182
+#: ../src/e-util/e-rule-editor.c:191
msgid "Add Rule"
msgstr "Add Rule"
-#: ../src/e-util/e-rule-editor.c:284
+#: ../src/e-util/e-rule-editor.c:302
msgid "Edit Rule"
msgstr "Edit Rule"
@@ -14851,6 +14561,7 @@ msgid "Clear the search"
msgstr "Clear the search"
#: ../src/e-util/e-search-bar.c:653
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:73
msgid "_Previous"
msgstr "_Previous"
@@ -14859,6 +14570,8 @@ msgid "Find the previous occurrence of the phrase"
msgstr "Find the previous occurrence of the phrase"
#: ../src/e-util/e-search-bar.c:665
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:80
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:224
msgid "_Next"
msgstr "_Next"
@@ -15041,21 +14754,22 @@ msgstr "Name cannot be empty"
#. Translators: This is the first of a sequence of widgets:
#. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../src/e-util/e-source-config.c:1314
+#: ../src/e-util/e-source-config.c:1359
msgid "Refresh every"
msgstr "Refresh every"
-#: ../src/e-util/e-source-config.c:1344 ../src/e-util/e-source-config.c:1414
+#: ../src/e-util/e-source-config.c:1389 ../src/e-util/e-source-config.c:1459
msgid "Use a secure connection"
msgstr "Use a secure connection"
-#: ../src/e-util/e-source-config.c:1440
+#: ../src/e-util/e-source-config.c:1485
msgid "Unset _trust for SSL/TLS certificate"
msgstr "Unset _trust for SSL/TLS certificate"
-#: ../src/e-util/e-source-config.c:1476
-msgid "User"
-msgstr "User"
+#: ../src/e-util/e-source-config.c:1521
+#| msgid "_User:"
+msgid "User:"
+msgstr "User:"
#: ../src/e-util/e-source-selector.c:3212
msgid "Show"
@@ -15065,7 +14779,7 @@ msgstr "Show"
msgid "Group name"
msgstr "Group name"
-#: ../src/e-util/e-source-selector.c:3374 ../src/mail/e-mail-display.c:796
+#: ../src/e-util/e-source-selector.c:3374 ../src/mail/e-mail-display.c:793
msgid "_Hide"
msgstr "_Hide"
@@ -15118,7 +14832,6 @@ msgstr "More…"
#. + Add to Dictionary
#: ../src/e-util/e-spell-entry.c:588
#, c-format
-#| msgid "Add \"%s\" to Dictionary"
msgid "Add “%s†to Dictionary"
msgstr "Add “%s†to Dictionary"
@@ -15132,52 +14845,40 @@ msgid "Spelling Suggestions"
msgstr "Spelling Suggestions"
#: ../src/e-util/e-system.error.xml.h:1
-#| msgid "A file named \"{0}\" already exists. Do you want to replace it?"
msgid "A file named “{0}†already exists. Do you want to replace it?"
msgstr "A file named “{0}†already exists. Do you want to replace it?"
#: ../src/e-util/e-system.error.xml.h:2
-#| msgid ""
-#| "The file already exists in \"{0}\". Replacing it will overwrite its "
-#| "contents."
msgid ""
"The file already exists in “{0}â€. Replacing it will overwrite its contents."
msgstr ""
"The file already exists in “{0}â€. Replacing it will overwrite its contents."
#: ../src/e-util/e-system.error.xml.h:4
-#| msgid "Cannot save file \"{0}\"."
msgid "Cannot save file “{0}â€."
msgstr "Cannot save file “{0}â€."
#: ../src/e-util/e-system.error.xml.h:6
-#| msgid "Cannot open file \"{0}\"."
msgid "Cannot open file “{0}â€."
msgstr "Cannot open file “{0}â€."
#: ../src/e-util/e-system.error.xml.h:7
-#| msgid "Failed to remove data source "{0}"."
msgid "Failed to remove data source “{0}â€."
msgstr "Failed to remove data source “{0}â€."
#: ../src/e-util/e-system.error.xml.h:8 ../src/mail/mail.error.xml.h:64
-#| msgid "The reported error was "{1}"."
msgid "The reported error was “{1}â€."
msgstr "The reported error was “{1}â€."
#: ../src/e-util/e-system.error.xml.h:9
-#| msgid "Failed to update data source "{0}"."
msgid "Failed to update data source “{0}â€."
msgstr "Failed to update data source “{0}â€."
#: ../src/e-util/e-system.error.xml.h:10
-#| msgid "Failed to delete resource "{0}"."
msgid "Failed to delete resource “{0}â€."
msgstr "Failed to delete resource “{0}â€."
#: ../src/e-util/e-system.error.xml.h:11
-#| msgid ""
-#| "The address book backend servicing "{0}" has quit unexpectedly."
msgid "The address book backend servicing “{0}†has quit unexpectedly."
msgstr "The address book backend servicing “{0}†has quit unexpectedly."
@@ -15188,8 +14889,6 @@ msgstr ""
"Some of your contacts may not be available until Evolution is restarted."
#: ../src/e-util/e-system.error.xml.h:13
-#| msgid ""
-#| "The calendar backend servicing "{0}" has quit unexpectedly."
msgid "The calendar backend servicing “{0}†has quit unexpectedly."
msgstr "The calendar backend servicing “{0}†has quit unexpectedly."
@@ -15200,8 +14899,6 @@ msgstr ""
"Some of your appointments may not be available until Evolution is restarted."
#: ../src/e-util/e-system.error.xml.h:15
-#| msgid ""
-#| "The memo list backend servicing "{0}" has quit unexpectedly."
msgid "The memo list backend servicing “{0}†has quit unexpectedly."
msgstr "The memo list backend servicing “{0}†has quit unexpectedly."
@@ -15210,8 +14907,6 @@ msgid "Some of your memos may not be available until Evolution is restarted."
msgstr "Some of your memos may not be available until Evolution is restarted."
#: ../src/e-util/e-system.error.xml.h:17
-#| msgid ""
-#| "The task list backend servicing "{0}" has quit unexpectedly."
msgid "The task list backend servicing “{0}†has quit unexpectedly."
msgstr "The task list backend servicing “{0}†has quit unexpectedly."
@@ -15220,25 +14915,18 @@ msgid "Some of your tasks may not be available until Evolution is restarted."
msgstr "Some of your tasks may not be available until Evolution is restarted."
#: ../src/e-util/e-system.error.xml.h:19
-#| msgid ""
-#| "The address book backend servicing "{0}" encountered an error."
msgid "The address book backend servicing “{0}†encountered an error."
msgstr "The address book backend servicing “{0}†encountered an error."
#: ../src/e-util/e-system.error.xml.h:20
-#| msgid "The calendar backend servicing "{0}" encountered an error."
msgid "The calendar backend servicing “{0}†encountered an error."
msgstr "The calendar backend servicing “{0}†encountered an error."
#: ../src/e-util/e-system.error.xml.h:21
-#| msgid ""
-#| "The memo list backend servicing "{0}" encountered an error."
msgid "The memo list backend servicing “{0}†encountered an error."
msgstr "The memo list backend servicing “{0}†encountered an error."
#: ../src/e-util/e-system.error.xml.h:22
-#| msgid ""
-#| "The task list backend servicing "{0}" encountered an error."
msgid "The task list backend servicing “{0}†encountered an error."
msgstr "The task list backend servicing “{0}†encountered an error."
@@ -15257,14 +14945,10 @@ msgstr ""
"GNOME bugzilla."
#: ../src/e-util/e-system.error.xml.h:25
-#| msgid "Are you sure you want to delete the memo '{0}'?"
msgid "Are you sure you want to delete remote collection “{0}�"
msgstr "Are you sure you want to delete remote collection “{0}�"
#: ../src/e-util/e-system.error.xml.h:26
-#| msgid ""
-#| "This will permanently remove the calendar '{0}' from the server. Are you "
-#| "sure you want to proceed?"
msgid ""
"This will permanently remove the collection “{0}†from the server. Are you "
"sure you want to proceed?"
@@ -15330,11 +15014,11 @@ msgstr "Clear _All"
msgid "_Show field in View"
msgstr "_Show field in View"
-#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1783
+#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1779
msgid "Ascending"
msgstr "Ascending"
-#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1783
+#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1779
msgid "Descending"
msgstr "Descending"
@@ -15473,20 +15157,20 @@ msgstr "Format Column_s…"
msgid "Custo_mize Current View..."
msgstr "Custo_mise Current View…"
-#: ../src/e-util/e-table-header-item.c:1733
+#: ../src/e-util/e-table-header-item.c:1729
msgid "_Sort By"
msgstr "_Sort By"
#. Custom
-#: ../src/e-util/e-table-header-item.c:1756
+#: ../src/e-util/e-table-header-item.c:1752
msgid "_Custom"
msgstr "_Custom"
-#: ../src/e-util/e-text.c:2135
+#: ../src/e-util/e-text.c:2105
msgid "Select All"
msgstr "Select All"
-#: ../src/e-util/e-text.c:2148
+#: ../src/e-util/e-text.c:2118
msgid "Input Methods"
msgstr "Input Methods"
@@ -15550,7 +15234,6 @@ msgid "Identity"
msgstr "Identity"
#: ../src/e-util/e-webdav-browser.c:447
-#| msgid "Address Book"
msgid "Address book"
msgstr "Address book"
@@ -15558,17 +15241,11 @@ msgstr "Address book"
msgid "Events"
msgstr "Events"
-#: ../src/e-util/e-webdav-browser.c:473
-msgid "Collection"
-msgstr "Collection"
-
#: ../src/e-util/e-webdav-browser.c:514
-#| msgid "Loading"
msgid "Loading…"
msgstr "Loading…"
#: ../src/e-util/e-webdav-browser.c:1383
-#| msgid "Searching folder content..."
msgid "Searching collection children…"
msgstr "Searching collection children…"
@@ -15577,12 +15254,10 @@ msgid "Failed to search for collection children"
msgstr "Failed to search for collection children"
#: ../src/e-util/e-webdav-browser.c:1419
-#| msgid "Searching for user's calendars..."
msgid "Searching for user home, please wait…"
msgstr "Searching for user home, please wait…"
#: ../src/e-util/e-webdav-browser.c:1421
-#| msgid "Unable to perform search."
msgid "Failed to search for user home"
msgstr "Failed to search for user home"
@@ -15591,48 +15266,38 @@ msgid "At least one component type should be set"
msgstr "At least one component type should be set"
#: ../src/e-util/e-webdav-browser.c:1781
-#| msgid "Failed to delete selected attendee"
-#| msgid_plural "Failed to delete selected attendees"
msgid "Failed to get selected collection HREF"
msgstr "Failed to get selected collection HREF"
#: ../src/e-util/e-webdav-browser.c:1812
-#| msgid "Saving changes..."
msgid "Saving changes…"
msgstr "Saving changes…"
#: ../src/e-util/e-webdav-browser.c:1813
-#| msgid "Failed to save attachments"
msgid "Failed to save changes"
msgstr "Failed to save changes"
#: ../src/e-util/e-webdav-browser.c:1815
-#| msgid "Creating a memo"
msgid "Creating new book…"
msgstr "Creating new book…"
#: ../src/e-util/e-webdav-browser.c:1816
-#| msgid "Failed to create pipe: %s"
msgid "Failed to create new book"
msgstr "Failed to create new book"
#: ../src/e-util/e-webdav-browser.c:1818
-#| msgid "Cre_ate new calendar"
msgid "Creating new calendar…"
msgstr "Creating new calendar…"
#: ../src/e-util/e-webdav-browser.c:1819
-#| msgid "Failed to create an event in the calendar '{0}'"
msgid "Failed to create new calendar"
msgstr "Failed to create new calendar"
#: ../src/e-util/e-webdav-browser.c:1821
-#| msgid "Create a new contact"
msgid "Creating new collection…"
msgstr "Creating new collection…"
#: ../src/e-util/e-webdav-browser.c:1822
-#| msgid "Failed to create pipe: %s"
msgid "Failed to create new collection"
msgstr "Failed to create new collection"
@@ -15640,68 +15305,56 @@ msgstr "Failed to create new collection"
msgid "It is not allowed to create book under another book or calendar"
msgstr "It is not allowed to create book under another book or calendar"
+#. if (button == webdav_browser->priv->create_calendar_button)
#: ../src/e-util/e-webdav-browser.c:1963
msgid "It is not allowed to create calendar under another book or calendar"
msgstr "It is not allowed to create calendar under another book or calendar"
#: ../src/e-util/e-webdav-browser.c:2189
-#| msgid "Deleting a memo"
-#| msgid_plural "Deleting %d memos"
msgid "Deleting book…"
msgstr "Deleting book…"
#: ../src/e-util/e-webdav-browser.c:2190
-#| msgid "Failed to delete contact"
msgid "Failed to delete book"
msgstr "Failed to delete book"
#: ../src/e-util/e-webdav-browser.c:2193
-#| msgid "Opening calendar"
msgid "Deleting calendar…"
msgstr "Deleting calendar…"
#: ../src/e-util/e-webdav-browser.c:2194
-#| msgid "Failed to delete contact"
msgid "Failed to delete calendar"
msgstr "Failed to delete calendar"
#: ../src/e-util/e-webdav-browser.c:2197
-#| msgid "Meeting Cancelation"
msgid "Deleting collection…"
msgstr "Deleting collection…"
#: ../src/e-util/e-webdav-browser.c:2198
-#| msgid "Failed to delete contact"
msgid "Failed to delete collection"
msgstr "Failed to delete collection"
#: ../src/e-util/e-webdav-browser.c:2429
-#| msgid "Component"
msgid "For Components:"
msgstr "For Components:"
#: ../src/e-util/e-webdav-browser.c:2435
-#| msgid "Events"
msgid "_Events"
msgstr "_Events"
#: ../src/e-util/e-webdav-browser.c:2625
-#| msgid "LDAP Servers"
msgid "WebDAV server:"
msgstr "WebDAV server:"
#: ../src/e-util/e-webdav-browser.c:2660
-#| msgid "Target Book"
msgid "Create _Book"
msgstr "Create _Book"
#: ../src/e-util/e-webdav-browser.c:2667
-#| msgid "Weather Calendars"
msgid "Create _Calendar"
msgstr "Create _Calendar"
#: ../src/e-util/e-webdav-browser.c:2674
-#| msgid "Collection"
msgid "Create Collectio_n"
msgstr "Create Collectio_n"
@@ -15709,120 +15362,114 @@ msgstr "Create Collectio_n"
#. gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
#. webdav_browser->priv->permissions_button = widget;
#: ../src/e-util/e-webdav-browser.c:2699
-#: ../src/mail/em-subscription-editor.c:1976
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1652
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1723
+#: ../src/mail/em-subscription-editor.c:1948
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1650
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1721
msgid "_Refresh"
msgstr "_Refresh"
-#: ../src/e-util/e-web-view.c:346
+#: ../src/e-util/e-web-view.c:348
msgid "_Copy Link Location"
msgstr "_Copy Link Location"
-#: ../src/e-util/e-web-view.c:348
+#: ../src/e-util/e-web-view.c:350
msgid "Copy the link to the clipboard"
msgstr "Copy the link to the clipboard"
-#: ../src/e-util/e-web-view.c:356
+#: ../src/e-util/e-web-view.c:358
msgid "_Open Link in Browser"
msgstr "_Open Link in Browser"
-#: ../src/e-util/e-web-view.c:358
+#: ../src/e-util/e-web-view.c:360
msgid "Open the link in a web browser"
msgstr "Open the link in a web browser"
-#: ../src/e-util/e-web-view.c:366
+#: ../src/e-util/e-web-view.c:368
msgid "_Copy Email Address"
msgstr "_Copy E-mail Address"
-#: ../src/e-util/e-web-view.c:373
+#: ../src/e-util/e-web-view.c:375
msgid "Copy _Raw Email Address"
msgstr "Copy _Raw E-mail Address"
-#: ../src/e-util/e-web-view.c:375
+#: ../src/e-util/e-web-view.c:377
msgid "Copy the raw email address to the clipboard"
msgstr "Copy the raw e-mail address to the clipboard"
-#: ../src/e-util/e-web-view.c:390
+#: ../src/e-util/e-web-view.c:392
msgid "_Copy Image"
msgstr "_Copy Image"
-#: ../src/e-util/e-web-view.c:392
+#: ../src/e-util/e-web-view.c:394
msgid "Copy the image to the clipboard"
msgstr "Copy the image to the clipboard"
-#: ../src/e-util/e-web-view.c:397
+#: ../src/e-util/e-web-view.c:399
msgid "Save _Image..."
msgstr "Save _Image…"
-#: ../src/e-util/e-web-view.c:399
+#: ../src/e-util/e-web-view.c:401
msgid "Save the image to a file"
msgstr "Save the image to a file"
-#: ../src/e-util/e-web-view.c:419 ../src/e-util/e-web-view.c:1999
+#: ../src/e-util/e-web-view.c:421 ../src/e-util/e-web-view.c:2025
msgid "Select all text and images"
msgstr "Select all text and images"
-#: ../src/e-util/e-web-view.c:1354
+#: ../src/e-util/e-web-view.c:1379
#, c-format
msgid "Click to call %s"
msgstr "Click to call %s"
-#: ../src/e-util/e-web-view.c:1356
+#: ../src/e-util/e-web-view.c:1381
msgid "Click to hide/unhide addresses"
msgstr "Click to hide/unhide addresses"
-#: ../src/e-util/e-web-view.c:1367
+#: ../src/e-util/e-web-view.c:1392
#, c-format
msgid "Go to the section %s of the message"
msgstr "Go to the section %s of the message"
-#: ../src/e-util/e-web-view.c:1369
+#: ../src/e-util/e-web-view.c:1394
msgid "Go to the beginning of the message"
msgstr "Go to the beginning of the message"
-#: ../src/e-util/e-web-view.c:1373
+#: ../src/e-util/e-web-view.c:1398
#, c-format
msgid "Click to open %s"
msgstr "Click to open %s"
-#: ../src/e-util/e-web-view.c:3906
+#: ../src/e-util/e-web-view.c:3928
msgid "Copying image to clipboard"
msgstr "Copying image to clipboard"
-#: ../src/e-util/e-web-view.c:4094
+#: ../src/e-util/e-web-view.c:4116
msgid "Save Image"
msgstr "Save Image"
-#: ../src/e-util/e-web-view.c:4135
+#: ../src/e-util/e-web-view.c:4157
#, c-format
-#| msgid "Saving image to '%s'"
msgid "Saving image to “%sâ€"
msgstr "Saving image to “%sâ€"
-#: ../src/e-util/e-web-view.c:4230
+#: ../src/e-util/e-web-view.c:4252
#, c-format
-#| msgid "Cannot get URI '%s', do not know how to download it."
msgid "Cannot get URI “%sâ€, do not know how to download it."
msgstr "Cannot get URI “%sâ€, do not know how to download it."
#: ../src/e-util/e-widget-undo.c:428
-#| msgid "Undo 'Insert text'"
msgid "Undo “Insert textâ€"
msgstr "Undo “Insert textâ€"
#: ../src/e-util/e-widget-undo.c:430
-#| msgid "Redo 'Insert text'"
msgid "Redo “Insert textâ€"
msgstr "Redo “Insert textâ€"
#: ../src/e-util/e-widget-undo.c:444
-#| msgid "Undo 'Delete text'"
msgid "Undo “Delete textâ€"
msgstr "Undo “Delete textâ€"
#: ../src/e-util/e-widget-undo.c:446
-#| msgid "Redo 'Delete text'"
msgid "Redo “Delete textâ€"
msgstr "Redo “Delete textâ€"
@@ -15843,17 +15490,14 @@ msgid "You must specify a filename."
msgstr "You must specify a filename."
#: ../src/e-util/filter.error.xml.h:5
-#| msgid "File "{0}" does not exist or is not a regular file."
msgid "File “{0}†does not exist or is not a regular file."
msgstr "File “{0}†does not exist or is not a regular file."
#: ../src/e-util/filter.error.xml.h:6
-#| msgid "Bad regular expression "{0}"."
msgid "Bad regular expression “{0}â€."
msgstr "Bad regular expression “{0}â€."
#: ../src/e-util/filter.error.xml.h:7
-#| msgid "Could not compile regular expression "{1}"."
msgid "Could not compile regular expression “{1}â€."
msgstr "Could not compile regular expression “{1}â€."
@@ -15866,7 +15510,6 @@ msgid "You must name this filter."
msgstr "You must name this filter."
#: ../src/e-util/filter.error.xml.h:10
-#| msgid "Name "{0}" already used."
msgid "Name “{0}†already used."
msgstr "Name “{0}†already used."
@@ -15891,7 +15534,6 @@ msgid "One or more values cannot be empty."
msgstr "One or more values cannot be empty."
#: ../src/e-util/filter.error.xml.h:16
-#| msgid "Are you sure you want to remove rule '{0}'?"
msgid "Are you sure you want to remove rule “{0}�"
msgstr "Are you sure you want to remove rule “{0}�"
@@ -15916,12 +15558,12 @@ msgid "seconds"
msgstr "seconds"
#: ../src/e-util/filter.ui.h:9
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:8
msgid "weeks"
msgstr "weeks"
#: ../src/e-util/filter.ui.h:10
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:9
msgid "months"
msgstr "months"
@@ -15942,9 +15584,6 @@ msgid "Compare against"
msgstr "Compare against"
#: ../src/e-util/filter.ui.h:15
-#| msgid ""
-#| "The message's date will be compared against\n"
-#| "the current time when filtering occurs."
msgid ""
"The message’s date will be compared against\n"
"the current time when filtering occurs."
@@ -15954,19 +15593,16 @@ msgstr ""
#: ../src/e-util/filter.ui.h:17
#| msgid ""
-#| "The message's date will be compared against\n"
+#| "The message’s date will be compared against\n"
#| "12:00am of the date specified."
msgid ""
"The message’s date will be compared against\n"
-"12:00am of the date specified."
+"the beginning of the specified day."
msgstr ""
"The message’s date will be compared against\n"
-"00:00 of the date specified."
+"the beginning of the specified day."
#: ../src/e-util/filter.ui.h:19
-#| msgid ""
-#| "The message's date will be compared against\n"
-#| "a time relative to when filtering occurs."
msgid ""
"The message’s date will be compared against\n"
"a time relative to when filtering occurs."
@@ -15982,6 +15618,11 @@ msgstr "Show filters for mail:"
msgid "_Filter Rules"
msgstr "_Filter Rules"
+#: ../src/e-util/filter.ui.h:24
+#| msgid "Rule name"
+msgid "Rule Name"
+msgstr "Rule Name"
+
#: ../src/e-util/gal-a11y-e-cell.c:128
msgid "Table Cell"
msgstr "Table Cell"
@@ -16067,30 +15708,8 @@ msgstr "Could not load signature."
msgid "Could not save signature."
msgstr "Could not save signature."
-#: ../src/libemail-engine/camel-sasl-oauth2-google.c:27
-msgid "OAuth2 Google"
-msgstr "OAuth2 Google"
-
-#: ../src/libemail-engine/camel-sasl-oauth2-google.c:28
-msgid ""
-"This option will use an OAuth 2.0 access token to connect to the Google "
-"server"
-msgstr ""
-"This option will use an OAuth 2.0 access token to connect to the Google "
-"server"
-
-#: ../src/libemail-engine/camel-sasl-xoauth2.c:27
-msgid "OAuth2"
-msgstr "OAuth2"
-
-#: ../src/libemail-engine/camel-sasl-xoauth2.c:28
-msgid "This option will use an OAuth 2.0 access token to connect to the server"
-msgstr ""
-"This option will use an OAuth 2.0 access token to connect to the server"
-
#: ../src/libemail-engine/e-mail-folder-utils.c:106
#, c-format
-#| msgid "Saving message to folder '%s'"
msgid "Saving message to folder “%sâ€"
msgstr "Saving message to folder “%sâ€"
@@ -16112,13 +15731,11 @@ msgstr "Scanning messages for duplicates"
#: ../src/libemail-engine/e-mail-folder-utils.c:1150
#, c-format
-#| msgid "Removing folder '%s'"
msgid "Removing folder “%sâ€"
msgstr "Removing folder “%sâ€"
#: ../src/libemail-engine/e-mail-folder-utils.c:1331
#, c-format
-#| msgid "File \"%s\" has been removed."
msgid "File “%s†has been removed."
msgstr "File “%s†has been removed."
@@ -16139,60 +15756,59 @@ msgstr[1] "Saving %d messages"
#: ../src/libemail-engine/e-mail-folder-utils.c:1961
#, c-format
-#| msgid "Invalid folder URI '%s'"
msgid "Invalid folder URI “%sâ€"
msgstr "Invalid folder URI “%sâ€"
#. Some local folders
-#: ../src/libemail-engine/e-mail-session.c:125
+#: ../src/libemail-engine/e-mail-session.c:121
#: ../src/mail/em-folder-properties.c:1150
#: ../src/mail/em-folder-tree-model.c:1237
#: ../src/mail/importers/kmail-libs.c:139
-#: ../src/modules/mail/e-mail-shell-view-private.c:1026
-#: ../src/modules/mail/e-mail-shell-view-private.c:1037
+#: ../src/modules/mail/e-mail-shell-view-private.c:1035
+#: ../src/modules/mail/e-mail-shell-view-private.c:1046
msgid "Inbox"
msgstr "Inbox"
#. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../src/libemail-engine/e-mail-session.c:126
+#: ../src/libemail-engine/e-mail-session.c:122
#: ../src/mail/em-folder-tree-model.c:1230
#: ../src/mail/importers/kmail-libs.c:145
-#: ../src/modules/mail/e-mail-shell-view-private.c:1024
+#: ../src/modules/mail/e-mail-shell-view-private.c:1033
msgid "Drafts"
msgstr "Drafts"
#. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../src/libemail-engine/e-mail-session.c:127
+#: ../src/libemail-engine/e-mail-session.c:123
#: ../src/mail/em-folder-tree-model.c:1241
#: ../src/mail/importers/kmail-libs.c:141
-#: ../src/modules/mail/e-mail-shell-view-private.c:1028
+#: ../src/modules/mail/e-mail-shell-view-private.c:1037
msgid "Outbox"
msgstr "Outbox"
#. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../src/libemail-engine/e-mail-session.c:128
+#: ../src/libemail-engine/e-mail-session.c:124
#: ../src/mail/em-folder-tree-model.c:1245
#: ../src/mail/importers/kmail-libs.c:143
-#: ../src/modules/mail/e-mail-shell-view-private.c:1030
+#: ../src/modules/mail/e-mail-shell-view-private.c:1039
msgid "Sent"
msgstr "Sent"
#. E_MAIL_LOCAL_FOLDER_SENT
-#: ../src/libemail-engine/e-mail-session.c:129
+#: ../src/libemail-engine/e-mail-session.c:125
#: ../src/mail/em-folder-tree-model.c:1233
#: ../src/mail/importers/kmail-libs.c:147
-#: ../src/modules/mail/e-mail-shell-view-private.c:1032
+#: ../src/modules/mail/e-mail-shell-view-private.c:1041
#: ../src/plugins/templates/e-templates-store.c:2212
#: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
msgid "Templates"
msgstr "Templates"
-#: ../src/libemail-engine/e-mail-session.c:1332
+#: ../src/libemail-engine/e-mail-session.c:1297
#, c-format
msgid "User cancelled operation"
msgstr "User cancelled operation"
-#: ../src/libemail-engine/e-mail-session.c:1389
+#: ../src/libemail-engine/e-mail-session.c:1354
#, c-format
msgid ""
"No destination address provided, forwarding of the message has been "
@@ -16201,15 +15817,20 @@ msgstr ""
"No destination address provided, forwarding of the message has been "
"cancelled."
-#: ../src/libemail-engine/e-mail-session.c:1402
+#: ../src/libemail-engine/e-mail-session.c:1367
#, c-format
msgid "No identity found to use, forwarding of the message has been cancelled."
msgstr ""
"No identity found to use, forwarding of the message has been cancelled."
-#: ../src/libemail-engine/e-mail-session.c:2444
+#: ../src/libemail-engine/e-mail-session.c:1519
+#, c-format
+#| msgid "Source with UID “%s†not found"
+msgid "Corresponding source for service with UID “%s†not found"
+msgstr "Corresponding source for service with UID “%s†not found"
+
+#: ../src/libemail-engine/e-mail-session.c:2460
#, c-format
-#| msgid "Waiting for '%s'"
msgid "Waiting for “%sâ€"
msgstr "Waiting for “%sâ€"
@@ -16218,32 +15839,27 @@ msgid "No mail transport service available"
msgstr "No mail transport service available"
#: ../src/libemail-engine/e-mail-session-utils.c:616
-#: ../src/libemail-engine/mail-ops.c:706
+#: ../src/libemail-engine/mail-ops.c:708
#, c-format
-#| msgid "Posting message to '%s'"
msgid "Posting message to “%sâ€"
msgstr "Posting message to “%sâ€"
#: ../src/libemail-engine/e-mail-session-utils.c:653
-#: ../src/libemail-engine/mail-ops.c:742
+#: ../src/libemail-engine/mail-ops.c:744
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "Failed to apply outgoing filters: %s"
#: ../src/libemail-engine/e-mail-session-utils.c:686
#: ../src/libemail-engine/e-mail-session-utils.c:721
-#: ../src/libemail-engine/mail-ops.c:770 ../src/libemail-engine/mail-ops.c:805
+#: ../src/libemail-engine/mail-ops.c:772 ../src/libemail-engine/mail-ops.c:807
#, c-format
-#| msgid "Storing sent message to '%s'"
msgid "Storing sent message to “%sâ€"
msgstr "Storing sent message to “%sâ€"
#: ../src/libemail-engine/e-mail-session-utils.c:710
-#: ../src/libemail-engine/mail-ops.c:794
+#: ../src/libemail-engine/mail-ops.c:796
#, c-format
-#| msgid ""
-#| "Failed to append to %s: %s\n"
-#| "Appending to local 'Sent' folder instead."
msgid ""
"Failed to append to %s: %s\n"
"Appending to local “Sent†folder instead."
@@ -16252,32 +15868,29 @@ msgstr ""
"Appending to local “Sent†folder instead."
#: ../src/libemail-engine/e-mail-session-utils.c:740
-#: ../src/libemail-engine/mail-ops.c:822
+#: ../src/libemail-engine/mail-ops.c:824
#, c-format
-#| msgid "Failed to append to local 'Sent' folder: %s"
msgid "Failed to append to local “Sent†folder: %s"
msgstr "Failed to append to local “Sent†folder: %s"
#: ../src/libemail-engine/e-mail-session-utils.c:928
-#: ../src/libemail-engine/mail-ops.c:983 ../src/libemail-engine/mail-ops.c:1085
+#: ../src/libemail-engine/mail-ops.c:985 ../src/libemail-engine/mail-ops.c:1098
+#: ../src/mail/mail-send-recv.c:636
msgid "Sending message"
msgstr "Sending message"
#: ../src/libemail-engine/e-mail-store-utils.c:188
#, c-format
-#| msgid "Disconnecting from '%s'"
msgid "Disconnecting from “%sâ€"
msgstr "Disconnecting from “%sâ€"
#: ../src/libemail-engine/e-mail-store-utils.c:264
#, c-format
-#| msgid "Reconnecting to '%s'"
msgid "Reconnecting to “%sâ€"
msgstr "Reconnecting to “%sâ€"
#: ../src/libemail-engine/e-mail-store-utils.c:349
#, c-format
-#| msgid "Preparing account '%s' for offline"
msgid "Preparing account “%s†for offline"
msgstr "Preparing account “%s†for offline"
@@ -16287,11 +15900,6 @@ msgstr "Filtering Selected Messages"
#: ../src/libemail-engine/mail-ops.c:146
#, c-format
-#| msgid ""
-#| "Failed to filter selected messages. One reason can be that folder "
-#| "location set in one or more filters is invalid. Please check your filters "
-#| "in Edit->Message Filters.\n"
-#| "Original error was: %s"
msgid ""
"Failed to filter selected messages. One reason can be that folder location "
"set in one or more filters is invalid. Please check your filters in "
@@ -16305,17 +15913,11 @@ msgstr ""
#: ../src/libemail-engine/mail-ops.c:226
#, c-format
-#| msgid "Fetching mail from '%s'"
msgid "Fetching mail from “%sâ€"
msgstr "Fetching mail from “%sâ€"
-#: ../src/libemail-engine/mail-ops.c:736
+#: ../src/libemail-engine/mail-ops.c:738
#, c-format
-#| msgid ""
-#| "Failed to apply outgoing filters. One reason can be that folder location "
-#| "set in one or more filters is invalid. Please check your filters in Edit-"
-#| ">Message Filters.\n"
-#| "Original error was: %s"
msgid ""
"Failed to apply outgoing filters. One reason can be that folder location set "
"in one or more filters is invalid. Please check your filters in Edit→Message "
@@ -16327,7 +15929,7 @@ msgstr ""
"Filters.\n"
"Original error was: %s"
-#: ../src/libemail-engine/mail-ops.c:994
+#: ../src/libemail-engine/mail-ops.c:996
#, c-format
msgid "Sending message %d of %d"
msgstr "Sending message %d of %d"
@@ -16335,95 +15937,84 @@ msgstr "Sending message %d of %d"
#. Translators: The string is distinguished by total
#. * count of messages to be sent. Failed messages is
#. * always more than zero.
-#: ../src/libemail-engine/mail-ops.c:1046
+#: ../src/libemail-engine/mail-ops.c:1054
#, c-format
msgid "Failed to send a message"
msgid_plural "Failed to send %d of %d messages"
msgstr[0] "Failed to send a message"
msgstr[1] "Failed to send %d of %d messages"
-#: ../src/libemail-engine/mail-ops.c:1052
+#: ../src/libemail-engine/mail-ops.c:1060
msgid "Cancelled."
msgstr "Cancelled."
-#: ../src/libemail-engine/mail-ops.c:1054
+#: ../src/libemail-engine/mail-ops.c:1062
msgid "Complete."
msgstr "Complete."
-#: ../src/libemail-engine/mail-ops.c:1169
+#: ../src/libemail-engine/mail-ops.c:1184
#, c-format
-#| msgid "Moving messages to '%s'"
msgid "Moving messages to “%sâ€"
msgstr "Moving messages to “%sâ€"
-#: ../src/libemail-engine/mail-ops.c:1170
+#: ../src/libemail-engine/mail-ops.c:1185
#, c-format
-#| msgid "Copying messages to '%s'"
msgid "Copying messages to “%sâ€"
msgstr "Copying messages to “%sâ€"
-#: ../src/libemail-engine/mail-ops.c:1289
+#: ../src/libemail-engine/mail-ops.c:1304
#, c-format
-#| msgid "Storing folder '%s'"
msgid "Storing folder “%sâ€"
msgstr "Storing folder “%sâ€"
-#: ../src/libemail-engine/mail-ops.c:1417
+#: ../src/libemail-engine/mail-ops.c:1432
#, c-format
-#| msgid "Expunging and storing account '%s'"
msgid "Expunging and storing account “%sâ€"
msgstr "Expunging and storing account “%sâ€"
-#: ../src/libemail-engine/mail-ops.c:1418
+#: ../src/libemail-engine/mail-ops.c:1433
#, c-format
-#| msgid "Storing account '%s'"
msgid "Storing account “%sâ€"
msgstr "Storing account “%sâ€"
-#: ../src/libemail-engine/mail-ops.c:1493
+#: ../src/libemail-engine/mail-ops.c:1508
#, c-format
-#| msgid "Emptying trash in '%s'"
msgid "Emptying trash in “%sâ€"
msgstr "Emptying wastebasket in “%sâ€"
-#: ../src/libemail-engine/mail-ops.c:1585
+#: ../src/libemail-engine/mail-ops.c:1600
#, c-format
-#| msgid "Processing folder changes in '%s'"
msgid "Processing folder changes in “%sâ€"
msgstr "Processing folder changes in “%sâ€"
-#: ../src/libemail-engine/mail-tools.c:68
+#: ../src/libemail-engine/mail-tools.c:69
#, c-format
-#| msgid "Could not create spool directory '%s': %s"
msgid "Could not create spool directory “%sâ€: %s"
msgstr "Could not create spool directory “%sâ€: %s"
-#: ../src/libemail-engine/mail-tools.c:108
+#: ../src/libemail-engine/mail-tools.c:109
#, c-format
-#| msgid "Trying to movemail a non-mbox source '%s'"
msgid "Trying to movemail a non-mbox source “%sâ€"
msgstr "Trying to movemail a non-mbox source “%sâ€"
#. Translators: This is a subject attribution for forwarded messages. The %s is replaced with subject of the
original message.
-#: ../src/libemail-engine/mail-tools.c:193
+#: ../src/libemail-engine/mail-tools.c:198
#, c-format
msgid "[Fwd: %s]"
msgstr "[Fwd: %s]"
#. Translators: This is a subject attribution for forwarded messages, used when there could not be used any
subject.
#. It results in "[Fwd: No Subject]" being used as a subject of the forwarded message.
-#: ../src/libemail-engine/mail-tools.c:196
-#| msgid "(No Subject)"
+#: ../src/libemail-engine/mail-tools.c:208
msgid "No Subject"
msgstr "No Subject"
-#: ../src/libemail-engine/mail-tools.c:271
+#: ../src/libemail-engine/mail-tools.c:283
#, c-format
-#| msgid "Forwarded message - %s"
msgid "Forwarded message — %s"
msgstr "Forwarded message — %s"
-#: ../src/libemail-engine/mail-tools.c:273
+#: ../src/libemail-engine/mail-tools.c:285
msgid "Forwarded message"
msgstr "Forwarded message"
@@ -16434,7 +16025,6 @@ msgstr "Setting up Search Folder: %s"
#: ../src/libemail-engine/mail-vfolder.c:302
#, c-format
-#| msgid "Updating Search Folders for '%s' - %s"
msgid "Updating Search Folders for “%s : %sâ€"
msgstr "Updating Search Folders for “%s : %sâ€"
@@ -16445,14 +16035,6 @@ msgstr "Updating Search Folders for “%s : %sâ€"
#. * in front of its name, without quotes.
#: ../src/libemail-engine/mail-vfolder.c:666
#, c-format
-#| msgid ""
-#| "The Search Folder \"%s\" has been modified to account for the deleted "
-#| "folder\n"
-#| "\"%s\"."
-#| msgid_plural ""
-#| "The following Search Folders\n"
-#| "%s have been modified to account for the deleted folder\n"
-#| "\"%s\"."
msgid ""
"The Search Folder “%s†has been modified to account for the deleted folder\n"
"“%sâ€."
@@ -16490,74 +16072,68 @@ msgstr "You can drag and drop account names to reorder them."
msgid "De_fault"
msgstr "De_fault"
-#: ../src/mail/e-mail-autoconfig.c:634
+#: ../src/mail/e-mail-autoconfig.c:648
#, c-format
msgid "Host: %s:%d"
msgstr "Host: %s:%d"
-#: ../src/mail/e-mail-autoconfig.c:638
+#: ../src/mail/e-mail-autoconfig.c:652
#, c-format
-#| msgid "Users"
msgid "User: %s"
msgstr "User: %s"
-#: ../src/mail/e-mail-autoconfig.c:642
+#: ../src/mail/e-mail-autoconfig.c:656
#, c-format
-#| msgid "Security:"
msgid "Security method: %s"
msgstr "Security method: %s"
-#: ../src/mail/e-mail-autoconfig.c:643
+#: ../src/mail/e-mail-autoconfig.c:657
#: ../src/mail/e-mail-config-summary-page.c:144
msgid "TLS"
msgstr "TLS"
-#: ../src/mail/e-mail-autoconfig.c:644
+#: ../src/mail/e-mail-autoconfig.c:658
#: ../src/mail/e-mail-config-summary-page.c:147
msgid "STARTTLS"
msgstr "STARTTLS"
-#: ../src/mail/e-mail-autoconfig.c:648
+#: ../src/mail/e-mail-autoconfig.c:662
#, c-format
-#| msgid "Authentication Required"
msgid "Authentication mechanism: %s"
msgstr "Authentication mechanism: %s"
-#: ../src/mail/e-mail-autoconfig.c:783
+#: ../src/mail/e-mail-autoconfig.c:821
msgid "No email address provided"
msgstr "No e-mail address provided"
-#: ../src/mail/e-mail-autoconfig.c:792
+#: ../src/mail/e-mail-autoconfig.c:830
msgid "Missing domain in email address"
msgstr "Missing domain in e-mail address"
-#: ../src/mail/e-mail-autoconfig.c:1097
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:78
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:79
-#| msgid "IMAP Headers"
+#: ../src/mail/e-mail-autoconfig.c:1167
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:82
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:83
msgid "IMAP server"
msgstr "IMAP server"
-#: ../src/mail/e-mail-autoconfig.c:1104
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:80
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:81
-#| msgid "On LDAP Servers"
+#: ../src/mail/e-mail-autoconfig.c:1174
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:84
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:85
msgid "POP3 server"
msgstr "POP3 server"
-#: ../src/mail/e-mail-autoconfig.c:1111
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:82
-#| msgid "Server"
+#: ../src/mail/e-mail-autoconfig.c:1181
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:86
msgid "SMTP server"
msgstr "SMTP server"
-#: ../src/mail/e-mail-browser.c:129 ../src/shell/e-shell-window-actions.c:812
+#: ../src/mail/e-mail-browser.c:130 ../src/shell/e-shell-window-actions.c:812
#: ../src/shell/e-shell-window-actions.c:819
#: ../src/shell/e-shell-window-actions.c:826
msgid "Close this window"
msgstr "Close this window"
-#: ../src/mail/e-mail-browser.c:287
+#: ../src/mail/e-mail-browser.c:288
msgid "(No Subject)"
msgstr "(No Subject)"
@@ -16567,23 +16143,23 @@ msgid "Go _Back"
msgstr "Go _Back"
#. GtkAssistant sinks the floating button reference.
-#: ../src/mail/e-mail-config-assistant.c:123
+#: ../src/mail/e-mail-config-assistant.c:130
msgid "_Skip Lookup"
msgstr "_Skip Lookup"
-#: ../src/mail/e-mail-config-assistant.c:718
+#: ../src/mail/e-mail-config-assistant.c:725
msgid "Evolution Account Assistant"
msgstr "Evolution Account Assistant"
-#: ../src/mail/e-mail-config-assistant.c:1025
+#: ../src/mail/e-mail-config-assistant.c:1032
msgid "_Revise Details"
msgstr "_Revise Details"
-#: ../src/mail/e-mail-config-auth-check.c:178
+#: ../src/mail/e-mail-config-auth-check.c:180
msgid "Querying authentication types..."
msgstr "Querying authentication types..."
-#: ../src/mail/e-mail-config-auth-check.c:341
+#: ../src/mail/e-mail-config-auth-check.c:393
msgid "Check for Supported Types"
msgstr "Check for Supported Types"
@@ -16635,13 +16211,11 @@ msgstr "Re_ply style:"
#: ../src/mail/e-mail-config-composing-page.c:488
#: ../src/mail/mail-config.ui.h:20
-#| msgid "Start _typing at the bottom on replying"
msgid "Start _typing at the bottom"
msgstr "Start _typing at the bottom"
#: ../src/mail/e-mail-config-composing-page.c:495
#: ../src/mail/mail-config.ui.h:21
-#| msgid "_Keep signature above the original message on replying"
msgid "_Keep signature above the original message"
msgstr "_Keep signature above the original message"
@@ -16666,12 +16240,6 @@ msgid "Ask for each message"
msgstr "Ask for each message"
#: ../src/mail/e-mail-config-confirm-page.c:154
-#| msgid ""
-#| "Congratulations, your mail configuration is complete.\n"
-#| "\n"
-#| "You are now ready to send and receive email using Evolution.\n"
-#| "\n"
-#| "Click \"Apply\" to save your settings."
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -16722,7 +16290,7 @@ msgid "Archi_ve Folder:"
msgstr "Archi_ve Folder:"
#: ../src/mail/e-mail-config-defaults-page.c:785
-#: ../src/modules/mail/em-mailer-prefs.c:1407
+#: ../src/modules/mail/em-mailer-prefs.c:1413
msgid "Choose a folder to archive messages to."
msgstr "Choose a folder to archive messages to."
@@ -16763,10 +16331,6 @@ msgid "Defaults"
msgstr "Defaults"
#: ../src/mail/e-mail-config-identity-page.c:513
-#| 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 "
-#| "information in email you send."
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 information in "
@@ -16776,16 +16340,8 @@ msgstr ""
"do not need to be filled in, unless you wish to include this information in "
"e-mail you send."
-#: ../src/mail/e-mail-config-identity-page.c:541
-#: ../src/mail/e-mail-config-summary-page.c:323
-msgid "Account Information"
-msgstr "Account Information"
-
#: ../src/mail/e-mail-config-identity-page.c:579
#: ../src/mail/e-mail-config-summary-page.c:353
-#| msgid ""
-#| "The above name will be used to identify this account.\n"
-#| "Use for example, \"Work\" or \"Personal\"."
msgid ""
"The above name will be used to identify this account.\n"
"Use for example, “Work†or “Personalâ€."
@@ -16806,7 +16362,7 @@ msgid "Email _Address:"
msgstr "E-mail _Address:"
#: ../src/mail/e-mail-config-identity-page.c:683
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:26
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:27
msgid "Optional Information"
msgstr "Optional Information"
@@ -16888,10 +16444,10 @@ msgstr "%s — %s"
#: ../src/mail/e-mail-config-security-page.c:318
#: ../src/mail/em-folder-properties.c:1070 ../src/mail/mail-config.ui.h:32
#: ../src/modules/addressbook/autocompletion-config.c:115
-#: ../src/modules/calendar/e-calendar-preferences.c:644
+#: ../src/modules/calendar/e-calendar-preferences.c:642
#: ../src/modules/calendar/e-calendar-preferences.ui.h:48
-#: ../src/modules/mail/e-mail-shell-backend.c:737
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:16
+#: ../src/modules/mail/e-mail-shell-backend.c:753
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
msgid "General"
msgstr "General"
@@ -17033,12 +16589,12 @@ msgid "Server Type:"
msgstr "Server Type:"
#: ../src/mail/e-mail-config-summary-page.c:452
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:606
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:657
msgid "Server:"
msgstr "Server:"
#: ../src/mail/e-mail-config-summary-page.c:473
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:704
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:755
msgid "Username:"
msgstr "Username:"
@@ -17055,10 +16611,6 @@ msgid "Account Summary"
msgstr "Account Summary"
#: ../src/mail/e-mail-config-welcome-page.c:161
-#| msgid ""
-#| "Welcome to the Evolution Mail Configuration Assistant.\n"
-#| "\n"
-#| "Click \"Next\" to begin."
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -17077,55 +16629,55 @@ msgstr "Welcome"
msgid "Account Editor"
msgstr "Account Editor"
-#: ../src/mail/e-mail-display.c:128
+#: ../src/mail/e-mail-display.c:126
msgid "_Add to Address Book..."
msgstr "_Add to Address Book…"
-#: ../src/mail/e-mail-display.c:135
+#: ../src/mail/e-mail-display.c:133
msgid "_To This Address"
msgstr "_To this Address"
-#: ../src/mail/e-mail-display.c:142
+#: ../src/mail/e-mail-display.c:140
msgid "_From This Address"
msgstr "_From This Address"
-#: ../src/mail/e-mail-display.c:149
+#: ../src/mail/e-mail-display.c:147
msgid "Send _Reply To..."
msgstr "Send _Reply To…"
-#: ../src/mail/e-mail-display.c:151
+#: ../src/mail/e-mail-display.c:149
msgid "Send a reply message to this address"
msgstr "Send a reply message to this address"
-#: ../src/mail/e-mail-display.c:158
+#: ../src/mail/e-mail-display.c:156
msgid "Create Search _Folder"
msgstr "Create Search _Folder"
-#: ../src/mail/e-mail-display.c:803
+#: ../src/mail/e-mail-display.c:800
msgid "Hid_e All"
msgstr "Hid_e All"
-#: ../src/mail/e-mail-display.c:810
+#: ../src/mail/e-mail-display.c:807
msgid "_View Inline"
msgstr "_View Inline"
-#: ../src/mail/e-mail-display.c:817
+#: ../src/mail/e-mail-display.c:814
msgid "Vie_w All Inline"
msgstr "Vie_w All Inline"
-#: ../src/mail/e-mail-display.c:824
+#: ../src/mail/e-mail-display.c:821
msgid "_Zoom to 100%"
msgstr "_Zoom to 100%"
-#: ../src/mail/e-mail-display.c:826
+#: ../src/mail/e-mail-display.c:823
msgid "Zoom the image to its natural size"
msgstr "Zoom the image to its natural size"
-#: ../src/mail/e-mail-display.c:831
+#: ../src/mail/e-mail-display.c:828
msgid "_Zoom to window"
msgstr "_Zoom to window"
-#: ../src/mail/e-mail-display.c:833
+#: ../src/mail/e-mail-display.c:830
msgid "Zoom large images to not be wider than the window width"
msgstr "Zoom large images to not be wider than the window width"
@@ -17221,7 +16773,7 @@ msgstr "_Later"
#: ../src/mail/e-mail-label-manager.c:169
#: ../src/mail/em-folder-properties.c:842
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1245
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1243
msgid "Add Label"
msgstr "Add Label"
@@ -17290,7 +16842,7 @@ msgstr "Header Name"
msgid "Header Value"
msgstr "Header Value"
-#: ../src/mail/e-mail-printer.c:100 ../src/mail/mail-config.ui.h:127
+#: ../src/mail/e-mail-printer.c:100 ../src/mail/mail-config.ui.h:128
msgid "Headers"
msgstr "Headers"
@@ -17299,639 +16851,638 @@ msgstr "Headers"
msgid "Page %d of %d"
msgstr "Page %d of %d"
-#: ../src/mail/e-mail-reader.c:349 ../src/mail/filtertypes.xml.in.h:65
+#: ../src/mail/e-mail-reader.c:350 ../src/mail/filtertypes.xml.in.h:65
msgid "Move to Folder"
msgstr "Move to Folder"
-#: ../src/mail/e-mail-reader.c:349 ../src/mail/filtertypes.xml.in.h:66
+#: ../src/mail/e-mail-reader.c:350 ../src/mail/filtertypes.xml.in.h:66
msgid "Copy to Folder"
msgstr "Copy to Folder"
-#: ../src/mail/e-mail-reader.c:353 ../src/mail/em-folder-utils.c:501
+#: ../src/mail/e-mail-reader.c:354 ../src/mail/em-folder-utils.c:568
#: ../src/mail/mail.error.xml.h:152
msgid "_Move"
msgstr "_Move"
-#: ../src/mail/e-mail-reader.c:353 ../src/mail/em-folder-utils.c:501
+#: ../src/mail/e-mail-reader.c:354 ../src/mail/em-folder-utils.c:568
msgid "C_opy"
msgstr "C_opy"
-#: ../src/mail/e-mail-reader.c:479
+#: ../src/mail/e-mail-reader.c:529
msgid "Deleting message note..."
msgstr "Deleting message note..."
-#: ../src/mail/e-mail-reader.c:1301 ../src/mail/e-mail-reader.c:1513
-#: ../src/mail/e-mail-reader.c:1553
+#: ../src/mail/e-mail-reader.c:1386 ../src/mail/e-mail-reader.c:1598
+#: ../src/mail/e-mail-reader.c:1638
msgid "_Do not ask me again."
msgstr "_Do not ask me again."
-#: ../src/mail/e-mail-reader.c:1559
+#: ../src/mail/e-mail-reader.c:1644
msgid "_Always ignore Reply-To: for mailing lists."
msgstr "_Always ignore Reply-To: for mailing lists."
-#: ../src/mail/e-mail-reader.c:1762
+#: ../src/mail/e-mail-reader.c:1847
msgid "Failed to retrieve message:"
msgstr "Failed to retrieve message:"
-#: ../src/mail/e-mail-reader.c:1807 ../src/mail/e-mail-reader.c:3166
+#: ../src/mail/e-mail-reader.c:1892 ../src/mail/e-mail-reader.c:3251
#, c-format
-#| msgid "Retrieving message '%s'"
msgid "Retrieving message “%sâ€"
msgstr "Retrieving message “%sâ€"
-#: ../src/mail/e-mail-reader.c:1995
+#: ../src/mail/e-mail-reader.c:2080
msgid "A_dd Sender to Address Book"
msgstr "A_dd Sender to Address Book"
-#: ../src/mail/e-mail-reader.c:1997
+#: ../src/mail/e-mail-reader.c:2082
msgid "Add sender to address book"
msgstr "Add sender to address book"
-#: ../src/mail/e-mail-reader.c:2002
+#: ../src/mail/e-mail-reader.c:2087
msgid "_Archive..."
msgstr "_Archive..."
-#: ../src/mail/e-mail-reader.c:2004
+#: ../src/mail/e-mail-reader.c:2089
msgid "Move selected messages to the Archive folder for the account"
msgstr "Move selected messages to the Archive folder for the account"
-#: ../src/mail/e-mail-reader.c:2009
+#: ../src/mail/e-mail-reader.c:2094
msgid "Check for _Junk"
msgstr "Check for _Junk"
-#: ../src/mail/e-mail-reader.c:2011
+#: ../src/mail/e-mail-reader.c:2096
msgid "Filter the selected messages for junk status"
msgstr "Filter the selected messages for junk status"
-#: ../src/mail/e-mail-reader.c:2016
+#: ../src/mail/e-mail-reader.c:2101
msgid "_Copy to Folder..."
msgstr "_Copy to Folder…"
-#: ../src/mail/e-mail-reader.c:2018
+#: ../src/mail/e-mail-reader.c:2103
msgid "Copy selected messages to another folder"
msgstr "Copy selected messages to another folder"
-#: ../src/mail/e-mail-reader.c:2023
+#: ../src/mail/e-mail-reader.c:2108
msgid "_Delete Message"
msgstr "_Delete Message"
-#: ../src/mail/e-mail-reader.c:2025
+#: ../src/mail/e-mail-reader.c:2110
msgid "Mark the selected messages for deletion"
msgstr "Mark the selected messages for deletion"
-#: ../src/mail/e-mail-reader.c:2030
+#: ../src/mail/e-mail-reader.c:2115
msgid "_Add note..."
msgstr "_Add note..."
-#: ../src/mail/e-mail-reader.c:2032
+#: ../src/mail/e-mail-reader.c:2117
msgid "Add a note for the selected message"
msgstr "Add a note for the selected message"
-#: ../src/mail/e-mail-reader.c:2037
+#: ../src/mail/e-mail-reader.c:2122
msgid "Delete no_te"
msgstr "Delete no_te"
-#: ../src/mail/e-mail-reader.c:2039
+#: ../src/mail/e-mail-reader.c:2124
msgid "Delete the note for the selected message"
msgstr "Delete the note for the selected message"
-#: ../src/mail/e-mail-reader.c:2044
+#: ../src/mail/e-mail-reader.c:2129
msgid "_Edit note..."
msgstr "_Edit note..."
-#: ../src/mail/e-mail-reader.c:2046
+#: ../src/mail/e-mail-reader.c:2131
msgid "Edit a note for the selected message"
msgstr "Edit a note for the selected message"
-#: ../src/mail/e-mail-reader.c:2051
+#: ../src/mail/e-mail-reader.c:2136
msgid "Create a Filter Rule for Mailing _List..."
msgstr "Create a Filter Rule for Mailing _List…"
-#: ../src/mail/e-mail-reader.c:2053
+#: ../src/mail/e-mail-reader.c:2138
msgid "Create a rule to filter messages to this mailing list"
msgstr "Create a rule to filter messages to this mailing list"
-#: ../src/mail/e-mail-reader.c:2058
+#: ../src/mail/e-mail-reader.c:2143
msgid "Create a Filter Rule for _Recipients..."
msgstr "Create a Filter Rule for _Recipients…"
-#: ../src/mail/e-mail-reader.c:2060
+#: ../src/mail/e-mail-reader.c:2145
msgid "Create a rule to filter messages to these recipients"
msgstr "Create a rule to filter messages to these recipients"
-#: ../src/mail/e-mail-reader.c:2065
+#: ../src/mail/e-mail-reader.c:2150
msgid "Create a Filter Rule for Se_nder..."
msgstr "Create a Filter Rule for Se_nder…"
-#: ../src/mail/e-mail-reader.c:2067
+#: ../src/mail/e-mail-reader.c:2152
msgid "Create a rule to filter messages from this sender"
msgstr "Create a rule to filter messages from this sender"
-#: ../src/mail/e-mail-reader.c:2072
+#: ../src/mail/e-mail-reader.c:2157
msgid "Create a Filter Rule for _Subject..."
msgstr "Create a Filter Rule for _Subject…"
-#: ../src/mail/e-mail-reader.c:2074
+#: ../src/mail/e-mail-reader.c:2159
msgid "Create a rule to filter messages with this subject"
msgstr "Create a rule to filter messages with this subject"
-#: ../src/mail/e-mail-reader.c:2079
+#: ../src/mail/e-mail-reader.c:2164
msgid "A_pply Filters"
msgstr "A_pply Filters"
-#: ../src/mail/e-mail-reader.c:2081
+#: ../src/mail/e-mail-reader.c:2166
msgid "Apply filter rules to the selected messages"
msgstr "Apply filter rules to the selected messages"
-#: ../src/mail/e-mail-reader.c:2086
+#: ../src/mail/e-mail-reader.c:2171
msgid "_Find in Message..."
msgstr "_Find in Message…"
-#: ../src/mail/e-mail-reader.c:2088
+#: ../src/mail/e-mail-reader.c:2173
msgid "Search for text in the body of the displayed message"
msgstr "Search for text in the body of the displayed message"
-#: ../src/mail/e-mail-reader.c:2093
+#: ../src/mail/e-mail-reader.c:2178
msgid "_Clear Flag"
msgstr "_Clear Flag"
-#: ../src/mail/e-mail-reader.c:2095
+#: ../src/mail/e-mail-reader.c:2180
msgid "Remove the follow-up flag from the selected messages"
msgstr "Remove the follow-up flag from the selected messages"
-#: ../src/mail/e-mail-reader.c:2100
+#: ../src/mail/e-mail-reader.c:2185
msgid "_Flag Completed"
msgstr "_Flag Completed"
-#: ../src/mail/e-mail-reader.c:2102
+#: ../src/mail/e-mail-reader.c:2187
msgid "Set the follow-up flag to completed on the selected messages"
msgstr "Set the follow-up flag to completed on the selected messages"
-#: ../src/mail/e-mail-reader.c:2107
+#: ../src/mail/e-mail-reader.c:2192
msgid "Follow _Up..."
msgstr "Follow _Up…"
-#: ../src/mail/e-mail-reader.c:2109
+#: ../src/mail/e-mail-reader.c:2194
msgid "Flag the selected messages for follow-up"
msgstr "Flag the selected messages for follow-up"
-#: ../src/mail/e-mail-reader.c:2114
-#: ../src/modules/mail/e-mail-attachment-handler.c:430
+#: ../src/mail/e-mail-reader.c:2199
+#: ../src/modules/mail/e-mail-attachment-handler.c:431
msgid "_Attached"
msgstr "_Attached"
-#: ../src/mail/e-mail-reader.c:2116 ../src/mail/e-mail-reader.c:2123
-#: ../src/modules/mail/e-mail-attachment-handler.c:432
+#: ../src/mail/e-mail-reader.c:2201 ../src/mail/e-mail-reader.c:2208
+#: ../src/modules/mail/e-mail-attachment-handler.c:433
msgid "Forward the selected message to someone as an attachment"
msgstr "Forward the selected message to someone as an attachment"
-#: ../src/mail/e-mail-reader.c:2121
+#: ../src/mail/e-mail-reader.c:2206
msgid "Forward As _Attached"
msgstr "Forward As _Attached"
-#: ../src/mail/e-mail-reader.c:2128
-#: ../src/modules/mail/e-mail-attachment-handler.c:437
+#: ../src/mail/e-mail-reader.c:2213
+#: ../src/modules/mail/e-mail-attachment-handler.c:438
msgid "_Inline"
msgstr "_Inline"
-#: ../src/mail/e-mail-reader.c:2130 ../src/mail/e-mail-reader.c:2137
-#: ../src/modules/mail/e-mail-attachment-handler.c:439
+#: ../src/mail/e-mail-reader.c:2215 ../src/mail/e-mail-reader.c:2222
+#: ../src/modules/mail/e-mail-attachment-handler.c:440
msgid "Forward the selected message in the body of a new message"
msgstr "Forward the selected message in the body of a new message"
-#: ../src/mail/e-mail-reader.c:2135
+#: ../src/mail/e-mail-reader.c:2220
msgid "Forward As _Inline"
msgstr "Forward As _Inline"
-#: ../src/mail/e-mail-reader.c:2142
-#: ../src/modules/mail/e-mail-attachment-handler.c:444
+#: ../src/mail/e-mail-reader.c:2227
+#: ../src/modules/mail/e-mail-attachment-handler.c:445
msgid "_Quoted"
msgstr "_Quoted"
-#: ../src/mail/e-mail-reader.c:2144 ../src/mail/e-mail-reader.c:2151
-#: ../src/modules/mail/e-mail-attachment-handler.c:446
+#: ../src/mail/e-mail-reader.c:2229 ../src/mail/e-mail-reader.c:2236
+#: ../src/modules/mail/e-mail-attachment-handler.c:447
msgid "Forward the selected message quoted like a reply"
msgstr "Forward the selected message quoted like a reply"
-#: ../src/mail/e-mail-reader.c:2149
+#: ../src/mail/e-mail-reader.c:2234
msgid "Forward As _Quoted"
msgstr "Forward As _Quoted"
-#: ../src/mail/e-mail-reader.c:2156
+#: ../src/mail/e-mail-reader.c:2241
msgid "_Load Images"
msgstr "_Load Images"
-#: ../src/mail/e-mail-reader.c:2158
+#: ../src/mail/e-mail-reader.c:2243
msgid "Force images in HTML mail to be loaded"
msgstr "Force images in HTML mail to be loaded"
-#: ../src/mail/e-mail-reader.c:2163 ../src/mail/e-mail-reader.c:2553
+#: ../src/mail/e-mail-reader.c:2248 ../src/mail/e-mail-reader.c:2638
msgid "_Ignore Subthread"
msgstr "_Ignore Subthread"
-#: ../src/mail/e-mail-reader.c:2165
+#: ../src/mail/e-mail-reader.c:2250
msgid "Mark new mails in a subthread as read automatically"
msgstr "Mark new mails in a subthread as read automatically"
-#: ../src/mail/e-mail-reader.c:2170 ../src/mail/e-mail-reader.c:2557
+#: ../src/mail/e-mail-reader.c:2255 ../src/mail/e-mail-reader.c:2642
msgid "_Ignore Thread"
msgstr "_Ignore Thread"
-#: ../src/mail/e-mail-reader.c:2172
+#: ../src/mail/e-mail-reader.c:2257
msgid "Mark new mails in this thread as read automatically"
msgstr "Mark new mails in this thread as read automatically"
-#: ../src/mail/e-mail-reader.c:2177
+#: ../src/mail/e-mail-reader.c:2262
msgid "_Important"
msgstr "_Important"
-#: ../src/mail/e-mail-reader.c:2179
+#: ../src/mail/e-mail-reader.c:2264
msgid "Mark the selected messages as important"
msgstr "Mark the selected messages as important"
-#: ../src/mail/e-mail-reader.c:2184
+#: ../src/mail/e-mail-reader.c:2269
msgid "_Junk"
msgstr "_Junk"
-#: ../src/mail/e-mail-reader.c:2186
+#: ../src/mail/e-mail-reader.c:2271
msgid "Mark the selected messages as junk"
msgstr "Mark the selected messages as junk"
-#: ../src/mail/e-mail-reader.c:2191
+#: ../src/mail/e-mail-reader.c:2276
msgid "_Not Junk"
msgstr "_Not Junk"
-#: ../src/mail/e-mail-reader.c:2193
+#: ../src/mail/e-mail-reader.c:2278
msgid "Mark the selected messages as not being junk"
msgstr "Mark the selected messages as not being junk"
-#: ../src/mail/e-mail-reader.c:2198
+#: ../src/mail/e-mail-reader.c:2283
msgid "_Read"
msgstr "_Read"
-#: ../src/mail/e-mail-reader.c:2200
+#: ../src/mail/e-mail-reader.c:2285
msgid "Mark the selected messages as having been read"
msgstr "Mark the selected messages as having been read"
-#: ../src/mail/e-mail-reader.c:2205 ../src/mail/e-mail-reader.c:2577
+#: ../src/mail/e-mail-reader.c:2290 ../src/mail/e-mail-reader.c:2662
msgid "Do not _Ignore Subthread"
msgstr "Do not _Ignore Subthread"
-#: ../src/mail/e-mail-reader.c:2207
+#: ../src/mail/e-mail-reader.c:2292
msgid "Do not mark new mails in a subthread as read automatically"
msgstr "Do not mark new mails in a subthread as read automatically"
-#: ../src/mail/e-mail-reader.c:2212 ../src/mail/e-mail-reader.c:2581
+#: ../src/mail/e-mail-reader.c:2297 ../src/mail/e-mail-reader.c:2666
msgid "Do not _Ignore Thread"
msgstr "Do not _Ignore Thread"
-#: ../src/mail/e-mail-reader.c:2214
+#: ../src/mail/e-mail-reader.c:2299
msgid "Do not mark new mails in this thread as read automatically"
msgstr "Do not mark new mails in this thread as read automatically"
-#: ../src/mail/e-mail-reader.c:2219
+#: ../src/mail/e-mail-reader.c:2304
msgid "Uni_mportant"
msgstr "Uni_mportant"
-#: ../src/mail/e-mail-reader.c:2221
+#: ../src/mail/e-mail-reader.c:2306
msgid "Mark the selected messages as unimportant"
msgstr "Mark the selected messages as unimportant"
-#: ../src/mail/e-mail-reader.c:2226
+#: ../src/mail/e-mail-reader.c:2311
msgid "_Unread"
msgstr "_Unread"
-#: ../src/mail/e-mail-reader.c:2228
+#: ../src/mail/e-mail-reader.c:2313
msgid "Mark the selected messages as not having been read"
msgstr "Mark the selected messages as not having been read"
-#: ../src/mail/e-mail-reader.c:2233
-#: ../src/modules/mail/e-mail-attachment-handler.c:416
+#: ../src/mail/e-mail-reader.c:2318
+#: ../src/modules/mail/e-mail-attachment-handler.c:417
msgid "_Edit as New Message..."
msgstr "_Edit as New Message…"
-#: ../src/mail/e-mail-reader.c:2235
-#: ../src/modules/mail/e-mail-attachment-handler.c:418
+#: ../src/mail/e-mail-reader.c:2320
+#: ../src/modules/mail/e-mail-attachment-handler.c:419
msgid "Open the selected messages in the composer for editing"
msgstr "Open the selected messages in the composer for editing"
-#: ../src/mail/e-mail-reader.c:2240
+#: ../src/mail/e-mail-reader.c:2325
msgid "Compose _New Message"
msgstr "Compose _New Message"
-#: ../src/mail/e-mail-reader.c:2242
+#: ../src/mail/e-mail-reader.c:2327
msgid "Open a window for composing a mail message"
msgstr "Open a window for composing a mail message"
-#: ../src/mail/e-mail-reader.c:2247
+#: ../src/mail/e-mail-reader.c:2332
msgid "_Open in New Window"
msgstr "_Open in New Window"
-#: ../src/mail/e-mail-reader.c:2249
+#: ../src/mail/e-mail-reader.c:2334
msgid "Open the selected messages in a new window"
msgstr "Open the selected messages in a new window"
-#: ../src/mail/e-mail-reader.c:2254
+#: ../src/mail/e-mail-reader.c:2339
msgid "_Move to Folder..."
msgstr "_Move to Folder…"
-#: ../src/mail/e-mail-reader.c:2256
+#: ../src/mail/e-mail-reader.c:2341
msgid "Move selected messages to another folder"
msgstr "Move selected messages to another folder"
-#: ../src/mail/e-mail-reader.c:2261
+#: ../src/mail/e-mail-reader.c:2346
msgid "_Next Message"
msgstr "_Next Message"
-#: ../src/mail/e-mail-reader.c:2263
+#: ../src/mail/e-mail-reader.c:2348
msgid "Display the next message"
msgstr "Display the next message"
-#: ../src/mail/e-mail-reader.c:2268
+#: ../src/mail/e-mail-reader.c:2353
msgid "Next _Important Message"
msgstr "Next _Important Message"
-#: ../src/mail/e-mail-reader.c:2270
+#: ../src/mail/e-mail-reader.c:2355
msgid "Display the next important message"
msgstr "Display the next important message"
-#: ../src/mail/e-mail-reader.c:2275
+#: ../src/mail/e-mail-reader.c:2360
msgid "Next _Thread"
msgstr "Next _Thread"
-#: ../src/mail/e-mail-reader.c:2277
+#: ../src/mail/e-mail-reader.c:2362
msgid "Display the next thread"
msgstr "Display the next thread"
-#: ../src/mail/e-mail-reader.c:2282
+#: ../src/mail/e-mail-reader.c:2367
msgid "Next _Unread Message"
msgstr "Next _Unread Message"
-#: ../src/mail/e-mail-reader.c:2284
+#: ../src/mail/e-mail-reader.c:2369
msgid "Display the next unread message"
msgstr "Display the next unread message"
-#: ../src/mail/e-mail-reader.c:2289
+#: ../src/mail/e-mail-reader.c:2374
msgid "_Previous Message"
msgstr "_Previous Message"
-#: ../src/mail/e-mail-reader.c:2291
+#: ../src/mail/e-mail-reader.c:2376
msgid "Display the previous message"
msgstr "Display the previous message"
-#: ../src/mail/e-mail-reader.c:2296
+#: ../src/mail/e-mail-reader.c:2381
msgid "Pr_evious Important Message"
msgstr "Pr_evious Important Message"
-#: ../src/mail/e-mail-reader.c:2298
+#: ../src/mail/e-mail-reader.c:2383
msgid "Display the previous important message"
msgstr "Display the previous important message"
-#: ../src/mail/e-mail-reader.c:2303
+#: ../src/mail/e-mail-reader.c:2388
msgid "Previous T_hread"
msgstr "Previous T_hread"
-#: ../src/mail/e-mail-reader.c:2305
+#: ../src/mail/e-mail-reader.c:2390
msgid "Display the previous thread"
msgstr "Display the previous thread"
-#: ../src/mail/e-mail-reader.c:2310
+#: ../src/mail/e-mail-reader.c:2395
msgid "P_revious Unread Message"
msgstr "P_revious Unread Message"
-#: ../src/mail/e-mail-reader.c:2312
+#: ../src/mail/e-mail-reader.c:2397
msgid "Display the previous unread message"
msgstr "Display the previous unread message"
-#: ../src/mail/e-mail-reader.c:2319
+#: ../src/mail/e-mail-reader.c:2404
msgid "Print this message"
msgstr "Print this message"
-#: ../src/mail/e-mail-reader.c:2326
+#: ../src/mail/e-mail-reader.c:2411
msgid "Preview the message to be printed"
msgstr "Preview the message to be printed"
-#: ../src/mail/e-mail-reader.c:2331
-#: ../src/modules/mail/e-mail-attachment-handler.c:451
+#: ../src/mail/e-mail-reader.c:2416
+#: ../src/modules/mail/e-mail-attachment-handler.c:452
msgid "Re_direct"
msgstr "Re_direct"
-#: ../src/mail/e-mail-reader.c:2333
-#: ../src/modules/mail/e-mail-attachment-handler.c:453
+#: ../src/mail/e-mail-reader.c:2418
+#: ../src/modules/mail/e-mail-attachment-handler.c:454
msgid "Redirect (bounce) the selected message to someone"
msgstr "Redirect (bounce) the selected message to someone"
-#: ../src/mail/e-mail-reader.c:2338
+#: ../src/mail/e-mail-reader.c:2423
msgid "Remo_ve Attachments"
msgstr "Remo_ve Attachments"
-#: ../src/mail/e-mail-reader.c:2340
+#: ../src/mail/e-mail-reader.c:2425
msgid "Remove attachments"
msgstr "Remove attachments"
-#: ../src/mail/e-mail-reader.c:2345
+#: ../src/mail/e-mail-reader.c:2430
msgid "Remove Du_plicate Messages"
msgstr "Remove Du_plicate Messages"
-#: ../src/mail/e-mail-reader.c:2347
+#: ../src/mail/e-mail-reader.c:2432
msgid "Checks selected messages for duplicates"
msgstr "Checks selected messages for duplicates"
-#: ../src/mail/e-mail-reader.c:2352 ../src/mail/mail.error.xml.h:28
+#: ../src/mail/e-mail-reader.c:2437 ../src/mail/mail.error.xml.h:28
#: ../src/modules/calendar/e-cal-shell-view-actions.c:1477
-#: ../src/modules/mail/e-mail-attachment-handler.c:395
+#: ../src/modules/mail/e-mail-attachment-handler.c:396
msgid "Reply to _All"
msgstr "Reply to _All"
-#: ../src/mail/e-mail-reader.c:2354
-#: ../src/modules/mail/e-mail-attachment-handler.c:397
+#: ../src/mail/e-mail-reader.c:2439
+#: ../src/modules/mail/e-mail-attachment-handler.c:398
msgid "Compose a reply to all the recipients of the selected message"
msgstr "Compose a reply to all the recipients of the selected message"
-#: ../src/mail/e-mail-reader.c:2359 ../src/mail/mail.error.xml.h:26
-#: ../src/modules/mail/e-mail-attachment-handler.c:402
+#: ../src/mail/e-mail-reader.c:2444 ../src/mail/mail.error.xml.h:26
+#: ../src/modules/mail/e-mail-attachment-handler.c:403
msgid "Reply to _List"
msgstr "Reply to _List"
-#: ../src/mail/e-mail-reader.c:2361
-#: ../src/modules/mail/e-mail-attachment-handler.c:404
+#: ../src/mail/e-mail-reader.c:2446
+#: ../src/modules/mail/e-mail-attachment-handler.c:405
msgid "Compose a reply to the mailing list of the selected message"
msgstr "Compose a reply to the mailing list of the selected message"
-#: ../src/mail/e-mail-reader.c:2366
-#: ../src/modules/mail/e-mail-attachment-handler.c:409
+#: ../src/mail/e-mail-reader.c:2451
+#: ../src/modules/mail/e-mail-attachment-handler.c:410
msgid "_Reply to Sender"
msgstr "_Reply to Sender"
-#: ../src/mail/e-mail-reader.c:2368
-#: ../src/modules/mail/e-mail-attachment-handler.c:411
+#: ../src/mail/e-mail-reader.c:2453
+#: ../src/modules/mail/e-mail-attachment-handler.c:412
msgid "Compose a reply to the sender of the selected message"
msgstr "Compose a reply to the sender of the selected message"
-#: ../src/mail/e-mail-reader.c:2373
+#: ../src/mail/e-mail-reader.c:2458
msgid "_Save as mbox..."
msgstr "_Save as mbox…"
-#: ../src/mail/e-mail-reader.c:2375
+#: ../src/mail/e-mail-reader.c:2460
msgid "Save selected messages as an mbox file"
msgstr "Save selected messages as an mbox file"
-#: ../src/mail/e-mail-reader.c:2380
+#: ../src/mail/e-mail-reader.c:2465
msgid "_Message Source"
msgstr "_Message Source"
-#: ../src/mail/e-mail-reader.c:2382
+#: ../src/mail/e-mail-reader.c:2467
msgid "Show the raw email source of the message"
msgstr "Show the raw e-mail source of the message"
-#: ../src/mail/e-mail-reader.c:2394
+#: ../src/mail/e-mail-reader.c:2479
msgid "_Undelete Message"
msgstr "_Undelete Message"
-#: ../src/mail/e-mail-reader.c:2396
+#: ../src/mail/e-mail-reader.c:2481
msgid "Undelete the selected messages"
msgstr "Undelete the selected messages"
-#: ../src/mail/e-mail-reader.c:2401
+#: ../src/mail/e-mail-reader.c:2486
msgid "_Normal Size"
msgstr "_Normal Size"
-#: ../src/mail/e-mail-reader.c:2403
+#: ../src/mail/e-mail-reader.c:2488
msgid "Reset the text to its original size"
msgstr "Reset the text to its original size"
-#: ../src/mail/e-mail-reader.c:2408
+#: ../src/mail/e-mail-reader.c:2493
msgid "_Zoom In"
msgstr "_Zoom In"
-#: ../src/mail/e-mail-reader.c:2410
+#: ../src/mail/e-mail-reader.c:2495
msgid "Increase the text size"
msgstr "Increase the text size"
-#: ../src/mail/e-mail-reader.c:2417
+#: ../src/mail/e-mail-reader.c:2502
msgid "Decrease the text size"
msgstr "Decrease the text size"
-#: ../src/mail/e-mail-reader.c:2424
+#: ../src/mail/e-mail-reader.c:2509
msgid "Cre_ate"
msgstr "Cre_ate"
-#: ../src/mail/e-mail-reader.c:2431
+#: ../src/mail/e-mail-reader.c:2516
msgid "Ch_aracter Encoding"
msgstr "Ch_aracter Encoding"
-#: ../src/mail/e-mail-reader.c:2438
-#: ../src/modules/mail/e-mail-attachment-handler.c:423
+#: ../src/mail/e-mail-reader.c:2523
+#: ../src/modules/mail/e-mail-attachment-handler.c:424
msgid "F_orward As"
msgstr "F_orward As"
-#: ../src/mail/e-mail-reader.c:2445
+#: ../src/mail/e-mail-reader.c:2530
msgid "_Group Reply"
msgstr "_Group Reply"
-#: ../src/mail/e-mail-reader.c:2452
+#: ../src/mail/e-mail-reader.c:2537
msgid "_Go To"
msgstr "_Go To"
-#: ../src/mail/e-mail-reader.c:2459
+#: ../src/mail/e-mail-reader.c:2544
msgid "Mar_k As"
msgstr "Mar_k As"
-#: ../src/mail/e-mail-reader.c:2466
+#: ../src/mail/e-mail-reader.c:2551
msgid "_Message"
msgstr "_Message"
-#: ../src/mail/e-mail-reader.c:2473
+#: ../src/mail/e-mail-reader.c:2558
msgid "_Zoom"
msgstr "_Zoom"
-#: ../src/mail/e-mail-reader.c:2483
+#: ../src/mail/e-mail-reader.c:2568
msgid "Create a Search Folder from Mailing _List..."
msgstr "Create a Search Folder from Mailing _List…"
-#: ../src/mail/e-mail-reader.c:2485
+#: ../src/mail/e-mail-reader.c:2570
msgid "Create a search folder for this mailing list"
msgstr "Create a search folder for this mailing list"
-#: ../src/mail/e-mail-reader.c:2490
+#: ../src/mail/e-mail-reader.c:2575
msgid "Create a Search Folder from Recipien_ts..."
msgstr "Create a Search Folder from Recipien_ts…"
-#: ../src/mail/e-mail-reader.c:2492
+#: ../src/mail/e-mail-reader.c:2577
msgid "Create a search folder for these recipients"
msgstr "Create a search folder for these recipients"
-#: ../src/mail/e-mail-reader.c:2497
+#: ../src/mail/e-mail-reader.c:2582
msgid "Create a Search Folder from Sen_der..."
msgstr "Create a Search Folder from Sen_der…"
-#: ../src/mail/e-mail-reader.c:2499
+#: ../src/mail/e-mail-reader.c:2584
msgid "Create a search folder for this sender"
msgstr "Create a search folder for this sender"
-#: ../src/mail/e-mail-reader.c:2504
+#: ../src/mail/e-mail-reader.c:2589
msgid "Create a Search Folder from S_ubject..."
msgstr "Create a Search Folder from S_ubject…"
-#: ../src/mail/e-mail-reader.c:2506
+#: ../src/mail/e-mail-reader.c:2591
msgid "Create a search folder for this subject"
msgstr "Create a search folder for this subject"
-#: ../src/mail/e-mail-reader.c:2545
+#: ../src/mail/e-mail-reader.c:2630
msgid "Mark for Follo_w Up..."
msgstr "Mark for Follo_w Up…"
-#: ../src/mail/e-mail-reader.c:2561
+#: ../src/mail/e-mail-reader.c:2646
msgid "Mark as _Important"
msgstr "Mark as _Important"
-#: ../src/mail/e-mail-reader.c:2565
+#: ../src/mail/e-mail-reader.c:2650
msgid "Mark as _Junk"
msgstr "Mark as _Junk"
-#: ../src/mail/e-mail-reader.c:2569
+#: ../src/mail/e-mail-reader.c:2654
msgid "Mark as _Not Junk"
msgstr "Mark as _Not Junk"
-#: ../src/mail/e-mail-reader.c:2573
+#: ../src/mail/e-mail-reader.c:2658
msgid "Mar_k as Read"
msgstr "Mar_k as Read"
-#: ../src/mail/e-mail-reader.c:2585
+#: ../src/mail/e-mail-reader.c:2670
msgid "Mark as Uni_mportant"
msgstr "Mark as Uni_mportant"
-#: ../src/mail/e-mail-reader.c:2589
+#: ../src/mail/e-mail-reader.c:2674
msgid "Mark as _Unread"
msgstr "Mark as _Unread"
-#: ../src/mail/e-mail-reader.c:2633
+#: ../src/mail/e-mail-reader.c:2718
msgid "_Caret Mode"
msgstr "_Caret Mode"
-#: ../src/mail/e-mail-reader.c:2635
+#: ../src/mail/e-mail-reader.c:2720
msgid "Show a blinking cursor in the body of displayed messages"
msgstr "Show a blinking cursor in the body of displayed messages"
-#: ../src/mail/e-mail-reader.c:2641
+#: ../src/mail/e-mail-reader.c:2726
msgid "All Message _Headers"
msgstr "All Message _Headers"
-#: ../src/mail/e-mail-reader.c:2643
+#: ../src/mail/e-mail-reader.c:2728
msgid "Show messages with all email headers"
msgstr "Show messages with all e-mail headers"
-#: ../src/mail/e-mail-reader.c:3172
+#: ../src/mail/e-mail-reader.c:3257
msgid "Retrieving message"
msgstr "Retrieving message"
-#: ../src/mail/e-mail-reader.c:4222
-#: ../src/modules/mail/e-mail-attachment-handler.c:388
+#: ../src/mail/e-mail-reader.c:4327
+#: ../src/modules/mail/e-mail-attachment-handler.c:389
msgid "_Forward"
msgstr "_Forward"
-#: ../src/mail/e-mail-reader.c:4223
-#: ../src/modules/mail/e-mail-attachment-handler.c:390
+#: ../src/mail/e-mail-reader.c:4328
+#: ../src/modules/mail/e-mail-attachment-handler.c:391
msgid "Forward the selected message to someone"
msgstr "Forward the selected message to someone"
@@ -17939,52 +17490,52 @@ msgstr "Forward the selected message to someone"
#. * (if possible and if that configuration option is enabled), or else
#. * it will reply to all. The word "Group" was chosen because it covers
#. * either of those, without too strongly implying one or the other.
-#: ../src/mail/e-mail-reader.c:4242
+#: ../src/mail/e-mail-reader.c:4347
msgid "Group Reply"
msgstr "Group Reply"
-#: ../src/mail/e-mail-reader.c:4243
+#: ../src/mail/e-mail-reader.c:4348
msgid "Reply to the mailing list, or to all recipients"
msgstr "Reply to the mailing list, or to all recipients"
-#: ../src/mail/e-mail-reader.c:4309 ../src/mail/filtertypes.xml.in.h:67
+#: ../src/mail/e-mail-reader.c:4414 ../src/mail/filtertypes.xml.in.h:67
msgid "Delete"
msgstr "Delete"
-#: ../src/mail/e-mail-reader.c:4321
+#: ../src/mail/e-mail-reader.c:4426
#: ../src/modules/calendar/e-cal-shell-view-actions.c:1281
msgid "Next"
msgstr "Next"
-#: ../src/mail/e-mail-reader.c:4325
+#: ../src/mail/e-mail-reader.c:4430
#: ../src/modules/calendar/e-cal-shell-view-actions.c:1274
msgid "Previous"
msgstr "Previous"
-#: ../src/mail/e-mail-reader.c:4334 ../src/mail/mail-dialogs.ui.h:9
+#: ../src/mail/e-mail-reader.c:4439 ../src/mail/mail-dialogs.ui.h:9
msgid "Reply"
msgstr "Reply"
-#: ../src/mail/e-mail-reader.c:5407
+#: ../src/mail/e-mail-reader.c:5502
#, c-format
msgid "Allow remote content for anyone from %s"
msgstr "Allow remote content for anyone from %s"
-#: ../src/mail/e-mail-reader.c:5409
+#: ../src/mail/e-mail-reader.c:5504
#, c-format
msgid "Allow remote content for %s"
msgstr "Allow remote content for %s"
-#: ../src/mail/e-mail-reader.c:5426
+#: ../src/mail/e-mail-reader.c:5521
#, c-format
msgid "Allow remote content from %s"
msgstr "Allow remote content from %s"
-#: ../src/mail/e-mail-reader.c:5443
+#: ../src/mail/e-mail-reader.c:5538
msgid "Do not show this message again"
msgstr "Do not show this message again"
-#: ../src/mail/e-mail-reader.c:5491
+#: ../src/mail/e-mail-reader.c:5590
msgid "Load remote content"
msgstr "Load remote content"
@@ -17994,13 +17545,11 @@ msgstr "Do not warn me again"
#: ../src/mail/e-mail-reader-utils.c:633
#, c-format
-#| msgid "Moving messages into folder %s"
msgid "Deleting messages in Junk folder “%sâ€â€¦"
msgstr "Deleting messages in Junk folder “%sâ€â€¦"
#: ../src/mail/e-mail-reader-utils.c:728
#, c-format
-#| msgid "Refreshing folder '%s'"
msgid "Refreshing folder “%sâ€"
msgstr "Refreshing folder “%sâ€"
@@ -18028,12 +17577,6 @@ msgstr "Printing"
#. * name %u with count of duplicate messages.
#: ../src/mail/e-mail-reader-utils.c:1836
#, c-format
-#| msgid ""
-#| "Folder '%s' contains %u duplicate message. Are you sure you want to "
-#| "delete it?"
-#| msgid_plural ""
-#| "Folder '%s' contains %u duplicate messages. Are you sure you want to "
-#| "delete them?"
msgid ""
"Folder “%s†contains %u duplicate message. Are you sure you want to delete "
"it?"
@@ -18064,7 +17607,7 @@ msgid_plural "Messages"
msgstr[0] "Message"
msgstr[1] "Messages"
-#: ../src/mail/e-mail-reader-utils.c:3248
+#: ../src/mail/e-mail-reader-utils.c:3271
msgid "Parsing message"
msgstr "Parsing message"
@@ -18076,14 +17619,13 @@ msgstr "The message has no text content."
msgid "Flag to Follow Up"
msgstr "Flag to Follow Up"
-#: ../src/mail/e-mail-ui-session.c:821
+#: ../src/mail/e-mail-ui-session.c:820
#, c-format
msgid "%s authentication failed"
msgstr "%s authentication failed"
-#: ../src/mail/e-mail-ui-session.c:871
+#: ../src/mail/e-mail-ui-session.c:870
#, c-format
-#| msgid "No data source found for UID '%s'"
msgid "No data source found for UID “%sâ€"
msgstr "No data source found for UID “%sâ€"
@@ -18136,7 +17678,7 @@ msgstr "Waiting for attachments to load..."
#. * when quoting messages. Each ${Variable} gets replaced
#. * with a value. To see a full list of available variables,
#. * see mail/em-composer-utils.c:attribvars array.
-#: ../src/mail/em-composer-utils.c:1845
+#: ../src/mail/em-composer-utils.c:1991
msgid ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
@@ -18144,31 +17686,32 @@ msgstr ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
-#: ../src/mail/em-composer-utils.c:1851
+#: ../src/mail/em-composer-utils.c:1997
msgid "-------- Forwarded Message --------"
msgstr "-------- Forwarded Message --------"
-#: ../src/mail/em-composer-utils.c:1856
+#: ../src/mail/em-composer-utils.c:2002
msgid "-----Original Message-----"
msgstr "-----Original Message-----"
-#. Translators: This is a reply attribution in the message reply subject. The %s is replaced with the
subject of the original message.
-#: ../src/mail/em-composer-utils.c:2562
+#. Translators: This is a reply attribution in the message reply subject. The %s is replaced with the
subject of the original message. Both 'Re'-s in the 'reply-attribution' translation context should translate
into the same string, the same as the ':' separator.
+#: ../src/mail/em-composer-utils.c:2711
#, c-format
-#| msgid "URL: %s"
+#| msgid "Re: %s"
+msgctxt "reply-attribution"
msgid "Re: %s"
msgstr "Re: %s"
-#: ../src/mail/em-composer-utils.c:3103
+#: ../src/mail/em-composer-utils.c:3257
msgid "an unknown sender"
msgstr "an unknown sender"
#. FIXME GTK_WINDOW (composer)
-#: ../src/mail/em-composer-utils.c:3581
+#: ../src/mail/em-composer-utils.c:3741
msgid "Posting destination"
msgstr "Posting destination"
-#: ../src/mail/em-composer-utils.c:3586
+#: ../src/mail/em-composer-utils.c:3746
msgid "Choose folders to post the message to."
msgstr "Choose folders to post the message to."
@@ -18176,12 +17719,29 @@ msgstr "Choose folders to post the message to."
msgid "Select Folder"
msgstr "Select Folder"
+#. Translators: This is in a Mail filter rule editor, part of "For account: [ Any ]" section
+#: ../src/mail/em-filter-rule.c:941
+#| msgid "A_ngry"
+msgctxt "mail-filter-rule"
+msgid "Any"
+msgstr "Any"
+
+#: ../src/mail/em-filter-rule.c:1038
+#| msgid "File _type:"
+msgid "Rul_e type:"
+msgstr "Rul_e type:"
+
+#: ../src/mail/em-filter-rule.c:1056
+#| msgid "_Account:"
+msgid "_For Account:"
+msgstr "_For Account:"
+
#. and now for the action area
-#: ../src/mail/em-filter-rule.c:595
+#: ../src/mail/em-filter-rule.c:1068
msgid "Then"
msgstr "Then"
-#: ../src/mail/em-filter-rule.c:660
+#: ../src/mail/em-filter-rule.c:1141
msgid "Add Ac_tion"
msgstr "Add Ac_tion"
@@ -18262,7 +17822,6 @@ msgid "_Delete old messages"
msgstr "_Delete old messages"
#: ../src/mail/em-folder-properties.c:1018
-#| msgid "Server"
msgid "Server Tag"
msgstr "Server Tag"
@@ -18275,7 +17834,7 @@ msgstr "Label"
msgid "AutoArchive"
msgstr "AutoArchive"
-#: ../src/mail/em-folder-properties.c:1076 ../src/mail/mail-config.ui.h:120
+#: ../src/mail/em-folder-properties.c:1076 ../src/mail/mail-config.ui.h:121
#: ../src/mail/message-list.etspec.h:19
msgid "Labels"
msgstr "Labels"
@@ -18285,7 +17844,6 @@ msgid "Folder Properties"
msgstr "Folder Properties"
#: ../src/mail/em-folder-properties.c:1394
-#| msgid "Category Properties"
msgid "Gathering folder properties"
msgstr "Gathering folder properties"
@@ -18297,8 +17855,7 @@ msgstr "<click here to select a folder>"
msgid "Create a new folder"
msgstr "Create a new folder"
-#: ../src/mail/em-folder-tree.c:683
-#| msgid "Folder names cannot contain '/'"
+#: ../src/mail/em-folder-tree.c:682
msgid "Folder names cannot contain “/â€"
msgstr "Folder names cannot contain “/â€"
@@ -18320,37 +17877,37 @@ msgstr "Folder names cannot contain “/â€"
#. * Do not translate the "folder-display|" part. Remove it
#. * from your translation.
#.
-#: ../src/mail/em-folder-tree.c:877
+#: ../src/mail/em-folder-tree.c:876
#, c-format
msgctxt "folder-display"
msgid "%s (%u%s)"
msgstr "%s (%u%s)"
-#: ../src/mail/em-folder-tree.c:1742
+#: ../src/mail/em-folder-tree.c:1731
msgid "Mail Folder Tree"
msgstr "Mail Folder Tree"
-#: ../src/mail/em-folder-tree.c:2290 ../src/mail/em-folder-utils.c:83
+#: ../src/mail/em-folder-tree.c:2279
#, c-format
msgid "Moving folder %s"
msgstr "Moving folder %s"
-#: ../src/mail/em-folder-tree.c:2293 ../src/mail/em-folder-utils.c:85
+#: ../src/mail/em-folder-tree.c:2282
#, c-format
msgid "Copying folder %s"
msgstr "Copying folder %s"
-#: ../src/mail/em-folder-tree.c:2300 ../src/mail/message-list.c:2508
+#: ../src/mail/em-folder-tree.c:2289 ../src/mail/message-list.c:2595
#, c-format
msgid "Moving messages into folder %s"
msgstr "Moving messages into folder %s"
-#: ../src/mail/em-folder-tree.c:2304 ../src/mail/message-list.c:2510
+#: ../src/mail/em-folder-tree.c:2293 ../src/mail/message-list.c:2597
#, c-format
msgid "Copying messages into folder %s"
msgstr "Copying messages into folder %s"
-#: ../src/mail/em-folder-tree.c:2323
+#: ../src/mail/em-folder-tree.c:2312
#, c-format
msgid "Cannot drop message(s) into toplevel store"
msgstr "Cannot drop message(s) into toplevel store"
@@ -18362,114 +17919,140 @@ msgid "UNMATCHED"
msgstr "UNMATCHED"
#: ../src/mail/em-folder-tree-model.c:1326
-#: ../src/mail/em-folder-tree-model.c:1702
+#: ../src/mail/em-folder-tree-model.c:1703
msgid "Loading..."
msgstr "Loading…"
-#: ../src/mail/em-folder-utils.c:502
+#: ../src/mail/em-folder-utils.c:111
+#, c-format
+#| msgid "Removing folder “%sâ€"
+msgid "Moving folder “%sâ€"
+msgstr "Moving folder “%sâ€"
+
+#: ../src/mail/em-folder-utils.c:113
+#, c-format
+#| msgid "Storing folder “%sâ€"
+msgid "Copying folder “%sâ€"
+msgstr "Copying folder “%sâ€"
+
+#: ../src/mail/em-folder-utils.c:252
+#, c-format
+#| msgid "Removing folder “%sâ€"
+msgid "Moving folder “%s†(%d/%d)"
+msgstr "Moving folder “%s†(%d/%d)"
+
+#: ../src/mail/em-folder-utils.c:252
+#, c-format
+#| msgid "Storing folder “%sâ€"
+msgid "Copying folder “%s†(%d/%d)"
+msgstr "Copying folder “%s†(%d/%d)"
+
+#: ../src/mail/em-folder-utils.c:569
msgid "Move Folder To"
msgstr "Move Folder To"
-#: ../src/mail/em-folder-utils.c:502
+#: ../src/mail/em-folder-utils.c:569
msgid "Copy Folder To"
msgstr "Copy Folder To"
-#: ../src/mail/em-subscription-editor.c:855
+#: ../src/mail/em-subscription-editor.c:813
msgid "_Subscribe"
msgstr "_Subscribe"
-#: ../src/mail/em-subscription-editor.c:864
+#: ../src/mail/em-subscription-editor.c:822
msgid "Su_bscribe To Shown"
msgstr "Su_bscribe To Shown"
-#: ../src/mail/em-subscription-editor.c:872
+#: ../src/mail/em-subscription-editor.c:830
msgid "Subscribe To _All"
msgstr "Subscribe To _All"
-#: ../src/mail/em-subscription-editor.c:970
-#: ../src/mail/em-subscription-editor.c:1914 ../src/mail/mail.error.xml.h:73
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
+#: ../src/mail/em-subscription-editor.c:935
+#: ../src/mail/em-subscription-editor.c:1886 ../src/mail/mail.error.xml.h:73
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1749
msgid "_Unsubscribe"
msgstr "_Unsubscribe"
-#: ../src/mail/em-subscription-editor.c:979
+#: ../src/mail/em-subscription-editor.c:944
msgid "Unsu_bscribe From Hidden"
msgstr "Unsu_bscribe From Hidden"
-#: ../src/mail/em-subscription-editor.c:987
+#: ../src/mail/em-subscription-editor.c:952
msgid "Unsubscribe From _All"
msgstr "Unsubscribe From _All"
-#: ../src/mail/em-subscription-editor.c:1339
-#: ../src/modules/mail/e-mail-shell-view-private.c:1003
+#: ../src/mail/em-subscription-editor.c:1311
+#: ../src/modules/mail/e-mail-shell-view-private.c:936
+#: ../src/modules/mail/e-mail-shell-view-private.c:968
+#: ../src/modules/mail/e-mail-shell-view-private.c:1012
#, c-format
msgid "%d unread, "
msgid_plural "%d unread, "
msgstr[0] "%d unread, "
msgstr[1] "%d unread, "
-#: ../src/mail/em-subscription-editor.c:1343
-#: ../src/modules/mail/e-mail-shell-view-private.c:1013
+#: ../src/mail/em-subscription-editor.c:1315
+#: ../src/modules/mail/e-mail-shell-view-private.c:1022
#, c-format
msgid "%d total"
msgid_plural "%d total"
msgstr[0] "%d total"
msgstr[1] "%d total"
-#: ../src/mail/em-subscription-editor.c:1755
+#: ../src/mail/em-subscription-editor.c:1727
msgid "Folder Subscriptions"
msgstr "Folder Subscriptions"
-#: ../src/mail/em-subscription-editor.c:1790
+#: ../src/mail/em-subscription-editor.c:1762
msgid "_Account:"
msgstr "_Account:"
-#: ../src/mail/em-subscription-editor.c:1803
+#: ../src/mail/em-subscription-editor.c:1775
msgid "Clear Search"
msgstr "Clear Search"
-#: ../src/mail/em-subscription-editor.c:1820
+#: ../src/mail/em-subscription-editor.c:1792
msgid "Sho_w items that contain:"
msgstr "Sho_w items that contain:"
-#: ../src/mail/em-subscription-editor.c:1867
+#: ../src/mail/em-subscription-editor.c:1839
msgid "Subscribe to the selected folder"
msgstr "Subscribe to the selected folder"
-#: ../src/mail/em-subscription-editor.c:1868
+#: ../src/mail/em-subscription-editor.c:1840
msgid "Su_bscribe"
msgstr "Su_bscribe"
-#: ../src/mail/em-subscription-editor.c:1913
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1753
+#: ../src/mail/em-subscription-editor.c:1885
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
msgid "Unsubscribe from the selected folder"
msgstr "Unsubscribe from the selected folder"
-#: ../src/mail/em-subscription-editor.c:1953
+#: ../src/mail/em-subscription-editor.c:1925
msgid "Collapse all folders"
msgstr "Collapse all folders"
-#: ../src/mail/em-subscription-editor.c:1954
+#: ../src/mail/em-subscription-editor.c:1926
msgid "C_ollapse All"
msgstr "C_ollapse All"
-#: ../src/mail/em-subscription-editor.c:1964
+#: ../src/mail/em-subscription-editor.c:1936
msgid "Expand all folders"
msgstr "Expand all folders"
-#: ../src/mail/em-subscription-editor.c:1965
+#: ../src/mail/em-subscription-editor.c:1937
msgid "E_xpand All"
msgstr "E_xpand All"
-#: ../src/mail/em-subscription-editor.c:1975
+#: ../src/mail/em-subscription-editor.c:1947
msgid "Refresh the folder list"
msgstr "Refresh the folder list"
-#: ../src/mail/em-subscription-editor.c:1987
+#: ../src/mail/em-subscription-editor.c:1959
msgid "Stop the current operation"
msgstr "Stop the current operation"
-#: ../src/mail/em-subscription-editor.c:1988
+#: ../src/mail/em-subscription-editor.c:1960
#: ../src/modules/addressbook/e-book-shell-view-actions.c:1005
msgid "_Stop"
msgstr "_Stop"
@@ -18489,12 +18072,25 @@ msgstr[1] "Are you sure you want to open %d messages at once?"
msgid "Message Filters"
msgstr "Message Filters"
-#: ../src/mail/em-utils.c:950
+#: ../src/mail/em-utils.c:1004
#, c-format
msgid "Messages from %s"
msgstr "Messages from %s"
-#: ../src/mail/em-utils.c:1764
+#. Translators: This is a reply attribution in the message reply subject. Both 'Re'-s in the
'reply-attribution' translation context should translate into the same string.
+#: ../src/mail/em-utils.c:1557
+#| msgid "Redo"
+msgctxt "reply-attribution"
+msgid "Re"
+msgstr "Re"
+
+#. Translators: This is a reply attribution separator in the message reply subject. This should match the
':' in 'Re: %s' in the 'reply-attribution' translation context.
+#: ../src/mail/em-utils.c:1560
+msgctxt "reply-attribution"
+msgid ":"
+msgstr ":"
+
+#: ../src/mail/em-utils.c:1846
msgid "Deleting old messages"
msgstr "Deleting old messages"
@@ -18685,7 +18281,7 @@ msgstr "Important"
msgid "Read"
msgstr "Read"
-#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:134
+#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:135
#: ../src/mail/vfoldertypes.xml.in.h:44
msgid "Junk"
msgstr "Junk"
@@ -18897,7 +18493,7 @@ msgid "Import mail and contacts from KMail."
msgstr "Import mail and contacts from KMail."
#: ../src/mail/importers/kmail-libs.c:150
-#: ../src/modules/mail/e-mail-shell-view-private.c:1034
+#: ../src/modules/mail/e-mail-shell-view-private.c:1043
msgid "Trash"
msgstr "Wastebasket"
@@ -18915,7 +18511,6 @@ msgstr "Importing mail and contacts from KMail"
#: ../src/plugins/dbx-import/dbx-importer.c:605
#: ../src/plugins/pst-import/pst-importer.c:756
#, c-format
-#| msgid "Importing '%s'"
msgid "Importing “%sâ€"
msgstr "Importing “%sâ€"
@@ -18965,16 +18560,8 @@ msgstr "Add Filter Rule"
#. * folder. For more than one filter rule is each of
#. * them on a separate line, with four spaces in front
#. * of its name, without quotes.
-#: ../src/mail/mail-autofilter.c:509
+#: ../src/mail/mail-autofilter.c:551
#, c-format
-#| msgid ""
-#| "The filter rule \"%s\" has been modified to account for the deleted "
-#| "folder\n"
-#| "\"%s\"."
-#| msgid_plural ""
-#| "The following filter rules\n"
-#| "%s have been modified to account for the deleted folder\n"
-#| "\"%s\"."
msgid ""
"The filter rule “%s†has been modified to account for the deleted folder\n"
"“%sâ€."
@@ -18990,6 +18577,11 @@ msgstr[1] ""
"%s have been modified to account for the deleted folder\n"
"“%sâ€."
+#: ../src/mail/mail-autofilter.c:559
+#| msgid "Message Filters"
+msgid "Open Message Filters"
+msgstr "Open Message Filters"
+
#: ../src/mail/mail-config.ui.h:1
msgid "Set custom junk header"
msgstr "Set custom junk header"
@@ -19260,7 +18852,7 @@ msgid "Highlight _quotations with"
msgstr "Highlight _quotations with"
#: ../src/mail/mail-config.ui.h:95
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
msgid "Pick a color"
msgstr "Pick a colour"
@@ -19293,132 +18885,136 @@ msgid "Confirm _when expunging a folder"
msgstr "Confirm _when expunging a folder"
#: ../src/mail/mail-config.ui.h:103
-#| msgid "Confirm _when expunging a folder"
msgid "Confirm when emptying a _Junk folder"
msgstr "Confirm when emptying a _Junk folder"
#: ../src/mail/mail-config.ui.h:104
+#| msgid "Go to the section %s of the message"
+msgid "Go to the previ_ous message after message deletion"
+msgstr "Go to the previ_ous message after message deletion"
+
+#: ../src/mail/mail-config.ui.h:105
msgid "Archive Mail"
msgstr "Archive Mail"
-#: ../src/mail/mail-config.ui.h:105
+#: ../src/mail/mail-config.ui.h:106
msgid "Archive folder to use for On This Computer messages"
msgstr "Archive folder to use for On This Computer messages"
-#: ../src/mail/mail-config.ui.h:106
+#: ../src/mail/mail-config.ui.h:107
msgid "On This Computer A_rchive folder:"
msgstr "On This Computer A_rchive folder:"
#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../src/mail/mail-config.ui.h:108
+#: ../src/mail/mail-config.ui.h:109
msgid "_Show animated images"
msgstr "_Show animated images"
-#: ../src/mail/mail-config.ui.h:109
+#: ../src/mail/mail-config.ui.h:110
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"
-#: ../src/mail/mail-config.ui.h:110
+#: ../src/mail/mail-config.ui.h:111
msgid "Loading Remote Content"
msgstr "Loading Remote Content"
-#: ../src/mail/mail-config.ui.h:111
+#: ../src/mail/mail-config.ui.h:112
msgid "_Never load remote content from the Internet"
msgstr "_Never load remote content from the Internet"
-#: ../src/mail/mail-config.ui.h:112
+#: ../src/mail/mail-config.ui.h:113
msgid "_Load remote content only in messages from contacts"
msgstr "_Load remote content only in messages from contacts"
-#: ../src/mail/mail-config.ui.h:113
+#: ../src/mail/mail-config.ui.h:114
msgid "_Always load remote content from the Internet"
msgstr "_Always load remote content from the Internet"
-#: ../src/mail/mail-config.ui.h:114
+#: ../src/mail/mail-config.ui.h:115
msgid "Notify about _missing remote content in the message preview"
msgstr "Notify about _missing remote content in the message preview"
-#: ../src/mail/mail-config.ui.h:115
+#: ../src/mail/mail-config.ui.h:116
msgid "Add"
msgstr "Add"
-#: ../src/mail/mail-config.ui.h:116
+#: ../src/mail/mail-config.ui.h:117
msgid "Remove"
msgstr "Remove"
-#: ../src/mail/mail-config.ui.h:117
+#: ../src/mail/mail-config.ui.h:118
msgid "Allow for sites:"
msgstr "Allow for sites:"
-#: ../src/mail/mail-config.ui.h:118
+#: ../src/mail/mail-config.ui.h:119
msgid "Allow for senders:"
msgstr "Allow for senders:"
-#: ../src/mail/mail-config.ui.h:119
+#: ../src/mail/mail-config.ui.h:120
msgid "HTML Messages"
msgstr "HTML Messages"
-#: ../src/mail/mail-config.ui.h:121
+#: ../src/mail/mail-config.ui.h:122
msgid "Sender Photograph"
msgstr "Sender Photograph"
-#: ../src/mail/mail-config.ui.h:122
+#: ../src/mail/mail-config.ui.h:123
msgid "_Show the photograph of sender in the message preview"
msgstr "_Show the photograph of sender in the message preview"
-#: ../src/mail/mail-config.ui.h:123
+#: ../src/mail/mail-config.ui.h:124
msgid "Search gra_vatar.com for the photograph of sender"
msgstr "Search gra_vatar.com for the photograph of sender"
-#: ../src/mail/mail-config.ui.h:124
+#: ../src/mail/mail-config.ui.h:125
msgid "Displayed Message Headers"
msgstr "Displayed Message Headers"
-#: ../src/mail/mail-config.ui.h:125
+#: ../src/mail/mail-config.ui.h:126
msgid "Mail Headers Table"
msgstr "Mail Headers Table"
-#: ../src/mail/mail-config.ui.h:126
+#: ../src/mail/mail-config.ui.h:127
#: ../src/modules/addressbook/autocompletion-config.c:118
#: ../src/modules/calendar/e-calendar-preferences.ui.h:45
msgid "Date/Time Format"
msgstr "Date/Time Format"
-#: ../src/mail/mail-config.ui.h:128
+#: ../src/mail/mail-config.ui.h:129
msgid "Check incoming _messages for junk"
msgstr "Check incoming _messages for junk"
-#: ../src/mail/mail-config.ui.h:129
+#: ../src/mail/mail-config.ui.h:130
msgid "_Delete junk messages"
msgstr "_Delete junk messages"
-#: ../src/mail/mail-config.ui.h:130
+#: ../src/mail/mail-config.ui.h:131
msgid "Junk Test Options"
msgstr "Junk Test Options"
-#: ../src/mail/mail-config.ui.h:131
+#: ../src/mail/mail-config.ui.h:132
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"
-#: ../src/mail/mail-config.ui.h:132
+#: ../src/mail/mail-config.ui.h:133
msgid "_Lookup in local address book only"
msgstr "_Look up in local address book only"
-#: ../src/mail/mail-config.ui.h:133
+#: ../src/mail/mail-config.ui.h:134
msgid "Check cu_stom headers for junk"
msgstr "Check cu_stom headers for junk"
-#: ../src/mail/mail-config.ui.h:135
+#: ../src/mail/mail-config.ui.h:136
#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:302
#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:245
msgid "No encryption"
msgstr "No encryption"
-#: ../src/mail/mail-config.ui.h:136
+#: ../src/mail/mail-config.ui.h:137
msgid "TLS encryption"
msgstr "TLS encryption"
-#: ../src/mail/mail-config.ui.h:137
+#: ../src/mail/mail-config.ui.h:138
msgid "SSL encryption"
msgstr "SSL encryption"
@@ -19455,9 +19051,6 @@ msgid "Review"
msgstr "Review"
#: ../src/mail/mail-dialogs.ui.h:12
-#| msgid ""
-#| "The messages you have selected for follow up are listed below.\n"
-#| "Please select a follow up action from the \"Flag\" menu."
msgid ""
"The messages you have selected for follow up are listed below.\n"
"Please select a follow up action from the “Flag†menu."
@@ -19515,7 +19108,6 @@ msgstr ""
"authentication at all."
#: ../src/mail/mail.error.xml.h:3
-#| msgid "Your login to your server \"{0}\" as \"{0}\" failed."
msgid "Your login to your server “{0}†as “{0}†failed."
msgstr "Your login to your server “{0}†as “{0}†failed."
@@ -19668,11 +19260,6 @@ msgid "Use default drafts folder?"
msgstr "Use default drafts folder?"
#: ../src/mail/mail.error.xml.h:34
-#| msgid ""
-#| "Unable to open the drafts folder for this account. Use the system drafts "
-#| "folder instead?\n"
-#| "\n"
-#| "The reported error was "{0}"."
msgid ""
"Unable to open the drafts folder for this account. Use the system drafts "
"folder instead?\n"
@@ -19689,9 +19276,6 @@ msgid "Use _Default"
msgstr "Use _Default"
#: ../src/mail/mail.error.xml.h:38
-#| msgid ""
-#| "Are you sure you want to permanently remove all the deleted messages in "
-#| "folder \"{0}\"?"
msgid ""
"Are you sure you want to permanently remove all the deleted messages in "
"folder “{0}�"
@@ -19716,7 +19300,7 @@ msgstr ""
"folders?"
#: ../src/mail/mail.error.xml.h:42
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1631
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1629
msgid "_Empty Trash"
msgstr "_Empty Wastebasket"
@@ -19760,17 +19344,14 @@ msgid "Error loading filter definitions."
msgstr "Error loading filter definitions."
#: ../src/mail/mail.error.xml.h:54
-#| msgid "Cannot save to directory \"{0}\"."
msgid "Cannot save to directory “{0}â€."
msgstr "Cannot save to directory “{0}â€."
#: ../src/mail/mail.error.xml.h:55
-#| msgid "Cannot save to file \"{0}\"."
msgid "Cannot save to file “{0}â€."
msgstr "Cannot save to file “{0}â€."
#: ../src/mail/mail.error.xml.h:56
-#| msgid "Cannot create the save directory, because \"{1}\""
msgid "Cannot create the save directory, because “{1}â€"
msgstr "Cannot create the save directory, because “{1}â€"
@@ -19787,12 +19368,10 @@ msgid "File exists but is not a regular file."
msgstr "File exists but is not a regular file."
#: ../src/mail/mail.error.xml.h:60
-#| msgid "Cannot delete folder \"{0}\"."
msgid "Cannot delete folder “{0}â€."
msgstr "Cannot delete folder “{0}â€."
#: ../src/mail/mail.error.xml.h:61
-#| msgid "Cannot delete system folder \"{0}\"."
msgid "Cannot delete system folder “{0}â€."
msgstr "Cannot delete system folder “{0}â€."
@@ -19805,29 +19384,22 @@ msgstr ""
"be renamed, moved, or deleted."
#: ../src/mail/mail.error.xml.h:63
-#| msgid "Failed to expunge folder "{0}"."
msgid "Failed to expunge folder “{0}â€."
msgstr "Failed to expunge folder “{0}â€."
#: ../src/mail/mail.error.xml.h:65
-#| msgid "Failed to refresh folder "{0}"."
msgid "Failed to refresh folder “{0}â€."
msgstr "Failed to refresh folder “{0}â€."
#: ../src/mail/mail.error.xml.h:66
-#| msgid "Cannot rename or move system folder \"{0}\"."
msgid "Cannot rename or move system folder “{0}â€."
msgstr "Cannot rename or move system folder “{0}â€."
#: ../src/mail/mail.error.xml.h:67
-#| msgid "Really delete folder \"{0}\" and all of its subfolders?"
msgid "Really delete folder “{0}†and all of its subfolders?"
msgstr "Really delete folder “{0}†and all of its subfolders?"
#: ../src/mail/mail.error.xml.h:68
-#| msgid ""
-#| "If you delete the folder, all of its contents and its subfolders' "
-#| "contents will be deleted permanently."
msgid ""
"If you delete the folder, all of its contents and its subfolders’ contents "
"will be deleted permanently."
@@ -19836,15 +19408,10 @@ msgstr ""
"will be deleted permanently."
#: ../src/mail/mail.error.xml.h:70
-#| msgid "Really unsubscribe folder \"{0}\"?"
msgid "Really unsubscribe folder “{0}�"
msgstr "Really unsubscribe folder “{0}�"
#: ../src/mail/mail.error.xml.h:71
-#| msgid ""
-#| "If you unsubscribe the folder, it might not be visible in the Evolution, "
-#| "while still being available on the server. You can re-subscribe in Folder-"
-#| ">Subscriptions... menu."
msgid ""
"If you unsubscribe the folder, it might not be visible in the Evolution, "
"while still being available on the server. You can re-subscribe in "
@@ -19859,7 +19426,6 @@ msgid "Do _Not Unsubscribe"
msgstr "Do _Not Unsubscribe"
#: ../src/mail/mail.error.xml.h:74
-#| msgid "Really delete folder \"{0}\"?"
msgid "Really delete folder “{0}�"
msgstr "Really delete folder “{0}�"
@@ -19884,17 +19450,14 @@ msgstr ""
"they physically reside. Do you really want to delete these messages?"
#: ../src/mail/mail.error.xml.h:78
-#| msgid "Cannot rename \"{0}\" to \"{1}\"."
msgid "Cannot rename “{0}†to “{1}â€."
msgstr "Cannot rename “{0}†to “{1}â€."
#: ../src/mail/mail.error.xml.h:79
-#| msgid "A folder named \"{1}\" already exists. Please use a different name."
msgid "A folder named “{1}†already exists. Please use a different name."
msgstr "A folder named “{1}†already exists. Please use a different name."
#: ../src/mail/mail.error.xml.h:80
-#| msgid "Cannot move folder \"{0}\" to \"{1}\"."
msgid "Cannot move folder “{0}†to “{1}â€."
msgstr "Cannot move folder “{0}†to “{1}â€."
@@ -19907,12 +19470,10 @@ msgid "Cannot open target folder. Error: {2}"
msgstr "Cannot open target folder. Error: {2}"
#: ../src/mail/mail.error.xml.h:83
-#| msgid "Cannot copy folder \"{0}\" to \"{1}\"."
msgid "Cannot copy folder “{0}†to “{1}â€."
msgstr "Cannot copy folder “{0}†to “{1}â€."
#: ../src/mail/mail.error.xml.h:84
-#| msgid "Cannot create folder \"{0}\"."
msgid "Cannot create folder “{0}â€."
msgstr "Cannot create folder “{0}â€."
@@ -19933,7 +19494,6 @@ msgid "You may not create two accounts with the same name."
msgstr "You may not create two accounts with the same name."
#: ../src/mail/mail.error.xml.h:89
-#| msgid "Are you sure you want to delete this account?"
msgid "Are you sure you want to delete account “{0}�"
msgstr "Are you sure you want to delete account “{0}�"
@@ -19972,7 +19532,6 @@ msgid "_Disable"
msgstr "_Disable"
#: ../src/mail/mail.error.xml.h:98
-#| msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
msgid "Cannot edit Search Folder “{0}†as it does not exist."
msgstr "Cannot edit Search Folder “{0}†as it does not exist."
@@ -19985,12 +19544,10 @@ msgstr ""
"go to the Search Folder editor to add it explicitly, if required."
#: ../src/mail/mail.error.xml.h:101
-#| msgid "Cannot add Search Folder \"{0}\"."
msgid "Cannot add Search Folder “{0}â€."
msgstr "Cannot add Search Folder “{0}â€."
#: ../src/mail/mail.error.xml.h:102
-#| msgid "A folder named \"{0}\" already exists. Please use a different name."
msgid "A folder named “{0}†already exists. Please use a different name."
msgstr "A folder named “{0}†already exists. Please use a different name."
@@ -20029,16 +19586,10 @@ msgstr ""
"folders, all remote folders, or both."
#: ../src/mail/mail.error.xml.h:112
-#| msgid "Problem migrating old mail folder \"{0}\"."
msgid "Problem migrating old mail folder “{0}â€."
msgstr "Problem migrating old mail folder “{0}â€."
#: ../src/mail/mail.error.xml.h:113
-#| msgid ""
-#| "A non-empty folder at \"{1}\" already exists.\n"
-#| "\n"
-#| "You can choose to ignore this folder, overwrite or append its contents, "
-#| "or quit."
msgid ""
"A non-empty folder at “{1}†already exists.\n"
"\n"
@@ -20059,19 +19610,10 @@ msgid "_Append"
msgstr "_Append"
#: ../src/mail/mail.error.xml.h:119
-#| msgid "Evolution's local mail format has changed."
msgid "Evolution’s local mail format has changed."
msgstr "Evolution’s local mail format has changed."
#: ../src/mail/mail.error.xml.h:120
-#| msgid ""
-#| "Evolution's local mail format has changed from mbox to Maildir. Your "
-#| "local mail must be migrated to the new format before Evolution can "
-#| "proceed. Do you want to migrate now?\n"
-#| "\n"
-#| "An mbox account will be created to preserve the old mbox folders. You can "
-#| "delete the account after ensuring the data is safely migrated. Please "
-#| "make sure there is enough disk space if you choose to migrate now."
msgid ""
"Evolution’s local mail format has changed from mbox to Maildir. Your local "
"mail must be migrated to the new format before Evolution can proceed. Do you "
@@ -20102,9 +19644,6 @@ msgid "Unable to read license file."
msgstr "Unable to read licence file."
#: ../src/mail/mail.error.xml.h:126
-#| msgid ""
-#| "Cannot read the license file \"{0}\", due to an installation problem. You "
-#| "will not be able to use this provider until you can accept its license."
msgid ""
"Cannot read the license file “{0}â€, due to an installation problem. You will "
"not be able to use this provider until you can accept its license."
@@ -20195,7 +19734,6 @@ msgid "Copy folder in folder tree."
msgstr "Copy folder in folder tree."
#: ../src/mail/mail.error.xml.h:145
-#| msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
msgid "Are you sure you want to copy folder “{0}†to folder “{1}�"
msgstr "Are you sure you want to copy folder “{0}†to folder “{1}�"
@@ -20216,7 +19754,6 @@ msgid "Move folder in folder tree."
msgstr "Move folder in folder tree."
#: ../src/mail/mail.error.xml.h:151
-#| msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
msgid "Are you sure you want to to move folder “{0}†to folder “{1}�"
msgstr "Are you sure you want to to move folder “{0}†to folder “{1}�"
@@ -20246,8 +19783,6 @@ msgid "Please enable the account or send using another account."
msgstr "Please enable the account or send using another account."
#: ../src/mail/mail.error.xml.h:158
-#| msgid ""
-#| "This message cannot be sent because you have not specified any recipients"
msgid "This message cannot be sent because there is no mail account configured"
msgstr ""
"This message cannot be sent because there is no mail account configured"
@@ -20269,17 +19804,14 @@ msgid "You do not have sufficient permissions to delete this mail."
msgstr "You do not have sufficient permissions to delete this mail."
#: ../src/mail/mail.error.xml.h:162
-#| msgid "\"Check Junk\" Failed"
msgid "“Check Junk†Failed"
msgstr "“Check Junk†Failed"
#: ../src/mail/mail.error.xml.h:163
-#| msgid "\"Report Junk\" Failed"
msgid "“Report Junk†Failed"
msgstr "“Report Junk†Failed"
#: ../src/mail/mail.error.xml.h:164
-#| msgid "\"Report Not Junk\" Failed"
msgid "“Report Not Junk†Failed"
msgstr "“Report Not Junk†Failed"
@@ -20293,22 +19825,18 @@ msgstr "No duplicate messages found."
#. Translators: {0} is replaced with a folder name
#: ../src/mail/mail.error.xml.h:168
-#| msgid "Folder '{0}' doesn't contain any duplicate message."
msgid "Folder “{0}†doesn’t contain any duplicate message."
msgstr "Folder “{0}†doesn’t contain any duplicate message."
#: ../src/mail/mail.error.xml.h:169
-#| msgid "Failed to connect mail account '{0}'"
msgid "Failed to connect account “{0}â€."
msgstr "Failed to connect account “{0}â€."
#: ../src/mail/mail.error.xml.h:170
-#| msgid "Failed to disconnect account "{0}"."
msgid "Failed to disconnect account “{0}â€."
msgstr "Failed to disconnect account “{0}â€."
#: ../src/mail/mail.error.xml.h:171
-#| msgid "Failed to unsubscribe from folder "{0}"."
msgid "Failed to unsubscribe from folder “{0}â€."
msgstr "Failed to unsubscribe from folder “{0}â€."
@@ -20325,12 +19853,6 @@ msgid "Message is not available in offline mode."
msgstr "Message is not available in offline mode."
#: ../src/mail/mail.error.xml.h:175
-#| msgid ""
-#| "This can be due to the message not being downloaded yet. The folder, or "
-#| "the account, can be marked for offline synchronization. Then, once the "
-#| "account is online again, use File->Download Messages for Offline "
-#| "Usage, when this folder is selected, to make sure that all the messages "
-#| "in the folder will be available in offline mode."
msgid ""
"This can be due to the message not being downloaded yet. The folder, or the "
"account, can be marked for offline synchronization. Then, once the account "
@@ -20389,7 +19911,6 @@ msgid "Printing failed."
msgstr "Printing failed."
#: ../src/mail/mail.error.xml.h:187
-#| msgid "The printer replied "{0}"."
msgid "The printer replied “{0}â€."
msgstr "The printer replied “{0}â€."
@@ -20402,27 +19923,22 @@ msgid "You must be working online to complete this operation."
msgstr "You must be working online to complete this operation."
#: ../src/mail/mail.error.xml.h:190
-#| msgid "Message from "{0}" account:"
msgid "Message from “{0}†account:"
msgstr "Message from “{0}†account:"
#: ../src/mail/mail.error.xml.h:191
-#| msgid "Failed to mark thread to be ignored in folder '{0}'"
msgid "Failed to mark thread to be ignored in folder “{0}â€"
msgstr "Failed to mark thread to be ignored in folder “{0}â€"
#: ../src/mail/mail.error.xml.h:192
-#| msgid "Failed to unmark thread from being ignored in folder '{0}'"
msgid "Failed to unmark thread from being ignored in folder “{0}â€"
msgstr "Failed to unmark thread from being ignored in folder “{0}â€"
#: ../src/mail/mail.error.xml.h:193
-#| msgid "Failed to mark subthread to be ignored in folder '{0}'"
msgid "Failed to mark subthread to be ignored in folder “{0}â€"
msgstr "Failed to mark subthread to be ignored in folder “{0}â€"
#: ../src/mail/mail.error.xml.h:194
-#| msgid "Failed to unmark subthread from being ignored in folder '{0}'"
msgid "Failed to unmark subthread from being ignored in folder “{0}â€"
msgstr "Failed to unmark subthread from being ignored in folder “{0}â€"
@@ -20459,18 +19975,15 @@ msgstr "This message note has been changed, but has not been saved."
#. Translators: {0} is the name of the folder where the delete of the message note failed.
#: ../src/mail/mail.error.xml.h:207
-#| msgid "Failed to delete message note in folder '{0}'"
msgid "Failed to delete message note in folder “{0}â€"
msgstr "Failed to delete message note in folder “{0}â€"
#. Translators: {0} is the name of the folder where the store of the message note failed.
#: ../src/mail/mail.error.xml.h:209
-#| msgid "Failed to store message note in folder '{0}'"
msgid "Failed to store message note in folder “{0}â€"
msgstr "Failed to store message note in folder “{0}â€"
#: ../src/mail/mail.error.xml.h:210
-#| msgid "Search for text in the body of the displayed message"
msgid "Something has gone wrong when displaying the message"
msgstr "Something has gone wrong when displaying the message"
@@ -20499,9 +20012,6 @@ msgstr ""
"a bug report in the GNOME bugzilla."
#: ../src/mail/mail.error.xml.h:214
-#| msgid ""
-#| "Are you sure you want to permanently remove all the deleted messages in "
-#| "all folders?"
msgid "Are you sure you want to delete all the messages in the Junk folder?"
msgstr "Are you sure you want to delete all the messages in the Junk folder?"
@@ -20514,56 +20024,60 @@ msgstr ""
"permanently deleted later."
#: ../src/mail/mail.error.xml.h:216
-#| msgid "_Not Junk"
msgid "_Empty Junk"
msgstr "_Empty Junk"
#: ../src/mail/mail.error.xml.h:217
-#| msgid "Failed to open folder."
msgid "Failed to empty Junk folder “{0}â€"
msgstr "Failed to empty Junk folder “{0}â€"
-#: ../src/mail/mail-send-recv.c:192
+#: ../src/mail/mail-send-recv.c:193
msgid "Canceling..."
msgstr "Cancelling…"
-#: ../src/mail/mail-send-recv.c:640
+#: ../src/mail/mail-send-recv.c:581
+#| msgid "_Edit Message"
+msgid "Edit Message"
+msgstr "Edit Message"
+
+#: ../src/mail/mail-send-recv.c:586
+#| msgid "Move to Folder"
+msgid "Open Outbox Folder"
+msgstr "Open Outbox Folder"
+
+#: ../src/mail/mail-send-recv.c:760
msgid "Send & Receive Mail"
msgstr "Send & Receive Mail"
-#: ../src/mail/mail-send-recv.c:654
+#: ../src/mail/mail-send-recv.c:774
msgid "Cancel _All"
msgstr "Cancel _All"
-#: ../src/mail/mail-send-recv.c:744 ../src/mail/mail-send-recv.c:1262
+#: ../src/mail/mail-send-recv.c:864 ../src/mail/mail-send-recv.c:1396
msgid "Updating..."
msgstr "Updating…"
-#: ../src/mail/mail-send-recv.c:744 ../src/mail/mail-send-recv.c:826
+#: ../src/mail/mail-send-recv.c:864 ../src/mail/mail-send-recv.c:946
msgid "Waiting..."
msgstr "Waiting…"
-#: ../src/mail/mail-send-recv.c:1228
+#: ../src/mail/mail-send-recv.c:1362
#, c-format
-#| msgid "Checking for new mail at '%s'"
msgid "Checking for new mail at “%sâ€"
msgstr "Checking for new mail at “%sâ€"
-#: ../src/mail/mail-send-recv.c:1455
+#: ../src/mail/mail-send-recv.c:1589
#, c-format
-#| msgid "Deleting junk and expunging trash at '%s'"
msgid "Deleting junk and expunging trash at “%sâ€"
msgstr "Deleting junk and expunging wastebasket at “%sâ€"
-#: ../src/mail/mail-send-recv.c:1457
+#: ../src/mail/mail-send-recv.c:1591
#, c-format
-#| msgid "Deleting junk at '%s'"
msgid "Deleting junk at “%sâ€"
msgstr "Deleting junk at “%sâ€"
-#: ../src/mail/mail-send-recv.c:1459
+#: ../src/mail/mail-send-recv.c:1593
#, c-format
-#| msgid "Expunging trash at '%s'"
msgid "Expunging trash at “%sâ€"
msgstr "Expunging wastebasket at “%sâ€"
@@ -20579,92 +20093,87 @@ msgstr "Edit Search Folder"
msgid "New Search Folder"
msgstr "New Search Folder"
-#: ../src/mail/message-list.c:300
+#: ../src/mail/message-list.c:305
msgid "Unseen"
msgstr "Unseen"
-#: ../src/mail/message-list.c:301
+#: ../src/mail/message-list.c:306
msgid "Seen"
msgstr "Seen"
-#: ../src/mail/message-list.c:302
+#: ../src/mail/message-list.c:307
msgid "Answered"
msgstr "Answered"
-#: ../src/mail/message-list.c:303
+#: ../src/mail/message-list.c:308
msgid "Forwarded"
msgstr "Forwarded"
-#: ../src/mail/message-list.c:304
+#: ../src/mail/message-list.c:309
msgid "Multiple Unseen Messages"
msgstr "Multiple Unseen Messages"
-#: ../src/mail/message-list.c:305
+#: ../src/mail/message-list.c:310
msgid "Multiple Messages"
msgstr "Multiple Messages"
-#: ../src/mail/message-list.c:318
+#: ../src/mail/message-list.c:323
msgid "Lowest"
msgstr "Lowest"
-#: ../src/mail/message-list.c:319
+#: ../src/mail/message-list.c:324
msgid "Lower"
msgstr "Lower"
-#: ../src/mail/message-list.c:323
+#: ../src/mail/message-list.c:328
msgid "Higher"
msgstr "Higher"
-#: ../src/mail/message-list.c:324
+#: ../src/mail/message-list.c:329
msgid "Highest"
msgstr "Highest"
-#: ../src/mail/message-list.c:470 ../src/mail/message-list.c:6289
+#: ../src/mail/message-list.c:478 ../src/mail/message-list.c:6508
msgid "Generating message list"
msgstr "Generating message list"
#. strftime format of a time,
#. * in 12-hour format, without seconds.
-#: ../src/mail/message-list.c:2074
-#: ../src/modules/itip-formatter/itip-view.c:267
+#: ../src/mail/message-list.c:2117
+#: ../src/modules/itip-formatter/itip-view.c:268
msgid "Today %l:%M %p"
msgstr "Today %l:%M %p"
-#: ../src/mail/message-list.c:2083
+#: ../src/mail/message-list.c:2126
msgid "Yesterday %l:%M %p"
msgstr "Yesterday %l:%M %p"
-#: ../src/mail/message-list.c:2095
+#: ../src/mail/message-list.c:2138
msgid "%a %l:%M %p"
msgstr "%a %l:%M %p"
-#: ../src/mail/message-list.c:2103
+#: ../src/mail/message-list.c:2146
msgid "%b %d %l:%M %p"
msgstr "%d %b %l:%M %p"
-#: ../src/mail/message-list.c:2105
+#: ../src/mail/message-list.c:2148
msgid "%b %d %Y"
msgstr "%d %b %Y"
-#: ../src/mail/message-list.c:3062
+#: ../src/mail/message-list.c:3178
msgid "Select all visible messages"
msgstr "Select all visible messages"
-#: ../src/mail/message-list.c:3781 ../src/mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:3923 ../src/mail/message-list.etspec.h:17
msgid "Messages"
msgstr "Messages"
#. default follow-up flag name to use when clicked in the message list column
-#: ../src/mail/message-list.c:5213
+#: ../src/mail/message-list.c:5387
msgid "Follow-up"
msgstr "Follow-up"
-#: ../src/mail/message-list.c:6228
-#| msgid ""
-#| "No message satisfies your search criteria. Change search criteria by "
-#| "selecting a new Show message filter from the drop down list above or by "
-#| "running a new search either by clearing it with Search->Clear menu item "
-#| "or by changing the query above."
+#: ../src/mail/message-list.c:6447
msgid ""
"No message satisfies your search criteria. Change search criteria by "
"selecting a new Show message filter from the drop down list above or by "
@@ -20676,7 +20185,7 @@ msgstr ""
"running a new search either by clearing it with Search→Clear menu item or by "
"changing the query above."
-#: ../src/mail/message-list.c:6236
+#: ../src/mail/message-list.c:6455
msgid "There are no messages in this folder."
msgstr "There are no messages in this folder."
@@ -20705,7 +20214,6 @@ msgid "Messages To"
msgstr "Messages To"
#: ../src/mail/message-list.etspec.h:20
-#| msgid "Subject - Trimmed"
msgid "Subject — Trimmed"
msgstr "Subject — Trimmed"
@@ -20714,6 +20222,16 @@ msgstr "Subject — Trimmed"
msgid "UID"
msgstr "UID"
+#: ../src/mail/message-list.etspec.h:22
+#| msgid "Sending Mail"
+msgid "Sender Mail"
+msgstr "Sender Mail"
+
+#: ../src/mail/message-list.etspec.h:23
+#| msgid "Recipients"
+msgid "Recipients Mail"
+msgstr "Recipients Mail"
+
#: ../src/mail/searchtypes.xml.in.h:23 ../src/mail/vfoldertypes.xml.in.h:23
msgid "Any header"
msgstr "Any header"
@@ -20723,42 +20241,40 @@ msgid "Subject or Addresses contains"
msgstr "Subject or Addresses contains"
#: ../src/mail/searchtypes.xml.in.h:58
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2179
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2177
msgid "Recipients contain"
msgstr "Recipients contain"
#: ../src/mail/searchtypes.xml.in.h:59
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2172
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2170
msgid "Message contains"
msgstr "Message contains"
#: ../src/mail/searchtypes.xml.in.h:60
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2193
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2191
msgid "Subject contains"
msgstr "Subject contains"
#: ../src/mail/searchtypes.xml.in.h:61
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2186
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2184
msgid "Sender contains"
msgstr "Sender contains"
#: ../src/mail/searchtypes.xml.in.h:62
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2158
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2156
msgid "Body contains"
msgstr "Body contains"
#: ../src/mail/searchtypes.xml.in.h:63
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2165
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2163
msgid "Free form expression"
msgstr "Free form expression"
#: ../src/modules/accounts-window/e-accounts-window-editors.c:275
-#| msgid "Collection"
msgid "Edit Collection"
msgstr "Edit Collection"
#: ../src/modules/accounts-window/e-accounts-window-editors.c:312
-#| msgid "Use for Folders"
msgid "Use for"
msgstr "Use for"
@@ -20768,47 +20284,52 @@ msgid "_Mail"
msgstr "_Mail"
#: ../src/modules/accounts-window/e-accounts-window-editors.c:327
-#| msgid "C_alendar:"
msgid "C_alendar"
msgstr "C_alendar"
-#: ../src/modules/accounts-window/e-accounts-window-editors.c:428
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:476
#: ../src/modules/addressbook/e-book-shell-backend.c:262
#: ../src/modules/addressbook/e-book-shell-view-actions.c:137
msgid "New Address Book"
msgstr "New Address Book"
-#: ../src/modules/accounts-window/e-accounts-window-editors.c:436
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:185
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:484
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:284
#: ../src/modules/calendar/e-memo-shell-view-actions.c:178
msgid "New Memo List"
msgstr "New Memo List"
-#: ../src/modules/accounts-window/e-accounts-window-editors.c:480
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:532
#: ../src/modules/addressbook/e-book-shell-view-actions.c:210
msgid "Address Book Properties"
msgstr "Address Book Properties"
-#: ../src/modules/accounts-window/e-accounts-window-editors.c:484
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:536
#: ../src/modules/calendar/e-cal-shell-view-actions.c:283
msgid "Calendar Properties"
msgstr "Calendar Properties"
-#: ../src/modules/accounts-window/e-accounts-window-editors.c:488
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:540
#: ../src/modules/calendar/e-memo-shell-view-actions.c:250
msgid "Memo List Properties"
msgstr "Memo List Properties"
-#: ../src/modules/accounts-window/e-accounts-window-editors.c:492
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:544
#: ../src/modules/calendar/e-task-shell-view-actions.c:274
msgid "Task List Properties"
msgstr "Task List Properties"
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:75
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:209
#: ../src/modules/accounts-window/e-webdav-browser-page.c:174
-#| msgid "Back"
msgid "_Back"
msgstr "_Back"
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:78
+#| msgid "Finish"
+msgid "_Finish"
+msgstr "_Finish"
+
#: ../src/modules/accounts-window/e-webdav-browser-page.c:195
msgid "_Browse"
msgstr "_Browse"
@@ -20823,7 +20344,7 @@ msgstr ""
#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a
date in message list
#: ../src/modules/addressbook/autocompletion-config.c:124
-#: ../src/modules/mail/em-mailer-prefs.c:1562
+#: ../src/modules/mail/em-mailer-prefs.c:1568
msgid "_Table column:"
msgstr "_Table column:"
@@ -20833,7 +20354,6 @@ msgstr "_Format address according to standard of its destination country"
#. Translators: This is part of a sentence "Open maps with OpenStreetMap" and "Open maps with Google"
#: ../src/modules/addressbook/autocompletion-config.c:143
-#| msgid "Open map"
msgctxt "OpenMap"
msgid "Open _maps with"
msgstr "Open _maps with"
@@ -20846,8 +20366,6 @@ msgstr "OpenStreetMap"
#. Translators: This is part of "Open maps with Google"
#: ../src/modules/addressbook/autocompletion-config.c:153
-#| msgctxt "addressbook-label"
-#| msgid "Google Talk"
msgctxt "OpenMap"
msgid "Google"
msgstr "Google"
@@ -20984,7 +20502,7 @@ msgstr "Show map with all contacts from selected address book"
#: ../src/modules/calendar/e-cal-shell-view-actions.c:1337
#: ../src/modules/calendar/e-memo-shell-view-actions.c:619
#: ../src/modules/calendar/e-task-shell-view-actions.c:745
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1730
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1728
msgid "_Rename..."
msgstr "_Rename…"
@@ -21065,7 +20583,7 @@ msgstr "_Actions"
#: ../src/modules/addressbook/e-book-shell-view-actions.c:1084
#: ../src/modules/calendar/e-memo-shell-view-actions.c:663
#: ../src/modules/calendar/e-task-shell-view-actions.c:817
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1902
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1900
msgid "_Preview"
msgstr "_Preview"
@@ -21099,7 +20617,7 @@ msgstr "Show maps in contact preview window"
#: ../src/modules/addressbook/e-book-shell-view-actions.c:1170
#: ../src/modules/calendar/e-memo-shell-view-actions.c:741
#: ../src/modules/calendar/e-task-shell-view-actions.c:907
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2060
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2058
msgid "_Classic View"
msgstr "_Classic View"
@@ -21110,7 +20628,7 @@ msgstr "Show contact preview below the contact list"
#: ../src/modules/addressbook/e-book-shell-view-actions.c:1177
#: ../src/modules/calendar/e-memo-shell-view-actions.c:748
#: ../src/modules/calendar/e-task-shell-view-actions.c:914
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2067
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2065
msgid "_Vertical View"
msgstr "_Vertical View"
@@ -21129,7 +20647,7 @@ msgstr "Unmatched"
#: ../src/modules/calendar/e-cal-shell-view-actions.c:1706
#: ../src/modules/calendar/e-memo-shell-view-actions.c:775
#: ../src/modules/calendar/e-task-shell-view-actions.c:976
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2151
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2149
#: ../src/shell/e-shell-content.c:637
msgid "Advanced Search"
msgstr "Advanced Search"
@@ -21209,41 +20727,40 @@ msgstr "Choose a backup file to restore"
msgid "Restore from Backup"
msgstr "Restore from Backup"
-#: ../src/modules/backup-restore/evolution-backup-restore.c:285
+#: ../src/modules/backup-restore/evolution-backup-restore.c:304
msgid "Select name of the Evolution backup file"
msgstr "Select name of the Evolution backup file"
-#: ../src/modules/backup-restore/evolution-backup-restore.c:318
+#: ../src/modules/backup-restore/evolution-backup-restore.c:349
msgid "_Restart Evolution after backup"
msgstr "_Restart Evolution after backup"
-#: ../src/modules/backup-restore/evolution-backup-restore.c:353
+#: ../src/modules/backup-restore/evolution-backup-restore.c:384
msgid "Re_start Evolution after restore"
msgstr "Re_start Evolution after restore"
-#: ../src/modules/backup-restore/evolution-backup-restore.c:395
+#: ../src/modules/backup-restore/evolution-backup-restore.c:426
msgid "Select name of the Evolution backup file to restore"
msgstr "Select name of the Evolution backup file to restore"
-#: ../src/modules/backup-restore/evolution-backup-restore.c:404
+#: ../src/modules/backup-restore/evolution-backup-restore.c:435
#, c-format
-#| msgid "Checking content of backup file '%s', please wait..."
msgid "Checking content of backup file “%sâ€, please wait..."
msgstr "Checking content of backup file “%sâ€, please wait..."
-#: ../src/modules/backup-restore/evolution-backup-restore.c:425
+#: ../src/modules/backup-restore/evolution-backup-restore.c:456
msgid "_Back up Evolution Data..."
msgstr "_Back up Evolution Data…"
-#: ../src/modules/backup-restore/evolution-backup-restore.c:427
+#: ../src/modules/backup-restore/evolution-backup-restore.c:458
msgid "Back up Evolution data and settings to an archive file"
msgstr "Back up Evolution data and settings to an archive file"
-#: ../src/modules/backup-restore/evolution-backup-restore.c:432
+#: ../src/modules/backup-restore/evolution-backup-restore.c:463
msgid "R_estore Evolution Data..."
msgstr "R_estore Evolution Data…"
-#: ../src/modules/backup-restore/evolution-backup-restore.c:434
+#: ../src/modules/backup-restore/evolution-backup-restore.c:465
msgid "Restore Evolution data and settings from an archive file"
msgstr "Restore Evolution data and settings from an archive file"
@@ -21310,43 +20827,41 @@ msgstr "Removing temporary backup files"
msgid "Reloading registry service"
msgstr "Reloading registry service"
-#: ../src/modules/backup-restore/evolution-backup-tool.c:899
+#: ../src/modules/backup-restore/evolution-backup-tool.c:903
msgid "Evolution Back Up"
msgstr "Evolution Back Up"
-#: ../src/modules/backup-restore/evolution-backup-tool.c:900
+#: ../src/modules/backup-restore/evolution-backup-tool.c:904
#, c-format
-#| msgid "Backing up to the folder %s"
msgid "Backing up to the file %s"
msgstr "Backing up to the file %s"
-#: ../src/modules/backup-restore/evolution-backup-tool.c:904
+#: ../src/modules/backup-restore/evolution-backup-tool.c:908
msgid "Evolution Restore"
msgstr "Evolution Restore"
-#: ../src/modules/backup-restore/evolution-backup-tool.c:905
+#: ../src/modules/backup-restore/evolution-backup-tool.c:909
#, c-format
-#| msgid "Restoring from the folder %s"
msgid "Restoring from the file %s"
msgstr "Restoring from the file %s"
-#: ../src/modules/backup-restore/evolution-backup-tool.c:974
+#: ../src/modules/backup-restore/evolution-backup-tool.c:978
msgid "Backing up Evolution Data"
msgstr "Backing up Evolution Data"
-#: ../src/modules/backup-restore/evolution-backup-tool.c:975
+#: ../src/modules/backup-restore/evolution-backup-tool.c:979
msgid "Please wait while Evolution is backing up your data."
msgstr "Please wait while Evolution backs up your data."
-#: ../src/modules/backup-restore/evolution-backup-tool.c:977
+#: ../src/modules/backup-restore/evolution-backup-tool.c:981
msgid "Restoring Evolution Data"
msgstr "Restoring Evolution Data"
-#: ../src/modules/backup-restore/evolution-backup-tool.c:978
+#: ../src/modules/backup-restore/evolution-backup-tool.c:982
msgid "Please wait while Evolution is restoring your data."
msgstr "Please wait while Evolution restores your data."
-#: ../src/modules/backup-restore/evolution-backup-tool.c:1000
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1004
msgid "This may take a while depending on the amount of data in your account."
msgstr "This may take a while depending on the amount of data in your account."
@@ -21355,7 +20870,6 @@ msgid "Invalid Evolution backup file"
msgstr "Invalid Evolution backup file"
#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
-#| msgid "File '{0}' is not a valid Evolution backup file."
msgid "File “{0}†is not a valid Evolution backup file."
msgstr "File “{0}†is not a valid Evolution backup file."
@@ -21427,16 +20941,16 @@ msgid "Convert message text to _Unicode"
msgstr "Convert message text to _Unicode"
#: ../src/modules/bogofilter/evolution-bogofilter.c:537
-#: ../src/modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
+#: ../src/modules/bogofilter/org.gnome.Evolution-bogofilter.metainfo.xml.in.h:1
msgid "Bogofilter"
msgstr "Bogofilter"
-#: ../src/modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
+#: ../src/modules/bogofilter/org.gnome.Evolution-bogofilter.metainfo.xml.in.h:2
msgid "Junk filter using Bogofilter"
msgstr "Junk filter using Bogofilter"
#: ../src/modules/book-config-google/evolution-book-config-google.c:93
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:994
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1045
#: ../src/modules/cal-config-google/e-cal-config-google.c:190
#: ../src/modules/cal-config-google/e-cal-config-gtasks.c:115
#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:434
@@ -21444,77 +20958,78 @@ msgstr "Junk filter using Bogofilter"
msgid "User name cannot be empty"
msgstr "User name cannot be empty"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:443
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:418
+#| msgid "Searching for user home, please wait…"
+msgid "Looking up server search bases, please wait…"
+msgstr "Looking up server search bases, please wait…"
+
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:494
msgid "Standard LDAP Port"
msgstr "Standard LDAP Port"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:449
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:632
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:500
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:683
msgid "LDAP over SSL/TLS (deprecated)"
msgstr "LDAP over SSL/TLS (deprecated)"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:455
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:506
msgid "Microsoft Global Catalog"
msgstr "Microsoft Global Catalogue"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:461
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:512
msgid "Microsoft Global Catalog over SSL/TLS"
msgstr "Microsoft Global Catalog over SSL/TLS"
#. Page 1
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:568
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:619
msgid "Connecting to LDAP"
msgstr "Connecting to LDAP"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:585
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:636
msgid "Server Information"
msgstr "Server Information"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:612
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:663
msgid "Port:"
msgstr "Port:"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:620
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:671
#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:246
#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:201
msgid "Port number is not valid"
msgstr "Port number is not valid"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:635
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:686
msgid "StartTLS (recommended)"
msgstr "StartTLS (recommended)"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:637
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:688
msgid "Encryption:"
msgstr "Encryption:"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:661
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:712
#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:323
#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:266
msgid "Authentication"
msgstr "Authentication"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:735
msgid "Anonymous"
msgstr "Anonymous"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:687
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:738
msgid "Using email address"
msgstr "Using e-mail address"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:690
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:741
msgid "Using distinguished name (DN)"
msgstr "Using distinguished name (DN)"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:692
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:743
msgid "Method:"
msgstr "Method:"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:697
-#| msgid ""
-#| "This is the method Evolution will use to authenticate you. Note that "
-#| "setting this to \"Using email address\" requires anonymous access to your "
-#| "LDAP server."
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:748
msgid ""
"This is the method Evolution will use to authenticate you. Note that "
"setting this to “Using email address†requires anonymous access to your LDAP "
@@ -21525,41 +21040,36 @@ msgstr ""
"LDAP server."
#. Page 2
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:712
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:763
msgid "Using LDAP"
msgstr "Using LDAP"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:729
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:780
#: ../src/modules/mail/e-mail-shell-view.c:118
msgid "Searching"
msgstr "Searching"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:751
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:802
msgid "Search Base:"
msgstr "Search Base:"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:755
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:806
msgid "Find Possible Search Bases"
msgstr "Find Possible Search Bases"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:777
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:828
msgid "One Level"
msgstr "One Level"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:779
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:830
msgid "Subtree"
msgstr "Subtree"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:781
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:832
msgid "Search Scope:"
msgstr "Search Scope:"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:786
-#| msgid ""
-#| "The search scope defines how deep you would like the search to extend "
-#| "down the directory tree. A search scope of \"Subtree\" will include all "
-#| "entries below your search base. A search scope of \"One Level\" will "
-#| "only include the entries one level beneath your search base."
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:837
msgid ""
"The search scope defines how deep you would like the search to extend down "
"the directory tree. A search scope of “Subtree†will include all entries "
@@ -21571,27 +21081,27 @@ msgstr ""
"below your search base. A search scope of “One Level†will only include the "
"entries one level beneath your search base."
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:795
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:846
msgid "Search Filter:"
msgstr "Search Filter:"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:807
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:858
msgid "Downloading"
msgstr "Downloading"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:828
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:879
msgid "Limit:"
msgstr "Limit:"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:839
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:890
msgid "contacts"
msgstr "contacts"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:844
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:895
msgid "Browse until limit is reached"
msgstr "Browse until limit is reached"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:979
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1030
#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:415
#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:451
msgid "Server address cannot be empty"
@@ -21622,17 +21132,17 @@ msgid "URL is not a valid http:// nor https:// URL"
msgstr "URL is not a valid http:// nor https:// URL"
#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:110
-#: ../src/modules/cal-config-google/e-google-chooser-button.c:225
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:226
msgid "Choose a Calendar"
msgstr "Choose a Calendar"
#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:114
-#: ../src/modules/cal-config-google/e-google-chooser-button.c:229
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:230
msgid "Choose a Memo List"
msgstr "Choose a Memo List"
#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:118
-#: ../src/modules/cal-config-google/e-google-chooser-button.c:233
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:234
msgid "Choose a Task List"
msgstr "Choose a Task List"
@@ -21668,7 +21178,7 @@ msgstr "Use in Birthdays & Anniversaries calendar"
msgid "Enable Calendars to synchronize"
msgstr "Enable Calendars to synchronise"
-#: ../src/modules/cal-config-google/e-google-chooser-button.c:144
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:145
msgid "Default User Calendar"
msgstr "Default User Calendar"
@@ -21771,37 +21281,31 @@ msgstr "I_mport to Task List"
#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:563
#, c-format
-#| msgid "Copying an event into the calendar '%s'"
msgid "Copying an event into the calendar “%sâ€"
msgstr "Copying an event into the calendar “%sâ€"
#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:564
#, c-format
-#| msgid "Moving an event into the calendar '%s'"
msgid "Moving an event into the calendar “%sâ€"
msgstr "Moving an event into the calendar “%sâ€"
#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:569
#, c-format
-#| msgid "Copying a memo into the memo list '%s'"
msgid "Copying a memo into the memo list “%sâ€"
msgstr "Copying a memo into the memo list “%sâ€"
#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:570
#, c-format
-#| msgid "Moving a memo into the memo list '%s'"
msgid "Moving a memo into the memo list “%sâ€"
msgstr "Moving a memo into the memo list “%sâ€"
#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:575
#, c-format
-#| msgid "Copying a task into the task list '%s'"
msgid "Copying a task into the task list “%sâ€"
msgstr "Copying a task into the task list “%sâ€"
#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:576
#, c-format
-#| msgid "Moving a task into the task list '%s'"
msgid "Moving a task into the task list “%sâ€"
msgstr "Moving a task into the task list “%sâ€"
@@ -21817,42 +21321,41 @@ msgstr "Memo List Selector"
msgid "Task List Selector"
msgstr "Task List Selector"
-#: ../src/modules/calendar/e-calendar-preferences.c:525
-#| msgid "Select the calendars for reminder notification"
+#: ../src/modules/calendar/e-calendar-preferences.c:523
msgid "Selected Calendars for Notifications of Reminders"
msgstr "Selected Calendars for Notifications of Reminders"
-#: ../src/modules/calendar/e-calendar-preferences.c:532
+#: ../src/modules/calendar/e-calendar-preferences.c:530
msgid "Selected Memo Lists for Notifications of Reminders"
msgstr "Selected Memo Lists for Notifications of Reminders"
-#: ../src/modules/calendar/e-calendar-preferences.c:539
+#: ../src/modules/calendar/e-calendar-preferences.c:537
msgid "Selected Task Lists for Notifications of Reminders"
msgstr "Selected Task Lists for Notifications of Reminders"
-#: ../src/modules/calendar/e-calendar-preferences.c:635
+#: ../src/modules/calendar/e-calendar-preferences.c:633
msgid "Meeting Invitations"
msgstr "Meeting Invitations"
-#: ../src/modules/calendar/e-calendar-preferences.c:661
+#: ../src/modules/calendar/e-calendar-preferences.c:659
msgid "_Delete message after acting"
msgstr "_Delete message after acting"
-#: ../src/modules/calendar/e-calendar-preferences.c:675
-#: ../src/modules/calendar/e-calendar-preferences.c:706
+#: ../src/modules/calendar/e-calendar-preferences.c:673
+#: ../src/modules/calendar/e-calendar-preferences.c:704
msgid "Conflict Search"
msgstr "Conflict Search"
#. Source selector
-#: ../src/modules/calendar/e-calendar-preferences.c:690
+#: ../src/modules/calendar/e-calendar-preferences.c:688
msgid "Select the calendars to search for meeting conflicts"
msgstr "Select the calendars to search for meeting conflicts"
-#: ../src/modules/calendar/e-calendar-preferences.c:1102
+#: ../src/modules/calendar/e-calendar-preferences.c:1114
msgid "Ti_me and date:"
msgstr "Ti_me and date:"
-#: ../src/modules/calendar/e-calendar-preferences.c:1103
+#: ../src/modules/calendar/e-calendar-preferences.c:1115
msgid "_Date only:"
msgstr "_Date only:"
@@ -22038,92 +21541,96 @@ msgid "Sc_roll Month View by a week"
msgstr "Sc_roll Month View by a week"
#: ../src/modules/calendar/e-calendar-preferences.ui.h:57
+msgid "Order days in Week View from _left to right"
+msgstr "Order days in Week View from _left to right"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:58
msgid "Alerts"
msgstr "Alerts"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:58
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
msgid "_Ask for confirmation when deleting items"
msgstr "_Ask for confirmation when deleting items"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
msgid "Display"
msgstr "Display"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
-msgid "Task List"
-msgstr "Task List"
-
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
msgid "Highlight t_asks due today"
msgstr "Highlight t_asks due today"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
msgid "Highlight _overdue tasks"
msgstr "Highlight _overdue tasks"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
msgid "_Hide completed tasks after"
msgstr "_Hide completed tasks after"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
+#| msgid "To Do"
+msgid "To Do bar"
+msgstr "To Do bar"
+
#: ../src/modules/calendar/e-calendar-preferences.ui.h:67
+msgid "Show Tasks without _Due date"
+msgstr "Show Tasks without _Due date"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
msgid "Display reminders in _notification area only"
msgstr "Display reminders in _notification area only"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
-#| msgid "Display reminders in _notification area only"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:71
msgid "Keep reminder notification _window always on top"
msgstr "Keep reminder notification _window always on top"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
msgid "Display reminders for completed _tasks"
msgstr "Display reminders for completed _tasks"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
-#| msgid "Display reminders for completed _tasks"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:73
msgid "Display reminders for _past events"
msgstr "Display reminders for _past events"
#. This is the first half of a user preference. "Set default reminder [time-period] before every new
appointment"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
-#| msgid "Default reminder value"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:75
msgid "Set _default reminder"
msgstr "Set _default reminder"
#. This is the last half of a user preference. "Set default reminder [time-period] before every new
appointment"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:74
-#| msgid "before every appointment"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:77
msgid "before every new appointment"
msgstr "before every new appointment"
#. This is the first half of a user preference. "Show a reminder [time-period] before every
anniversary/birthday"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:76
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:79
msgid "Show a _reminder"
msgstr "Show a _reminder"
#. This is the last half of a user preference. "Show a reminder [time-period] before every
anniversary/birthday"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:78
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
msgid "before every anniversary/birthday"
msgstr "before every anniversary/birthday"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:79
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:82
msgid "Default _snooze time (in minutes)"
msgstr "Default _snooze time (in minutes)"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:80
-#| msgid "Select the calendars for reminder notification"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
msgid "Select the sources for reminder notification:"
msgstr "Select the sources for reminder notification:"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:84
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
msgid "Default Free/Busy Server"
msgstr "Default Free/Busy Server"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:90
#, no-c-format
msgid "%u and %d will be replaced by user and domain from the email address."
msgstr "%u and %d will be replaced by user and domain from the e-mail address."
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:91
msgid "Publishing Information"
msgstr "Publishing Information"
@@ -22335,12 +21842,10 @@ msgid "Delete all occurrences"
msgstr "Delete all occurrences"
#: ../src/modules/calendar/e-cal-shell-view-actions.c:1414
-#| msgid "_Edit as New Message..."
msgid "Edit as Ne_w..."
msgstr "Edit as Ne_w..."
#: ../src/modules/calendar/e-cal-shell-view-actions.c:1416
-#| msgid "View the current appointment"
msgid "Edit the current appointment as new"
msgstr "Edit the current appointment as new"
@@ -22445,7 +21950,6 @@ msgid "Active Appointments"
msgstr "Active Appointments"
#: ../src/modules/calendar/e-cal-shell-view-actions.c:1682
-#| msgid "Next 7 Days' Appointments"
msgid "Next 7 Days’ Appointments"
msgstr "Next 7 Days’ Appointments"
@@ -22865,7 +22369,6 @@ msgid "Completed Tasks"
msgstr "Completed Tasks"
#: ../src/modules/calendar/e-task-shell-view-actions.c:945
-#| msgid "Next 7 Days' Tasks"
msgid "Next 7 Days’ Tasks"
msgstr "Next 7 Days’ Tasks"
@@ -22900,44 +22403,103 @@ msgid_plural "%d tasks"
msgstr[0] "%d task"
msgstr[1] "%d tasks"
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:319
-#| msgid "Con_vert to Meeting"
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:324
msgid "Convert to M_eeting"
msgstr "Convert to M_eeting"
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:321
-#| msgid "%s has replied to a meeting request."
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:326
msgid "Convert the message to a meeting request"
msgstr "Convert the message to a meeting request"
#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:357
-#| msgid "Con_vert to Meeting"
msgid "Convert to M_essage"
msgstr "Convert to M_essage"
#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:359
-#| msgid "Compose a new mail message"
msgid "Convert to the mail message"
msgstr "Convert to the mail message"
+#: ../src/modules/config-lookup/e-gnome-config-lookup.c:67
+msgid "Look up e-mail domain on the GNOME server"
+msgstr "Look up e-mail domain on the GNOME server"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:82
#: ../src/modules/config-lookup/e-srv-config-lookup.c:83
+#| msgid "IMAP server"
+msgid "Looking up IMAP server…"
+msgstr "Looking up IMAP server…"
+
#: ../src/modules/config-lookup/e-srv-config-lookup.c:84
-#| msgid "LDAP Servers"
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:85
+#| msgid "POP3 server"
+msgid "Looking up POP3 server…"
+msgstr "Looking up POP3 server…"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:86
+#| msgid "SMTP server"
+msgid "Looking up SMTP server…"
+msgstr "Looking up SMTP server…"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:118
msgid "CalDAV server"
msgstr "CalDAV server"
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:85
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:86
-#| msgid "LDAP Servers"
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
+#| msgid "CalDAV server"
+msgid "Looking up CalDAV server…"
+msgstr "Looking up CalDAV server…"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:89
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:90
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:118
msgid "CardDAV server"
msgstr "CardDAV server"
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
-#| msgid "LDAP Servers"
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:89
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:90
+#| msgid "CardDAV server"
+msgid "Looking up CardDAV server…"
+msgstr "Looking up CardDAV server…"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:91
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:92
msgid "LDAP server"
msgstr "LDAP server"
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:91
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:92
+#| msgid "LDAP server"
+msgid "Looking up LDAP server…"
+msgstr "Looking up LDAP server…"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:234
+msgid "Look up in SRV records"
+msgstr "Look up in SRV records"
+
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:104
+#, c-format
+#| msgid "CalDAV"
+msgid "CalDAV: %s"
+msgstr "CalDAV: %s"
+
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:111
+#, c-format
+#| msgid "CardDAV server"
+msgid "CardDAV: %s"
+msgstr "CardDAV: %s"
+
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:117
+#| msgid "CardDAV server"
+msgid "CalDAV and CardDAV server"
+msgstr "CalDAV and CardDAV server"
+
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:209
+msgid "Look up for a CalDAV/CardDAV server"
+msgstr "Look up for a CalDAV/CardDAV server"
+
#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:162
msgid "ITIP"
msgstr "ITIP"
@@ -22948,194 +22510,194 @@ msgstr "Display part as an invitation"
#. strftime format of a time,
#. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:258
+#: ../src/modules/itip-formatter/itip-view.c:259
msgid "Today %H:%M"
msgstr "Today %H:%M"
#. strftime format of a time,
#. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:262
+#: ../src/modules/itip-formatter/itip-view.c:263
msgid "Today %H:%M:%S"
msgstr "Today %H:%M:%S"
#. strftime format of a time,
#. * in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:271
+#: ../src/modules/itip-formatter/itip-view.c:272
msgid "Today %l:%M:%S %p"
msgstr "Today %l:%M:%S %p"
#. strftime format of a time,
#. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:286
+#: ../src/modules/itip-formatter/itip-view.c:287
msgid "Tomorrow %H:%M"
msgstr "Tomorrow %H:%M"
#. strftime format of a time,
#. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:290
+#: ../src/modules/itip-formatter/itip-view.c:291
msgid "Tomorrow %H:%M:%S"
msgstr "Tomorrow %H:%M:%S"
#. strftime format of a time,
#. * in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:295
+#: ../src/modules/itip-formatter/itip-view.c:296
msgid "Tomorrow %l:%M %p"
msgstr "Tomorrow %l:%M %p"
#. strftime format of a time,
#. * in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:299
+#: ../src/modules/itip-formatter/itip-view.c:300
msgid "Tomorrow %l:%M:%S %p"
msgstr "Tomorrow %l:%M:%S %p"
#. strftime format of a weekday.
-#: ../src/modules/itip-formatter/itip-view.c:318
+#: ../src/modules/itip-formatter/itip-view.c:319
#, c-format
msgid "%A"
msgstr "%A"
#. strftime format of a weekday and a
#. * time, in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:323
+#: ../src/modules/itip-formatter/itip-view.c:324
msgid "%A %H:%M"
msgstr "%A %H:%M"
#. strftime format of a weekday and a
#. * time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:327
+#: ../src/modules/itip-formatter/itip-view.c:328
msgid "%A %H:%M:%S"
msgstr "%A %H:%M:%S"
#. strftime format of a weekday and a
#. * time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:332
+#: ../src/modules/itip-formatter/itip-view.c:333
msgid "%A %l:%M %p"
msgstr "%A %l:%M %p"
#. strftime format of a weekday and a
#. * time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:336
+#: ../src/modules/itip-formatter/itip-view.c:337
msgid "%A %l:%M:%S %p"
msgstr "%A %l:%M:%S %p"
#. strftime format of a weekday and a date
#. * without a year.
-#: ../src/modules/itip-formatter/itip-view.c:345
+#: ../src/modules/itip-formatter/itip-view.c:346
msgid "%A, %B %e"
msgstr "%A %e %B"
#. strftime format of a weekday, a date
#. * without a year and a time,
#. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:351
+#: ../src/modules/itip-formatter/itip-view.c:352
msgid "%A, %B %e %H:%M"
msgstr "%A, %e %B %H:%M"
#. strftime format of a weekday, a date without a year
#. * and a time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:355
+#: ../src/modules/itip-formatter/itip-view.c:356
msgid "%A, %B %e %H:%M:%S"
msgstr "%A, %e %B %H:%M:%S"
#. strftime format of a weekday, a date without a year
#. * and a time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:360
+#: ../src/modules/itip-formatter/itip-view.c:361
msgid "%A, %B %e %l:%M %p"
msgstr "%A, %e %B %l:%M %p"
#. strftime format of a weekday, a date without a year
#. * and a time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:364
+#: ../src/modules/itip-formatter/itip-view.c:365
msgid "%A, %B %e %l:%M:%S %p"
msgstr "%A, %e %B %l:%M:%S %p"
#. strftime format of a weekday and a date.
-#: ../src/modules/itip-formatter/itip-view.c:370
+#: ../src/modules/itip-formatter/itip-view.c:371
msgid "%A, %B %e, %Y"
msgstr "%A, %e %B, %Y"
#. strftime format of a weekday, a date and a
#. * time, in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:375
+#: ../src/modules/itip-formatter/itip-view.c:376
msgid "%A, %B %e, %Y %H:%M"
msgstr "%A, %e %B, %Y %H:%M"
#. strftime format of a weekday, a date and a
#. * time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:379
+#: ../src/modules/itip-formatter/itip-view.c:380
msgid "%A, %B %e, %Y %H:%M:%S"
msgstr "%A, %e %B, %Y %H:%M:%S"
#. strftime format of a weekday, a date and a
#. * time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:384
+#: ../src/modules/itip-formatter/itip-view.c:385
msgid "%A, %B %e, %Y %l:%M %p"
msgstr "%A, %e %B, %Y %l:%M %p"
#. strftime format of a weekday, a date and a
#. * time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:388
+#: ../src/modules/itip-formatter/itip-view.c:389
msgid "%A, %B %e, %Y %l:%M:%S %p"
msgstr "%A, %e %B, %Y %l:%M:%S %p"
-#: ../src/modules/itip-formatter/itip-view.c:426
#: ../src/modules/itip-formatter/itip-view.c:427
-#: ../src/modules/itip-formatter/itip-view.c:516
+#: ../src/modules/itip-formatter/itip-view.c:428
#: ../src/modules/itip-formatter/itip-view.c:517
-#: ../src/modules/itip-formatter/itip-view.c:606
+#: ../src/modules/itip-formatter/itip-view.c:518
+#: ../src/modules/itip-formatter/itip-view.c:607
msgid "An unknown person"
msgstr "An unknown person"
-#: ../src/modules/itip-formatter/itip-view.c:431
-#: ../src/modules/itip-formatter/itip-view.c:521
-#: ../src/modules/itip-formatter/itip-view.c:610
+#: ../src/modules/itip-formatter/itip-view.c:432
+#: ../src/modules/itip-formatter/itip-view.c:522
+#: ../src/modules/itip-formatter/itip-view.c:611
#, c-format
msgid "Please respond on behalf of %s"
msgstr "Please respond on behalf of %s"
-#: ../src/modules/itip-formatter/itip-view.c:433
-#: ../src/modules/itip-formatter/itip-view.c:523
-#: ../src/modules/itip-formatter/itip-view.c:612
+#: ../src/modules/itip-formatter/itip-view.c:434
+#: ../src/modules/itip-formatter/itip-view.c:524
+#: ../src/modules/itip-formatter/itip-view.c:613
#, c-format
msgid "Received on behalf of %s"
msgstr "Received on behalf of %s"
-#: ../src/modules/itip-formatter/itip-view.c:438
+#: ../src/modules/itip-formatter/itip-view.c:439
#, c-format
msgid "%s through %s has published the following meeting information:"
msgstr "%s through %s has published the following meeting information:"
-#: ../src/modules/itip-formatter/itip-view.c:440
+#: ../src/modules/itip-formatter/itip-view.c:441
#, c-format
msgid "%s has published the following meeting information:"
msgstr "%s has published the following meeting information:"
-#: ../src/modules/itip-formatter/itip-view.c:445
+#: ../src/modules/itip-formatter/itip-view.c:446
#, c-format
msgid "%s has delegated the following meeting to you:"
msgstr "%s has delegated the following meeting to you:"
-#: ../src/modules/itip-formatter/itip-view.c:448
+#: ../src/modules/itip-formatter/itip-view.c:449
#, c-format
msgid "%s through %s requests your presence at the following meeting:"
msgstr "%s through %s requests your presence at the following meeting:"
-#: ../src/modules/itip-formatter/itip-view.c:450
+#: ../src/modules/itip-formatter/itip-view.c:451
#, c-format
msgid "%s requests your presence at the following meeting:"
msgstr "%s requests your presence at the following meeting:"
-#: ../src/modules/itip-formatter/itip-view.c:456
+#: ../src/modules/itip-formatter/itip-view.c:457
#, c-format
msgid "%s through %s wishes to add to an existing meeting:"
msgstr "%s through %s wishes to add to an existing meeting:"
-#: ../src/modules/itip-formatter/itip-view.c:458
+#: ../src/modules/itip-formatter/itip-view.c:459
#, c-format
msgid "%s wishes to add to an existing meeting:"
msgstr "%s wishes to add to an existing meeting:"
-#: ../src/modules/itip-formatter/itip-view.c:462
+#: ../src/modules/itip-formatter/itip-view.c:463
#, c-format
msgid ""
"%s through %s wishes to receive the latest information for the following "
@@ -23144,87 +22706,87 @@ msgstr ""
"%s through %s wishes to receive the latest information for the following "
"meeting:"
-#: ../src/modules/itip-formatter/itip-view.c:464
+#: ../src/modules/itip-formatter/itip-view.c:465
#, c-format
msgid "%s wishes to receive the latest information for the following meeting:"
msgstr "%s wishes to receive the latest information for the following meeting:"
-#: ../src/modules/itip-formatter/itip-view.c:468
+#: ../src/modules/itip-formatter/itip-view.c:469
#, c-format
msgid "%s through %s has sent back the following meeting response:"
msgstr "%s through %s has sent back the following meeting response:"
-#: ../src/modules/itip-formatter/itip-view.c:470
+#: ../src/modules/itip-formatter/itip-view.c:471
#, c-format
msgid "%s has sent back the following meeting response:"
msgstr "%s has sent back the following meeting response:"
-#: ../src/modules/itip-formatter/itip-view.c:474
+#: ../src/modules/itip-formatter/itip-view.c:475
#, c-format
msgid "%s through %s has cancelled the following meeting:"
msgstr "%s through %s has cancelled the following meeting:"
-#: ../src/modules/itip-formatter/itip-view.c:476
+#: ../src/modules/itip-formatter/itip-view.c:477
#, c-format
msgid "%s has cancelled the following meeting:"
msgstr "%s has cancelled the following meeting:"
-#: ../src/modules/itip-formatter/itip-view.c:480
+#: ../src/modules/itip-formatter/itip-view.c:481
#, c-format
msgid "%s through %s has proposed the following meeting changes."
msgstr "%s through %s has proposed the following meeting changes."
-#: ../src/modules/itip-formatter/itip-view.c:482
+#: ../src/modules/itip-formatter/itip-view.c:483
#, c-format
msgid "%s has proposed the following meeting changes:"
msgstr "%s has proposed the following meeting changes:"
-#: ../src/modules/itip-formatter/itip-view.c:486
+#: ../src/modules/itip-formatter/itip-view.c:487
#, c-format
msgid "%s through %s has declined the following meeting changes:"
msgstr "%s through %s has declined the following meeting changes:"
-#: ../src/modules/itip-formatter/itip-view.c:488
+#: ../src/modules/itip-formatter/itip-view.c:489
#, c-format
msgid "%s has declined the following meeting changes:"
msgstr "%s has declined the following meeting changes:"
-#: ../src/modules/itip-formatter/itip-view.c:528
+#: ../src/modules/itip-formatter/itip-view.c:529
#, c-format
msgid "%s through %s has published the following task:"
msgstr "%s through %s has published the following task:"
-#: ../src/modules/itip-formatter/itip-view.c:530
+#: ../src/modules/itip-formatter/itip-view.c:531
#, c-format
msgid "%s has published the following task:"
msgstr "%s has published the following task:"
-#: ../src/modules/itip-formatter/itip-view.c:535
+#: ../src/modules/itip-formatter/itip-view.c:536
#, c-format
msgid "%s requests the assignment of %s to the following task:"
msgstr "%s requests the assignment of %s to the following task:"
-#: ../src/modules/itip-formatter/itip-view.c:538
+#: ../src/modules/itip-formatter/itip-view.c:539
#, c-format
msgid "%s through %s has assigned you a task:"
msgstr "%s through %s has assigned you a task:"
-#: ../src/modules/itip-formatter/itip-view.c:540
+#: ../src/modules/itip-formatter/itip-view.c:541
#, c-format
msgid "%s has assigned you a task:"
msgstr "%s has assigned you a task:"
-#: ../src/modules/itip-formatter/itip-view.c:546
+#: ../src/modules/itip-formatter/itip-view.c:547
#, c-format
msgid "%s through %s wishes to add to an existing task:"
msgstr "%s through %s wishes to add to an existing task:"
-#: ../src/modules/itip-formatter/itip-view.c:548
+#: ../src/modules/itip-formatter/itip-view.c:549
#, c-format
msgid "%s wishes to add to an existing task:"
msgstr "%s wishes to add to an existing task:"
-#: ../src/modules/itip-formatter/itip-view.c:552
+#: ../src/modules/itip-formatter/itip-view.c:553
#, c-format
msgid ""
"%s through %s wishes to receive the latest information for the following "
@@ -23233,205 +22795,203 @@ msgstr ""
"%s through %s wishes to receive the latest information for the following "
"assigned task:"
-#: ../src/modules/itip-formatter/itip-view.c:554
+#: ../src/modules/itip-formatter/itip-view.c:555
#, c-format
msgid ""
"%s wishes to receive the latest information for the following assigned task:"
msgstr ""
"%s wishes to receive the latest information for the following assigned task:"
-#: ../src/modules/itip-formatter/itip-view.c:558
+#: ../src/modules/itip-formatter/itip-view.c:559
#, c-format
msgid "%s through %s has sent back the following assigned task response:"
msgstr "%s through %s has sent back the following assigned task response:"
-#: ../src/modules/itip-formatter/itip-view.c:560
+#: ../src/modules/itip-formatter/itip-view.c:561
#, c-format
msgid "%s has sent back the following assigned task response:"
msgstr "%s has sent back the following assigned task response:"
-#: ../src/modules/itip-formatter/itip-view.c:564
+#: ../src/modules/itip-formatter/itip-view.c:565
#, c-format
msgid "%s through %s has cancelled the following assigned task:"
msgstr "%s through %s has cancelled the following assigned task:"
-#: ../src/modules/itip-formatter/itip-view.c:566
+#: ../src/modules/itip-formatter/itip-view.c:567
#, c-format
msgid "%s has cancelled the following assigned task:"
msgstr "%s has cancelled the following assigned task:"
-#: ../src/modules/itip-formatter/itip-view.c:570
+#: ../src/modules/itip-formatter/itip-view.c:571
#, c-format
msgid "%s through %s has proposed the following task assignment changes:"
msgstr "%s through %s has proposed the following task assignment changes:"
-#: ../src/modules/itip-formatter/itip-view.c:572
+#: ../src/modules/itip-formatter/itip-view.c:573
#, c-format
msgid "%s has proposed the following task assignment changes:"
msgstr "%s has proposed the following task assignment changes:"
-#: ../src/modules/itip-formatter/itip-view.c:576
+#: ../src/modules/itip-formatter/itip-view.c:577
#, c-format
msgid "%s through %s has declined the following assigned task:"
msgstr "%s through %s has declined the following assigned task:"
-#: ../src/modules/itip-formatter/itip-view.c:578
+#: ../src/modules/itip-formatter/itip-view.c:579
#, c-format
msgid "%s has declined the following assigned task:"
msgstr "%s has declined the following assigned task:"
-#: ../src/modules/itip-formatter/itip-view.c:617
+#: ../src/modules/itip-formatter/itip-view.c:618
#, c-format
msgid "%s through %s has published the following memo:"
msgstr "%s through %s has published the following memo:"
-#: ../src/modules/itip-formatter/itip-view.c:619
+#: ../src/modules/itip-formatter/itip-view.c:620
#, c-format
msgid "%s has published the following memo:"
msgstr "%s has published the following memo:"
-#: ../src/modules/itip-formatter/itip-view.c:624
+#: ../src/modules/itip-formatter/itip-view.c:625
#, c-format
msgid "%s through %s wishes to add to an existing memo:"
msgstr "%s through %s wishes to add to an existing memo:"
-#: ../src/modules/itip-formatter/itip-view.c:626
+#: ../src/modules/itip-formatter/itip-view.c:627
#, c-format
msgid "%s wishes to add to an existing memo:"
msgstr "%s wishes to add to an existing memo:"
-#: ../src/modules/itip-formatter/itip-view.c:630
+#: ../src/modules/itip-formatter/itip-view.c:631
#, c-format
msgid "%s through %s has cancelled the following shared memo:"
msgstr "%s through %s has cancelled the following shared memo:"
-#: ../src/modules/itip-formatter/itip-view.c:632
+#: ../src/modules/itip-formatter/itip-view.c:633
#, c-format
msgid "%s has cancelled the following shared memo:"
msgstr "%s has cancelled the following shared memo:"
-#: ../src/modules/itip-formatter/itip-view.c:857
+#: ../src/modules/itip-formatter/itip-view.c:858
msgid "All day:"
msgstr "All day:"
-#: ../src/modules/itip-formatter/itip-view.c:863
+#: ../src/modules/itip-formatter/itip-view.c:864
msgid "Start day:"
msgstr "Start day:"
-#: ../src/modules/itip-formatter/itip-view.c:863
-#: ../src/modules/itip-formatter/itip-view.c:1679
+#: ../src/modules/itip-formatter/itip-view.c:864
+#: ../src/modules/itip-formatter/itip-view.c:1682
msgid "Start time:"
msgstr "Start time:"
-#: ../src/modules/itip-formatter/itip-view.c:872
+#: ../src/modules/itip-formatter/itip-view.c:873
msgid "End day:"
msgstr "End day:"
-#: ../src/modules/itip-formatter/itip-view.c:872
-#: ../src/modules/itip-formatter/itip-view.c:1680
+#: ../src/modules/itip-formatter/itip-view.c:873
+#: ../src/modules/itip-formatter/itip-view.c:1683
msgid "End time:"
msgstr "End time:"
-#: ../src/modules/itip-formatter/itip-view.c:1210
+#: ../src/modules/itip-formatter/itip-view.c:1213
msgid "Ope_n Calendar"
msgstr "Ope_n Calendar"
-#: ../src/modules/itip-formatter/itip-view.c:1213
+#: ../src/modules/itip-formatter/itip-view.c:1216
msgid "_Decline all"
msgstr "_Decline all"
-#: ../src/modules/itip-formatter/itip-view.c:1216
+#: ../src/modules/itip-formatter/itip-view.c:1219
msgid "_Decline"
msgstr "_Decline"
-#: ../src/modules/itip-formatter/itip-view.c:1219
+#: ../src/modules/itip-formatter/itip-view.c:1222
msgid "_Tentative all"
msgstr "_Tentative all"
-#: ../src/modules/itip-formatter/itip-view.c:1222
+#: ../src/modules/itip-formatter/itip-view.c:1225
msgid "_Tentative"
msgstr "_Tentative"
-#: ../src/modules/itip-formatter/itip-view.c:1225
+#: ../src/modules/itip-formatter/itip-view.c:1228
msgid "Acce_pt all"
msgstr "Acce_pt all"
-#: ../src/modules/itip-formatter/itip-view.c:1228
+#: ../src/modules/itip-formatter/itip-view.c:1231
msgid "Acce_pt"
msgstr "Acce_pt"
-#: ../src/modules/itip-formatter/itip-view.c:1231
+#: ../src/modules/itip-formatter/itip-view.c:1234
msgid "Send _Information"
msgstr "Send _Information"
-#: ../src/modules/itip-formatter/itip-view.c:1234
+#: ../src/modules/itip-formatter/itip-view.c:1237
msgid "_Update Attendee Status"
msgstr "_Update Attendee Status"
-#: ../src/modules/itip-formatter/itip-view.c:1237
+#: ../src/modules/itip-formatter/itip-view.c:1240
#: ../src/smime/gui/certificate-manager.c:1677
msgid "_Update"
msgstr "_Update"
-#: ../src/modules/itip-formatter/itip-view.c:1682
-#: ../src/modules/itip-formatter/itip-view.c:1730
-#: ../src/modules/itip-formatter/itip-view.c:1801
+#: ../src/modules/itip-formatter/itip-view.c:1685
+#: ../src/modules/itip-formatter/itip-view.c:1733
+#: ../src/modules/itip-formatter/itip-view.c:1804
msgid "Comment:"
msgstr "Comment:"
#. RSVP area
-#: ../src/modules/itip-formatter/itip-view.c:1718
+#: ../src/modules/itip-formatter/itip-view.c:1721
msgid "Send reply to sender"
msgstr "Send reply to sender"
#. Updates
-#: ../src/modules/itip-formatter/itip-view.c:1733
+#: ../src/modules/itip-formatter/itip-view.c:1736
msgid "Send _updates to attendees"
msgstr "Send _updates to attendees"
#. The recurrence check button
-#: ../src/modules/itip-formatter/itip-view.c:1736
+#: ../src/modules/itip-formatter/itip-view.c:1739
msgid "_Apply to all instances"
msgstr "_Apply to all instances"
-#: ../src/modules/itip-formatter/itip-view.c:1737
+#: ../src/modules/itip-formatter/itip-view.c:1740
msgid "Show time as _free"
msgstr "Show time as _free"
-#: ../src/modules/itip-formatter/itip-view.c:1738
+#: ../src/modules/itip-formatter/itip-view.c:1741
msgid "_Preserve my reminder"
msgstr "_Preserve my reminder"
-#: ../src/modules/itip-formatter/itip-view.c:1739
+#: ../src/modules/itip-formatter/itip-view.c:1742
msgid "_Inherit reminder"
msgstr "_Inherit reminder"
-#: ../src/modules/itip-formatter/itip-view.c:2048
+#: ../src/modules/itip-formatter/itip-view.c:2051
msgid "_Tasks:"
msgstr "_Tasks:"
-#: ../src/modules/itip-formatter/itip-view.c:2051
+#: ../src/modules/itip-formatter/itip-view.c:2054
msgid "_Memos:"
msgstr "_Memos:"
-#: ../src/modules/itip-formatter/itip-view.c:2964
+#: ../src/modules/itip-formatter/itip-view.c:3111
msgid "Sa_ve"
msgstr "Sa_ve"
-#: ../src/modules/itip-formatter/itip-view.c:3486
-#: ../src/modules/itip-formatter/itip-view.c:5015
+#: ../src/modules/itip-formatter/itip-view.c:3633
+#: ../src/modules/itip-formatter/itip-view.c:5189
msgid "Attendee status updated"
msgstr "Attendee status updated"
-#: ../src/modules/itip-formatter/itip-view.c:3701
+#: ../src/modules/itip-formatter/itip-view.c:3848
#, c-format
-#| msgid "An appointment in the calendar '%s' conflicts with this meeting"
msgid "An appointment “%s†in the calendar “%s†conflicts with this meeting"
msgstr "An appointment “%s†in the calendar “%s†conflicts with this meeting"
-#: ../src/modules/itip-formatter/itip-view.c:3707
+#: ../src/modules/itip-formatter/itip-view.c:3854
#, c-format
-#| msgid "An appointment in the calendar '%s' conflicts with this meeting"
msgid ""
"The calendar “%s†contains an appointment which conflicts with this meeting"
msgid_plural ""
@@ -23441,152 +23001,145 @@ msgstr[0] ""
msgstr[1] ""
"The calendar “%s†contains %d appointments which conflict with this meeting"
-#: ../src/modules/itip-formatter/itip-view.c:3740
+#: ../src/modules/itip-formatter/itip-view.c:3887
#, c-format
-#| msgid "Found the appointment in the calendar '%s'"
msgid "Found the appointment in the calendar “%sâ€"
msgstr "Found the appointment in the calendar “%sâ€"
-#: ../src/modules/itip-formatter/itip-view.c:3749
-#| msgid "The meeting is invalid and cannot be updated"
+#: ../src/modules/itip-formatter/itip-view.c:3896
msgid "This meeting invitation is obsolete. It had been updated."
msgstr "This meeting invitation is obsolete. It had been updated."
-#: ../src/modules/itip-formatter/itip-view.c:3891
+#: ../src/modules/itip-formatter/itip-view.c:4038
msgid "Unable to find any calendars"
msgstr "Unable to find any calendars"
-#: ../src/modules/itip-formatter/itip-view.c:3899
+#: ../src/modules/itip-formatter/itip-view.c:4046
msgid "Unable to find this meeting in any calendar"
msgstr "Unable to find this meeting in any calendar"
-#: ../src/modules/itip-formatter/itip-view.c:3904
+#: ../src/modules/itip-formatter/itip-view.c:4051
msgid "Unable to find this task in any task list"
msgstr "Unable to find this task in any task list"
-#: ../src/modules/itip-formatter/itip-view.c:3909
+#: ../src/modules/itip-formatter/itip-view.c:4056
msgid "Unable to find this memo in any memo list"
msgstr "Unable to find this memo in any memo list"
-#: ../src/modules/itip-formatter/itip-view.c:4250
+#: ../src/modules/itip-formatter/itip-view.c:4397
msgid "Opening the calendar. Please wait..."
msgstr "Opening the calendar. Please wait…"
-#: ../src/modules/itip-formatter/itip-view.c:4255
+#: ../src/modules/itip-formatter/itip-view.c:4402
msgid "Searching for an existing version of this appointment"
msgstr "Searching for an existing version of this appointment"
-#: ../src/modules/itip-formatter/itip-view.c:4654
+#: ../src/modules/itip-formatter/itip-view.c:4801
#, c-format
-#| msgid "Unable to send item to calendar '%s'. %s"
msgid "Unable to send item to calendar “%sâ€. %s"
msgstr "Unable to send item to calendar “%sâ€. %s"
-#: ../src/modules/itip-formatter/itip-view.c:4669
+#: ../src/modules/itip-formatter/itip-view.c:4816
#, c-format
-#| msgid "Sent to calendar '%s' as accepted"
msgid "Sent to calendar “%s†as accepted"
msgstr "Sent to calendar “%s†as accepted"
-#: ../src/modules/itip-formatter/itip-view.c:4674
+#: ../src/modules/itip-formatter/itip-view.c:4821
#, c-format
-#| msgid "Sent to calendar '%s' as tentative"
msgid "Sent to calendar “%s†as tentative"
msgstr "Sent to calendar “%s†as tentative"
-#: ../src/modules/itip-formatter/itip-view.c:4680
+#: ../src/modules/itip-formatter/itip-view.c:4827
#, c-format
-#| msgid "Sent to calendar '%s' as declined"
msgid "Sent to calendar “%s†as declined"
msgstr "Sent to calendar “%s†as declined"
-#: ../src/modules/itip-formatter/itip-view.c:4686
+#: ../src/modules/itip-formatter/itip-view.c:4833
#, c-format
-#| msgid "Sent to calendar '%s' as cancelled"
msgid "Sent to calendar “%s†as cancelled"
msgstr "Sent to calendar “%s†as cancelled"
-#: ../src/modules/itip-formatter/itip-view.c:4706
-#: ../src/modules/itip-formatter/itip-view.c:5152
-#: ../src/modules/itip-formatter/itip-view.c:5255
+#: ../src/modules/itip-formatter/itip-view.c:4869
+#: ../src/modules/itip-formatter/itip-view.c:5326
+#: ../src/modules/itip-formatter/itip-view.c:5429
msgid "Saving changes to the calendar. Please wait..."
msgstr "Saving changes to the calendar. Please wait…"
-#: ../src/modules/itip-formatter/itip-view.c:4747
+#: ../src/modules/itip-formatter/itip-view.c:4921
msgid "Unable to parse item"
msgstr "Unable to parse item"
-#: ../src/modules/itip-formatter/itip-view.c:4939
+#: ../src/modules/itip-formatter/itip-view.c:5113
#, c-format
msgid "Organizer has removed the delegate %s "
msgstr "Organiser has removed the delegate %s "
-#: ../src/modules/itip-formatter/itip-view.c:4956
+#: ../src/modules/itip-formatter/itip-view.c:5130
msgid "Sent a cancelation notice to the delegate"
msgstr "Sent a cancellation notice to the delegate"
-#: ../src/modules/itip-formatter/itip-view.c:4960
+#: ../src/modules/itip-formatter/itip-view.c:5134
msgid "Could not send the cancelation notice to the delegate"
msgstr "Could not send the cancellation notice to the delegate"
-#: ../src/modules/itip-formatter/itip-view.c:5007
+#: ../src/modules/itip-formatter/itip-view.c:5181
#, c-format
msgid "Unable to update attendee. %s"
msgstr "Unable to update attendee. %s"
-#: ../src/modules/itip-formatter/itip-view.c:5042
+#: ../src/modules/itip-formatter/itip-view.c:5216
msgid "The meeting is invalid and cannot be updated"
msgstr "The meeting is invalid and cannot be updated"
-#: ../src/modules/itip-formatter/itip-view.c:5117
+#: ../src/modules/itip-formatter/itip-view.c:5291
msgid "Attendee status could not be updated because the status is invalid"
msgstr "Attendee status could not be updated because the status is invalid"
-#: ../src/modules/itip-formatter/itip-view.c:5188
-#: ../src/modules/itip-formatter/itip-view.c:5226
+#: ../src/modules/itip-formatter/itip-view.c:5362
+#: ../src/modules/itip-formatter/itip-view.c:5400
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"
-#: ../src/modules/itip-formatter/itip-view.c:5287
+#: ../src/modules/itip-formatter/itip-view.c:5461
msgid "Meeting information sent"
msgstr "Meeting information sent"
-#: ../src/modules/itip-formatter/itip-view.c:5292
+#: ../src/modules/itip-formatter/itip-view.c:5466
msgid "Task information sent"
msgstr "Task information sent"
-#: ../src/modules/itip-formatter/itip-view.c:5297
+#: ../src/modules/itip-formatter/itip-view.c:5471
msgid "Memo information sent"
msgstr "Memo information sent"
-#: ../src/modules/itip-formatter/itip-view.c:5308
+#: ../src/modules/itip-formatter/itip-view.c:5482
msgid "Unable to send meeting information, the meeting does not exist"
msgstr "Unable to send meeting information, the meeting does not exist"
-#: ../src/modules/itip-formatter/itip-view.c:5313
+#: ../src/modules/itip-formatter/itip-view.c:5487
msgid "Unable to send task information, the task does not exist"
msgstr "Unable to send task information, the task does not exist"
-#: ../src/modules/itip-formatter/itip-view.c:5318
+#: ../src/modules/itip-formatter/itip-view.c:5492
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.
-#: ../src/modules/itip-formatter/itip-view.c:5383
+#: ../src/modules/itip-formatter/itip-view.c:5557
msgid "calendar.ics"
msgstr "calendar.ics"
-#: ../src/modules/itip-formatter/itip-view.c:5388
+#: ../src/modules/itip-formatter/itip-view.c:5562
msgid "Save Calendar"
msgstr "Save Calendar"
-#: ../src/modules/itip-formatter/itip-view.c:5436
-#: ../src/modules/itip-formatter/itip-view.c:5449
+#: ../src/modules/itip-formatter/itip-view.c:5611
+#: ../src/modules/itip-formatter/itip-view.c:5624
msgid "The calendar attached is not valid"
msgstr "The calendar attached is not valid"
-#: ../src/modules/itip-formatter/itip-view.c:5437
-#: ../src/modules/itip-formatter/itip-view.c:5450
+#: ../src/modules/itip-formatter/itip-view.c:5612
+#: ../src/modules/itip-formatter/itip-view.c:5625
msgid ""
"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
@@ -23594,15 +23147,15 @@ msgstr ""
"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
-#: ../src/modules/itip-formatter/itip-view.c:5492
-#: ../src/modules/itip-formatter/itip-view.c:5522
-#: ../src/modules/itip-formatter/itip-view.c:5625
+#: ../src/modules/itip-formatter/itip-view.c:5667
+#: ../src/modules/itip-formatter/itip-view.c:5748
+#: ../src/modules/itip-formatter/itip-view.c:5844
msgid "The item in the calendar is not valid"
msgstr "The item in the calendar is not valid"
-#: ../src/modules/itip-formatter/itip-view.c:5493
-#: ../src/modules/itip-formatter/itip-view.c:5523
-#: ../src/modules/itip-formatter/itip-view.c:5626
+#: ../src/modules/itip-formatter/itip-view.c:5668
+#: ../src/modules/itip-formatter/itip-view.c:5749
+#: ../src/modules/itip-formatter/itip-view.c:5845
msgid ""
"The message does contain a calendar, but the calendar contains no events, "
"tasks or free/busy information"
@@ -23610,11 +23163,11 @@ msgstr ""
"The message does contain a calendar, but the calendar contains no events, "
"tasks or free/busy information"
-#: ../src/modules/itip-formatter/itip-view.c:5538
+#: ../src/modules/itip-formatter/itip-view.c:5758
msgid "The calendar attached contains multiple items"
msgstr "The calendar attached contains multiple items"
-#: ../src/modules/itip-formatter/itip-view.c:5539
+#: ../src/modules/itip-formatter/itip-view.c:5759
msgid ""
"To process all of these items, the file should be saved and the calendar "
"imported"
@@ -23622,24 +23175,24 @@ msgstr ""
"To process all of these items, the file should be saved and the calendar "
"imported"
-#: ../src/modules/itip-formatter/itip-view.c:6057
+#: ../src/modules/itip-formatter/itip-view.c:6276
msgctxt "cal-itip"
msgid "None"
msgstr "None"
-#: ../src/modules/itip-formatter/itip-view.c:6073
+#: ../src/modules/itip-formatter/itip-view.c:6292
msgid "Tentatively Accepted"
msgstr "Tentatively Accepted"
-#: ../src/modules/itip-formatter/itip-view.c:6239
+#: ../src/modules/itip-formatter/itip-view.c:6460
msgid "This meeting recurs"
msgstr "This meeting recurs"
-#: ../src/modules/itip-formatter/itip-view.c:6242
+#: ../src/modules/itip-formatter/itip-view.c:6463
msgid "This task recurs"
msgstr "This task recurs"
-#: ../src/modules/itip-formatter/itip-view.c:6245
+#: ../src/modules/itip-formatter/itip-view.c:6466
msgid "This memo recurs"
msgstr "This memo recurs"
@@ -23654,45 +23207,40 @@ msgid "This meeting has been delegated"
msgstr "This meeting has been delegated"
#: ../src/modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-#| msgid ""
-#| "'{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}�"
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:283
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:301
msgid "Google Features"
msgstr "Google Features"
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:292
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:310
msgid "Add Google Ca_lendar to this account"
msgstr "Add Google Ca_lendar to this account"
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:301
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:319
msgid "Add Google Con_tacts to this account"
msgstr "Add Google Con_tacts to this account"
#. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
#. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:312
-#| msgid "IMAP Headers"
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:330
msgctxt "GoggleSummary"
msgid "IMAP access"
msgstr "IMAP access"
#. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
#. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:315
-#| msgid "Calendars to run reminders for"
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:333
msgctxt "GoggleSummary"
msgid "Calendars to synchronize"
msgstr "Calendars to synchronise"
#. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
#. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:318
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:336
#, c-format
-#| msgid "You may need to enable IMAP access"
msgctxt "GoggleSummary"
msgid "You may need to enable %s and %s"
msgstr "You may need to enable %s and %s"
@@ -23761,12 +23309,6 @@ msgstr "Mbox spool directory cannot be empty"
msgid "Configuration"
msgstr "Configuration"
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:216
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:172
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:24
-msgid "_Server:"
-msgstr "_Server:"
-
#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:230
#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:185
msgid "_Port:"
@@ -23799,7 +23341,6 @@ msgid "TLS on a dedicated port"
msgstr "TLS on a dedicated port"
#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:75
-#| msgid "_Use custom binary, instead of 'sendmail'"
msgid "_Use custom binary, instead of “sendmailâ€"
msgstr "_Use custom binary, instead of “sendmailâ€"
@@ -23816,10 +23357,6 @@ msgid "Cus_tom arguments:"
msgstr "Cus_tom arguments:"
#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:120
-#| msgid ""
-#| "Default arguments are '-i -f %F -- %R', where\n"
-#| " %F - stands for the From address\n"
-#| " %R - stands for the recipient addresses"
msgid ""
"Default arguments are “-i -f %F -- %Râ€, where\n"
" %F — stands for the From address\n"
@@ -23854,93 +23391,93 @@ msgstr "Yahoo! Features"
msgid "Add Yahoo! Ca_lendar and Tasks to this account"
msgstr "Add Yahoo! Ca_lendar and Tasks to this account"
-#: ../src/modules/mail/e-mail-attachment-handler.c:671
+#: ../src/modules/mail/e-mail-attachment-handler.c:644
#, c-format
msgid "%d attached message"
msgid_plural "%d attached messages"
msgstr[0] "%d attached message"
msgstr[1] "%d attached messages"
-#: ../src/modules/mail/e-mail-shell-backend.c:383
+#: ../src/modules/mail/e-mail-shell-backend.c:399
msgctxt "New"
msgid "_Mail Message"
msgstr "_Mail Message"
-#: ../src/modules/mail/e-mail-shell-backend.c:385
+#: ../src/modules/mail/e-mail-shell-backend.c:401
msgid "Compose a new mail message"
msgstr "Compose a new mail message"
-#: ../src/modules/mail/e-mail-shell-backend.c:393
+#: ../src/modules/mail/e-mail-shell-backend.c:409
msgctxt "New"
msgid "Mail Acco_unt"
msgstr "Mail Acco_unt"
-#: ../src/modules/mail/e-mail-shell-backend.c:395
+#: ../src/modules/mail/e-mail-shell-backend.c:411
msgid "Create a new mail account"
msgstr "Create a new mail account"
-#: ../src/modules/mail/e-mail-shell-backend.c:400
+#: ../src/modules/mail/e-mail-shell-backend.c:416
msgctxt "New"
msgid "Mail _Folder"
msgstr "Mail _Folder"
-#: ../src/modules/mail/e-mail-shell-backend.c:402
+#: ../src/modules/mail/e-mail-shell-backend.c:418
msgid "Create a new mail folder"
msgstr "Create a new mail folder"
#. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
#. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:717
+#: ../src/modules/mail/e-mail-shell-backend.c:733
msgctxt "NetworkMonitor"
msgid "base"
msgstr "base"
#. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
#. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:720
+#: ../src/modules/mail/e-mail-shell-backend.c:736
msgctxt "NetworkMonitor"
msgid "netlink"
msgstr "netlink"
#. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
#. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:723
+#: ../src/modules/mail/e-mail-shell-backend.c:739
msgctxt "NetworkMonitor"
msgid "networkmanager"
msgstr "networkmanager"
-#: ../src/modules/mail/e-mail-shell-backend.c:757
+#: ../src/modules/mail/e-mail-shell-backend.c:769
msgctxt "NetworkMonitor"
msgid "Method to detect _online state:"
msgstr "Method to detect _online state:"
#. Always as the first
-#: ../src/modules/mail/e-mail-shell-backend.c:766
+#: ../src/modules/mail/e-mail-shell-backend.c:778
msgctxt "NetworkMonitor"
msgid "Default"
msgstr "Default"
#. Always as the last
-#: ../src/modules/mail/e-mail-shell-backend.c:780
+#: ../src/modules/mail/e-mail-shell-backend.c:792
msgctxt "NetworkMonitor"
msgid "Always Online"
msgstr "Always Online"
-#: ../src/modules/mail/e-mail-shell-backend.c:849
+#: ../src/modules/mail/e-mail-shell-backend.c:861
msgid "Mail Preferences"
msgstr "Mail Preferences"
-#: ../src/modules/mail/e-mail-shell-backend.c:858
+#: ../src/modules/mail/e-mail-shell-backend.c:870
msgid "Composer Preferences"
msgstr "Composer Preferences"
-#: ../src/modules/mail/e-mail-shell-backend.c:867
+#: ../src/modules/mail/e-mail-shell-backend.c:879
msgid "Network Preferences"
msgstr "Network Preferences"
#. Translators: The first item in the list, to be
#. * able to set rule: [Label] [is/is-not] [None]
-#: ../src/modules/mail/e-mail-shell-backend.c:1220
+#: ../src/modules/mail/e-mail-shell-backend.c:1240
msgctxt "label"
msgid "None"
msgstr "None"
@@ -23957,252 +23494,250 @@ msgstr "Go to Folder"
msgid "_Select"
msgstr "_Select"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1624
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1622
msgid "_Disable Account"
msgstr "_Disable Account"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1626
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1624
msgid "Disable this account"
msgstr "Disable this account"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1633
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1631
msgid "Permanently remove all the deleted messages from all folders"
msgstr "Permanently remove all the deleted messages from all folders"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1638
-#| msgid "Not Junk"
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1636
msgid "Empty _Junk"
msgstr "Empty _Junk"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1640
-#| msgid "Permanently remove all the deleted messages from all folders"
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1638
msgid "Delete all Junk messages from all folders"
msgstr "Delete all Junk messages from all folders"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1647
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1645
msgid "Edit properties of this account"
msgstr "Edit properties of this account"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1654
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1652
msgid "Refresh list of folders of this account"
msgstr "Refresh list of folders of this account"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1659
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1657
msgid "_Download Messages for Offline Usage"
msgstr "_Download Messages for Offline Usage"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1661
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1659
msgid "Download messages of accounts and folders marked for offline usage"
msgstr "Download messages of accounts and folders marked for offline usage"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1666
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1664
msgid "Fl_ush Outbox"
msgstr "Fl_ush Outbox"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1671
msgid "_Copy Folder To..."
msgstr "_Copy Folder To…"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1675
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
msgid "Copy the selected folder into another folder"
msgstr "Copy the selected folder into another folder"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1682
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
msgid "Permanently remove this folder"
msgstr "Permanently remove this folder"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1687
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1685
msgid "E_xpunge"
msgstr "E_xpunge"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1689
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1687
msgid "Permanently remove all deleted messages from this folder"
msgstr "Permanently remove all deleted messages from this folder"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1802
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1692
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1800
msgid "Mar_k All Messages as Read"
msgstr "Mar_k All Messages as Read"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1696
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1804
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1802
msgid "Mark all messages in the folder as read"
msgstr "Mark all messages in the folder as read"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1699
msgid "_Move Folder To..."
msgstr "_Move Folder To…"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1703
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
msgid "Move the selected folder into another folder"
msgstr "Move the selected folder into another folder"
#. Translators: An action caption to create a new mail folder
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1709
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1707
msgid "_New..."
msgstr "_New…"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1711
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1709
msgid "Create a new folder for storing mail"
msgstr "Create a new folder for storing mail"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1718
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1716
msgid "Change the properties of this folder"
msgstr "Change the properties of this folder"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1725
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1723
msgid "Refresh the folder"
msgstr "Refresh the folder"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1732
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1730
msgid "Change the name of this folder"
msgstr "Change the name of this folder"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1737
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1735
msgid "Select Message _Thread"
msgstr "Select Message _Thread"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1739
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1737
msgid "Select all messages in the same thread as the selected message"
msgstr "Select all messages in the same thread as the selected message"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1742
msgid "Select Message S_ubthread"
msgstr "Select Message S_ubthread"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1746
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
msgid "Select all replies to the currently selected message"
msgstr "Select all replies to the currently selected message"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1756
msgid "Empty _Trash"
msgstr "Empty Was_tebasket"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1760
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
msgid "Permanently remove all the deleted messages from all accounts"
msgstr "Permanently remove all the deleted messages from all accounts"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1765
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1763
msgid "Go to _Folder"
msgstr "Go to _Folder"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1767
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1765
msgid "Opens a dialog to select a folder to go to"
msgstr "Opens a dialog to select a folder to go to"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1772
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1770
msgid "_New Label"
msgstr "_New Label"
#. Translators: "None" is used in the message label context menu.
#. * It removes all labels from the selected messages.
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1781
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1779
msgid "N_one"
msgstr "N_one"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1795
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1793
msgid "_Manage Subscriptions"
msgstr "_Manage Subscriptions"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1797
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1881
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1795
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1879
msgid "Subscribe or unsubscribe to folders on remote servers"
msgstr "Subscribe or unsubscribe to folders on remote servers"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1809
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1830
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1807
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1828
msgid "Send / _Receive"
msgstr "Send / _Receive"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1811
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1809
msgid "Send queued items and retrieve new items"
msgstr "Send queued items and retrieve new items"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1816
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1814
msgid "R_eceive All"
msgstr "R_eceive All"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1818
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1816
msgid "Receive new items from all accounts"
msgstr "Receive new items from all accounts"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1823
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1821
msgid "_Send All"
msgstr "_Send All"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1825
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1823
msgid "Send queued items in all accounts"
msgstr "Send queued items in all accounts"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1853
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1851
msgid "Cancel the current mail operation"
msgstr "Cancel the current mail operation"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1858
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1856
msgid "Collapse All _Threads"
msgstr "Collapse All _Threads"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1860
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1858
msgid "Collapse all message threads"
msgstr "Collapse all message threads"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1865
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1863
msgid "E_xpand All Threads"
msgstr "E_xpand All Threads"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1867
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1865
msgid "Expand all message threads"
msgstr "Expand all message threads"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1872
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1870
msgid "_Message Filters"
msgstr "_Message Filters"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1874
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1872
msgid "Create or edit rules for filtering new mail"
msgstr "Create or edit rules for filtering new mail"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1879
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1877
msgid "_Subscriptions..."
msgstr "_Subscriptions…"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1888
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1886
msgid "F_older"
msgstr "F_older"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1895
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1893
msgid "_Label"
msgstr "_Label"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1912
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1910
msgid "C_reate Search Folder From Search..."
msgstr "C_reate Search Folder From Search…"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1919
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1917
msgid "Search F_olders"
msgstr "Search F_olders"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1921
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1919
msgid "Create or edit search folder definitions"
msgstr "Create or edit search folder definitions"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1964
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1962
msgid "_New Folder..."
msgstr "_New Folder…"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1992
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1990
msgid "Show Message _Preview"
msgstr "Show Message _Preview"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1994
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1992
msgid "Show message preview pane"
msgstr "Show message preview pane"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2000
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1998
msgid "Show _Attachment Bar"
msgstr "Show _Attachment Bar"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2002
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2000
msgid ""
"Show Attachment Bar below the message preview pane when the message has "
"attachments"
@@ -24210,109 +23745,107 @@ msgstr ""
"Show Attachment Bar below the message preview pane when the message has "
"attachments"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2008
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2006
msgid "Show _Deleted Messages"
msgstr "Show _Deleted Messages"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2010
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2008
msgid "Show deleted messages with a line through them"
msgstr "Show deleted messages with a line through them"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2016
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2014
msgid "Show _Junk Messages"
msgstr "Show _Junk Messages"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2018
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2016
msgid "Show junk messages with a red line through them"
msgstr "Show junk messages with a red line through them"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2024
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2022
msgid "_Group By Threads"
msgstr "_Group By Threads"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2026
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2024
msgid "Threaded message list"
msgstr "Threaded message list"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2032
-#| msgid "Show _Tool Bar"
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2030
msgid "Show To _Do Bar"
msgstr "Show To _Do Bar"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2034
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2032
msgid "Show To Do bar with appointments and tasks"
msgstr "Show To Do bar with appointments and tasks"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2040
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2038
msgid "_Unmatched Folder Enabled"
msgstr "_Unmatched Folder Enabled"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2042
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2040
msgid "Toggles whether Unmatched search folder is enabled"
msgstr "Toggles whether Unmatched search folder is enabled"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2062
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2060
msgid "Show message preview below the message list"
msgstr "Show message preview below the message list"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2069
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2067
msgid "Show message preview alongside the message list"
msgstr "Show message preview alongside the message list"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2077
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2075
msgid "All Messages"
msgstr "All Messages"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2084
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2082
msgid "Important Messages"
msgstr "Important Messages"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2091
-#| msgid "Last 5 Days' Messages"
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2089
msgid "Last 5 Days’ Messages"
msgstr "Last 5 Days’ Messages"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2098
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2096
msgid "Messages Not Junk"
msgstr "Messages Not Junk"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2105
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2103
msgid "Messages with Attachments"
msgstr "Messages with Attachments"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2112
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2110
msgid "Messages with Notes"
msgstr "Messages with Notes"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2119
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2117
msgid "No Label"
msgstr "No Label"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2126
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2124
msgid "Read Messages"
msgstr "Read Messages"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2133
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2131
msgid "Unread Messages"
msgstr "Unread Messages"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2140
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2138
msgid "Message Thread"
msgstr "Message Thread"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2200
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2198
msgid "Subject or Addresses contain"
msgstr "Subject or Addresses contain"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2210
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2208
msgid "All Accounts"
msgstr "All Accounts"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2217
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2215
msgid "Current Account"
msgstr "Current Account"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2224
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2222
msgid "Current Folder"
msgstr "Current Folder"
@@ -24324,58 +23857,58 @@ msgstr "All Account Search"
msgid "Account Search"
msgstr "Account Search"
-#: ../src/modules/mail/e-mail-shell-view-private.c:931
+#: ../src/modules/mail/e-mail-shell-view-private.c:929
#, c-format
msgid "%d selected, "
msgid_plural "%d selected, "
msgstr[0] "%d selected, "
msgstr[1] "%d selected, "
-#: ../src/modules/mail/e-mail-shell-view-private.c:940
-#: ../src/modules/mail/e-mail-shell-view-private.c:957
+#: ../src/modules/mail/e-mail-shell-view-private.c:944
+#: ../src/modules/mail/e-mail-shell-view-private.c:961
#, c-format
msgid "%d deleted"
msgid_plural "%d deleted"
msgstr[0] "%d deleted"
msgstr[1] "%d deleted"
-#: ../src/modules/mail/e-mail-shell-view-private.c:966
-#: ../src/modules/mail/e-mail-shell-view-private.c:972
+#: ../src/modules/mail/e-mail-shell-view-private.c:975
+#: ../src/modules/mail/e-mail-shell-view-private.c:981
#, c-format
msgid "%d junk"
msgid_plural "%d junk"
msgstr[0] "%d junk"
msgstr[1] "%d junk"
-#: ../src/modules/mail/e-mail-shell-view-private.c:979
+#: ../src/modules/mail/e-mail-shell-view-private.c:988
#, c-format
msgid "%d draft"
msgid_plural "%d drafts"
msgstr[0] "%d draft"
msgstr[1] "%d drafts"
-#: ../src/modules/mail/e-mail-shell-view-private.c:985
+#: ../src/modules/mail/e-mail-shell-view-private.c:994
#, c-format
msgid "%d unsent"
msgid_plural "%d unsent"
msgstr[0] "%d unsent"
msgstr[1] "%d unsent"
-#: ../src/modules/mail/e-mail-shell-view-private.c:991
+#: ../src/modules/mail/e-mail-shell-view-private.c:1000
#, c-format
msgid "%d sent"
msgid_plural "%d sent"
msgstr[0] "%d sent"
msgstr[1] "%d sent"
-#: ../src/modules/mail/e-mail-shell-view-private.c:1008
+#: ../src/modules/mail/e-mail-shell-view-private.c:1017
#, c-format
msgid "%d unread"
msgid_plural "%d unread"
msgstr[0] "%d unread"
msgstr[1] "%d unread"
-#: ../src/modules/mail/e-mail-shell-view-private.c:1526
+#: ../src/modules/mail/e-mail-shell-view-private.c:1535
msgid "Send / Receive"
msgstr "Send / Receive"
@@ -24436,21 +23969,19 @@ msgid "Contains Value"
msgstr "Contains Value"
#. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail
message window/preview
-#: ../src/modules/mail/em-mailer-prefs.c:1564
+#: ../src/modules/mail/em-mailer-prefs.c:1570
msgid "_Date header:"
msgstr "_Date header:"
-#: ../src/modules/mail/em-mailer-prefs.c:1565
+#: ../src/modules/mail/em-mailer-prefs.c:1571
msgid "Show _original header value"
msgstr "Show _original header value"
#: ../src/modules/mailto-handler/evolution-mailto-handler.c:112
-#| msgid "Exchange Settings"
msgid "Do _not change settings"
msgstr "Do _not change settings"
#: ../src/modules/mailto-handler/evolution-mailto-handler.c:113
-#| msgid "Make Anjal the default email client"
msgid "_Set as default email client"
msgstr "_Set as default e-mail client"
@@ -24462,20 +23993,17 @@ msgstr "Do you want to make Evolution your default e-mail client?"
#. * is the subject of the email, third %s is the date.
#: ../src/modules/mdn/evolution-mdn.c:308
#, c-format
-#| msgid "Your message to %s about \"%s\" on %s has been read."
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.
#: ../src/modules/mdn/evolution-mdn.c:374
#, c-format
-#| msgid "Delivery Notification for \"%s\""
msgid "Delivery Notification for “%sâ€"
msgstr "Delivery Notification for “%sâ€"
#: ../src/modules/mdn/evolution-mdn.c:540
#, c-format
-#| msgid "Send a read receipt to '%s'"
msgid "Send a read receipt to “%sâ€"
msgstr "Send a read receipt to “%sâ€"
@@ -24497,7 +24025,6 @@ msgid "Evolution is currently offline."
msgstr "Evolution is currently offline."
#: ../src/modules/offline-alert/evolution-offline-alert.error.xml.h:2
-#| msgid "Click 'Work Online' to return to online mode."
msgid "Click “Work Online†to return to online mode."
msgstr "Click “Work Online†to return to online mode."
@@ -24638,7 +24165,6 @@ msgstr "Failed to stream mail message content to SpamAssassin: "
#: ../src/modules/spamassassin/evolution-spamassassin.c:230
#, c-format
-#| msgid "Failed to write '%s' to SpamAssassin: "
msgid "Failed to write “%s†to SpamAssassin: "
msgstr "Failed to write “%s†to SpamAssassin: "
@@ -24663,11 +24189,11 @@ msgid "This will make SpamAssassin more reliable, but slower."
msgstr "This will make SpamAssassin more reliable, but slower."
#: ../src/modules/spamassassin/evolution-spamassassin.c:740
-#: ../src/modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
+#: ../src/modules/spamassassin/org.gnome.Evolution-spamassassin.metainfo.xml.in.h:1
msgid "SpamAssassin"
msgstr "SpamAssassin"
-#: ../src/modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
+#: ../src/modules/spamassassin/org.gnome.Evolution-spamassassin.metainfo.xml.in.h:2
msgid "Junk filter using SpamAssassin"
msgstr "Junk filter using SpamAssassin"
@@ -24699,7 +24225,6 @@ msgstr ""
"accounts, and to import files from other applications."
#: ../src/modules/startup-wizard/e-startup-assistant.c:165
-#| msgid "Do not show this message again"
msgid "Do not _show this wizard again"
msgstr "Do not _show this wizard again"
@@ -25116,9 +24641,6 @@ 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
#: ../src/plugins/email-custom-header/email-custom-header.c:807
-#| msgid ""
-#| "The format for specifying a Custom Header key value is:\n"
-#| "Name of the Custom Header key values separated by \";\"."
msgid ""
"The format for specifying a Custom Header key value is:\n"
"Name of the Custom Header key values separated by “;â€."
@@ -25153,9 +24675,6 @@ msgid "Command to be executed to launch the editor: "
msgstr "Command to be executed to launch the editor: "
#: ../src/plugins/external-editor/external-editor.c:112
-#| msgid ""
-#| "For XEmacs use \"xemacs\"\n"
-#| "For Vim use \"gvim -f\""
msgid ""
"For XEmacs use “xemacsâ€\n"
"For Vim use “gvim -fâ€"
@@ -25257,9 +24776,6 @@ msgid "Invalid Image Size"
msgstr "Invalid Image Size"
#: ../src/plugins/face/org-gnome-face.error.xml.h:4
-#| msgid ""
-#| "Please select a PNG image of size 48 * 48 pixels, whose file size doesn't "
-#| "exceed 723 bytes."
msgid ""
"Please select a PNG image of size 48 × 48 pixels, whose file size doesn’t "
"exceed 723 bytes."
@@ -25272,10 +24788,6 @@ msgid "Incorrect Face Image Byte Size"
msgstr "Incorrect Face Image Byte Size"
#: ../src/plugins/face/org-gnome-face.error.xml.h:6
-#| msgid ""
-#| "The Face image size is {0} bytes, while it should not be more than 723 "
-#| "bytes. Please select a PNG image of size 48 * 48 pixels, whose file size "
-#| "doesn't exceed 723 bytes."
msgid ""
"The Face image size is {0} bytes, while it should not be more than 723 "
"bytes. Please select a PNG image of size 48 × 48 pixels, whose file size "
@@ -25293,63 +24805,63 @@ msgstr "Not an image"
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}"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:413
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:417
msgid "Get List _Archive"
msgstr "Get List _Archive"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:415
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:419
msgid "Get an archive of the list this message belongs to"
msgstr "Get an archive of the list this message belongs to"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:420
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:424
msgid "Copy _Message Archive URL"
msgstr "Copy _Message Archive URL"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:422
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:426
msgid "Copy direct URL for the selected message in its archive"
msgstr "Copy direct URL for the selected message in its archive"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:427
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:431
msgid "Get List _Usage Information"
msgstr "Get List _Usage Information"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:429
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:433
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"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:434
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:438
msgid "Contact List _Owner"
msgstr "Contact List _Owner"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:436
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:440
msgid "Contact the owner of the mailing list this message belongs to"
msgstr "Contact the owner of the mailing list this message belongs to"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:441
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:445
msgid "_Post Message to List"
msgstr "_Post Message to List"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:443
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:447
msgid "Post a message to the mailing list this message belongs to"
msgstr "Post a message to the mailing list this message belongs to"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:448
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:452
msgid "_Subscribe to List"
msgstr "_Subscribe to List"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:450
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:454
msgid "Subscribe to the mailing list this message belongs to"
msgstr "Subscribe to the mailing list this message belongs to"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:455
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:459
msgid "_Unsubscribe from List"
msgstr "_Unsubscribe from List"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:457
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:461
msgid "Unsubscribe from the mailing list this message belongs to"
msgstr "Unsubscribe from the mailing list this message belongs to"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:464
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:468
msgid "Mailing _List"
msgstr "Mailing _List"
@@ -25390,12 +24902,6 @@ msgid "Send e-mail message to mailing list?"
msgstr "Send e-mail message to mailing list?"
#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
-#| msgid ""
-#| "An e-mail message will be sent to the URL \"{0}\". You can either send "
-#| "the message automatically, or see and change it first.\n"
-#| "\n"
-#| "You should receive an answer from the mailing list shortly after the "
-#| "message has been sent."
msgid ""
"An e-mail message will be sent to the URL “{0}â€. You can either send the "
"message automatically, or see and change it first.\n"
@@ -25518,34 +25024,31 @@ msgid "Notifies you when new mail messages arrive."
msgstr "Notifies you when new mail messages arrive."
#. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../src/plugins/mail-to-task/mail-to-task.c:194
+#: ../src/plugins/mail-to-task/mail-to-task.c:200
#, c-format
msgid "Created from a mail by %s"
msgstr "Created from a mail by %s"
#. Translators: Dialog button to Cancel edit of an existing event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:576
+#: ../src/plugins/mail-to-task/mail-to-task.c:605
msgctxt "mail-to-task"
msgid "_Cancel"
msgstr "_Cancel"
#. Translators: Dialog button to Edit an existing event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:578
+#: ../src/plugins/mail-to-task/mail-to-task.c:607
msgctxt "mail-to-task"
msgid "_Edit"
msgstr "_Edit"
#. Translators: Dialog button to create a New event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:580
+#: ../src/plugins/mail-to-task/mail-to-task.c:609
msgctxt "mail-to-task"
msgid "_New"
msgstr "_New"
-#: ../src/plugins/mail-to-task/mail-to-task.c:598
+#: ../src/plugins/mail-to-task/mail-to-task.c:627
#, c-format
-#| msgid ""
-#| "Selected calendar contains event '%s' already. Would you like to edit the "
-#| "old event?"
msgid ""
"Selected calendar contains event “%s†already. Would you like to edit the "
"old event?"
@@ -25553,11 +25056,8 @@ msgstr ""
"Selected calendar contains event “%s†already. Would you like to edit the "
"old event?"
-#: ../src/plugins/mail-to-task/mail-to-task.c:601
+#: ../src/plugins/mail-to-task/mail-to-task.c:630
#, c-format
-#| msgid ""
-#| "Selected task list contains task '%s' already. Would you like to edit the "
-#| "old task?"
msgid ""
"Selected task list contains task “%s†already. Would you like to edit the "
"old task?"
@@ -25565,11 +25065,8 @@ msgstr ""
"Selected task list contains task “%s†already. Would you like to edit the "
"old task?"
-#: ../src/plugins/mail-to-task/mail-to-task.c:604
+#: ../src/plugins/mail-to-task/mail-to-task.c:633
#, c-format
-#| msgid ""
-#| "Selected memo list contains memo '%s' already. Would you like to edit the "
-#| "old memo?"
msgid ""
"Selected memo list contains memo “%s†already. Would you like to edit the "
"old memo?"
@@ -25578,7 +25075,7 @@ msgstr ""
"old memo?"
#. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:624
+#: ../src/plugins/mail-to-task/mail-to-task.c:653
#, c-format
msgid ""
"You have selected %d mails to be converted to events. Do you really want to "
@@ -25594,7 +25091,7 @@ msgstr[1] ""
"add them all?"
#. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:631
+#: ../src/plugins/mail-to-task/mail-to-task.c:660
#, c-format
msgid ""
"You have selected %d mails to be converted to tasks. Do you really want to "
@@ -25610,7 +25107,7 @@ msgstr[1] ""
"add them all?"
#. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:638
+#: ../src/plugins/mail-to-task/mail-to-task.c:667
#, c-format
msgid ""
"You have selected %d mails to be converted to memos. Do you really want to "
@@ -25625,29 +25122,29 @@ msgstr[1] ""
"You have selected %d mails to be converted to memos. Do you really want to "
"add them all?"
-#: ../src/plugins/mail-to-task/mail-to-task.c:659
+#: ../src/plugins/mail-to-task/mail-to-task.c:688
msgid "Do you wish to continue converting remaining mails?"
msgstr "Do you wish to continue converting remaining mails?"
-#: ../src/plugins/mail-to-task/mail-to-task.c:735
+#: ../src/plugins/mail-to-task/mail-to-task.c:764
msgid "[No Summary]"
msgstr "[No Summary]"
-#: ../src/plugins/mail-to-task/mail-to-task.c:748
+#: ../src/plugins/mail-to-task/mail-to-task.c:777
msgid "Invalid object returned from a server"
msgstr "Invalid object returned from a server"
-#: ../src/plugins/mail-to-task/mail-to-task.c:802
+#: ../src/plugins/mail-to-task/mail-to-task.c:831
#, c-format
msgid "An error occurred during processing: %s"
msgstr "An error occurred during processing: %s"
-#: ../src/plugins/mail-to-task/mail-to-task.c:838
+#: ../src/plugins/mail-to-task/mail-to-task.c:869
#, c-format
msgid "Cannot open calendar. %s"
msgstr "Cannot open calendar. %s"
-#: ../src/plugins/mail-to-task/mail-to-task.c:842
+#: ../src/plugins/mail-to-task/mail-to-task.c:873
msgid ""
"Selected calendar is read only, thus cannot create event there. Select other "
"calendar, please."
@@ -25655,7 +25152,7 @@ msgstr ""
"Selected calendar is read only, thus cannot create event there. Select other "
"calendar, please."
-#: ../src/plugins/mail-to-task/mail-to-task.c:845
+#: ../src/plugins/mail-to-task/mail-to-task.c:876
msgid ""
"Selected task list is read only, thus cannot create task there. Select other "
"task list, please."
@@ -25663,7 +25160,7 @@ msgstr ""
"Selected task list is read only, thus cannot create task there. Select other "
"task list, please."
-#: ../src/plugins/mail-to-task/mail-to-task.c:848
+#: ../src/plugins/mail-to-task/mail-to-task.c:879
msgid ""
"Selected memo list is read only, thus cannot create memo there. Select other "
"memo list, please."
@@ -25671,35 +25168,35 @@ msgstr ""
"Selected memo list is read only, thus cannot create memo there. Select other "
"memo list, please."
-#: ../src/plugins/mail-to-task/mail-to-task.c:1252
+#: ../src/plugins/mail-to-task/mail-to-task.c:1301
msgid "Create an _Appointment"
msgstr "Create an _Appointment"
-#: ../src/plugins/mail-to-task/mail-to-task.c:1254
+#: ../src/plugins/mail-to-task/mail-to-task.c:1303
msgid "Create a new event from the selected message"
msgstr "Create a new event from the selected message"
-#: ../src/plugins/mail-to-task/mail-to-task.c:1259
+#: ../src/plugins/mail-to-task/mail-to-task.c:1308
msgid "Create a Mem_o"
msgstr "Create a Mem_o"
-#: ../src/plugins/mail-to-task/mail-to-task.c:1261
+#: ../src/plugins/mail-to-task/mail-to-task.c:1310
msgid "Create a new memo from the selected message"
msgstr "Create a new memo from the selected message"
-#: ../src/plugins/mail-to-task/mail-to-task.c:1266
+#: ../src/plugins/mail-to-task/mail-to-task.c:1315
msgid "Create a _Task"
msgstr "Create a _Task"
-#: ../src/plugins/mail-to-task/mail-to-task.c:1268
+#: ../src/plugins/mail-to-task/mail-to-task.c:1317
msgid "Create a new task from the selected message"
msgstr "Create a new task from the selected message"
-#: ../src/plugins/mail-to-task/mail-to-task.c:1276
+#: ../src/plugins/mail-to-task/mail-to-task.c:1325
msgid "Create a _Meeting"
msgstr "Create a _Meeting"
-#: ../src/plugins/mail-to-task/mail-to-task.c:1278
+#: ../src/plugins/mail-to-task/mail-to-task.c:1327
msgid "Create a new meeting from the selected message"
msgstr "Create a new meeting from the selected message"
@@ -25707,12 +25204,12 @@ 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."
-#: ../src/plugins/pst-import/evolution-pst.metainfo.xml.in.h:1
+#: ../src/plugins/pst-import/org.gnome.Evolution-pst.metainfo.xml.in.h:1
#: ../src/plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
msgid "Outlook PST import"
msgstr "Outlook PST import"
-#: ../src/plugins/pst-import/evolution-pst.metainfo.xml.in.h:2
+#: ../src/plugins/pst-import/org.gnome.Evolution-pst.metainfo.xml.in.h:2
#: ../src/plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
msgid "Import Outlook messages from PST file"
msgstr "Import Outlook messages from PST file"
@@ -25756,38 +25253,38 @@ msgid "Publish calendars to the web."
msgstr "Publish calendars to the web."
#: ../src/plugins/publish-calendar/publish-calendar.c:215
-#: ../src/plugins/publish-calendar/publish-calendar.c:482
+#: ../src/plugins/publish-calendar/publish-calendar.c:483
#, c-format
msgid "Could not open %s:"
msgstr "Could not open %s:"
-#: ../src/plugins/publish-calendar/publish-calendar.c:234
+#: ../src/plugins/publish-calendar/publish-calendar.c:235
#, c-format
msgid "There was an error while publishing to %s:"
msgstr "There was an error while publishing to %s:"
-#: ../src/plugins/publish-calendar/publish-calendar.c:240
+#: ../src/plugins/publish-calendar/publish-calendar.c:241
#, c-format
msgid "Publishing to %s finished successfully"
msgstr "Publishing to %s finished successfully"
-#: ../src/plugins/publish-calendar/publish-calendar.c:288
+#: ../src/plugins/publish-calendar/publish-calendar.c:289
#, c-format
msgid "Mount of %s failed:"
msgstr "Mount of %s failed:"
-#: ../src/plugins/publish-calendar/publish-calendar.c:787
+#: ../src/plugins/publish-calendar/publish-calendar.c:788
msgid "Are you sure you want to remove this location?"
msgstr "Are you sure you want to remove this location?"
#. To Translators: This is shown to a user when creation of a new thread,
#. * where the publishing should be done, fails. Basically, this shouldn't
#. * ever happen, and if so, then something is really wrong.
-#: ../src/plugins/publish-calendar/publish-calendar.c:1097
+#: ../src/plugins/publish-calendar/publish-calendar.c:1098
msgid "Could not create publish thread."
msgstr "Could not create publish thread."
-#: ../src/plugins/publish-calendar/publish-calendar.c:1107
+#: ../src/plugins/publish-calendar/publish-calendar.c:1108
msgid "_Publish Calendar Information"
msgstr "_Publish Calendar Information"
@@ -25796,94 +25293,89 @@ msgid "iCal"
msgstr "iCal"
#: ../src/plugins/publish-calendar/publish-calendar.ui.h:3
+#| msgid "Free/Busy Publishing Settings"
+msgid "Free/Busy with Details"
+msgstr "Free/Busy with Details"
+
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:4
msgid "Daily"
msgstr "Daily"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:4
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:5
msgid "Weekly"
msgstr "Weekly"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:5
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:6
msgid "Manual (via Actions menu)"
msgstr "Manual (via Actions menu)"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:9
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:10
msgid "Secure FTP (SFTP)"
msgstr "Secure FTP (SFTP)"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:10
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:11
msgid "Public FTP"
msgstr "Public FTP"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:11
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:12
msgid "FTP (with login)"
msgstr "FTP (with login)"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:12
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:13
msgid "Windows share"
msgstr "Windows share"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:13
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:14
msgid "WebDAV (HTTP)"
msgstr "WebDAV (HTTP)"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:14
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:15
msgid "Secure WebDAV (HTTPS)"
msgstr "Secure WebDAV (HTTPS)"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:15
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:16
msgid "Custom Location"
msgstr "Custom Location"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:18
msgid "_Publish as:"
msgstr "_Publish as:"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:18
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:19
msgid "Publishing _Frequency:"
msgstr "Publishing _Frequency:"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:19
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:20
msgid "Time _duration:"
msgstr "Time _duration:"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:20
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:21
msgid "Sources"
msgstr "Sources"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:24
msgid "Service _type:"
msgstr "Service _type:"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:25
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:26
msgid "_File:"
msgstr "_File:"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:27
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:28
msgid "P_ort:"
msgstr "P_ort:"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:28
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:29
msgid "_Username:"
msgstr "_Username:"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:29
-#: ../src/smime/gui/certificate-manager.c:785
-msgid "_Password:"
-msgstr "_Password:"
-
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
-msgid "_Remember password"
-msgstr "_Remember password"
-
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:32
msgid "Publishing Location"
msgstr "Publishing Location"
-#: ../src/plugins/publish-calendar/publish-format-fb.c:82
+#: ../src/plugins/publish-calendar/publish-format-fb.c:83
#: ../src/plugins/publish-calendar/publish-format-ical.c:102
#, c-format
-#| msgid "Invalid source UID '%s'"
msgid "Invalid source UID “%sâ€"
msgstr "Invalid source UID “%sâ€"
@@ -26063,7 +25555,6 @@ msgid "Preparing to quit..."
msgstr "Preparing to quit…"
#: ../src/shell/e-shell.c:926
-#| msgid "Settings"
msgid "Open _Settings"
msgstr "Open _Settings"
@@ -26160,12 +25651,10 @@ msgid "Show information about Evolution"
msgstr "Show information about Evolution"
#: ../src/shell/e-shell-window-actions.c:803
-#| msgid "_Account:"
msgid "_Accounts"
msgstr "_Accounts"
#: ../src/shell/e-shell-window-actions.c:805
-#| msgid "Configure Evolution"
msgid "Configure Evolution Accounts"
msgstr "Configure Evolution Accounts"
@@ -26207,7 +25696,6 @@ msgid "_Quick Reference"
msgstr "_Quick Reference"
#: ../src/shell/e-shell-window-actions.c:896
-#| msgid "Show Evolution's shortcut keys"
msgid "Show Evolution’s shortcut keys"
msgstr "Show Evolution’s shortcut keys"
@@ -26301,12 +25789,10 @@ msgid "_Window"
msgstr "_Window"
#: ../src/shell/e-shell-window-actions.c:1066
-#| msgid "Show _Status Bar"
msgid "Show _Menu Bar"
msgstr "Show _Menu Bar"
#: ../src/shell/e-shell-window-actions.c:1068
-#| msgid "Show the side bar"
msgid "Show the menu bar"
msgstr "Show the menu bar"
@@ -26421,7 +25907,7 @@ msgstr "Select view: %s"
msgid "Delete view: %s"
msgstr "Delete view: %s"
-#: ../src/shell/e-shell-window-actions.c:1801
+#: ../src/shell/e-shell-window-actions.c:1804
msgid "Execute these search parameters"
msgstr "Execute these search parameters"
@@ -26433,14 +25919,13 @@ msgid "New"
msgstr "New"
#. Translators: This is used for the main window title.
-#: ../src/shell/e-shell-window-private.c:721
+#: ../src/shell/e-shell-window-private.c:756
#, c-format
-#| msgid "%s - Evolution"
msgid "%s — Evolution"
msgstr "%s — Evolution"
#. Preview/Alpha/Beta version warning message
-#: ../src/shell/main.c:195
+#: ../src/shell/main.c:192
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -26475,7 +25960,7 @@ msgstr ""
"We hope that you enjoy the results of our hard work, and we\n"
"eagerly await your contributions!\n"
-#: ../src/shell/main.c:219
+#: ../src/shell/main.c:216
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -26483,16 +25968,13 @@ msgstr ""
"Thanks\n"
"The Evolution Team\n"
-#: ../src/shell/main.c:225
+#: ../src/shell/main.c:222
msgid "Do not tell me again"
msgstr "Do not tell me again"
#. Translators: Do NOT translate the five component
#. * names, they MUST remain in English!
-#: ../src/shell/main.c:314
-#| msgid ""
-#| "Start Evolution showing the specified component. Available options are "
-#| "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
+#: ../src/shell/main.c:311
msgid ""
"Start Evolution showing the specified component. Available options are "
"“mailâ€, “calendarâ€, “contactsâ€, “tasksâ€, and “memosâ€"
@@ -26500,39 +25982,39 @@ msgstr ""
"Start Evolution showing the specified component. Available options are "
"“mailâ€, “calendarâ€, “contactsâ€, “tasksâ€, and “memosâ€"
-#: ../src/shell/main.c:318
+#: ../src/shell/main.c:315
msgid "Apply the given geometry to the main window"
msgstr "Apply the given geometry to the main window"
-#: ../src/shell/main.c:322
+#: ../src/shell/main.c:319
msgid "Start in online mode"
msgstr "Start in online mode"
-#: ../src/shell/main.c:324
+#: ../src/shell/main.c:321
msgid "Ignore network availability"
msgstr "Ignore network availability"
-#: ../src/shell/main.c:327
+#: ../src/shell/main.c:324
msgid "Forcibly shut down Evolution"
msgstr "Forcibly shut down Evolution"
-#: ../src/shell/main.c:330
+#: ../src/shell/main.c:327
msgid "Disable loading of any plugins."
msgstr "Disable loading of any plugins."
-#: ../src/shell/main.c:332
+#: ../src/shell/main.c:329
msgid "Disable preview pane of Mail, Contacts and Tasks."
msgstr "Disable preview pane of Mail, Contacts and Tasks."
-#: ../src/shell/main.c:336
+#: ../src/shell/main.c:333
msgid "Import URIs or filenames given as rest of arguments."
msgstr "Import URIs or filenames given as rest of arguments."
-#: ../src/shell/main.c:338
+#: ../src/shell/main.c:335
msgid "Request a running Evolution process to quit"
msgstr "Request a running Evolution process to quit"
-#: ../src/shell/main.c:415
+#: ../src/shell/main.c:417
#, c-format
msgid ""
"Cannot start Evolution. Another Evolution instance may be unresponsive. "
@@ -26541,16 +26023,12 @@ msgstr ""
"Cannot start Evolution. Another Evolution instance may be unresponsive. "
"System error: %s"
-#: ../src/shell/main.c:466 ../src/shell/main.c:471
-#| msgid "- The Evolution PIM and Email Client"
+#: ../src/shell/main.c:473 ../src/shell/main.c:478
msgid "— The Evolution PIM and Email Client"
msgstr "— The Evolution PIM and Email Client"
-#: ../src/shell/main.c:533
+#: ../src/shell/main.c:540
#, c-format
-#| msgid ""
-#| "%s: --online and --offline cannot be used together.\n"
-#| " Run '%s --help' for more information.\n"
msgid ""
"%s: --online and --offline cannot be used together.\n"
" Run “%s --help†for more information.\n"
@@ -26558,11 +26036,8 @@ msgstr ""
"%s: --online and --offline cannot be used together.\n"
" Run “%s --help†for more information.\n"
-#: ../src/shell/main.c:539
+#: ../src/shell/main.c:546
#, c-format
-#| msgid ""
-#| "%s: --force-online and --offline cannot be used together.\n"
-#| " Run '%s --help' for more information.\n"
msgid ""
"%s: --force-online and --offline cannot be used together.\n"
" Run “%s --help†for more information.\n"
@@ -26633,17 +26108,14 @@ msgid "Keep _Waiting"
msgstr "Keep _Waiting"
#: ../src/shell/shell.error.xml.h:15
-#| msgid "Failed to get values from '{0}'"
msgid "Failed to get values from “{0}â€"
msgstr "Failed to get values from “{0}â€"
#: ../src/shell/shell.error.xml.h:16
-#| msgid "Failed to invoke authenticate for '{0}'"
msgid "Failed to invoke authenticate for “{0}â€"
msgstr "Failed to invoke authenticate for “{0}â€"
#: ../src/shell/shell.error.xml.h:17
-#| msgid "Failed to connect '{0}'"
msgid "Failed to connect “{0}â€"
msgstr "Failed to connect “{0}â€"
@@ -26652,42 +26124,34 @@ msgid "_Reconnect"
msgstr "_Reconnect"
#: ../src/shell/shell.error.xml.h:19
-#| msgid "Failed to connect address book '{0}'"
msgid "Failed to connect address book “{0}â€"
msgstr "Failed to connect address book “{0}â€"
#: ../src/shell/shell.error.xml.h:20
-#| msgid "Failed to connect calendar '{0}'"
msgid "Failed to connect calendar “{0}â€"
msgstr "Failed to connect calendar “{0}â€"
#: ../src/shell/shell.error.xml.h:21
-#| msgid "Failed to connect mail account '{0}'"
msgid "Failed to connect mail account “{0}â€"
msgstr "Failed to connect mail account “{0}â€"
#: ../src/shell/shell.error.xml.h:22
-#| msgid "Failed to connect memo list '{0}'"
msgid "Failed to connect memo list “{0}â€"
msgstr "Failed to connect memo list “{0}â€"
#: ../src/shell/shell.error.xml.h:23
-#| msgid "Failed to connect task list '{0}'"
msgid "Failed to connect task list “{0}â€"
msgstr "Failed to connect task list “{0}â€"
#: ../src/shell/shell.error.xml.h:24
-#| msgid "Failed to prompt for credentials for '{0}'"
msgid "Failed to prompt for credentials for “{0}â€"
msgstr "Failed to prompt for credentials for “{0}â€"
#: ../src/shell/shell.error.xml.h:25
-#| msgid "Failed to finish trust prompt for '{0}'"
msgid "Failed to finish trust prompt for “{0}â€"
msgstr "Failed to finish trust prompt for “{0}â€"
#: ../src/shell/shell.error.xml.h:26
-#| msgid "SSL certificate for '{0}' is not trusted."
msgid "SSL certificate for “{0}†is not trusted."
msgstr "SSL certificate for “{0}†is not trusted."
@@ -26696,36 +26160,27 @@ msgid "Reason: {1}"
msgstr "Reason: {1}"
#: ../src/shell/shell.error.xml.h:29
-#| msgid "SSL certificate for address book '{0}' is not trusted."
msgid "SSL certificate for address book “{0}†is not trusted."
msgstr "SSL certificate for address book “{0}†is not trusted."
#: ../src/shell/shell.error.xml.h:30
-#| msgid "SSL certificate for calendar '{0}' is not trusted."
msgid "SSL certificate for calendar “{0}†is not trusted."
msgstr "SSL certificate for calendar “{0}†is not trusted."
#: ../src/shell/shell.error.xml.h:31
-#| msgid "SSL certificate for mail account '{0}' is not trusted."
msgid "SSL certificate for mail account “{0}†is not trusted."
msgstr "SSL certificate for mail account “{0}†is not trusted."
#: ../src/shell/shell.error.xml.h:32
-#| msgid "SSL certificate for memo list '{0}' is not trusted."
msgid "SSL certificate for memo list “{0}†is not trusted."
msgstr "SSL certificate for memo list “{0}†is not trusted."
#: ../src/shell/shell.error.xml.h:33
-#| msgid "SSL certificate for task list '{0}' is not trusted."
msgid "SSL certificate for task list “{0}†is not trusted."
msgstr "SSL certificate for task list “{0}†is not trusted."
#: ../src/smime/gui/ca-trust-dialog.c:104
#, c-format
-#| msgid ""
-#| "Certificate '%s' is a CA certificate.\n"
-#| "\n"
-#| "Edit trust settings:"
msgid ""
"Certificate “%s†is a CA certificate.\n"
"\n"
@@ -26926,7 +26381,6 @@ msgstr "Change certificate trust"
#: ../src/smime/gui/certificate-manager.c:1358
#, c-format
-#| msgid "Change trust for the host '%s':"
msgid "Change trust for the host “%sâ€:"
msgstr "Change trust for the host “%sâ€:"
@@ -27030,13 +26484,11 @@ msgstr ""
#: ../src/smime/gui/component.c:53
#, c-format
-#| msgid "Enter the password for '%s', token '%s'"
msgid "Enter the password for “%sâ€, token “%sâ€"
msgstr "Enter the password for “%sâ€, token “%sâ€"
#: ../src/smime/gui/component.c:55
#, c-format
-#| msgid "Enter the password for %s"
msgid "Enter the password for “%sâ€"
msgstr "Enter the password for “%sâ€"
@@ -27190,6 +26642,129 @@ msgstr "Unable to write store to disk, err_code: %i"
msgid "Imported Certificate"
msgstr "Imported Certificate"
+#~ msgid ""
+#~ "Check to make sure your password is spelled correctly and that you are "
+#~ "using a supported login method. Remember that many passwords are case "
+#~ "sensitive; your caps lock might be on."
+#~ msgstr ""
+#~ "Check to make sure your password is spelt correctly and that you are "
+#~ "using a supported login method. Remember that many passwords are case-"
+#~ "sensitive; your caps lock might be on."
+
+#~ msgid "1st"
+#~ msgstr "1st"
+
+#~ msgid "2nd"
+#~ msgstr "2nd"
+
+#~ msgid "3rd"
+#~ msgstr "3rd"
+
+#~ msgid "4th"
+#~ msgstr "4th"
+
+#~ msgid "5th"
+#~ msgstr "5th"
+
+#~ msgid "6th"
+#~ msgstr "6th"
+
+#~ msgid "7th"
+#~ msgstr "7th"
+
+#~ msgid "8th"
+#~ msgstr "8th"
+
+#~ msgid "9th"
+#~ msgstr "9th"
+
+#~ msgid "10th"
+#~ msgstr "10th"
+
+#~ msgid "11th"
+#~ msgstr "11th"
+
+#~ msgid "12th"
+#~ msgstr "12th"
+
+#~ msgid "13th"
+#~ msgstr "13th"
+
+#~ msgid "14th"
+#~ msgstr "14th"
+
+#~ msgid "15th"
+#~ msgstr "15th"
+
+#~ msgid "16th"
+#~ msgstr "16th"
+
+#~ msgid "17th"
+#~ msgstr "17th"
+
+#~ msgid "18th"
+#~ msgstr "18th"
+
+#~ msgid "19th"
+#~ msgstr "19th"
+
+#~ msgid "20th"
+#~ msgstr "20th"
+
+#~ msgid "21st"
+#~ msgstr "21st"
+
+#~ msgid "22nd"
+#~ msgstr "22nd"
+
+#~ msgid "23rd"
+#~ msgstr "23rd"
+
+#~ msgid "24th"
+#~ msgstr "24th"
+
+#~ msgid "25th"
+#~ msgstr "25th"
+
+#~ msgid "26th"
+#~ msgstr "26th"
+
+#~ msgid "27th"
+#~ msgstr "27th"
+
+#~ msgid "28th"
+#~ msgstr "28th"
+
+#~ msgid "29th"
+#~ msgstr "29th"
+
+#~ msgid "30th"
+#~ msgstr "30th"
+
+#~ msgid "31st"
+#~ msgstr "31st"
+
+#~ msgid "User"
+#~ msgstr "User"
+
+#~ msgid "OAuth2 Google"
+#~ msgstr "OAuth2 Google"
+
+#~ msgid ""
+#~ "This option will use an OAuth 2.0 access token to connect to the Google "
+#~ "server"
+#~ msgstr ""
+#~ "This option will use an OAuth 2.0 access token to connect to the Google "
+#~ "server"
+
+#~ msgid "OAuth2"
+#~ msgstr "OAuth2"
+
+#~ msgid ""
+#~ "This option will use an OAuth 2.0 access token to connect to the server"
+#~ msgstr ""
+#~ "This option will use an OAuth 2.0 access token to connect to the server"
+
#~ msgid "Delete address book '{0}'?"
#~ msgstr "Delete address book '{0}'?"
@@ -27903,9 +27478,6 @@ msgstr "Imported Certificate"
#~ msgid "Path"
#~ msgstr "Path"
-#~ msgid "Enter Google password for user '%s'."
-#~ msgstr "Enter Google password for user '%s'."
-
#~ msgid "User declined to provide a password"
#~ msgstr "User declined to provide a password"
@@ -28477,9 +28049,6 @@ msgstr "Imported Certificate"
#~ msgid "Please enter your password."
#~ msgstr "Please enter your password."
-#~ msgid "CalDAV"
-#~ msgstr "CalDAV"
-
#~ msgid "Always (SSL)"
#~ msgstr "Always (SSL)"
@@ -28580,9 +28149,6 @@ msgstr "Imported Certificate"
#~ msgid "Review account"
#~ msgstr "Review account"
-#~ msgid "Finish"
-#~ msgstr "Finish"
-
#~ msgid "Back - Sending"
#~ msgstr "Back — Sending"
@@ -29616,9 +29182,6 @@ msgstr "Imported Certificate"
#~ msgid "Supports"
#~ msgstr "Supports"
-#~ msgid "User e_mail:"
-#~ msgstr "User e-_mail:"
-
#~ msgid "Server URL '%s' is not a valid URL"
#~ msgstr "Server URL '%s' is not a valid URL"
@@ -30446,9 +30009,6 @@ msgstr "Imported Certificate"
#~ msgid "Add User"
#~ msgstr "Add User"
-#~ msgid "Advanced send options"
-#~ msgstr "Advanced send options"
-
#~ msgid "Enter the users and set permissions"
#~ msgstr "Enter the users and set permissions"
@@ -31074,9 +30634,6 @@ msgstr "Imported Certificate"
#~ msgid "Select Trash Folder"
#~ msgstr "Select Wastebasket Folder"
-#~ msgid "Sending Mail"
-#~ msgstr "Sending Mail"
-
#~ msgid "Sent and Draft Messages"
#~ msgstr "Sent and Draft Messages"
@@ -31761,9 +31318,6 @@ msgstr "Imported Certificate"
#~ msgid "Group by Threads"
#~ msgstr "Group by Threads"
-#~ msgid "Whether to group messages by threads"
-#~ msgstr "Whether to group messages by threads"
-
#~ msgid "Hide _Read Messages"
#~ msgstr "Hide _Read Messages"
@@ -32551,9 +32105,6 @@ msgstr "Imported Certificate"
#~ "months\n"
#~ "years"
-#~ msgid "Rule name"
-#~ msgstr "Rule name"
-
#~ msgid "Select _All Text"
#~ msgstr "Select _All Text"
@@ -32794,9 +32345,6 @@ msgstr "Imported Certificate"
#~ msgid "_Folder Name:"
#~ msgstr "_Folder Name:"
-#~ msgid "_User:"
-#~ msgstr "_User:"
-
#~ msgid "Secure Password"
#~ msgstr "Secure Password"
@@ -35929,9 +35477,6 @@ msgstr "Imported Certificate"
#~ msgid "<b>Publishing _Location</b>"
#~ msgstr "<b>Publishing _Location</b>"
-#~ msgid "Free/Busy Publishing Settings"
-#~ msgstr "Free/Busy Publishing Settings"
-
#~ msgid "Memo sort"
#~ msgstr "Memo sort"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]