[evolution] Updated Esperanto translation

[Kristjan Schmidt <kristjansc src gnome org>]

commit 28cad190bce97284f796c38ace32cfdb720a7b3a
Author: Kristjan SCHMIDT <kristjan schmidt googlemail com>
Date:   Thu Sep 14 23:33:31 2017 +0200

    Updated Esperanto translation

 po/eo.po |23438 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 13421 insertions(+), 10017 deletions(-)
---
diff --git a/po/eo.po b/po/eo.po
index c8c10d2..2d97ab9 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,18 +1,19 @@
 # Esperanto translation for evolution.
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Copyright (C) 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the evolution package.
 # Aisano, Eliovir, Kim RIBEIRO, Leo ARIAS, Matt PEPERELL, Michael MORONI, Patrick (Petriko) OUDEJANS, Serge 
LEBLANC, Simon TITE, Yekrats, chops, maku, trio.
 # Daniel PUENTES <blatberk openmailbox org>, 2015.
-# Kristjan SCHMIDT <kristjan schmidt googlemail com>, 2011, 2012, 2015.
+# Kristjan SCHMIDT <kristjan schmidt googlemail com>, 2011, 2012, 2015, 2017.
+#: ../src/shell/main.c:519
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolut";
-"ion&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2015-04-23 16:09+0000\n"
-"PO-Revision-Date: 2015-04-24 21:23+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=evolut";
+"ion&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-09-14 15:22+0000\n"
+"PO-Revision-Date: 2017-09-14 23:32+0200\n"
 "Last-Translator: Kristjan SCHMIDT <kristjan schmidt googlemail com>\n"
-"Language-Team: Esperanto <gnome-l10n-eo lists launchpad net>\n"
+"Language-Team: Esperanto <gnome-eo-list gnome org>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,11 +22,2918 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../addressbook/addressbook.error.xml.h:1
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
+msgid "Enable address formatting"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:2
+msgid ""
+"Whether addresses should be formatted according to standard in their "
+"destination country"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:3
+msgid "Autocomplete length"
+msgstr "Aŭtomata longo"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:4
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:6
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:7
+msgid "URI for the folder last used in the select names dialog"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:8
+msgid "URI for the folder last used in the select names dialog."
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:9
+msgid "Contact layout style"
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
+msgid "Contact preview pane position (horizontal)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
+msgid "Contact preview pane position (vertical)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:14
+msgid "Position of the contact preview pane when oriented vertically."
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:15
+msgid "Show maps"
+msgstr "Montri mapojn"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:16
+msgid "Whether to show maps in preview pane"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
+msgid "Primary address book"
+msgstr "Ĉefa adresaro"
+
+#: ../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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
+msgid "Show preview pane"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:20
+msgid "Whether to show the preview pane."
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:21
+msgid "true"
+msgstr "vero"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:22
+msgid "Whether to show phone numbers in the editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:23
+msgid "Whether to show SIP addresses in the editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:24
+msgid "Whether to show IM addresses in the editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:25
+msgid "Whether to show mailing Home addresses in the editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:26
+msgid "Whether to show mailing addresses Work in the editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:27
+msgid "Whether to show mailing addresses Other in the editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:28
+msgid "Whether to show Web Addresses in the editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:29
+msgid "Whether to show job information in the editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:30
+msgid "Whether to show Miscellaneous information in the editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:31
+msgid "Whether to show notes in the editor"
+msgstr "Ĉu montri notojn en la redaktilo"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:32
+#, fuzzy
+#| msgid "Whether to show notes in the editor"
+msgid "Whether to show Certificates tab in the editor"
+msgstr "Ĉu montri notojn en la redaktilo"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:33
+#, fuzzy
+#| msgid "Create a new contact list"
+msgid "Where to open contact locations"
+msgstr "Krei novan kontaktliston"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:34
+msgid ""
+"Currently supported values are “openstreetmap” and “google”; if unknown set, "
+"uses “openstreetmap”"
+msgstr ""
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "Konverti retmesaĝojn al Unikodo"
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:3
+msgid "Full path command to run Bogofilter"
+msgstr ""
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:4
+msgid ""
+"Full path to a Bogofilter command. If not set, then a compile-time path is "
+"used, usually /usr/bin/bogofilter. The command should not contain any other "
+"arguments."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
+msgid "Save directory for reminder audio"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:2
+msgid "Directory for saving reminder audio files"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:3
+msgid "Birthday and anniversary reminder value"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:4
+msgid "Number of units for determining a birthday or anniversary reminder"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:5
+msgid "Birthday and anniversary reminder units"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:6
+msgid ""
+"Units for a birthday or anniversary reminder, “minutes”, “hours” or “days”"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:7
+msgid "Compress weekends in month view"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:8
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:9
+msgid "Ask for confirmation when deleting items"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:10
+msgid "Whether to ask for confirmation when deleting an appointment or task"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
+msgid "Confirm expunge"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:12
+msgid "Whether to ask for confirmation when expunging appointments and tasks"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:13
+msgid "Month view vertical pane position"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:14
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:15
+msgid "Workday end hour"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:16
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:17
+msgid "Workday end minute"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:18
+msgid "Minute the workday ends on, 0 to 59."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:19
+msgid "Workday start hour"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:20
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:21
+msgid "Workday start minute"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:22
+msgid "Minute the workday starts on, 0 to 59."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
+msgid "Workday start time for Monday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
+msgid ""
+"Time the workday starts on, in twenty four hour format HHMM, 0000 to 2359, "
+"or -1 to use day-start-hour and day-start-minute"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
+msgid "Workday end time for Monday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
+msgid ""
+"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
+"-1 to use day-end-hour and day-end-minute"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
+msgid "Workday start time for Tuesday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
+msgid ""
+"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
+"-1 to use day-start-hour and day-start-minute"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
+msgid "Workday end time for Tuesday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
+msgid "Workday start time for Wednesday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
+msgid "Workday end time for Wednesday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
+msgid "Workday start time for Thursday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
+msgid "Workday end time for Thursday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
+msgid "Workday start time for Friday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
+msgid "Workday end time for Friday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
+msgid "Workday start time for Saturday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
+msgid "Workday end time for Saturday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
+msgid "Workday start time for Sunday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
+msgid "Workday end time for Sunday"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
+msgid "The second timezone for a Day View"
+msgstr "La dua horzono de taga vido"
+
+#: ../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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
+msgid "Recently used second time zones in a Day View"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
+msgid "List of recently used second time zones in a Day View"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
+msgid "Maximum number of recently used timezones to remember"
+msgstr ""
+
+#: ../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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
+msgid "Default reminder value"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
+msgid "Number of units for determining a default reminder"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
+msgid "Default reminder units"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
+msgid "Units for a default reminder, “minutes”, “hours” or “days”"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
+msgid "Default reminder snooze interval, in minutes"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
+msgid ""
+"Default reminder snooze interval, in minutes, to be filled in the reminder "
+"notification dialog"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
+msgid "Show categories field in the event/meeting/task editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
+msgid "Show Role field in the event/task/meeting editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
+msgid "Show status field in the event/task/meeting editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
+msgid "Show timezone field in the event/meeting editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
+msgid "Show type field in the event/task/meeting editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
+msgid "Hide completed tasks"
+msgstr "Kaŝi plenumigitajn taskojn"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
+msgid "Whether to hide completed tasks in the tasks view"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
+#, fuzzy
+msgid "Hide task units"
+msgstr "Kaŝi task-unuojn"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
+msgid "Units for determining when to hide tasks, “minutes”, “hours” or “days”"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
+msgid "Hide task value"
+msgstr "Kaŝi task-valoron"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
+msgid "Horizontal pane position"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
+msgid "Last reminder time"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
+msgid "Time the last reminder ran, in time_t"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
+#| msgctxt "iCalImp"
+#| msgid "has reminders"
+msgid "Allow past reminders"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
+msgid ""
+"Whether can show reminders for events/tasks/memos which already happened"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
+msgid "Marcus Bains Line Color — Day View"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+msgid "Color to draw the Marcus Bains line in the Day View"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
+msgid "Marcus Bains Line Color — Time bar"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+#, fuzzy
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
+msgstr ""
+"Koloro por kolori la nunhoromontrilan linion en la tempa tabulbarilo "
+"(malplenigu la kampon elektos la defaŭltan koloron)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
+msgid "Marcus Bains Line"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+#, fuzzy
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar"
+msgstr ""
+"Koloro por kolori la nunhoromontrilan linion en la tempa tabulbarilo "
+"(malplenigu la kampon elektos la defaŭltan koloron)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
+msgid "Memo preview pane position (horizontal)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
+msgid "Position of the task preview pane when oriented horizontally"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
+msgid "Memo layout style"
+msgstr "Noto-stilo"
+
+#: ../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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+msgid "Memo preview pane position (vertical)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
+msgid "Position of the memo preview pane when oriented vertically"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+msgid "Month view horizontal pane position"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+msgid "Scroll Month View by a week, not by a month"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
+msgid "Whether to scroll a Month View by a week, not by a month"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
+msgid "Reminder programs"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+msgid "Programs that are allowed to be run by reminders"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+msgid "Show display reminders in notification tray"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+msgid "Whether or not to use the notification tray for display reminders"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
+#, fuzzy
+msgid "Show reminder notification dialog always on top"
+msgstr "Montri memorigilon"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+msgid ""
+"Whether or not to show reminder notification dialog always on top. Note this "
+"works only as a hint for the window manager, which may or may not obey it."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+msgid "Preferred New button item"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+msgid "Name of the preferred New toolbar button item"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+msgid "Primary calendar"
+msgstr "Ĉefa kalendaro"
+
+#: ../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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#, fuzzy
+msgid "Primary memo list"
+msgstr "Ĉefa tasklisto"
+
+#: ../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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+msgid "Primary task list"
+msgstr "Ĉefa tasklisto"
+
+#: ../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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+msgid "Free/busy template URL"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#, no-c-format
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+msgid "Recurrent Events in Italic"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+msgid "Show days with recurrent events in italic font in bottom left calendar"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+msgid "Search range for time-based searching in years"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+msgid ""
+"How many years can the time-based search go forward or backward from "
+"currently selected day when searching for another occurrence; default is ten "
+"years"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+msgid "Show appointment end times in week and month views"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+msgid "Whether to display the end time of events in the week and month views"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+msgid "Show appointment icons in the month view"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#, fuzzy
+#| msgid "Whether to show notes in the editor"
+msgid "Whether to show icons of events in the month view"
+msgstr "Ĉu montri notojn en la redaktilo"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+msgid "Show the memo preview pane"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+msgid "If “true”, show the memo preview pane in the main window"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+msgid "Show the task preview pane"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+msgid "If “true”, show the task preview pane in the main window"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+msgid "Whether to show week numbers in various places in the Calendar"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+msgid "Vertical position for the tag pane"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+msgid "Highlight tasks due today"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+msgid ""
+"Whether highlight tasks due today with a special color (task-due-today-color)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+msgid "Tasks due today color"
+msgstr ""
+
+#: ../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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+msgid "Task preview pane position (horizontal)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+msgid "Task layout style"
+msgstr ""
+
+#: ../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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+msgid "Task preview pane position (vertical)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+msgid "Position of the task preview pane when oriented vertically"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+#, fuzzy
+#| msgid "Hide completed tasks"
+msgid "Show reminders for completed tasks"
+msgstr "Kaŝi plenumigitajn taskojn"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+msgid ""
+"Whether to show reminders for completed tasks. When set to false, reminders "
+"for completed tasks are suppressed."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+#, fuzzy
+msgid "Highlight overdue tasks"
+msgstr "Malfruaj taskoj"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
+msgid ""
+"Whether highlight overdue tasks with a special color (task-overdue-color)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
+#, fuzzy
+msgid "Overdue tasks color"
+msgstr "Koloro de malfruaj taskoj"
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
+msgid "Time divisions"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
+msgid "Intervals shown in Day and Work Week views, in minutes"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
+msgid "Timezone"
+msgstr "Horzono"
+
+#: ../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”"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
+msgid "Twenty four hour time format"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
+msgid "Whether to show times in twenty four hour format instead of using am/pm"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
+msgid "Birthday and anniversary reminder"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
+msgid "Whether to set a reminder for birthdays and anniversaries"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
+msgid "Default appointment reminder"
+msgstr "Defaŭlta rendevuo-memorigilo"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
+msgid "Whether to set a default reminder for appointments"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
+msgid "Use system timezone"
+msgstr "Uzi la sisteman horzonon"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
+#, fuzzy
+msgid "Use the system timezone instead of the timezone selected in Evolution"
+msgstr ""
+"Uzi la sisteman horzonon anstataŭ la horzono kiu estas elektita en Evolucio"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
+msgid "First day of the week"
+msgstr "Unua tago de la semajno"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
+msgid "Monday is a work day"
+msgstr "Lundo estas labortago"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
+msgid "Tuesday is a work day"
+msgstr "Mardo estas labortago"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
+msgid "Wednesday is a work day"
+msgstr "Merkredo estas labortago"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
+msgid "Thursday is a work day"
+msgstr "Ĵaŭdo estas labortago"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
+msgid "Friday is a work day"
+msgstr "Vendredo estas labortablo"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
+msgid "Saturday is a work day"
+msgstr "Sabato estas labortago"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
+msgid "Sunday is a work day"
+msgstr "Dimanĉo estas labortablo"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
+msgid "Create events, memos and tasks as Private by default"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:160
+msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:162
+msgid "(Deprecated) Work days"
+msgstr ""
+
+#: ../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.)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:1
+#, fuzzy
+#| msgid "Evolution Website"
+msgid "Previous Evolution version"
+msgstr "Retpaĝaro de Evolucio"
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:3
+msgid "List of disabled plugins"
+msgstr "Listo de elŝaltitaj kromprogramoj"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:4
+msgid "The list of disabled plugins in Evolution"
+msgstr "La listo de elŝaltitaj kromprogramoj de Evolucio"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:5
+#, fuzzy
+#| msgid "The window's X coordinate"
+msgid "The window’s X coordinate"
+msgstr "La fenestra X-koordinato"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:6
+#, fuzzy
+#| msgid "The window's Y coordinate"
+msgid "The window’s Y coordinate"
+msgstr "La fenestra Y-koordinato"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:7
+#, fuzzy
+#| msgid "The window's width in pixels"
+msgid "The window’s width in pixels"
+msgstr "La fenestra larĝo bildere"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:8
+#, fuzzy
+#| msgid "The window's height in pixels"
+msgid "The window’s height in pixels"
+msgstr "La fenestra alto bildere"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:9
+msgid "Whether the window is maximized"
+msgstr "Ĉu la fenestro estas maksimumigita"
+
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:1
+msgid "GNOME Calendar’s calendar import done"
+msgstr ""
+
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:2
+msgid "Whether calendar from GNOME Calendar has been imported or not"
+msgstr ""
+
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:3
+msgid "GNOME Calendar’s tasks import done"
+msgstr ""
+
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:4
+msgid "Whether tasks from GNOME Calendar have been imported or not"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+"Ĉiufoje Evolucio startas, kontroli ĉu ĝi estas la defaŭlta poŝtilo aŭ ne."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:3
+msgid "Default charset in which to compose messages"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
+msgid "Default charset in which to compose messages. Uses UTF-8, if not set."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
+msgid "Name of the editor to prefer in the message composer"
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
+msgid "Path where picture gallery should search for its content"
+msgstr ""
+
+#: ../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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
+#, fuzzy
+msgid "Spell check inline"
+msgstr "Literum-kontrolataj"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
+msgid "Automatic link recognition"
+msgstr "Aŭtomata rekono de ligiloj"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
+msgid "Recognize links in text and replace them."
+msgstr "Rekoni ligilojn en teksto kaj anstataŭigi ilin."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+msgid "Automatic emoticon recognition"
+msgstr "Aŭtomata miensimbola rekono"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
+msgid ""
+"Recognize emoticons in text and replace them with images or Unicode "
+"characters."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
+#, fuzzy
+#| msgid "Unicode smileys"
+msgid "Unicode emoticons"
+msgstr "Unikodaj ridetoj"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
+#, fuzzy
+#| msgid "Use Unicode characters for smileys."
+msgid "Use Unicode characters for emoticons."
+msgstr "Uzi Unikodajn karakterojn por ridetoj."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
+#, fuzzy
+msgid "Attribute message"
+msgstr "Aldonita mesaĝo"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
+msgid ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
+msgid "Forward message"
+msgstr "Plusendi mesaĝon"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
+msgid ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
+msgid "Original message"
+msgstr "Originala mesaĝo"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
+msgid ""
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
+msgid "Group Reply replies to list"
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
+msgid "Put the cursor at the bottom of replies"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
+#, fuzzy
+msgid ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
+msgstr ""
+"Tio ĉi difinas, ĉu en respondo la kursoro komence estu supre aŭ malsupre en "
+"la mesaĝo."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
+msgid "Always request read receipt"
+msgstr "Ĉiam peti kvitancon pri legado"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
+msgid "Whether a read receipt request gets added to every message by default."
+msgstr "Ĉu defaŭlte peti lego-konfirmon por ĉiu sendita mesaĝo?"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
+msgid "Send HTML mail by default"
+msgstr "Sendi HTML-poŝton defaŭlte"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
+msgid "Send HTML mail by default."
+msgstr "Sendi HTML-poŝton defaŭlte."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
+msgid "Spell checking languages"
+msgstr "Literum-kontrolataj lingvoj"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
+msgid "List of dictionary language codes used for spell checking."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
+msgid "Show “Bcc” field when sending a mail message"
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+msgid "Show “Cc” field when sending a mail message"
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+msgid "Show “From” override field when sending a mail message"
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+msgid "Show “Reply To” field when sending a mail message"
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+msgid "Show “From” field when posting to a newsgroup"
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+msgid "Show “Reply To” field when posting to a newsgroup"
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+msgid "Digitally sign replies when the original message is signed"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
+msgid ""
+"Automatically enable PGP or S/MIME signatures when replying to a message "
+"which is also PGP or S/MIME signed."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+msgid "Encode filenames in an Outlook/GMail way"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+msgid ""
+"Encode filenames in the mail headers same as Outlook or GMail do, to let "
+"them display correctly filenames with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
+#, fuzzy
+#| msgid "Saving message to Outbox."
+msgid "Send messages through Outbox folder"
+msgstr "Konservi mesaĝon en senditujo"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
+msgid ""
+"Always save messages to Outbox folder when sending, to let a user choose "
+"when the messages should be sent."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+msgid "Include signature in new messages only"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+msgid ""
+"Include selected signature only for new messages, but have no signature "
+"added for Replies or Forwards."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+msgid "Put personalized signatures at the top of replies"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+#, fuzzy
+msgid ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
+msgstr ""
+"Tio ĉi difinas, ĉu en respondo la subskriba alineo aperu super aŭ sub la "
+"mesaĝo."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+msgid "Do not add signature delimiter"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+msgid "Ignore list Reply-To:"
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+msgid "List of localized “Re”"
+msgstr ""
+
+#: ../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”."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+msgid "List of localized “Re” separators"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+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 "
+"“︰” separators."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+msgid "Number of characters for wrapping"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+msgid "Will autowrap lines after given number of characters."
+msgstr ""
+
+#: ../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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+msgid ""
+"When to ask, when the number of To and CC recipients reaches this value."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+msgid "Wrap quoted text in replies"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+msgid "If set to “true” quoted text in replies will be wrapped."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+msgid "Whether to obey Content-Disposition:inline message header hint"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+msgid ""
+"Set to “false” to block automatic display of attachments with Content-"
+"Disposition: inline."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+msgid "Save file format for drag-and-drop operation"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+msgid "Can be either “mbox” or “pdf”."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+msgid "Show image animations"
+msgstr "Montri movbildojn"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+msgid "Enable or disable type ahead search feature"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+msgid ""
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+msgid "Enable or disable magic space bar"
+msgstr "Enŝalti aŭ elŝalti magian spacostangon"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+msgid "Enable to use a similar message list view settings for all folders"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+msgid "Mark citations in the message “Preview”"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+msgid "Mark citations in the message “Preview”."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+msgid "Citation highlight color"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+msgid "Citation highlight color."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+msgid "Default charset in which to display messages"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+msgid "Default charset in which to display messages."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+msgid "Automatically load images for HTML messages over HTTP"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+msgid "Show notification about missing remote content"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+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 "
+"show a notification about it on top of the preview panel."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+msgid "Show Animations"
+msgstr "Vidigi movbildojn"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+msgid "Show animated images as animations."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+msgid "Show all message headers"
+msgstr "Montri ĉiujn kapliniojn"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+msgid "Show all the headers when viewing a messages."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+msgid "List of headers to show when viewing a message."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+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 "
+"when viewing a message, but are still listed in Preferences."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+msgid "Show photo of the sender"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+msgid "Show the photo of the sender in the message reading pane."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+msgid "Search gravatar.com for photo of the sender"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+msgid "Allow searching also at gravatar.com for photo of the sender."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+msgid "Mark as Seen always after specified timeout"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+msgid ""
+"If set to true, the selected message will be set as unread after the timeout "
+"also after the folder change."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+msgid "Timeout for marking messages as seen"
+msgstr "Tempolimo post kiu mesaĝoj estas markitaj kiel legita"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#, fuzzy
+#| msgid "Timeout for marking message as seen."
+msgid "Timeout in milliseconds for marking messages as seen."
+msgstr "Tempolimo, post kiu mesaĝo estas markita kiel legita."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#, fuzzy
+#| msgid "Show Attachment _Bar"
+msgid "Show Attachment Bar"
+msgstr "Montri aldonaĵbreton"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+msgid ""
+"Show Attachment Bar below the message preview pane when the message has "
+"attachments."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+msgid "Sender email-address column in the message list"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+msgid ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+msgid "Show deleted messages in the message-list"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#, fuzzy
+#| msgid "Show all message headers"
+msgid "Show junk messages in the message-list"
+msgstr "Montri ĉiujn kapliniojn"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+msgid "Show junk messages (with a red strike-through) in the message-list."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#, fuzzy
+msgid "Enable Unmatched search folder"
+msgstr "Ĉiuj lokaj dosierujoj"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+msgid ""
+"Enable Unmatched search folder within Search Folders. It does nothing if "
+"Search Folders are disabled."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+msgid "Hides the per-folder preview and removes the selection"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#, fuzzy
+#| 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."
+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."
+msgstr ""
+"Tiu ĉi ŝlosilo estas legata nur unufoje kaj poste metita al “ne”. Tio "
+"malmarkas la mesaĝon en la listo kaj forigas la antaŭrigardilon el la "
+"mesaĝujo."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+msgid "Height of the message-list pane"
+msgstr "Alto de la mesaĝo-lista fenestro"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+msgid "Height of the message-list pane."
+msgstr "Alto de la mesaĝo-lista fenestro."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+msgid "Whether message headers are collapsed in the user interface"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+msgid "Width of the message-list pane"
+msgstr "Larĝo de la mesaĝo-lista areo"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+msgid "Width of the message-list pane."
+msgstr "Larĝo de la mesaĝo-lista areo."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+msgid "Layout style"
+msgstr "Stilo de aranĝo"
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+msgid "Variable width font"
+msgstr "Diverslarĝa tiparo"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+msgid "The variable width font for mail display."
+msgstr "La varilarĝa tiparo por montrado de retpoŝtaĵoj."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+msgid "Terminal font"
+msgstr "Terminala tiparo"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+msgid "The terminal font for mail display."
+msgstr "La terminala litertiparo por montri poŝtaĵojn."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+msgid "Use custom fonts"
+msgstr "Uzu personecigitajn riparojn"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+msgid "Use custom fonts for displaying mail."
+msgstr "Uzu personecigitajn riparojn por montri poŝtaĵojn."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+msgid "Compress display of addresses in TO/CC/BCC"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+msgid "Number of addresses to display in TO/CC/BCC"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#, fuzzy
+#| msgid ""
+#| "This sets the number of addresses to show in default message list view, "
+#| "beyond which a '...' is shown."
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a “...” is shown."
+msgstr ""
+"Tio ĉi difinas la nombron de adresoj montrataj en la normala mesaĝa vido, "
+"post kiuj aperas “...”."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+msgid "Default value for thread expand state"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+msgid "Whether sort threads based on latest message in that thread"
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+msgid "Whether sort thread children always ascending"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+msgid "Sort accounts alphabetically in a folder tree"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+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 "
+"Computer and Search folders, otherwise accounts are sorted based on an order "
+"given by a user"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+msgid "Log filter actions"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+msgid ""
+"If not set, or being “stdout”, then the logging is done to stdout, instead "
+"to a file."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+msgid "Flush Outbox after filtering"
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+msgid "Default forward style"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+msgid "Default reply style"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+msgid ""
+"Prompt the user when he or she tries to send a message with a key "
+"accelerator."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+msgid "Prompt when emptying the trash"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+msgid "Prompt the user when he or she tries to empty the trash."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+msgid "Prompt when user calls Empty Junk"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+msgid "Prompt the user when he or she tries to Empty a Junk folder."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+msgid "Prompt before sending to recipients not entered as mail addresses"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying to send "
+"a message to recipients not entered as mail addresses"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+msgid "Prompt when user tries to open 10 or more messages at once"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+msgid ""
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+msgid "Prompt while marking multiple messages"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+msgid "Prompt when deleting messages in search folder"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+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 "
+"the search results."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+msgid ""
+"Possible values are: “never” — do not allow copy with drag &amp; drop of "
+"folders in folder tree, “always” — allow copy with drag &amp; drop of "
+"folders in folder tree without asking, or “ask” — (or any other value) will "
+"ask user."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+msgid ""
+"Possible values are: “never” — do not allow move with drag &amp; drop of "
+"folders in folder tree, “always” — allow move with drag &amp; drop of "
+"folders in folder tree without asking, or “ask” — (or any other value) will "
+"ask user."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+msgid "Prompt when replying privately to list messages"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"private reply to a message which arrived via a mailing list."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+msgid "Prompt when mailing list hijacks private replies"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying sending "
+"a private reply to a message which arrived via a mailing list, but the list "
+"sets a Reply-To: header which redirects your reply back to the list"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+msgid "Prompt when replying to many recipients"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+msgid ""
+"Prompt when switching composer format and the content needs to lose its "
+"formatting"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+msgid ""
+"It disables/enables the repeated prompts to warn that you are switching "
+"composer format and the content needs to lose its formatting."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+msgid "Prompt when sending to many To and CC recipients"
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+msgid ""
+"Policy for automatically closing the message browser window when forwarding "
+"or replying to the displayed message."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+msgid "Empty Trash folders on exit"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+msgid "Last time Empty Trash was run"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr ""
+"La tempo de la lasta malplenigo de la rubujo, en tagoj ekde la 1-a de "
+"januaro 1970 (\"la epoko\")."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+msgid "Level beyond which the message should be logged."
+msgstr ""
+
+#: ../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."
+msgid ""
+"This can have three possible values. “0” for errors. “1” for warnings. “2” "
+"for debug messages."
+msgstr ""
+"Tio povas havi tri eblajn valorojn. “0” por eraroj. “1” por avertoj. “2” por "
+"sencimigaj mesaĝoj."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+msgid "Show original “Date” header value."
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+msgid "List of Labels and their associated colors"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#, fuzzy
+msgid "Check incoming mail being junk"
+msgstr "Kontrolu alvenantajn poŝtaĵojn pri nedezirateco"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+msgid "Run junk test on incoming mail."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+msgid "Empty Junk folders on exit"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+msgid "Minimum days between emptying the junk on exit"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+msgid "Minimum time between emptying the junk on exit, in days."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+msgid "Last time Empty Junk was run"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgstr ""
+"La tempo de la lasta malplenigo de la mesaĝaĉujo, en tagoj ekde la 1-a de "
+"januaro 1970 (\"la epoko\")."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+msgid "The default plugin for Junk hook"
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+msgid "Determines whether to lookup in address book for sender email"
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+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 "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+msgid "Determines whether to use custom headers to check for junk"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+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 "
+"checking speed."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+msgid "Custom headers to use while checking for junk."
+msgstr ""
+
+#: ../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”."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+msgid "UID string of the default account."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+msgid "Save directory"
+msgstr "Konservi dosierujon"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+msgid "Directory for saving mail component files."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
+msgid "Composer load/attach directory"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+msgid "Directory for loading/attaching files to composer."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
+msgid "Check for new messages on start"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+msgid ""
+"Whether to check for new messages when Evolution is started. This includes "
+"also sending messages from Outbox."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
+msgid "Check for new messages in all active accounts"
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
+msgid "Server synchronization interval"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
+msgid "Allow expunge in virtual folders"
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
+#: ../src/mail/mail-config.ui.h:9
+msgid "Inherit theme colors in HTML format"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
+msgid ""
+"When enabled the theme colors for background, text and links are sent in "
+"resulting HTML formatted message."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
+msgid "An Archive folder for On This Computer folders."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
+msgid ""
+"An Archive folder to use for Messages|Archive... feature when in an On This "
+"Computer folder."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
+msgid "Whether the To Do bar is visible in the main window"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
+msgid "Stores whether the To Do bar is visible in the main window."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
+msgid "Width of the To Do bar in the main window"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
+msgid "Holds the width of the To Do bar for the main window."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
+msgid "Whether the To Do bar is visible in a sub-window"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
+msgid "Stores whether the To Do bar is visible in a sub-window."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
+msgid "Width of the To Do bar in a sub-window"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
+msgid "Holds the width of the To Do bar for a sub-window."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
+msgid "Whether the To Do bar should show also completed tasks"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
+msgid "Stores whether the To Do bar should show also completed tasks."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
+#, fuzzy
+#| msgid "Show the status bar"
+msgid "Show start up wizard"
+msgstr "Montri la statbreton"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
+msgid "Whether show start up wizard when there is no mail account configured."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
+msgid "Whether go to the previous message after message deletion"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
+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 ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
+msgid "(Deprecated) Default forward style"
+msgstr ""
+
+#: ../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 "
+"“forward-style-name” instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
+msgid "(Deprecated) Default reply style"
+msgstr ""
+
+#: ../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 "
+"“reply-style-name” instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
+msgid "(Deprecated) List of custom headers and whether they are enabled."
+msgstr ""
+
+#: ../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 "
+"“show-headers” instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
+msgid "(Deprecated) Load images for HTML messages over HTTP"
+msgstr ""
+
+#: ../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 "
+"“image-loading-policy” instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
+msgid ""
+"(Deprecated) Asks whether to close the message window when the user forwards "
+"or replies to the message shown in the window"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"“browser-close-on-reply-policy” instead."
+msgstr ""
+
+#. Translators: This is the a list of words for the attach reminder plugin to look
+#. for in a message body. Please use any number of words here in your language that might
+#. indicate that an attachment should have been attached to the message.
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:4
+msgid "['attachment','attaching','attached','enclosed']"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:5
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:6
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:1
+msgid "Address book source"
+msgstr "Adresaro-fonto"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:2
+msgid "Address book to use for storing automatically synced contacts."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
+msgid "Auto sync Pidgin contacts"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
+msgid "Whether Pidgin contacts should be automatically synced."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
+#, fuzzy
+msgid "Enable autocontacts"
+msgstr "Enŝalti aŭtomatajn kontaktojn"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
+msgid ""
+"Whether contacts should be automatically added to the user’s address book."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
+#, fuzzy
+#| msgid "Address book source"
+msgid "Pidgin address book source"
+msgstr "Adresaro-fonto"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
+msgid ""
+"Address book to use for storing automatically synced contacts from Pidgin."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
+msgid "Pidgin check interval"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
+msgid "Check interval for Pidgin syncing of contacts."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
+msgid "Pidgin last sync MD5"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
+msgid "Pidgin last sync MD5."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
+msgid "Pidgin last sync time"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:14
+msgid "Pidgin last sync time."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:1
+msgid "List of Custom Headers"
+msgstr ""
+
+#: ../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 “;”"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
+msgid "Default External Editor"
+msgstr "Defaŭlta ekstera redaktilo"
+
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
+msgid "Automatically launch when a new mail is edited"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:4
+msgid "Automatically launch editor when key is pressed in the mail composer."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:1
+msgid "Insert Face picture by default"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:2
+msgid ""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:1
+msgid "Delete processed"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:2
+msgid "Whether to delete processed iTip objects"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
+msgid "Notify new messages for Inbox only."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:2
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:3
+msgid "Enable D-Bus messages."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:4
+msgid "Generates a D-Bus message when new mail messages arrive."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:5
+msgid "Enable icon in notification area."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:6
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:7
+msgid "Popup message together with the icon."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:8
+msgid "Whether show message over the icon when new messages arrive."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
+msgid "Enable audible notifications when new messages arrive."
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
+msgid "Whether to emit a beep."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
+msgid "Whether to emit a beep when new messages arrive."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
+msgid "Sound filename to be played."
+msgstr ""
+
+#: ../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”."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
+#, fuzzy
+#| msgid "Beep or play sound file."
+msgid "Whether to play a sound file."
+msgstr "Pepi aŭ ludi sondosieron."
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
+msgid "Use sound theme"
+msgstr "Uzi sontemon"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:18
+msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
+msgid "Mode to use when displaying mails"
+msgstr ""
+
+#: ../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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:3
+msgid "Whether to show suppressed HTML output"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:1
+msgid "List of Destinations for publishing"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:2
+msgid ""
+"The key specifies the list of destinations to where publish calendars. Each "
+"values specifies an XML with setup for publishing to one destination."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
+msgid "Skip development warning dialog"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:3
+msgid "Initial attachment view"
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:5
+msgid "Initial file chooser folder"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:6
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
+msgid "Compression format used by autoar"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
+msgid ""
+"Compression format used when compressing attached directories with autoar."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
+msgid "Compression filter used by autoar"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
+msgid ""
+"Compression filter used when compressing attached directories with autoar."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
+#: ../src/shell/main.c:320
+msgid "Start in offline mode"
+msgstr "Starti per nekonektita reĝimo"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
+msgid "Whether Evolution will start up in offline mode instead of online mode."
+msgstr "Ĉu starti Evolucion per nekonektita reĝimo anstataŭ konektita reĝimo?"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
+msgid "Offline folder paths"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
+msgid "Enable express mode"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
+msgid "Flag that enables a much simplified user interface."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
+msgid "List of button names to hide in the window switcher"
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
+msgid "Window buttons are visible"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
+msgid "Whether the window buttons should be visible."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
+msgid "Window button style"
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
+#, fuzzy
+#| msgid "Sidebar is visible"
+msgid "Menubar is visible"
+msgstr "Flanka breto estas videbla"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
+#, fuzzy
+#| msgid "Beep or play sound file."
+msgid "Whether the menubar should be visible."
+msgstr "Pepi aŭ ludi sondosieron."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
+msgid "Toolbar is visible"
+msgstr "Ilobreto estas videbla"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:26
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:27
+msgid "Sidebar is visible"
+msgstr "Flanka breto estas videbla"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:28
+msgid "Whether the sidebar should be visible."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:29
+msgid "Statusbar is visible"
+msgstr "Statobreto estas videbla"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:30
+msgid "Whether the status bar should be visible."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:31
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:32
+msgid "Default sidebar width"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:33
+msgid "The default width for the sidebar, in pixels."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:34
+msgid "Enable special WebKit developer features"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:35
+msgid "Any change of this option requires restart of Evolution."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:36
+msgid "The last extension being used when backing up Evolution data."
+msgstr ""
+
+#: ../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 ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
+msgid "Use only local spam tests."
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:2
+msgid "Use only the local spam tests (no DNS)."
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
+msgid "Full path command to run spamassassin"
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
+msgid ""
+"Full path to a spamassassin command. If not set, then a compile-time path is "
+"used, usually /usr/bin/spamassassin. The command should not contain any "
+"other arguments."
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
+msgid "Full path command to run sa-learn"
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
+msgid ""
+"Full path to a sa-learn command. If not set, then a compile-time path is "
+"used, usually /usr/bin/sa-learn. The command should not contain any other "
+"arguments."
+msgstr ""
+
+#: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:1
+msgid "Theme name to use, defaults to “bclear”"
+msgstr ""
+
+#: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:2
+msgid ""
+"Use “highlight --list-scripts=themes” to get the list of installed themes "
+"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→...."
+msgstr ""
+
+#: ../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 "Evolucio"
+
+#: ../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 "Administri viajn retpoŝton, kontaktojn kaj planojn"
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:2
+#: ../src/shell/e-shell-utils.c:428
+msgid "Groupware Suite"
+msgstr "Grupprogramaro"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:3
+msgid "Evolution Mail and Calendar"
+msgstr "Evolucio - Retpoŝto kaj Kalendaro"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:5
+msgid "email;calendar;contact;addressbook;task;"
+msgstr ""
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:6
+#| msgid "New _Window"
+msgid "New Window"
+msgstr "Nova fenestro"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:7
+#, fuzzy
+#| msgid "Compose Message"
+msgid "Compose a Message"
+msgstr "Krei mesaĝon"
+
+#: ../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 "Kontaktoj"
+
+#: ../data/org.gnome.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 "Kalendaro"
+
+#: ../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:1247
+#: ../src/smime/gui/certificate-manager.c:1682
+msgid "Mail"
+msgstr "Retpoŝto"
+
+#: ../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 "Notoj"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:12
+#: ../src/calendar/gui/e-task-table.c:696 ../src/calendar/gui/print.c:2418
+#: ../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 "Taskoj"
+
+#: ../data/org.gnome.Evolution-alarm-notify.desktop.in.in.h:1
+msgid "Evolution Alarm Notify"
+msgstr ""
+
+#: ../data/org.gnome.Evolution-alarm-notify.desktop.in.in.h:2
+msgid "Calendar event notifications"
+msgstr ""
+
+#: ../data/views/addressbook/galview.xml.h:1
+msgid "_Address Cards"
+msgstr ""
+
+#: ../data/views/addressbook/galview.xml.h:2
+#: ../data/views/calendar/galview.xml.h:5
+msgid "_List View"
+msgstr ""
+
+#: ../data/views/addressbook/galview.xml.h:3
+msgid "By _Company"
+msgstr ""
+
+#: ../data/views/calendar/galview.xml.h:1
+msgid "_Day View"
+msgstr ""
+
+#: ../data/views/calendar/galview.xml.h:2
+msgid "_Work Week View"
+msgstr ""
+
+#: ../data/views/calendar/galview.xml.h:3
+msgid "W_eek View"
+msgstr ""
+
+#: ../data/views/calendar/galview.xml.h:4
+msgid "_Month View"
+msgstr ""
+
+#: ../data/views/mail/galview.xml.h:1
+msgid "_Messages"
+msgstr "_Mesaĝoj"
+
+#: ../data/views/mail/galview.xml.h:2
+msgid "As _Sent Folder"
+msgstr ""
+
+#: ../data/views/mail/galview.xml.h:3
+msgid "By Su_bject"
+msgstr ""
+
+#: ../data/views/mail/galview.xml.h:4
+msgid "By Se_nder"
+msgstr ""
+
+#: ../data/views/mail/galview.xml.h:5
+msgid "By S_tatus"
+msgstr ""
+
+#: ../data/views/mail/galview.xml.h:6
+msgid "By _Follow Up Flag"
+msgstr ""
+
+#: ../data/views/mail/galview.xml.h:7
+msgid "For _Wide View"
+msgstr ""
+
+#: ../data/views/mail/galview.xml.h:8
+msgid "As Sent Folder for Wi_de View"
+msgstr ""
+
+#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2439
+msgid "_Memos"
+msgstr "_Notoj"
+
+#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2443
+#: ../src/plugins/pst-import/pst-importer.c:571
+msgid "_Tasks"
+msgstr "_Taskoj"
+
+#: ../data/views/tasks/galview.xml.h:2
+msgid "With _Due Date"
+msgstr ""
+
+#: ../data/views/tasks/galview.xml.h:3
+msgid "With _Status"
+msgstr ""
+
+#: ../src/addressbook/addressbook.error.xml.h:1
 msgid "This address book could not be opened."
 msgstr "Ne eblis malfermi ĉi tiun adresaron."
 
-#: ../addressbook/addressbook.error.xml.h:2
+#: ../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."
@@ -33,11 +2941,11 @@ msgstr ""
 "Ĉi tiu adresarservilo povas esti neatingebla aŭ la servilnomo estis "
 "mistajpita aŭ via retkonekto faliĝis."
 
-#: ../addressbook/addressbook.error.xml.h:3
+#: ../src/addressbook/addressbook.error.xml.h:3
 msgid "Failed to authenticate with LDAP server."
 msgstr "Aŭtentigo al LDAP-servilo malsukcesis."
 
-#: ../addressbook/addressbook.error.xml.h:4
+#: ../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; "
@@ -47,11 +2955,11 @@ msgstr ""
 "ensalut-metodon. Memoru, ke pasvortoj distingas usklecon; eble vi aktivigis "
 "la majuskligan klavon."
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../src/addressbook/addressbook.error.xml.h:5
 msgid "This address book server does not have any suggested search bases."
 msgstr "Ĉi tiu adresarservilo ne havas iajn proponatajn serĉbazojn."
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../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 "
@@ -61,87 +2969,100 @@ msgstr ""
 "ĉi funkcion, aŭ eble ĝi estas mise agordita. Demandu vian administranton, "
 "kiuj serĉbazoj estas subtenataj."
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../src/addressbook/addressbook.error.xml.h:7
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Ĉi tiu servilo ne subtenas informskemon por LDAPv3."
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../src/addressbook/addressbook.error.xml.h:8
 msgid "Could not get schema information for LDAP server."
 msgstr "Ne eblas ricevi skemo-informojn pri LDAP-servilo."
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../src/addressbook/addressbook.error.xml.h:9
 msgid "LDAP server did not respond with valid schema information."
 msgstr "Bild-akirilo ne respondis per valida skeminformo."
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../src/addressbook/addressbook.error.xml.h:10
 msgid "Could not remove address book."
 msgstr "Ne eblis forigi adresaron."
 
-#: ../addressbook/addressbook.error.xml.h:11
-msgid "Delete address book '{0}'?"
-msgstr "Forigi adresaron '{0}'?"
+#: ../src/addressbook/addressbook.error.xml.h:11
+#, fuzzy
+#| msgid "Are you sure you want to delete the memo “{0}”?"
+msgid "Are you sure you want to delete address book “{0}”?"
+msgstr "Ĉu vi certe volas forigi tiun noton “{0}”?"
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../src/addressbook/addressbook.error.xml.h:12
 msgid "This address book will be removed permanently."
 msgstr "Ĉi tiu adresaro estos por ĉiam viŝita."
 
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:66
+#: ../src/addressbook/addressbook.error.xml.h:13
+#: ../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 "_Ne forigi"
 
-#: ../addressbook/addressbook.error.xml.h:14
-msgid "Delete remote address book &quot;{0}&quot;?"
-msgstr "Ĉu forigi la foran adresaron &quot;{0}&quot;?"
+#: ../src/addressbook/addressbook.error.xml.h:14
+#| msgid "Delete remote address book &quot;{0}&quot;?"
+msgid "Delete remote address book “{0}”?"
+msgstr "Ĉu forigi la foran adresaron “{0}”?"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../src/addressbook/addressbook.error.xml.h:15
+#, fuzzy
+#| msgid ""
+#| "This will permanently remove the address book &quot;{0}&quot; from the "
+#| "server. Are you sure you want to proceed?"
 msgid ""
-"This will permanently remove the address book &quot;{0}&quot; from the "
-"server. Are you sure you want to proceed?"
+"This will permanently remove the address book “{0}” from the server. Are you "
+"sure you want to proceed?"
 msgstr ""
-"La adresaro &quot;{0}&quot; estos daŭre forigita el la servilo. Ĉu vi vere "
-"volas daŭrigi?"
+"La adresaro “{0}” estos daŭre forigita el la servilo. Ĉu vi vere volas "
+"daŭrigi?"
 
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../calendar/calendar.error.xml.h:61
+#: ../src/addressbook/addressbook.error.xml.h:16
+#: ../src/calendar/calendar.error.xml.h:65
+#: ../src/e-util/e-system.error.xml.h:28
 msgid "_Delete From Server"
 msgstr "_Forigi de servilo"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../src/addressbook/addressbook.error.xml.h:17
 msgid "Category editor not available."
 msgstr "Ne disponeblas redaktilo por la kategorio."
 
-#: ../addressbook/addressbook.error.xml.h:18
-msgid "Unable to open address book '{0}'"
-msgstr "Ne eblas malfermi la adresaron '{0}'"
+#: ../src/addressbook/addressbook.error.xml.h:18
+#, fuzzy
+#| msgid "Unable to open address book “{0}”"
+msgid "Unable to open address book “{0}”"
+msgstr "Ne eblas malfermi la adresaron “{0}”"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../src/addressbook/addressbook.error.xml.h:19
 msgid "Unable to perform search."
 msgstr "Ne ebliĝas efektivigi serĉon."
 
-#: ../addressbook/addressbook.error.xml.h:20
-msgid "Failed to refresh address book '{0}'"
-msgstr "Malsukcesis aktualigi la adresaron '{0}'"
+#: ../src/addressbook/addressbook.error.xml.h:20
+#, fuzzy
+#| msgid "Failed to refresh address book “{0}”"
+msgid "Failed to refresh address book “{0}”"
+msgstr "Malsukcesis aktualigi la adresaron “{0}”"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../src/addressbook/addressbook.error.xml.h:21
 msgid "Would you like to save your changes?"
 msgstr "Ĉu vi deziras konservi viajn ŝanĝojn?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../src/addressbook/addressbook.error.xml.h:22
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "Vi modifis tiun ĉi kontakton. Ĉu vi volas konservi la modifojn?"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../src/addressbook/addressbook.error.xml.h:23
 msgid "_Discard"
 msgstr "_Rifuzi"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../src/addressbook/addressbook.error.xml.h:24
 msgid "Cannot move contact."
 msgstr "Ne eblas movi kontakton."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../src/addressbook/addressbook.error.xml.h:25
 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?"
@@ -149,38 +3070,40 @@ msgstr ""
 "Vi provas transmovi kontakton de unu adresaro al alia, sed ne eblas forigi "
 "ĝin el la fonta adresaro. Ĉu anstataŭe vi volas konservi kopion?"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../src/addressbook/addressbook.error.xml.h:26
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "La bildo kiun vi elektis estas tro grande. Ĉu vi volas aligrandigi kaj "
 "konservi ĝin?"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../src/addressbook/addressbook.error.xml.h:27
 msgid "_Resize"
 msgstr "_Aligrandigi"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../src/addressbook/addressbook.error.xml.h:28
 msgid "_Use as it is"
 msgstr "_Uzi laŭ ĝi estas"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../src/addressbook/addressbook.error.xml.h:29
 msgid "_Do not save"
 msgstr "_Ne konservi"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../src/addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "Ne eblas konservi {0}."
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../src/addressbook/addressbook.error.xml.h:31
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Eraro je konservo de {0} al {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:32
-msgid "Address '{0}' already exists."
-msgstr "Adreso '{0}' jam ekzistas."
+#: ../src/addressbook/addressbook.error.xml.h:32
+#, fuzzy
+#| msgid "Address “{0}” already exists."
+msgid "Address “{0}” already exists."
+msgstr "Adreso “{0}” jam ekzistas."
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../src/addressbook/addressbook.error.xml.h:33
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
@@ -188,30 +3111,31 @@ msgstr ""
 "Jam ekzistas kontakto kun tiu adreso. Ĉu vi volas aldoni novan karton kun "
 "sama adreso?"
 
-#: ../addressbook/addressbook.error.xml.h:34
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
-#: ../addressbook/gui/widgets/eab-contact-merging.c:723
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:4
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:19
-#: ../calendar/gui/dialogs/task-page.ui.h:30
-#: ../e-util/e-mail-signature-manager.c:327
-#: ../e-util/e-name-selector-dialog.c:995 ../e-util/filter.ui.h:16
-#: ../mail/e-mail-account-manager.c:718 ../mail/e-mail-label-manager.c:373
-#: ../mail/em-vfolder-editor-rule.c:396 ../mail/em-vfolder-editor-rule.c:625
-#: ../mail/mail-config.ui.h:54 ../modules/mail/em-composer-prefs.c:416
-#: ../plugins/attachment-reminder/attachment-reminder.c:557
-#: ../plugins/email-custom-header/email-custom-header.c:839
-#: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../plugins/templates/templates.c:453
+#: ../src/addressbook/addressbook.error.xml.h:34
+#: ../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:1489
+#: ../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/mail/e-mail-account-manager.c:719
+#: ../src/mail/e-mail-label-manager.c:371
+#: ../src/mail/em-folder-properties.c:1031
+#: ../src/mail/em-vfolder-editor-rule.c:397
+#: ../src/mail/em-vfolder-editor-rule.c:626 ../src/mail/mail-config.ui.h:61
+#: ../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/templates/templates.c:463
 msgid "_Add"
 msgstr "_Aldoni"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../src/addressbook/addressbook.error.xml.h:35
 msgid "Some addresses already exist in this contact list."
 msgstr "Iuj adresoj jam troviĝas en ĉi tiu kontaktlisto."
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../src/addressbook/addressbook.error.xml.h:36
 msgid ""
 "You are trying to add addresses that are part of this list already. Would "
 "you like to add them anyway?"
@@ -219,485 +3143,625 @@ msgstr ""
 "Vi provis aldoni adresojn kiuj jam apartenas al tiu listo. Ĉu vi volas "
 "aldoni ĝin malgraŭ tio?"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../src/addressbook/addressbook.error.xml.h:37
 msgid "Skip duplicates"
 msgstr "Transsalti duoblojn"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../src/addressbook/addressbook.error.xml.h:38
 msgid "Add with duplicates"
 msgstr "Aldoni kun duplikatoj"
 
-#: ../addressbook/addressbook.error.xml.h:39
-msgid "List '{0}' is already in this contact list."
-msgstr "Listo '{0}' jam troviĝas en ĉi tiu kontaktlisto."
+#: ../src/addressbook/addressbook.error.xml.h:39
+#, fuzzy
+#| msgid "List “{0}” is already in this contact list."
+msgid "List “{0}” is already in this contact list."
+msgstr "Listo “{0}” jam troviĝas en ĉi tiu kontaktlisto."
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../src/addressbook/addressbook.error.xml.h:40
+#, fuzzy
+#| msgid ""
+#| "A contact list named “{0}” is already in this contact list. Would you "
+#| "like to add it anyway?"
 msgid ""
-"A contact list named '{0}' is already in this contact list. Would you like "
+"A contact list named “{0}” is already in this contact list. Would you like "
 "to add it anyway?"
 msgstr ""
-"Kontaktlisto nomata '{0}' jam estas en tiu kontaktlisto. Ĉu vi tamen volas "
+"Kontaktlisto nomata “{0}” jam estas en tiu kontaktlisto. Ĉu vi tamen volas "
 "aldoni ĝin?"
 
-#: ../addressbook/addressbook.error.xml.h:41
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1248
+#: ../src/addressbook/addressbook.error.xml.h:41
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1280
 msgid "Failed to delete contact"
 msgstr "Forigo de kontakto malsukcesis"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../src/addressbook/addressbook.error.xml.h:42
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "Vi ne havas rajton por forigi kontaktojn en ĉi tiu adresaro."
 
-#: ../addressbook/addressbook.error.xml.h:43
+#: ../src/addressbook/addressbook.error.xml.h:43
 msgid "Cannot add new contact"
 msgstr "Ne eblas aldoni novan kontakton"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:45
+#: ../src/addressbook/addressbook.error.xml.h:45
+#, fuzzy
+#| 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."
 msgid ""
-"'{0}' is a read-only address book and cannot be modified. Please select a "
+"“{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."
 msgstr ""
-"'{0}' estas nurlega adresaro kaj ne estas modifebla. Bonvolu elekti alian "
+"“{0}” estas nurlega adresaro kaj ne estas modifebla. Bonvolu elekti alian "
 "adresaron de la flankbreto en la kontaktvido."
 
-#: ../addressbook/addressbook.error.xml.h:46
+#: ../src/addressbook/addressbook.error.xml.h:46
 msgid "Cannot save a contact, address book is still opening"
 msgstr "Ne eblas konservi kontakton, adresaro ankoraŭ estas malfermita"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:48
+#: ../src/addressbook/addressbook.error.xml.h:48
+#, fuzzy
+#| 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."
 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."
+"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."
 msgstr ""
-"Ne eblas konservi kontakton en adresaro '{0}', ĉar ĝi ankoraŭ estas "
+"Ne eblas konservi kontakton en adresaro “{0}”, ĉar ĝi ankoraŭ estas "
 "malfermata. Aŭ atendu ĝis ĝi estas tute malfermita, aŭ elektu alian "
 "adresaron."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:722
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:744
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
+#: ../src/addressbook/addressbook.error.xml.h:49
+msgid "Something has gone wrong when displaying the contact"
+msgstr ""
+
+#: ../src/addressbook/addressbook.error.xml.h:50
+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 "
+"report in the GNOME bugzilla."
+msgstr ""
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:1
+msgid "Show Telephone"
+msgstr "Montri telefonnumeron"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:2
+msgid "Show SIP Address"
+msgstr "Montri SIP-adreson"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:3
+msgid "Show Instant Messaging"
+msgstr "Montri tujmesaĝilon"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Show Web Addresses"
+msgstr "Montri retadreson"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:5
+msgid "Show Job section"
+msgstr "Montri la laboran sekcion"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:6
+msgid "Show Miscellaneous"
+msgstr "Montri diversaĵojn"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:7
+msgid "Show Home Mailing Address"
+msgstr "Montri hejman retpoŝtadreson"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:8
+msgid "Show Work Mailing Address"
+msgstr "Montri laboran retpoŝtadreson"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:9
+msgid "Show Other Mailing Address"
+msgstr "Montri aliajn retpoŝtadresojn"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:10
+msgid "Show Notes"
+msgstr "Montri notojn"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:11
+#, fuzzy
+#| msgid "Certificates"
+msgid "Show Certificates"
+msgstr "Atestiloj"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:725
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:747
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3108
 msgid "Contact Editor"
 msgstr "Kontaktredaktilo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1976
+#: ../src/mail/mail-config.ui.h:38
+msgid "Options"
+msgstr "Agordoj"
+
+#. This is only shown if the EActivity has a GCancellable.
+#. no flags
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3271
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3504
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4319
+#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:220
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:453
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:14
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:472
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:716
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:316
+#: ../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/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-color-chooser-widget.c:125
+#: ../src/e-util/e-filter-datespec.c:289
+#: ../src/e-util/e-html-editor-actions.c:321
+#: ../src/e-util/e-html-editor-actions.c:415
+#: ../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:186 ../src/e-util/e-rule-editor.c:297
+#: ../src/e-util/e-rule-editor.c:810 ../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:4082
+#: ../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-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/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/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
+#: ../src/shell/e-shell-utils.c:70 ../src/shell/e-shell-utils.c:139
+#: ../src/smime/gui/certificate-manager.c:665
+#: ../src/smime/gui/certificate-manager.c:742
+#: ../src/smime/gui/certificate-manager.c:966
+#: ../src/smime/gui/certificate-manager.c:1348
+#: ../src/smime/gui/e-cert-selector.c:235 ../src/smime/gui/smime-ui.ui.h:17
+#, fuzzy
+#| msgid "Cancel"
+msgid "_Cancel"
+msgstr "_Nuligi"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3505
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+#: ../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/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:4083
+#: ../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
+#: ../src/smime/gui/certificate-manager.c:743
+msgid "_Save"
+msgstr "Kon_servi"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../src/calendar/gui/e-comp-editor.c:2012
+#: ../src/calendar/gui/e-comp-editor.c:2084
+#: ../src/e-util/e-preferences-window.c:390
+#: ../src/e-util/e-send-options.ui.h:15
+#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
+#: ../src/shell/e-shell.c:1309 ../src/shell/e-shell-window-actions.c:994
+msgid "_Help"
+msgstr "_Helpo"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Image"
 msgstr "Bildo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:18
 msgid "Nic_kname:"
 msgstr "_Kromnomo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "_File under:"
 msgstr "_Klasi sub:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
 msgid "_Where:"
 msgstr "_En:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-#: ../calendar/gui/dialogs/event-page.ui.h:16
-#: ../calendar/gui/dialogs/memo-page.ui.h:1
-#: ../calendar/gui/dialogs/task-page.ui.h:27
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Ca_tegories..."
 msgstr "Ka_tegorioj..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Full _Name..."
 msgstr "Tuta _nomo..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:749
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1163
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:762
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1181
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Email"
 msgstr "Retpoŝto"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "_Wants to receive HTML mail"
 msgstr "_Volas recevi HTML-poŝton"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Telephone"
 msgstr "Telefono"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:26
 msgid "SIP Address"
 msgstr "SIP-adreso"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "Instant Messaging"
 msgstr "Tujmesaĝilo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../addressbook/importers/evolution-vcard-importer.c:971
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../src/addressbook/importers/evolution-vcard-importer.c:981
 msgid "Contact"
 msgstr "Kontakto"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Home Page:"
 msgstr "_Startpaĝo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../calendar/gui/dialogs/event-page.c:709
-#: ../calendar/gui/dialogs/event-page.ui.h:25
-#: ../modules/itip-formatter/itip-view.c:1907
+#: ../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
 msgid "_Calendar:"
 msgstr "_Kalendaro:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Free/Busy:"
 msgstr "_Libera/okupita:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Video Chat:"
 msgstr "_Videobabilado:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "Home Page:"
 msgstr "Startpaĝo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-#: ../modules/cal-config-google/e-cal-config-google.c:93
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../src/modules/cal-config-google/e-cal-config-google.c:97
 msgid "Calendar:"
 msgstr "Kalendaro:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "Free/Busy:"
 msgstr "Libere/okupite:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "Video Chat:"
 msgstr "Video-retbabilo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Blog:"
 msgstr "_Blogo:"
 
 #. Translators: an accessibility name
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "Blog:"
 msgstr "Blogo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "Web Addresses"
 msgstr "TTT-adresoj"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Profession:"
 msgstr "_Profesio:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgctxt "Job"
 msgid "_Title:"
 msgstr "_Titolo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_Company:"
 msgstr "_Firmao:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Department:"
 msgstr "_Sekcio:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Office:"
 msgstr "_Oficejo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_Manager:"
 msgstr "_Estro:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Assistant:"
 msgstr "_Asistanto:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "Job"
 msgstr "Tasko"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Spouse:"
 msgstr "_Edz(in)o:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:50
 msgid "_Birthday:"
 msgstr "_Naskiĝtago:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:51
 msgid "_Anniversary:"
 msgstr "_Datreveno:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:875
-#: ../calendar/gui/e-calendar-view.c:1996
+#: ../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
 msgid "Anniversary"
 msgstr "Datreveno"
 
-#. XXX Allow the category icons to be referenced as named
-#. *     icons, since GtkAction does not support GdkPixbufs.
-#. Get the icon file for some default category.  Doesn't matter
-#. * which, so long as it has an icon.  We're just interested in
-#. * the directory components.
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:874
-#: ../calendar/gui/e-calendar-view.c:1995 ../shell/main.c:127
+#: ../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
 msgid "Birthday"
 msgstr "Naskiĝtago"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../src/modules/addressbook/autocompletion-config.c:127
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:55
 msgid "Personal Information"
 msgstr "Personaj informoj"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:56
 msgid "_City:"
 msgstr "_Urbo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:57
 msgid "_Zip/Postal Code:"
 msgstr "Poŝt_kodo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:58
 msgid "_State/Province:"
 msgstr "_Subŝtato/provinco:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:59
 msgid "_Country:"
 msgstr "_Lando:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:60
 msgid "_PO Box:"
 msgstr "_Poŝtfako:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
-#: ../composer/e-composer-from-header.c:123
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:61
+#: ../src/composer/e-composer-from-header.c:122
 msgid "_Address:"
 msgstr "_Adreso:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/widgets/eab-contact-display.c:356
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
-#: ../addressbook/gui/widgets/e-contact-map.c:369
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:62
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:83
+#: ../src/addressbook/gui/widgets/e-contact-map.c:367
 msgid "Home"
 msgstr "Hejmo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:842
-#: ../addressbook/gui/widgets/e-contact-map.c:382
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:63
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:82
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:860
+#: ../src/addressbook/gui/widgets/e-contact-map.c:380
 msgid "Work"
 msgstr "Laborejo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:83
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:512
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:909
-#: ../calendar/gui/e-cal-model.c:3034
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:64
+#: ../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:3805
 msgid "Other"
 msgstr "Aliaj"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:65
 msgid "Mailing Address"
 msgstr "Poŝtadreso"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:66
+#: ../src/mail/filtertypes.xml.in.h:50 ../src/mail/searchtypes.xml.in.h:52
+#: ../src/mail/vfoldertypes.xml.in.h:53
 msgid "Notes"
 msgstr "Notoj"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../calendar/gui/dialogs/comp-editor.c:1249
-#: ../calendar/gui/dialogs/comp-editor.c:1335
-#: ../e-util/e-preferences-window.c:379 ../e-util/e-send-options.ui.h:41
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../shell/e-shell-window-actions.c:1085
-msgid "_Help"
-msgstr "_Helpo"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:35
-msgid "Options"
-msgstr "Agordoj"
-
-#. This is only shown if the EActivity has a GCancellable.
-#. no flags
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3683
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:222
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
-#: ../addressbook/gui/contact-editor/fullname.ui.h:14
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
-#: ../addressbook/gui/widgets/eab-contact-merging.c:474
-#: ../addressbook/gui/widgets/eab-contact-merging.c:718
-#: ../addressbook/gui/widgets/eab-gui-util.c:318
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1328
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:15
-#: ../calendar/gui/dialogs/recurrence-page.c:2322
-#: ../composer/e-composer-actions.c:267 ../e-util/e-activity-bar.c:340
-#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:491
-#: ../e-util/e-attachment-store.c:635 ../e-util/e-attachment-view.c:370
-#: ../e-util/e-categories-dialog.c:82 ../e-util/e-category-editor.c:138
-#: ../e-util/e-category-editor.c:208 ../e-util/e-charset-combo-box.c:101
-#: ../e-util/e-color-chooser-widget.c:127 ../e-util/e-filter-datespec.c:291
-#: ../e-util/e-html-editor-actions.c:614 ../e-util/e-html-editor-actions.c:708
-#: ../e-util/e-image-chooser-dialog.c:171
-#: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:470
-#: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
-#: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:776
-#: ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
-#: ../e-util/e-source-selector-dialog.c:350 ../e-util/e-table-config.c:548
-#: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
-#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3174
-#: ../e-util/gal-view-instance-save-as-dialog.c:269
-#: ../mail/e-mail-config-window.c:330 ../mail/e-mail-label-dialog.c:196
-#: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:317
-#: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:738
-#: ../mail/mail-send-recv.c:820 ../mail/mail-vfolder-ui.c:148
-#: ../mail/mail-vfolder-ui.c:270
-#: ../modules/backup-restore/evolution-backup-tool.c:900
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:363
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:363
-#: ../modules/calendar/e-cal-attachment-handler.c:285
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
-#: ../plugins/face/face.c:291
-#: ../plugins/publish-calendar/publish-calendar.c:806
-#: ../plugins/publish-calendar/url-editor-dialog.c:421
-#: ../plugins/save-calendar/save-calendar.c:187 ../shell/e-shell-content.c:659
-#: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:70
-#: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:652
-#: ../smime/gui/certificate-manager.c:729
-#: ../smime/gui/certificate-manager.c:953
-#: ../smime/gui/certificate-manager.c:1335 ../smime/gui/e-cert-selector.c:237
-#: ../smime/gui/smime-ui.ui.h:23
-#, fuzzy
-#| msgid "Cancel"
-msgid "_Cancel"
-msgstr "_Nuligi"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:55
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
-#: ../addressbook/gui/widgets/eab-contact-merging.c:721
-#: ../calendar/calendar.error.xml.h:47
-#: ../calendar/gui/dialogs/comp-editor.c:1277
-#: ../composer/e-composer-actions.c:268 ../composer/e-composer-actions.c:408
-#: ../e-util/e-attachment-store.c:636
-#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3175
-#: ../e-util/gal-view-instance-save-as-dialog.c:270
-#: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:135
-#: ../smime/gui/certificate-manager.c:653
-#: ../smime/gui/certificate-manager.c:730
-msgid "_Save"
-msgstr "Kon_servi"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
-msgid "Show Telephone"
-msgstr "Montri telefonnumeron"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:57
-msgid "Show SIP Address"
-msgstr "Montri SIP-adreson"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
-msgid "Show Instant Messaging"
-msgstr "Montri tujmesaĝilon"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
-msgid "Show Web Addresses"
-msgstr "Montri retadreson"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
-msgid "Show Job section"
-msgstr "Montri la laboran sekcion"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:61
-msgid "Show Miscellaneous"
-msgstr "Montri diversaĵojn"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
-msgid "Show Home Mailing Address"
-msgstr "Montri hejman retpoŝtadreson"
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:67
+msgid "Add _PGP"
+msgstr ""
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:68
+msgid "Add _X.509"
+msgstr ""
+
+#: ../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/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/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/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/templates/templates.c:473
+msgid "_Remove"
+msgstr "Fo_rigi"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
-msgid "Show Work Mailing Address"
-msgstr "Montri laboran retpoŝtadreson"
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:70
+msgid "Load P_GP"
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
-msgid "Show Other Mailing Address"
-msgstr "Montri aliajn retpoŝtadresojn"
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:71
+msgid "_Load X.509"
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
-msgid "Show Notes"
-msgstr "Montri notojn"
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:72
+#: ../src/modules/addressbook/e-book-shell-backend.c:318
+msgid "Certificates"
+msgstr "Atestiloj"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
-#: ../calendar/gui/dialogs/comp-editor.c:1298
-#: ../e-util/e-html-editor-actions.c:1129
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:260
+#: ../src/calendar/gui/e-comp-editor.c:2047
+#: ../src/e-util/e-html-editor-actions.c:913
 msgid "_Undo"
 msgstr "_Malfari"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
-#: ../calendar/gui/dialogs/comp-editor.c:1300 ../e-util/e-focus-tracker.c:122
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:262
+#: ../src/calendar/gui/e-comp-editor.c:2049 ../src/e-util/e-focus-tracker.c:120
 msgid "Undo"
 msgstr "Malfari"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
-#: ../calendar/gui/dialogs/comp-editor.c:1305
-#: ../e-util/e-html-editor-actions.c:1115
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:267
+#: ../src/calendar/gui/e-comp-editor.c:2054
+#: ../src/e-util/e-html-editor-actions.c:899
 msgid "_Redo"
 msgstr "_Refari"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
-#: ../calendar/gui/dialogs/comp-editor.c:1307 ../e-util/e-focus-tracker.c:138
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:269
+#: ../src/calendar/gui/e-comp-editor.c:2056 ../src/e-util/e-focus-tracker.c:136
 msgid "Redo"
 msgstr "Refari"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
-#: ../addressbook/gui/widgets/eab-gui-util.c:503
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:501
 msgid "Error adding contact"
 msgstr "Eraro aldonante kontakton"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:318
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:321
 msgid "Error modifying contact"
 msgstr "Eraro dum modifado de kontaktulo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:341
 msgid "Error removing contact"
 msgstr "Eraro dum forigo de kontaktulo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:738
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3081
-#, c-format
-msgid "Contact Editor - %s"
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:741
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3102
+#, fuzzy, c-format
+#| msgid "Contact Editor - %s"
+msgid "Contact Editor — %s"
 msgstr "Kontaktula redaktilo – %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3680
-msgid "Please select an image for this contact"
-msgstr "Bonvolu elekti bildon por tiu ĉi kontaktulo"
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3238
+#| msgid "Certificates"
+msgid "X.509 certificates"
+msgstr "X.509-atestiloj"
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3243
+msgid "PGP keys"
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3684
-#: ../e-util/e-attachment-store.c:489 ../e-util/e-category-editor.c:146
-#: ../e-util/e-html-editor-actions.c:615 ../e-util/e-html-editor-actions.c:709
-#: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:292
-#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:954
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3249
+#: ../src/smime/gui/certificate-manager.c:689
+#: ../src/smime/gui/certificate-manager.c:978
+msgid "All files"
+msgstr "Ĉiuj dosieroj"
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3269
+msgid "Open PGP key"
+msgstr ""
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3269
+#, fuzzy
+#| msgid "Encryption:"
+msgid "Open X.509 certificate"
+msgstr "Malfermi X.509-atestilon"
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4320
+#: ../src/e-util/e-attachment-store.c:662 ../src/e-util/e-category-editor.c:148
+#: ../src/e-util/e-html-editor-actions.c:322
+#: ../src/e-util/e-html-editor-actions.c:416
+#: ../src/e-util/e-image-chooser-dialog.c:172 ../src/plugins/face/face.c:296
+#: ../src/shell/e-shell-utils.c:71 ../src/smime/gui/certificate-manager.c:967
 msgid "_Open"
 msgstr "_Malfermi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3685
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3289
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3520
+#| msgid "File is not a valid .desktop file"
+msgid "Chosen file is not a local file."
+msgstr "Elektita dosiero ne estas loka dosiero."
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3302
+#, c-format
+#| msgid "Failed to open client “%s”: %s"
+msgid "Failed to load certificate: %s"
+msgstr "Malsukcesis ŝargi atestilon: %s"
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3331
+msgctxt "cert-kind"
+msgid "X.509"
+msgstr ""
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3331
+msgctxt "cert-kind"
+msgid "PGP"
+msgstr ""
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
+msgid "Save PGP key"
+msgstr ""
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
+#| msgid "_View Certificate"
+msgid "Save X.509 certificate"
+msgstr "Konservi X.509-atestilon"
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3532
+#, c-format
+#| msgid "Failed to open client “%s”: %s"
+msgid "Failed to save certificate: %s"
+msgstr "Malsukcesis konservi atestilon: %s"
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4316
+msgid "Please select an image for this contact"
+msgstr "Bonvolu elekti bildon por tiu ĉi kontaktulo"
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4321
 msgid "_No image"
 msgstr "_Neniu bildo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4034
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4670
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -705,476 +3769,468 @@ msgstr ""
 "La kontaktulaj informoj ne estas validaj:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4040
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4676
 #, c-format
-msgid "'%s' has an invalid format"
-msgstr "'%s' havas nevalidan strukturon"
+#| msgid "“%s” has an invalid format"
+msgid "“%s” has an invalid format"
+msgstr "“%s” havas nevalidan strukturon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4048
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4684
 #, c-format
-msgid "'%s' cannot be a future date"
-msgstr "'%s' ne povas esti estonta dato"
+#| msgid "“%s” cannot be a future date"
+msgid "“%s” cannot be a future date"
+msgstr "“%s” ne povas esti estonta dato"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4056
-#, c-format
-msgid "%s'%s' has an invalid format"
-msgstr "%s'%s' havas nevalidan strukturon"
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4692
+#, fuzzy, c-format
+#| msgid "%s“%s” has an invalid format"
+msgid "%s“%s” has an invalid format"
+msgstr "%s“%s” havas nevalidan strukturon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4069
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4083
-#, c-format
-msgid "%s'%s' is empty"
-msgstr "%s'%s' estas malplena"
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4705
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4719
+#, fuzzy, c-format
+#| msgid "%s“%s” is empty"
+msgid "%s“%s” is empty"
+msgstr "%s“%s” estas malplena"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4098
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4734
 msgid "Invalid contact."
 msgstr "Nevalida kontakto."
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:223
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:456
-#: ../addressbook/gui/contact-editor/fullname.ui.h:13
-#: ../addressbook/gui/widgets/eab-gui-util.c:319
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:3
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
-#: ../calendar/gui/dialogs/recurrence-page.c:2323
-#: ../e-util/e-attachment-dialog.c:313 ../e-util/e-categories-dialog.c:83
-#: ../e-util/e-category-editor.c:209 ../e-util/e-charset-combo-box.c:102
-#: ../e-util/e-color-chooser-widget.c:128 ../e-util/e-filter-datespec.c:292
-#: ../e-util/e-html-editor-link-dialog.c:388 ../e-util/e-passwords.c:471
-#: ../e-util/e-rule-context.c:816 ../e-util/e-rule-editor.c:181
-#: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:777
-#: ../e-util/e-send-options.ui.h:43 ../e-util/e-source-config-dialog.c:380
-#: ../e-util/e-source-selector-dialog.c:351 ../e-util/e-table-config.c:549
-#: ../e-util/e-table-config.ui.h:3 ../e-util/e-timezone-dialog.ui.h:3
-#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-tag-editor.c:243
-#: ../mail/em-folder-selector.c:43 ../mail/mail-config.ui.h:3
-#: ../mail/mail-dialogs.ui.h:26 ../mail/mail-vfolder-ui.c:149
-#: ../mail/mail-vfolder-ui.c:271
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
-#: ../plugins/publish-calendar/url-editor-dialog.c:422
-#: ../shell/e-shell-content.c:661 ../shell/e-shell-content.c:767
-#: ../shell/main.c:168 ../smime/gui/certificate-manager.c:1336
-#: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
+#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:221
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:454
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:13
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:317
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:302
+#: ../src/e-util/e-attachment-dialog.c:311
+#: ../src/e-util/e-categories-dialog.c:81 ../src/e-util/e-category-editor.c:212
+#: ../src/e-util/e-charset-combo-box.c:100
+#: ../src/e-util/e-color-chooser-widget.c:126
+#: ../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:187 ../src/e-util/e-rule-editor.c:298
+#: ../src/e-util/e-rule-editor.c:811 ../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
+#: ../src/e-util/e-timezone-dialog.ui.h:3
+#: ../src/mail/e-mail-config-window.c:335 ../src/mail/e-mail-tag-editor.c:169
+#: ../src/mail/em-folder-selector.c:44 ../src/mail/mail-config.ui.h:3
+#: ../src/mail/mail-dialogs.ui.h:24 ../src/mail/mail-vfolder-ui.c:150
+#: ../src/mail/mail-vfolder-ui.c:272
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:278
+#: ../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/smime/gui/e-cert-selector.c:236 ../src/smime/gui/smime-ui.ui.h:18
 msgid "_OK"
 msgstr "_Bone"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:451
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:449
 msgid "Contact Quick-Add"
 msgstr "Rapida aldono de kontaktulo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:452
 msgid "_Edit Full"
 msgstr "R_edakti plene"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:505
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:503
 msgid "_Full name"
 msgstr "_Tuta nomo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:518
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:516
 msgid "E_mail"
 msgstr "Ret_poŝto"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:531
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:529
 msgid "_Select Address Book"
 msgstr "E_ekti adresaron"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:1
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Mr."
 msgstr "S-ro"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:2
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:2
 msgid "Mrs."
 msgstr "S-ino"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:3
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:3
 msgid "Ms."
 msgstr "F-ino"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:4
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:4
 msgid "Miss"
 msgstr "Sinjorino"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:5
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:5
 msgid "Dr."
 msgstr "D-ro"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:6
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:6
 msgid "Sr."
 msgstr "S-ro"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:7
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:8
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:8
 msgid "I"
 msgstr "I"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:9
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:9
 msgid "II"
 msgstr "II"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:10
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:10
 msgid "III"
 msgstr "III"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:11
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:11
 msgid "Esq."
 msgstr "Est."
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:12
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:12
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Full Name"
 msgstr "Tuta nomo"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:15
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_First:"
 msgstr "_Unua:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:16
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:16
 msgctxt "FullName"
 msgid "_Title:"
 msgstr "_Titolo:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:17
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Middle:"
 msgstr "_Meza:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:18
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:18
 msgid "_Last:"
 msgstr "_Lasta:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:19
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:19
 msgid "_Suffix:"
 msgstr "_Sufikso:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:817
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:815
 msgid "Contact List Editor"
 msgstr "Kontaktlist-redaktilo"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "_List name:"
 msgstr "_Listnomo:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "Members"
 msgstr "Membroj"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Tajpu retpoŝtadreson aŭ treni kontakton al la suba listo:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Kaŝu adresojn kiam poŝt estas sendata al tiu listo"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
 msgid "Add an email to the List"
 msgstr "Aldoni retpoŝtadreson al la listo"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:12
 msgid "Remove an email address from the List"
 msgstr "Forigi retpoŝtadreson el la listo"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:21
-#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/e-attachment-view.c:424
-#: ../e-util/e-filter-rule.c:225 ../e-util/e-mail-signature-manager.c:367
-#: ../e-util/e-name-selector-dialog.c:999 ../e-util/filter.ui.h:18
-#: ../mail/e-mail-label-manager.c:391 ../mail/em-filter-rule.c:440
-#: ../mail/em-vfolder-editor-rule.c:630 ../mail/mail-config.ui.h:55
-#: ../plugins/attachment-reminder/attachment-reminder.c:567
-#: ../plugins/email-custom-header/email-custom-header.c:849
-#: ../plugins/publish-calendar/publish-calendar.c:807
-#: ../plugins/publish-calendar/publish-calendar.ui.h:34
-#: ../plugins/templates/templates.c:463
-msgid "_Remove"
-msgstr "Fo_rigi"
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:13
+msgid "_Select..."
+msgstr "_Elekti..."
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14
 msgid "Insert email addresses from Address Book"
 msgstr "Enmeti retpoŝtadreson el adresaro"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:12
-msgid "_Select..."
-msgstr "_Elekti..."
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:13
-#: ../e-util/filter.ui.h:19
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
+#: ../src/e-util/filter.ui.h:26
 msgid "_Top"
 msgstr "_Supre"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14
-#: ../e-util/filter.ui.h:20
+#: ../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
 msgid "_Up"
 msgstr "_Supre"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
-#: ../e-util/filter.ui.h:21
+#: ../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
 msgid "_Down"
 msgstr "_Malsupre"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
-#: ../e-util/filter.ui.h:22
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
+#: ../src/e-util/filter.ui.h:29
 msgid "_Bottom"
 msgstr "_Malsupre"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:942
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:940
 msgid "Contact List Members"
 msgstr "Kontaktlist-membroj"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1487
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1499
 msgid "_Members"
 msgstr "_Membroj"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1627
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1639
 msgid "Error adding list"
 msgstr "Eraro dum aldono de listo"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1647
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1659
 msgid "Error modifying list"
 msgstr "Eraro dum ŝangô de listo"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1667
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1679
 msgid "Error removing list"
 msgstr "Eraro dum forigo de listo"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1195
+#: ../src/addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1225
 msgid "Name contains"
 msgstr "La nomo entenas"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1188
+#: ../src/addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1218
 msgid "Email begins with"
 msgstr "Retpoŝto komencas kun"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1181
-#: ../modules/calendar/e-cal-shell-view-actions.c:1611
-#: ../modules/calendar/e-memo-shell-view-actions.c:733
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../src/addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../src/calendar/gui/caltypes.xml.in.h:26
+#: ../src/calendar/gui/memotypes.xml.in.h:19
+#: ../src/calendar/gui/tasktypes.xml.in.h:30
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1211
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1713
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:782
+#: ../src/modules/calendar/e-task-shell-view-actions.c:983
 msgid "Any field contains"
 msgstr "Iu ajn kampo enhavas"
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
-#: ../addressbook/gui/widgets/ea-minicard-view.c:193
+#: ../src/addressbook/gui/widgets/ea-addressbook-view.c:92
+#: ../src/addressbook/gui/widgets/ea-addressbook-view.c:101
+#: ../src/addressbook/gui/widgets/ea-minicard-view.c:223
 msgid "evolution address book"
 msgstr "adresaro de Evolucio"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:149
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:185
 msgid "Copy _Email Address"
 msgstr "Kopiu _Retpoŝtadreson"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:151
-#: ../e-util/e-web-view.c:317
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:187
+#: ../src/e-util/e-web-view.c:368
 msgid "Copy the email address to the clipboard"
 msgstr "Kopii la retpoŝtadreson en la tondujon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:156
-#: ../e-util/e-web-view.c:322
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:192
+#: ../src/e-util/e-web-view.c:380
 msgid "_Send New Message To..."
 msgstr "_Sendi novan mesaĝon al..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:158
-#: ../e-util/e-web-view.c:324
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:194
+#: ../src/e-util/e-web-view.c:382
 msgid "Send a mail message to this address"
 msgstr "Sendi retmesaĝon al tiu ĉi adreso"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../e-util/e-web-view.c:1036
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:321
+#: ../src/e-util/e-web-view.c:1349
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klaku por sendi retpoŝton al %s"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:141
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:335
+#, fuzzy, c-format
+#| msgid "Click to open %s"
+msgid "Click to open map for %s"
+msgstr "Klaki por malfermi %s"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:154
 msgid "Open map"
 msgstr "Malfermi mapon"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:437
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:450
 msgid "SIP"
 msgstr "SIP"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:694
 msgid "List Members:"
 msgstr "Listanoj:"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:753
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:766
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "Kromnomo"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:754
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:767
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:755
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:768
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:756
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:769
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:757
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:770
 msgid "Jabber"
 msgstr "Jabero"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:758
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:771
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:759
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:772
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:760
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:773
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:761
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:774
 msgid "Skype"
 msgstr "Skajpo"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:762
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:775
 msgid "Twitter"
 msgstr "Tvitero"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:819
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:837
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "Firmao"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:820
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:838
 msgid "Department"
 msgstr "Distrikto"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:821
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:839
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Office"
 msgstr "Oficejo"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:822
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:840
 msgid "Profession"
 msgstr "Profesio"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:823
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:841
 msgid "Position"
 msgstr "Pozicio"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:824
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:842
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "Estro"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:825
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:843
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "Asistanto"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:826
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:844
 msgid "Video Chat"
 msgstr "Video-babilado"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:827
-#: ../e-util/e-send-options.c:546
-#: ../modules/calendar/e-cal-shell-view-actions.c:181
-#: ../modules/calendar/e-cal-shell-view.c:570
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-msgid "Calendar"
-msgstr "Kalendaro"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:828
-#: ../calendar/gui/dialogs/event-editor.c:115
-#: ../calendar/gui/dialogs/event-editor.c:342
-#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:846
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Libere/okupite"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:829
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:870
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:847
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:888
 msgid "Phone"
 msgstr "Telefono"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:830
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:848
 msgid "Fax"
 msgstr "Faksilo"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:832
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:873
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:899
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:850
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:891
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:917
 msgid "Address"
 msgstr "Adreso"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:868
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:886
 msgid "Home Page"
 msgstr "Hejmpaĝo"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:869
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:887
 msgid "Web Log"
 msgstr "Blogo"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:871
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:889
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Mobile Phone"
 msgstr "Poŝtelefono"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:876
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:894
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "Edz(in)o"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:886
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:904
 msgid "Personal"
 msgstr "Persona"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:931
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:949
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "Noto"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1127
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1145
 msgid "List Members"
 msgstr "Listanoj"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1148
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1166
 msgid "Job Title"
 msgstr "Postena titolo"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1189
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1207
 msgid "Home page"
 msgstr "Hejmpaĝo"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1199
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1217
 msgid "Blog"
 msgstr "Blogo"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:261
-#: ../calendar/gui/tasktypes.xml.h:14
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:259
+#: ../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:3596
+#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:966
 msgid "Cancelled"
 msgstr "Nuligite"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:457
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:455
 msgid "Merge Contact"
 msgstr "Kunigi kontakton"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:475
-#: ../addressbook/gui/widgets/eab-contact-merging.c:724
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:473
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:722
 msgid "_Merge"
 msgstr "_Kunigi"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:713
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:711
 msgid "Duplicate Contact Detected"
 msgstr "Trovis duoblan kontaktulon"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:771
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:769
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to save the changes anyway?"
@@ -1182,7 +4238,7 @@ msgstr ""
 "La nomo aŭ la retpoŝtadreso de tiu ĉi kontakto jam ekzistas en\n"
 "tiu dosierujo. Ĉu vi malgraŭ tio volas konservi la ŝanĝojn?"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:774
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:772
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to add it anyway?"
@@ -1190,23 +4246,23 @@ msgstr ""
 "La nomo aŭ retpoŝtadreso de tiu ĉi kontakto jam ekzistas\n"
 "en tiu dosierujo. Ĉu vi malgraŭ volas aldoni ĝin?"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:789
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:787
 msgid "Changed Contact:"
 msgstr "Ŝanĝita kontakto:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:791
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:789
 msgid "New Contact:"
 msgstr "Nova kontakto:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:830
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:828
 msgid "Conflicting Contact:"
 msgstr "Konflikta kontakto:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:832
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:830
 msgid "Old Contact:"
 msgstr "Malnova kontakto:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:121
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:119
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1216,7 +4272,7 @@ msgstr ""
 "uzo, aŭ ĝi ankoraŭ neniam estis elŝutita por senkonekta uzo. Bonvolu unufoje "
 "ŝargi la adresaron en konektita reĝimo por elŝuti ĝian enhavon."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:138
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1225,7 +4281,7 @@ msgstr ""
 "Ne eblis malfermi tiun adresaron.  Bonvolu kontroli ĉu la vojo %s ekzistas "
 "kaj ĉu la permesagordoj permesas atingi ĝin al vi."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:151
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1233,7 +4289,7 @@ msgstr ""
 "Tiu ĉi versio de Evolucio ne estis tradukita kun subteno de LDAP.  Por uzi "
 "LDAP necesas instali alian version de Evolucio, kiu subtenas LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:162
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:160
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1241,11 +4297,11 @@ msgstr ""
 "Ne eblis malfermi tiun adresaron.  Tio signifas ke vi enigis malĝustan URI-"
 "on, aŭ la servilo ne atingeblas."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:170
 msgid "Detailed error message:"
 msgstr "Detala erar-mesaĝo:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:209
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1258,7 +4314,7 @@ msgstr ""
 "Bonvolu igi vian serĉon pli strikta aŭ pligrandigi la maksimuman nombron de "
 "rezultoj en la adresara servilo por tiu ĉi adresaro."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:218
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:216
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1272,7 +4328,7 @@ msgstr ""
 "tempon de la adresara servilo por tiu ĉi adresaro."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:226
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:224
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr ""
@@ -1280,134 +4336,136 @@ msgstr ""
 "informpeton. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:231
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:229
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr ""
 "La interna interfaco por tiu adresaro rifuzis efektivigi tiun informpeton. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:237
-#: ../addressbook/gui/widgets/eab-gui-util.c:243
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:235
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:241
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "Tiu informpeto ne sukcese finiĝis. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:265
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:263
 msgid "card.vcf"
 msgstr "karto.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:314
 msgid "Select Address Book"
 msgstr "Elekti adresaron"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:398
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:396
 msgid "list"
 msgstr "listo"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:587
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:585
 msgid "Move contact to"
 msgstr "Movi kontakton al"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:589
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:587
 msgid "Copy contact to"
 msgstr "Kopii kontakton al"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:592
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:590
 msgid "Move contacts to"
 msgstr "Movi kontaktojn al"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:592
 msgid "Copy contacts to"
 msgstr "Kopii kontaktojn al"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:162
+#: ../src/addressbook/gui/widgets/e-addressbook-model.c:160
 msgid "No contacts"
 msgstr "Neniuj kontaktoj"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:166
+#: ../src/addressbook/gui/widgets/e-addressbook-model.c:164
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d kontakto"
 msgstr[1] "%d kontaktoj"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:372
+#: ../src/addressbook/gui/widgets/e-addressbook-model.c:370
 msgid "Error getting book view"
 msgstr "Eraro dum akiro de libro-aspekton"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:819
+#: ../src/addressbook/gui/widgets/e-addressbook-model.c:817
 msgid "Search Interrupted"
 msgstr "Serĉado interrompita"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:203
+#: ../src/addressbook/gui/widgets/e-addressbook-table-adapter.c:219
 msgid "Error modifying card"
 msgstr "Eraro dum modifado de karto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:648
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:680
 msgid "Cut selected contacts to the clipboard"
 msgstr "Eltondi la elektitajn kontaktulojn en la tondujon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:654
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:686
 msgid "Copy selected contacts to the clipboard"
 msgstr "Kopii la elektitajn kontaktulojn en la tondujon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:660
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:692
 msgid "Paste contacts from the clipboard"
 msgstr "Alglui la kontaktulojn el la tondujo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:666
-#: ../modules/addressbook/e-book-shell-view-actions.c:995
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:698
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1021
 msgid "Delete selected contacts"
 msgstr "Forigi la elektitajn kontaktulojn"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:672
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Select all visible contacts"
 msgstr "Elektu ĉiujn videblajn kontaktulojn"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1296
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1328
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Ĉu certe vi volas forigi tiun ĉi liston de kontaktuloj?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1332
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Ĉu certe vi volas forigi tiun ĉi liston de kontaktuloj?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1336
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Ĉu certe vi volas forigi tiun ĉi liston de kontaktuloj (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1310
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1342
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Ĉu certe vi volas forigi tiujn ĉi kontaktulojn?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1346
 msgid "Are you sure you want to delete this contact?"
 msgstr "Ĉu certe vi volas forigi tiun ĉi kontaktulon?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1318
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1350
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Ĉu certe vi volas forigi tiun ĉi kontaktulon (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1329
-#: ../calendar/gui/dialogs/comp-editor.c:1242 ../e-util/e-focus-tracker.c:785
-#: ../e-util/evolution-source-viewer.c:805
-#: ../mail/e-mail-account-manager.c:736
-#: ../modules/addressbook/e-book-shell-view-actions.c:1067
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
-#: ../modules/calendar/e-memo-shell-view-actions.c:635
-#: ../modules/calendar/e-task-shell-view-actions.c:788
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
-#: ../shell/e-shell-window-actions.c:943
-#: ../smime/gui/certificate-manager.c:1659 ../smime/gui/smime-ui.ui.h:10
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1361
+#: ../src/calendar/gui/e-comp-editor.c:2005
+#: ../src/e-util/e-accounts-window.c:1676 ../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
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1093
+#: ../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/shell/e-shell-window-actions.c:852
+#: ../src/smime/gui/certificate-manager.c:1672 ../src/smime/gui/smime-ui.ui.h:8
 msgid "_Delete"
 msgstr "_Forigi"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1474
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1508
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1422,99 +4480,101 @@ msgstr[1] ""
 "Malfermado de %d kontaktoj malfermos ankaŭ %d novajn fenestrojn.\n"
 "Ĉu certe vi volas montri ĉiujn ĉi kontaktulojn?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1482
-msgid "_Don't Display"
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1516
+#, fuzzy
+#| msgid "_Don't Display"
+msgid "_Don’t Display"
 msgstr "_Ne montru"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1483
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1517
 msgid "Display _All Contacts"
 msgstr "_Montru ĉiujn kontaktulojn"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 msgid "File As"
 msgstr "Klasi kiel"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Given Name"
 msgstr "Donita nomo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Family Name"
 msgstr "Familia nomo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Email 2"
 msgstr "Retpoŝto 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 msgid "Email 3"
 msgstr "Retpoŝto 3"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Assistant Phone"
 msgstr "Telefono de asistanto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 msgid "Business Phone"
 msgstr "Deĵora telefono"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Business Phone 2"
 msgstr "Deĵora telefono 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Business Fax"
 msgstr "Deĵora telekopiilo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Callback Phone"
 msgstr "Responda telefono"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Car Phone"
 msgstr "Aŭta telefono"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Company Phone"
 msgstr "Kompania telefono"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Home Phone"
 msgstr "Hejma telefono"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Phone 2"
 msgstr "Hejma telfono 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
 msgstr "Hejma telekopiilo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "ISDN Phone"
 msgstr "ISDN-a telefono"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "Alia telefono"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Other Fax"
 msgstr "Plia telekopiilo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Pager"
 msgstr "Televokilo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Primary Phone"
 msgstr "Ĉefa telefono"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Radio"
 msgstr "Radio"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Telex"
 msgstr "Telekso"
 
@@ -1524,97 +4584,97 @@ msgstr "Telekso"
 #. Device for Deaf". However, you probably want to leave this
 #. abbreviation unchanged unless you know that there is actually a
 #. different and established translation for this in your language.
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Unit"
 msgstr "Unuo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Titolo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:666
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: ../src/calendar/gui/e-meeting-list-view.c:658
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Rolo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "Retpaĝo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:42
 msgid "Journal"
 msgstr "Ĵurnalo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../calendar/gui/dialogs/event-page.ui.h:20
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:6
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../e-util/e-categories-dialog.c:87
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:6
+#: ../src/calendar/gui/e-memo-table.etspec.h:4
+#: ../src/calendar/gui/e-task-table.etspec.h:12
+#: ../src/e-util/e-categories-dialog.c:85
 msgid "Categories"
 msgstr "Kategorioj"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:33
+#: ../src/addressbook/gui/widgets/ea-minicard.c:31
 msgid "Open"
 msgstr "Malfermi"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:159
+#: ../src/addressbook/gui/widgets/ea-minicard.c:157
 msgid "Contact List: "
 msgstr "Kontaklisto: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:160
+#: ../src/addressbook/gui/widgets/ea-minicard.c:158
 msgid "Contact: "
 msgstr "Kontakto: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:187
+#: ../src/addressbook/gui/widgets/ea-minicard.c:180
 msgid "evolution minicard"
 msgstr "karteto de Evolucio"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:35
+#: ../src/addressbook/gui/widgets/ea-minicard-view.c:33
 msgid "New Contact"
 msgstr "Nova kontakto"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+#: ../src/addressbook/gui/widgets/ea-minicard-view.c:34
 msgid "New Contact List"
 msgstr "Nova kontaktaro"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:176
+#: ../src/addressbook/gui/widgets/ea-minicard-view.c:206
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "nuna adresara dosierujo %s havas %d karton"
 msgstr[1] "nuna adresara dosierujo %s havas %d kartojn"
 
-#: ../addressbook/gui/widgets/e-contact-map-window.c:377
+#: ../src/addressbook/gui/widgets/e-contact-map-window.c:374
 msgid "Contacts Map"
 msgstr "Kontakt-mapo"
 
 #. Zoom-in button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:412
+#: ../src/addressbook/gui/widgets/e-contact-map-window.c:409
 #, fuzzy
 #| msgid "_Zoom In"
 msgid "Zoom _In"
 msgstr "E_nzomi"
 
 #. Zoom-out button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:420
-#: ../mail/e-mail-reader.c:2360
+#: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
+#: ../src/mail/e-mail-reader.c:2420
 msgid "Zoom _Out"
 msgstr "E_lzomi"
 
 #. Search button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:450
-#: ../e-util/e-html-editor-actions.c:2108
-#: ../e-util/e-html-editor-find-dialog.c:195
-#: ../shell/e-shell-window-actions.c:1020
+#: ../src/addressbook/gui/widgets/e-contact-map-window.c:447
+#: ../src/e-util/e-html-editor-actions.c:1872
+#: ../src/e-util/e-html-editor-find-dialog.c:250
+#: ../src/shell/e-shell-window-actions.c:929
 msgid "_Find"
 msgstr "_Serĉi"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../src/addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1624,7 +4684,7 @@ msgstr ""
 "\n"
 "Serĉante kontakulojn..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../src/addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1638,7 +4698,7 @@ msgstr ""
 "\n"
 "Du-klaku tie ĉi por krei novan kontaktulon."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:196
+#: ../src/addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -1652,7 +4712,7 @@ msgstr ""
 "\n"
 "Du-klaku tie ĉi por krei novan kontaktulon."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:200
+#: ../src/addressbook/gui/widgets/e-minicard-view.c:196
 msgid ""
 "\n"
 "\n"
@@ -1662,7 +4722,7 @@ msgstr ""
 "\n"
 "Serĉado de la kontaktulo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:202
+#: ../src/addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1672,183 +4732,151 @@ msgstr ""
 "\n"
 "Ne estas eroj montreblaj en tiu ĉi vido."
 
-#: ../addressbook/importers/evolution-csv-importer.c:746
-#: ../addressbook/importers/evolution-ldif-importer.c:548
-#: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:430
-#: ../calendar/importers/icalendar-importer.c:925
-#: ../calendar/importers/icalendar-importer.c:964 ../shell/shell.error.xml.h:1
+#: ../src/addressbook/importers/evolution-csv-importer.c:745
+#: ../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/shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Enportante..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1081
+#: ../src/addressbook/importers/evolution-csv-importer.c:927
+#, fuzzy
+#| msgid "Can not open file"
+msgid "Can’t open .csv file"
+msgstr "Ne eblis malfermi dosieron"
+
+#: ../src/addressbook/importers/evolution-csv-importer.c:1096
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV- aŭ Tab-kontaktoj (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1082
+#: ../src/addressbook/importers/evolution-csv-importer.c:1097
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Enportilo de Outlook CSV- kaj Tab-kontaktojn"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1090
+#: ../src/addressbook/importers/evolution-csv-importer.c:1105
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV- aŭ Tab-kontaktoj (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1091
+#: ../src/addressbook/importers/evolution-csv-importer.c:1106
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Enportilo de Mozilla CSV- kaj Tab-kontaktojn"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1099
+#: ../src/addressbook/importers/evolution-csv-importer.c:1114
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolucio CSV- aŭ Tab-kontaktoj (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1100
+#: ../src/addressbook/importers/evolution-csv-importer.c:1115
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Enportilo de Evolucio CSV- kaj Tab-kontaktojn"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:806
+#: ../src/addressbook/importers/evolution-ldif-importer.c:717
+#, fuzzy
+#| msgid "Can not open file"
+msgid "Can’t open .ldif file"
+msgstr "Ne eblis malfermi dosieron"
+
+#: ../src/addressbook/importers/evolution-ldif-importer.c:819
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Datum-Interŝanĝ-Formato (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:807
+#: ../src/addressbook/importers/evolution-ldif-importer.c:820
 msgid "Evolution LDIF importer"
 msgstr "Evolucio-LDIF-enportilo"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:634
+#: ../src/addressbook/importers/evolution-vcard-importer.c:644
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:635
+#: ../src/addressbook/importers/evolution-vcard-importer.c:645
 msgid "Evolution vCard Importer"
 msgstr "Evolucio-vCard-enportilo"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:874
+#: ../src/addressbook/printing/e-contact-print.c:872
 #, c-format
 msgid "Page %d"
 msgstr "Paĝo %d"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:54
-msgid "Specify the output file instead of standard output"
-msgstr "Uzi la eligitan dosieron anstataŭ la defaŭltan eligon"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:55
-msgid "OUTPUTFILE"
-msgstr "ELIGDOSIERO"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:58
-msgid "List local address book folders"
-msgstr "Listigi lokajn adresar-dosierujojn"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:61
-msgid "Show cards as vcard or csv file"
-msgstr "Montri kartojn kiel vcard- aŭ csv-dosiero"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:62
-msgid "[vcard|csv]"
-msgstr "[vcard|csv]"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:111
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-"Eraro de komandliniaj argumentoj, bonvolu uzi opcion --help por vidi la "
-"uzadon."
-
-#: ../addressbook/tools/evolution-addressbook-export.c:125
-msgid "Only support csv or vcard format."
-msgstr "Nur subteni CSV- aŭ vcard-aranĝonjn."
-
-#: ../addressbook/tools/evolution-addressbook-export.c:156
-msgid "Unhandled error"
-msgstr "Netraktita eraro"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:635
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-msgid "Can not open file"
-msgstr "Ne eblis malfermi dosieron"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:75
-#, c-format
-msgid "Failed to open client '%s': %s"
-msgstr "Ne eblis malfermi la klienton '%s': %s"
-
-#: ../addressbook/util/eab-book-util.c:36
+#: ../src/addressbook/util/eab-book-util.c:34
 msgctxt "addressbook-label"
 msgid "Work Email"
 msgstr "Labora retpoŝto"
 
-#: ../addressbook/util/eab-book-util.c:37
+#: ../src/addressbook/util/eab-book-util.c:35
 msgctxt "addressbook-label"
 msgid "Home Email"
 msgstr "Hejma retpoŝto"
 
-#: ../addressbook/util/eab-book-util.c:38
+#: ../src/addressbook/util/eab-book-util.c:36
 msgctxt "addressbook-label"
 msgid "Other Email"
 msgstr "Alia retpoŝto"
 
-#: ../addressbook/util/eab-book-util.c:44
+#: ../src/addressbook/util/eab-book-util.c:42
 msgctxt "addressbook-label"
 msgid "Work SIP"
 msgstr "Labora SIP"
 
-#: ../addressbook/util/eab-book-util.c:45
+#: ../src/addressbook/util/eab-book-util.c:43
 msgctxt "addressbook-label"
 msgid "Home SIP"
 msgstr "Hejma SIP"
 
-#: ../addressbook/util/eab-book-util.c:46
+#: ../src/addressbook/util/eab-book-util.c:44
 msgctxt "addressbook-label"
 msgid "Other SIP"
 msgstr "Alia SIP"
 
-#: ../addressbook/util/eab-book-util.c:74
+#: ../src/addressbook/util/eab-book-util.c:72
 msgctxt "addressbook-label"
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/util/eab-book-util.c:75
+#: ../src/addressbook/util/eab-book-util.c:73
 msgctxt "addressbook-label"
 msgid "Jabber"
 msgstr "Jabero"
 
-#: ../addressbook/util/eab-book-util.c:76
+#: ../src/addressbook/util/eab-book-util.c:74
 msgctxt "addressbook-label"
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/util/eab-book-util.c:77
+#: ../src/addressbook/util/eab-book-util.c:75
 msgctxt "addressbook-label"
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/util/eab-book-util.c:78
+#: ../src/addressbook/util/eab-book-util.c:76
 msgctxt "addressbook-label"
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/util/eab-book-util.c:79
+#: ../src/addressbook/util/eab-book-util.c:77
 msgctxt "addressbook-label"
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/util/eab-book-util.c:80
+#: ../src/addressbook/util/eab-book-util.c:78
 msgctxt "addressbook-label"
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/util/eab-book-util.c:81
+#: ../src/addressbook/util/eab-book-util.c:79
 msgctxt "addressbook-label"
 msgid "Skype"
 msgstr "Skajpo"
 
-#: ../addressbook/util/eab-book-util.c:82
+#: ../src/addressbook/util/eab-book-util.c:80
 msgctxt "addressbook-label"
 msgid "Twitter"
 msgstr "Tvitero"
 
-#: ../addressbook/util/eab-book-util.c:83
+#: ../src/addressbook/util/eab-book-util.c:81
 msgctxt "addressbook-label"
 msgid "Google Talk"
 msgstr "Google Talk"
@@ -1857,7 +4885,7 @@ msgstr "Google Talk"
 #. * if an email address type is not one of the predefined types,
 #. * this generic label is used instead of one of the predefined labels.
 #.
-#: ../addressbook/util/eab-book-util.c:126
+#: ../src/addressbook/util/eab-book-util.c:124
 msgctxt "addressbook-label"
 msgid "Email"
 msgstr "Retpoŝto"
@@ -1867,7 +4895,7 @@ msgstr "Retpoŝto"
 #. * this generic label is used instead of one of the predefined labels.
 #. * SIP=Session Initiation Protocol, used for voice over IP
 #.
-#: ../addressbook/util/eab-book-util.c:173
+#: ../src/addressbook/util/eab-book-util.c:171
 msgctxt "addressbook-label"
 msgid "SIP"
 msgstr "SIP"
@@ -1877,7 +4905,7 @@ msgstr "SIP"
 #. * this generic label is used instead of one of the predefined labels.
 #. * IM=Instant Messaging
 #.
-#: ../addressbook/util/eab-book-util.c:216
+#: ../src/addressbook/util/eab-book-util.c:214
 msgctxt "addressbook-label"
 msgid "IM"
 msgstr "IM"
@@ -1886,160 +4914,152 @@ msgstr "IM"
 #. * if a phone number type is not one of the predefined types,
 #. * this generic label is used instead of one of the predefined labels.
 #.
-#: ../addressbook/util/eab-book-util.c:271
+#: ../src/addressbook/util/eab-book-util.c:269
 msgctxt "addressbook-label"
 msgid "Phone"
 msgstr "Telefono"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:105
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:103
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutoj"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:118
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:116
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "horo"
 msgstr[1] "horoj"
 
-#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
-#. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:131
-#: ../calendar/gui/dialogs/recurrence-page.c:1249
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:129
 msgid "day"
 msgid_plural "days"
 msgstr[0] "tago"
 msgstr[1] "tagoj"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:343
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:357
 msgid "Start time"
 msgstr "Strarttempo"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:1
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:1
+#: ../src/calendar/alarm-notify/alarm-queue.c:1991
 msgid "Appointments"
 msgstr "Rendevuoj"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:2
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:2
 msgid "Dismiss _All"
 msgstr "Malakcepi ĉi_on"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:3
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:3
 msgid "_Snooze"
 msgstr "_Dormeti"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1321
-#: ../calendar/gui/dialogs/event-page.ui.h:24
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
-#: ../calendar/gui/dialogs/task-page.ui.h:32
-#: ../e-util/e-html-editor-actions.c:1138
-#: ../e-util/e-mail-signature-manager.c:357 ../e-util/filter.ui.h:17
-#: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:170
-#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:59
-#: ../plugins/attachment-reminder/attachment-reminder.c:562
-#: ../plugins/email-custom-header/email-custom-header.c:844
-#: ../plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1071
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../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:2223
+#: ../src/calendar/gui/e-comp-editor.c:2070
+#: ../src/e-util/e-accounts-window.c:1668
+#: ../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: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/templates/templates.c:468
+#: ../src/shell/e-shell-window-actions.c:980 ../src/smime/gui/smime-ui.ui.h:11
 msgid "_Edit"
 msgstr "R_edakti"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:5
 msgid "_Print"
 msgstr "_Presi"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:164
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:6
+#: ../src/e-util/e-alert-dialog.c:162
 msgid "_Dismiss"
 msgstr "_Malakcepti"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1860
-#: ../calendar/alarm-notify/alarm-queue.c:1870
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../modules/itip-formatter/itip-view.c:1516
-#: ../modules/itip-formatter/itip-view.c:1627
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../src/calendar/alarm-notify/alarm-queue.c:1958
+#: ../src/calendar/alarm-notify/alarm-queue.c:1968
+#: ../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
 msgid "Location:"
 msgstr "Loko:"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:8
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:8
 msgid "location of appointment"
 msgstr "loko de rendevuo"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:9
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:9
 msgid "Snooze _time:"
 msgstr "Dormet_tempo:"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
-#: ../e-util/e-interval-chooser.c:143 ../e-util/filter.ui.h:8
-#: ../modules/calendar/e-cal-shell-view-actions.c:326
-#: ../plugins/publish-calendar/publish-calendar.ui.h:6
+#: ../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
 msgid "days"
 msgstr "tagoj"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:11
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:18
-#: ../e-util/e-interval-chooser.c:141 ../e-util/filter.ui.h:7
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:11
+#: ../src/e-util/e-interval-chooser.c:142 ../src/e-util/filter.ui.h:7
 msgid "hours"
 msgstr "horoj"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:12
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-#: ../calendar/gui/dialogs/event-page.ui.h:19
-#: ../e-util/e-interval-chooser.c:139 ../e-util/filter.ui.h:6
-#: ../mail/e-mail-config-provider-page.c:526
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:12
+#: ../src/e-util/e-interval-chooser.c:140 ../src/e-util/filter.ui.h:6
+#: ../src/mail/e-mail-config-provider-page.c:579
 msgid "minutes"
 msgstr "minutoj"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1703
-#: ../calendar/alarm-notify/alarm-queue.c:1840
+#: ../src/calendar/alarm-notify/alarm-queue.c:1759
+#: ../src/calendar/alarm-notify/alarm-queue.c:1939
 msgid "No summary available."
 msgstr "Neniu resumo disponeblas."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1712
-#: ../calendar/alarm-notify/alarm-queue.c:1714
+#: ../src/calendar/alarm-notify/alarm-queue.c:1768
+#: ../src/calendar/alarm-notify/alarm-queue.c:1770
 msgid "No description available."
 msgstr "Neniu priskribo disponebla."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1722
+#: ../src/calendar/alarm-notify/alarm-queue.c:1778
 msgid "No location information available."
 msgstr "Neniu lokinformo disponeblas."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1727
-#: ../calendar/alarm-notify/alarm-queue.c:1831
-#: ../calendar/alarm-notify/alarm-queue.c:2178
+#: ../src/calendar/alarm-notify/alarm-queue.c:1783
+#: ../src/calendar/alarm-notify/alarm-queue.c:1930
+#: ../src/calendar/alarm-notify/alarm-queue.c:2281
 msgid "Evolution Reminders"
 msgstr "Memorigoj de Evolucio"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1771
+#: ../src/calendar/alarm-notify/alarm-queue.c:1826
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "Vi havas %d memorigaĵon"
 msgstr[1] "Vi havas %d memorigaĵojn"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1996
+#: ../src/calendar/alarm-notify/alarm-queue.c:2099
 msgid "Warning"
 msgstr "Averto"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1997 ../mail/mail-dialogs.ui.h:21
-#: ../mail/mail.error.xml.h:139
-#: ../modules/mailto-handler/evolution-mailto-handler.c:114
+#: ../src/calendar/alarm-notify/alarm-queue.c:2100
+#: ../src/mail/mail-dialogs.ui.h:20
 msgid "_No"
 msgstr "_Ne"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1998 ../mail/mail.error.xml.h:138
-#: ../modules/mailto-handler/evolution-mailto-handler.c:115
+#: ../src/calendar/alarm-notify/alarm-queue.c:2101
 msgid "_Yes"
 msgstr "_Jes"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2002
+#: ../src/calendar/alarm-notify/alarm-queue.c:2105
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2056,26 +5076,35 @@ msgstr ""
 "\n"
 "Ĉu vi certe volas lanĉi ĉi tiun programaron?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2017
+#: ../src/calendar/alarm-notify/alarm-queue.c:2120
 msgid "Do not ask me about this program again."
 msgstr "Ne demandu min denove pri tiu programo."
 
-#: ../calendar/alarm-notify/util.c:43
+#: ../src/calendar/alarm-notify/util.c:65
 msgid "invalid time"
 msgstr "nevalida tempo"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:382
-#: ../calendar/gui/misc.c:103
+#. Translator: Entire string is like "Pop up an alert %d days before start"
+#: ../src/calendar/alarm-notify/util.c:91
+#: ../src/calendar/gui/e-alarm-list.c:368 ../src/calendar/gui/misc.c:95
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d tago"
+msgstr[1] "%d tagoj"
+
+#. Translator: Entire string is like "Pop up an alert %d hours before start"
+#: ../src/calendar/alarm-notify/util.c:97
+#: ../src/calendar/gui/e-alarm-list.c:380 ../src/calendar/gui/misc.c:101
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d horo"
 msgstr[1] "%d horoj"
 
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:388
-#: ../calendar/gui/misc.c:109
+#. Translator: Entire string is like "Pop up an alert %d minutes before start"
+#: ../src/calendar/alarm-notify/util.c:103
+#: ../src/calendar/gui/e-alarm-list.c:386 ../src/calendar/gui/misc.c:107
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -2083,21 +5112,21 @@ msgstr[0] "%d minuto"
 msgstr[1] "%d minutoj"
 
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. Translator: Entire string is like "Pop up an alert %d seconds before start"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:394
-#: ../calendar/gui/misc.c:113
+#: ../src/calendar/alarm-notify/util.c:107
+#: ../src/calendar/gui/e-alarm-list.c:392 ../src/calendar/gui/misc.c:111
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekundo"
 msgstr[1] "%d sekundoj"
 
-#: ../calendar/calendar.error.xml.h:1
+#: ../src/calendar/calendar.error.xml.h:1
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Ĉu vi volas sendi al ĉiuj partoprenantoj nuligpeton?"
 
-#: ../calendar/calendar.error.xml.h:2
+#: ../src/calendar/calendar.error.xml.h:2
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -2105,26 +5134,26 @@ msgstr ""
 "Se vi ne sendas nulig-mesaĝon, la aliaj partoprenantoj eble ne scias, ke la "
 "kunsido estas nuligite."
 
-#: ../calendar/calendar.error.xml.h:3
+#: ../src/calendar/calendar.error.xml.h:3
 msgid "Do _not Send"
 msgstr "_Ne sendi"
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../src/calendar/calendar.error.xml.h:4
 msgid "_Send Notice"
 msgstr "_Sendi rimarkon"
 
-#: ../calendar/calendar.error.xml.h:5
-#: ../calendar/gui/dialogs/delete-comp.c:192
+#: ../src/calendar/calendar.error.xml.h:5
+#: ../src/calendar/gui/e-cal-dialogs.c:507
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Ĉe vi certe volas forigi tiun kunsidon?"
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../src/calendar/calendar.error.xml.h:6
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr "Ĉiuj informoj de tiu kunsido estos forigotaj kaj ne restaŭrigeblaj."
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../src/calendar/calendar.error.xml.h:8
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -2132,21 +5161,21 @@ msgstr ""
 "Se vi ne sendas nulig-mesaĝon, la aliaj partoprenantoj eble ne scias, ke la "
 "tasko estas forigite."
 
-#: ../calendar/calendar.error.xml.h:9
-#: ../calendar/gui/dialogs/delete-comp.c:195
+#: ../src/calendar/calendar.error.xml.h:9
+#: ../src/calendar/gui/e-cal-dialogs.c:510
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Ĉu vi certe volas forigi tiun taskon?"
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../src/calendar/calendar.error.xml.h:10
 msgid "All information on this task will be deleted and can not be restored."
 msgstr "Ĉiuj informoj de tiu tasko estos forigotaj kaj ne restaŭrigeblaj."
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../src/calendar/calendar.error.xml.h:11
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Ĉu vi volas sendi nulig-mesaĝon por tiu noto?"
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../src/calendar/calendar.error.xml.h:12
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -2154,137 +5183,145 @@ msgstr ""
 "Se vi ne sendas nulig-mesaĝon, la aliaj partoprenantoj eble ne scias, ke la "
 "noto estas forigite."
 
-#: ../calendar/calendar.error.xml.h:13
-#: ../calendar/gui/dialogs/delete-comp.c:198
+#: ../src/calendar/calendar.error.xml.h:13
+#: ../src/calendar/gui/e-cal-dialogs.c:513
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Ĉu vi certe volas forigi tiun noton?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../src/calendar/calendar.error.xml.h:14
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr ""
 "Ĉiuj infromoj de tiu noto estos forigitaj kaj ne plu eblas restaŭri ilin."
 
-#: ../calendar/calendar.error.xml.h:15
-msgid "Are you sure you want to delete the meeting titled '{0}'?"
-msgstr "Ĉu vi certe volas forigi tiun kunsidon nomite '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:15
+#, fuzzy
+#| 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 "Ĉu vi certe volas forigi tiun kunsidon nomite “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:16
-msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr "Ĉu vi certe volas forigi tiun rendevuon nomite '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:16
+#, fuzzy
+#| 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 "Ĉu vi certe volas forigi tiun rendevuon nomite “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../src/calendar/calendar.error.xml.h:17
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr "Ĉiuj informoj de tiu rendevuo estos forigotaj kaj ne restaŭrigeblaj."
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../src/calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Ĉe vi certe volas forigi tiun rendevuon?"
 
-#: ../calendar/calendar.error.xml.h:19
-msgid "Are you sure you want to delete the '{0}' task?"
-msgstr "Ĉu vi certe volas forigi la taskon '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:19
+#, fuzzy
+#| msgid "Are you sure you want to delete the “{0}” task?"
+msgid "Are you sure you want to delete the “{0}” task?"
+msgstr "Ĉu vi certe volas forigi la taskon “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:20
-msgid "Are you sure you want to delete the memo '{0}'?"
-msgstr "Ĉu vi certe volas forigi tiun noton '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:20
+#, fuzzy
+#| msgid "Are you sure you want to delete the memo “{0}”?"
+msgid "Are you sure you want to delete the memo “{0}”?"
+msgstr "Ĉu vi certe volas forigi tiun noton “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../src/calendar/calendar.error.xml.h:21
 msgid "All information in this memo will be deleted and can not be restored."
 msgstr ""
 "Ĉiuj infromoj en tiu noto estos forigitaj kaj ne plu eblas restaŭri ilin."
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../src/calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Ĉu vi certe volas forigi tiujn {0} rendevuojn?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../src/calendar/calendar.error.xml.h:23
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
 msgstr "Ĉiuj informoj de tiu rendevuoj estos forigotaj kaj ne restaŭrigeblaj."
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../src/calendar/calendar.error.xml.h:24
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Ĉu vi certe volas forigi tiujn taskojn {0}?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../src/calendar/calendar.error.xml.h:25
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "Ĉiuj informoj de tiu taskoj estos forigotaj kaj ne restaŭrigeblaj."
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../src/calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "Ĉu vi certe volas forigi tiujn {0} notojn?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../src/calendar/calendar.error.xml.h:27
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr ""
 "Ĉiuj infromoj en tiuj notoj estos forigitaj kaj ne plu eblas restaŭri ilin."
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../src/calendar/calendar.error.xml.h:28
 msgid "Would you like to save your changes to this meeting?"
 msgstr "Ĉu vi volas konservi viajn ŝanĝojn al tiu kunsido?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../src/calendar/calendar.error.xml.h:29
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "Vi ŝanĝis tiun kunsidon, sed ja ne konservis ĝin."
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../src/calendar/calendar.error.xml.h:30
 msgid "_Save Changes"
 msgstr "Kon_servi ŝanĝojn"
 
-#: ../calendar/calendar.error.xml.h:31
-#: ../composer/mail-composer.error.xml.h:16
+#: ../src/calendar/calendar.error.xml.h:31
+#: ../src/composer/mail-composer.error.xml.h:13
 msgid "_Discard Changes"
 msgstr "_Ignori ŝanĝojn"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../src/calendar/calendar.error.xml.h:32
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Ĉu vi volas konservi viajn ŝanĝojn al tiu rendevuo?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../src/calendar/calendar.error.xml.h:33
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Vi ŝanĝis tiun rendevuon, sed ja ne konservis ĝin."
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../src/calendar/calendar.error.xml.h:34
 msgid "Would you like to save your changes to this task?"
 msgstr "Ĉu vi volas konservi viajn ŝanĝojn al tiu taskon?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../src/calendar/calendar.error.xml.h:35
 msgid "You have changed this task, but not yet saved it."
 msgstr "Vi ŝanĝis tiun taskon, sed ja ne konservis ĝin."
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../src/calendar/calendar.error.xml.h:36
 msgid "Would you like to save your changes to this memo?"
 msgstr "Ĉu vi volas konservi viajn ŝanĝoj je tiu noto?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../src/calendar/calendar.error.xml.h:37
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Vi faris ŝanĝojn je tiu noto, sed ankoraŭ ne konservis ilin."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../src/calendar/calendar.error.xml.h:38
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Ĉu vi volas sendi kunsidinvitoj al partoprenantoj?"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../src/calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Retpoŝtaj invitoj estos senditaj al ĉiuj partoprenantoj kaj ĝi permesas ilin "
 "respondi."
 
-#: ../calendar/calendar.error.xml.h:40
-#: ../composer/mail-composer.error.xml.h:13 ../mail/mail.error.xml.h:8
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../src/calendar/calendar.error.xml.h:40
+#: ../src/composer/mail-composer.error.xml.h:38 ../src/mail/mail.error.xml.h:8
+#: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Sendi"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../src/calendar/calendar.error.xml.h:41
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Ĉu vi volas sendi ĝisdatigitaj kunsidinformoj al partoprenantoj?"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../src/calendar/calendar.error.xml.h:42
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -2292,11 +5329,11 @@ msgstr ""
 "Sendi ĝidatigatajn informojn permesas aliajn partoprenantojn manteni iliajn "
 "kalendarojn ĝisdatigitajn."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../src/calendar/calendar.error.xml.h:43
 msgid "Would you like to send this task to participants?"
 msgstr "Ĉu vi volas sendi tiun taskon al partoprenantoj?"
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../src/calendar/calendar.error.xml.h:44
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -2304,11 +5341,11 @@ msgstr ""
 "Retpoŝtaj invitoj estos senditaj al ĉiuj partoprenantoj kaj ĝi permesas ilin "
 "akcepti ĉi tiun taskon."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../src/calendar/calendar.error.xml.h:45
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Elŝuto progresas. Ĉu vi volas konservi la taskon?"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../src/calendar/calendar.error.xml.h:46
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -2316,11 +5353,11 @@ msgstr ""
 "Kelkaj kunsendaĵoj estas elŝutotaj. Konservi la taskon perdigos ĉi tiujn "
 "kunsendaĵojn."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../src/calendar/calendar.error.xml.h:48
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Elŝuto progresas. Ĉu vi volas konservi la rendevuon?"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../src/calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -2328,11 +5365,11 @@ msgstr ""
 "Kelkaj kunsendaĵoj estas elŝutotaj. Konservi la rendevuon perdigos ĉi tiujn "
 "kunsendaĵojn."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../src/calendar/calendar.error.xml.h:50
 msgid "Would you like to send updated task information to participants?"
 msgstr "Ĉu vi volas sendi ĝisdatigitaj taskinformoj al partoprenantoj?"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../src/calendar/calendar.error.xml.h:51
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -2340,75 +5377,135 @@ msgstr ""
 "Sendi ĝidatigatajn informojn permesas aliajn partoprenantojn manteni iliajn "
 "taskojn ĝisdatigitajn."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../src/calendar/calendar.error.xml.h:52
+#, fuzzy
+#| msgid "Would you like to send this task to participants?"
+msgid "Would you like to send this memo to participants?"
+msgstr "Ĉu vi volas sendi tiun taskon al partoprenantoj?"
+
+#: ../src/calendar/calendar.error.xml.h:53
+#, fuzzy
+#| msgid ""
+#| "Email invitations will be sent to all participants and allow them to "
+#| "accept this task."
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this memo."
+msgstr ""
+"Retpoŝtaj invitoj estos senditaj al ĉiuj partoprenantoj kaj ĝi permesas ilin "
+"akcepti ĉi tiun taskon."
+
+#: ../src/calendar/calendar.error.xml.h:54
+#, fuzzy
+#| msgid "Would you like to send updated meeting information to participants?"
+msgid "Would you like to send updated memo information to participants?"
+msgstr "Ĉu vi volas sendi ĝisdatigitaj kunsidinformoj al partoprenantoj?"
+
+#: ../src/calendar/calendar.error.xml.h:55
+#, fuzzy
+#| msgid ""
+#| "Sending updated information allows other participants to keep their task "
+#| "lists up to date."
+msgid ""
+"Sending updated information allows other participants to keep their memo "
+"lists up to date."
+msgstr ""
+"Sendi ĝidatigatajn informojn permesas aliajn partoprenantojn manteni iliajn "
+"taskojn ĝisdatigitajn."
+
+#: ../src/calendar/calendar.error.xml.h:56
 msgid "Editor could not be loaded."
 msgstr "Ne eblis ŝargi redaktilon."
 
-#: ../calendar/calendar.error.xml.h:53
-msgid "Delete calendar '{0}'?"
-msgstr "Ĉu forigi kalendaron '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:57
+#, fuzzy
+#| msgid "Are you sure you want to delete the “{0}” task?"
+msgid "Are you sure you want to delete calendar “{0}”?"
+msgstr "Ĉu vi certe volas forigi la taskon “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../src/calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "La kalendaro estos daŭre forigta."
 
-#: ../calendar/calendar.error.xml.h:55
-msgid "Delete task list '{0}'?"
-msgstr "Ĉu forigi taskliston '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:59
+#, fuzzy
+#| msgid "Are you sure you want to delete the memo “{0}”?"
+msgid "Are you sure you want to delete task list “{0}”?"
+msgstr "Ĉu vi certe volas forigi tiun noton “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../src/calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "La tasklisto estos daŭre forigta."
 
-#: ../calendar/calendar.error.xml.h:57
-msgid "Delete memo list '{0}'?"
-msgstr "Ĉu forigi notoliston '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:61
+#, fuzzy
+#| msgid "Are you sure you want to delete the memo “{0}”?"
+msgid "Are you sure you want to delete memo list “{0}”?"
+msgstr "Ĉu vi certe volas forigi tiun noton “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../src/calendar/calendar.error.xml.h:62
 msgid "This memo list will be removed permanently."
 msgstr "Tiu notolisto forigitos por ĉiam."
 
-#: ../calendar/calendar.error.xml.h:59
-msgid "Delete remote calendar '{0}'?"
-msgstr "Ĉu forigi la foran kalendaron '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:63
+#, fuzzy
+#| msgid "Are you sure you want to delete the memo “{0}”?"
+msgid "Are you sure you want to delete remote calendar “{0}”?"
+msgstr "Ĉu vi certe volas forigi tiun noton “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../src/calendar/calendar.error.xml.h:64
+#, fuzzy
+#| 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 "
+"This will permanently remove the calendar “{0}” from the server. Are you "
 "sure you want to proceed?"
 msgstr ""
-"La kalendaro '{0}' estos daŭre forigita el la servilo. Ĉu vi vere volas "
+"La kalendaro “{0}” estos daŭre forigita el la servilo. Ĉu vi vere volas "
 "daŭrigi?"
 
-#: ../calendar/calendar.error.xml.h:62
-msgid "Delete remote task list '{0}'?"
-msgstr "Ĉu forigi la foran taskoliston '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:66
+#, fuzzy
+#| msgid "Are you sure you want to delete these contact lists?"
+msgid "Are you sure you want to delete remote task list “{0}”?"
+msgstr "Ĉu certe vi volas forigi tiun ĉi liston de kontaktuloj “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../src/calendar/calendar.error.xml.h:67
+#, fuzzy
+#| 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 "
+"This will permanently remove the task list “{0}” from the server. Are you "
 "sure you want to proceed?"
 msgstr ""
-"La taskolisto '{0}' estos daŭre forigita el la servilo. Ĉu vi vere volas "
+"La taskolisto “{0}” estos daŭre forigita el la servilo. Ĉu vi vere volas "
 "daŭrigi?"
 
-#: ../calendar/calendar.error.xml.h:64
-msgid "Delete remote memo list '{0}'?"
-msgstr "Ĉu forigi la notoliston '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:68
+#, fuzzy
+#| msgid "Are you sure you want to delete the memo “{0}”?"
+msgid "Are you sure you want to delete remote memo list “{0}”?"
+msgstr "Ĉu vi certe volas forigi tiun noton “{0}”?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../src/calendar/calendar.error.xml.h:69
+#, fuzzy
+#| 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 "
+"This will permanently remove the memo list “{0}” from the server. Are you "
 "sure you want to proceed?"
 msgstr ""
-"La notolisto '{0}' estos daŭre forigita el la servilo. Ĉu vi vere volas "
+"La notolisto “{0}” estos daŭre forigita el la servilo. Ĉu vi vere volas "
 "daŭrigi?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../src/calendar/calendar.error.xml.h:70
 msgid "Are you sure you want to save the appointment without a summary?"
 msgstr "Ĉu vi certe volas konservi la rendevuon sen resumo?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../src/calendar/calendar.error.xml.h:71
 msgid ""
 "Adding a meaningful summary to your appointment will give you an idea of "
 "what your appointment is about."
@@ -2416,11 +5513,11 @@ msgstr ""
 "Aldoni signifan resumon al via rendevuo donos al vi ideon pri kio via "
 "rendevuo temas pri."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../src/calendar/calendar.error.xml.h:72
 msgid "Are you sure you want to save the task without a summary?"
 msgstr "Ĉu vi certe volas konservi la taskon sen resumo?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../src/calendar/calendar.error.xml.h:73
 msgid ""
 "Adding a meaningful summary to your task will give you an idea of what your "
 "task is about."
@@ -2428,1300 +5525,1953 @@ msgstr ""
 "Aldoni signifan resumon al via tasko donos al vi ideon pri kio via tasko "
 "temas pri."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../src/calendar/calendar.error.xml.h:74
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Ĉu vi certe volas konservi tiun noton sen iu resumo?"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:72
-msgid "Error loading calendar '{0}'"
-msgstr "Eraro dum ŝarĝo de la kalendaro '{0}'"
+#: ../src/calendar/calendar.error.xml.h:76
+#, fuzzy
+#| msgid "Error loading calendar “{0}”"
+msgid "Error loading calendar “{0}”"
+msgstr "Eraro dum ŝarĝo de la kalendaro “{0}”"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../src/calendar/calendar.error.xml.h:77
 msgid "The calendar is not marked for offline usage."
 msgstr "La kalendaro ne estas markite por senkonekta uzado."
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../src/calendar/calendar.error.xml.h:78
 msgid "Cannot save event"
 msgstr "Ne eblas konservi eventon"
 
 #. Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:76
+#: ../src/calendar/calendar.error.xml.h:80
+#, fuzzy
+#| 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 "
+"“{0}” is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
 msgstr ""
-"'{0}' estas nurlega kalendaro kaj ne estas modifebla. Bonvolu elekti alian "
+"“{0}” estas nurlega kalendaro kaj ne estas modifebla. Bonvolu elekti alian "
 "kalendaron kiu povas akcepti rendevuojn."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../src/calendar/calendar.error.xml.h:81
 msgid "Cannot save task"
 msgstr "Ne eblas konservi taskon"
 
 #. Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:79
+#: ../src/calendar/calendar.error.xml.h:83
+#, fuzzy
+#| 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 "'{0}' ne subtenas asignitaj taskoj, bonvolu elekti alian taskoliston."
+"“{0}” does not support assigned tasks, please select a different task list."
+msgstr "“{0}” ne subtenas asignitaj taskoj, bonvolu elekti alian taskoliston."
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:81
-msgid "Error loading task list '{0}'"
-msgstr "Eraro dum ŝarĝo de la taskolisto '{0}'"
+#: ../src/calendar/calendar.error.xml.h:85
+#, fuzzy
+#| msgid "Error loading task list “{0}”"
+msgid "Error loading task list “{0}”"
+msgstr "Eraro dum ŝarĝo de la taskolisto “{0}”"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../src/calendar/calendar.error.xml.h:86
 msgid "The task list is not marked for offline usage."
 msgstr "La tasklisto ne estas markite por senkonekta uzado."
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:84
-msgid "Error loading memo list '{0}'"
-msgstr "Eraro dum ŝargo de la notolisto '{0}'"
+#: ../src/calendar/calendar.error.xml.h:88
+#, fuzzy
+#| msgid "Error loading memo list “{0}”"
+msgid "Error loading memo list “{0}”"
+msgstr "Eraro dum ŝargo de la notolisto “{0}”"
 
-#: ../calendar/calendar.error.xml.h:85
+#: ../src/calendar/calendar.error.xml.h:89
 msgid "The memo list is not marked for offline usage."
 msgstr "La notolisto ne estas markite por senreta uzo."
 
+#. Translators: {0} is the name of the calendar/memo list/task list.
+#: ../src/calendar/calendar.error.xml.h:91
+#, fuzzy
+#| msgid "Failed to connect to “{0}”"
+msgid "Failed to add timezone to “{0}”"
+msgstr "Malsukcesis konekti al “{0}”"
+
+#. The {0} is a calendar/memo list/task list name, which is useless here
+#: ../src/calendar/calendar.error.xml.h:93
+#, fuzzy
+#| msgid "Could not save attachments"
+msgid "Failed to save attachments"
+msgstr "Ne eblis konservi aldonaĵojn"
+
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:87
-msgid "Failed to open calendar '{0}'"
-msgstr "Malsukcesis malfermi la kalendaron '{0}'"
+#: ../src/calendar/calendar.error.xml.h:95
+#, fuzzy
+#| msgid "Failed to open calendar “{0}”"
+msgid "Failed to open calendar “{0}”"
+msgstr "Malsukcesis malfermi la kalendaron “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:89
-msgid "Failed to open memo list '{0}'"
-msgstr "Malsukcesis malfermi la notoliston '{0}'"
+#: ../src/calendar/calendar.error.xml.h:97
+#, fuzzy
+#| msgid "Failed to open memo list “{0}”"
+msgid "Failed to open memo list “{0}”"
+msgstr "Malsukcesis malfermi la notoliston “{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:91
-msgid "Failed to open task list '{0}'"
-msgstr "Malsukcesis malfermi la taskoliston '{0}'"
+#: ../src/calendar/calendar.error.xml.h:99
+#, fuzzy
+#| msgid "Failed to open task list “{0}”"
+msgid "Failed to open task list “{0}”"
+msgstr "Malsukcesis malfermi la taskoliston “{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:93
-msgid "Failed to create an event in the calendar '{0}'"
-msgstr "Malsukcesis krei eventon en kalendaro '{0}'"
+#: ../src/calendar/calendar.error.xml.h:101
+#, fuzzy
+#| msgid "Failed to create an event in the calendar “{0}”"
+msgid "Failed to create an event in the calendar “{0}”"
+msgstr "Malsukcesis krei eventon en kalendaro “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:95
-msgid "Failed to create a memo in the memo list '{0}'"
-msgstr "Malsukcesis krei noton en notolisto '{0}'"
+#: ../src/calendar/calendar.error.xml.h:103
+#, fuzzy
+#| msgid "Failed to create a memo in the memo list “{0}”"
+msgid "Failed to create a memo in the memo list “{0}”"
+msgstr "Malsukcesis krei noton en notolisto “{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:97
-msgid "Failed to create a task in the task list '{0}'"
-msgstr "Malsukcesis krei taskon en taskolisto '{0}'"
+#: ../src/calendar/calendar.error.xml.h:105
+#, fuzzy
+#| msgid "Failed to create a task in the task list “{0}”"
+msgid "Failed to create a task in the task list “{0}”"
+msgstr "Malsukcesis krei taskon en taskolisto “{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:99
-msgid "Failed to modify an event in the calendar '{0}'"
-msgstr "Malsukcesis modifi eventon en kalendaro '{0}'"
+#: ../src/calendar/calendar.error.xml.h:107
+#, fuzzy
+#| msgid "Failed to modify an event in the calendar “{0}”"
+msgid "Failed to modify an event in the calendar “{0}”"
+msgstr "Malsukcesis modifi eventon en kalendaro “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:101
-msgid "Failed to modify a memo in the memo list '{0}'"
-msgstr ""
+#: ../src/calendar/calendar.error.xml.h:109
+#, fuzzy
+#| msgid "Failed to move a memo into the memo list “{0}”"
+msgid "Failed to modify a memo in the memo list “{0}”"
+msgstr "Malsukcesis movi noton en notoliston “{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:103
-msgid "Failed to modify a task in the task list '{0}'"
-msgstr "Malsukcesis modifi taskon en taskolisto '{0}'"
+#: ../src/calendar/calendar.error.xml.h:111
+#, fuzzy
+#| msgid "Failed to modify a task in the task list “{0}”"
+msgid "Failed to modify a task in the task list “{0}”"
+msgstr "Malsukcesis modifi taskon en taskolisto “{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:105
-msgid "Failed to delete an event in the calendar '{0}'"
-msgstr "Malsukcesis forigi eventon en la kalendaro '{0}'"
+#: ../src/calendar/calendar.error.xml.h:113
+#, fuzzy
+#| msgid "Failed to delete an event in the calendar “{0}”"
+msgid "Failed to delete an event in the calendar “{0}”"
+msgstr "Malsukcesis forigi eventon en la kalendaro “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:107
-msgid "Failed to delete a memo in the memo list '{0}'"
-msgstr "Malsukcesis forigi noton en notolisto '{0}'"
+#: ../src/calendar/calendar.error.xml.h:115
+#, fuzzy
+#| msgid "Failed to delete a memo in the memo list “{0}”"
+msgid "Failed to delete a memo in the memo list “{0}”"
+msgstr "Malsukcesis forigi noton en notolisto “{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:109
-msgid "Failed to delete a task in the task list '{0}'"
-msgstr "Malsukcesis forigi taskon en taskolisto '{0}'"
+#: ../src/calendar/calendar.error.xml.h:117
+#, fuzzy
+#| msgid "Failed to delete a task in the task list “{0}”"
+msgid "Failed to delete a task in the task list “{0}”"
+msgstr "Malsukcesis forigi taskon en taskolisto “{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:111
-msgid "Failed to update an event in the calendar '{0}'"
-msgstr "Malsukcesis ĝisdatigi eventon en kalendaro '{0}'"
+#: ../src/calendar/calendar.error.xml.h:119
+#, fuzzy
+#| msgid "Failed to update an event in the calendar “{0}”"
+msgid "Failed to update an event in the calendar “{0}”"
+msgstr "Malsukcesis ĝisdatigi eventon en kalendaro “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:113
-msgid "Failed to update a memo in the memo list '{0}'"
-msgstr "Malsukcesis ĝisdatigi noton en notolisto '{0}'"
+#: ../src/calendar/calendar.error.xml.h:121
+#, fuzzy
+#| msgid "Failed to update a memo in the memo list “{0}”"
+msgid "Failed to update a memo in the memo list “{0}”"
+msgstr "Malsukcesis ĝisdatigi noton en notolisto “{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:115
-msgid "Failed to update a task in the task list '{0}'"
-msgstr "Malsukcesis ĝisdatigi taskon en taskolisto '{0}'"
+#: ../src/calendar/calendar.error.xml.h:123
+#, fuzzy
+#| msgid "Failed to update a task in the task list “{0}”"
+msgid "Failed to update a task in the task list “{0}”"
+msgstr "Malsukcesis ĝisdatigi taskon en taskolisto “{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:117
-msgid "Failed to send an event to the calendar '{0}'"
-msgstr "Malsukcesis sendi eventon al kalendaro '{0}'"
+#: ../src/calendar/calendar.error.xml.h:125
+#, fuzzy
+#| msgid "Failed to send an event to the calendar “{0}”"
+msgid "Failed to send an event to the calendar “{0}”"
+msgstr "Malsukcesis sendi eventon al kalendaro “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:119
-msgid "Failed to send a memo to the memo list '{0}'"
-msgstr "Malsukcesis sendi noton al notolisto '{0}'"
+#: ../src/calendar/calendar.error.xml.h:127
+#, fuzzy
+#| msgid "Failed to send a memo to the memo list “{0}”"
+msgid "Failed to send a memo to the memo list “{0}”"
+msgstr "Malsukcesis sendi noton al notolisto “{0}”"
+
+#. Translators: {0} is the name of the task list.
+#: ../src/calendar/calendar.error.xml.h:129
+#, fuzzy
+#| msgid "Failed to send a task to the task list “{0}”"
+msgid "Failed to send a task to the task list “{0}”"
+msgstr "Malsukcesis sendi taskon al taskolisto “{0}”"
+
+#. Translators: {0} is the name of the calendar.
+#: ../src/calendar/calendar.error.xml.h:131
+#, fuzzy
+#| msgid "Error creating view for the calendar “{0}”"
+msgid "Error creating view for the calendar “{0}”"
+msgstr "Eraro dum kreado de vido por la kalendaro “{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:121
-msgid "Failed to send a task to the task list '{0}'"
-msgstr "Malsukcesis sendi taskon al taskolisto '{0}'"
+#: ../src/calendar/calendar.error.xml.h:133
+#, fuzzy
+#| msgid "Error creating view for the task list “{0}”"
+msgid "Error creating view for the task list “{0}”"
+msgstr "Eraro dum kreado de vido por la taskolisto “{0}”"
+
+#. Translators: {0} is the name of the memo list.
+#: ../src/calendar/calendar.error.xml.h:135
+#, fuzzy
+#| msgid "Error creating view for the memo list “{0}”"
+msgid "Error creating view for the memo list “{0}”"
+msgstr "Eraro dum kreado de vido por la notolisto “{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:123
-msgid "Error creating view for the calendar '{0}'"
-msgstr "Eraro dum kreado de vido por la kalendaro '{0}'"
+#: ../src/calendar/calendar.error.xml.h:137
+#, fuzzy
+#| msgid "Failed to copy an event into the calendar “{0}”"
+msgid "Failed to copy an event into the calendar “{0}”"
+msgstr "Malsukcesis kopii eventon en kalendaron “{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:125
-msgid "Error creating view for the task list '{0}'"
-msgstr "Eraro dum kreado de vido por la taskolisto '{0}'"
+#: ../src/calendar/calendar.error.xml.h:139
+#, fuzzy
+#| msgid "Failed to copy a task into the task list “{0}”"
+msgid "Failed to copy a task into the task list “{0}”"
+msgstr "Malsukcesis kopii taskon en taskoliston “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:127
-msgid "Error creating view for the memo list '{0}'"
-msgstr "Eraro dum kreado de vido por la notolisto '{0}'"
+#: ../src/calendar/calendar.error.xml.h:141
+#, fuzzy
+#| msgid "Failed to copy a memo into the memo list “{0}”"
+msgid "Failed to copy a memo into the memo list “{0}”"
+msgstr "Malsukcesis kopii noton en notliston “{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:129
-msgid "Failed to copy an event into the calendar '{0}'"
-msgstr "Malsukcesis kopii eventon en kalendaron '{0}'"
+#: ../src/calendar/calendar.error.xml.h:143
+#, fuzzy
+#| msgid "Failed to move an event into the calendar “{0}”"
+msgid "Failed to move an event into the calendar “{0}”"
+msgstr "Malsukcesis movi eventon al kalendaro “{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:131
-msgid "Failed to copy a task into the task list '{0}'"
-msgstr "Malsukcesis kopii taskon en taskoliston '{0}'"
+#: ../src/calendar/calendar.error.xml.h:145
+#, fuzzy
+#| msgid "Failed to move a task into the task list “{0}”"
+msgid "Failed to move a task into the task list “{0}”"
+msgstr "Malsukcesis movi taskon en taskoliston “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:133
-msgid "Failed to copy a memo into the memo list '{0}'"
-msgstr "Malsukcesis kopii noton en notliston '{0}'"
+#: ../src/calendar/calendar.error.xml.h:147
+#, fuzzy
+#| msgid "Failed to move a memo into the memo list “{0}”"
+msgid "Failed to move a memo into the memo list “{0}”"
+msgstr "Malsukcesis movi noton en notoliston “{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:135
-msgid "Failed to move an event into the calendar '{0}'"
-msgstr "Malsukcesis movi eventon al kalendaro '{0}'"
+#: ../src/calendar/calendar.error.xml.h:149
+#, fuzzy
+#| msgid "Failed to send an event to the calendar “{0}”"
+msgid "Failed to get an event from the calendar “{0}”"
+msgstr "Malsukcesis sendi eventon al kalendaro “{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:137
-msgid "Failed to move a task into the task list '{0}'"
-msgstr "Malsukcesis movi taskon en taskoliston '{0}'"
+#: ../src/calendar/calendar.error.xml.h:151
+#, fuzzy
+#| msgid "Failed to send a task to the task list “{0}”"
+msgid "Failed to get a task from the task list “{0}”"
+msgstr "Malsukcesis sendi taskon al taskolisto “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:139
-msgid "Failed to move a memo into the memo list '{0}'"
-msgstr "Malsukcesis movi noton en notoliston '{0}'"
+#: ../src/calendar/calendar.error.xml.h:153
+#, fuzzy
+#| msgid "Failed to send a memo to the memo list “{0}”"
+msgid "Failed to get a memo from the memo list “{0}”"
+msgstr "Malsukcesis sendi noton al notolisto “{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:141
-msgid "Copying an event into the calendar '{0}'"
-msgstr "Kopiante eventon al kalendaro '{0}'"
+#: ../src/calendar/calendar.error.xml.h:155
+#, fuzzy
+#| msgid "Copying an event into the calendar “{0}”"
+msgid "Copying an event into the calendar “{0}”"
+msgstr "Kopiante eventon al kalendaro “{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:143
-msgid "Copying a task into the task list '{0}'"
-msgstr "Kopiante taskon en taskoliston '{0}'"
+#: ../src/calendar/calendar.error.xml.h:157
+#, fuzzy
+#| msgid "Copying a task into the task list “{0}”"
+msgid "Copying a task into the task list “{0}”"
+msgstr "Kopiante taskon en taskoliston “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:145
-msgid "Copying a memo into the memo list '{0}'"
-msgstr "Kopiante noton al notolisto '{0}'"
+#: ../src/calendar/calendar.error.xml.h:159
+#, fuzzy
+#| msgid "Copying a memo into the memo list “{0}”"
+msgid "Copying a memo into the memo list “{0}”"
+msgstr "Kopiante noton al notolisto “{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:147
-msgid "Moving an event into the calendar '{0}'"
-msgstr "Movante eventon al kalendaro'{0}'"
+#: ../src/calendar/calendar.error.xml.h:161
+#, fuzzy
+#| msgid "Moving an event into the calendar “{0}”"
+msgid "Moving an event into the calendar “{0}”"
+msgstr "Movante eventon al kalendaro“{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:149
-msgid "Moving a task into the task list '{0}'"
-msgstr "Movante taskon al taskolisto '{0}'"
+#: ../src/calendar/calendar.error.xml.h:163
+#, fuzzy
+#| msgid "Moving a task into the task list “{0}”"
+msgid "Moving a task into the task list “{0}”"
+msgstr "Movante taskon al taskolisto “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:151
-msgid "Moving a memo into the memo list '{0}'"
-msgstr "Movante noton al notolisto '{0}'"
+#: ../src/calendar/calendar.error.xml.h:165
+#, fuzzy
+#| msgid "Moving a memo into the memo list “{0}”"
+msgid "Moving a memo into the memo list “{0}”"
+msgstr "Movante noton al notolisto “{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:153
-msgid "Failed to refresh calendar '{0}'"
-msgstr "Malsukcesis aktualigi kalendaron '{0}'"
+#: ../src/calendar/calendar.error.xml.h:167
+#, fuzzy
+#| msgid "Failed to refresh calendar “{0}”"
+msgid "Failed to refresh calendar “{0}”"
+msgstr "Malsukcesis aktualigi kalendaron “{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:155
-msgid "Failed to refresh task list '{0}'"
-msgstr "Malsukcesis aktualigi taskoliston '{0}'"
+#: ../src/calendar/calendar.error.xml.h:169
+#, fuzzy
+#| msgid "Failed to refresh task list “{0}”"
+msgid "Failed to refresh task list “{0}”"
+msgstr "Malsukcesis aktualigi taskoliston “{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:157
-msgid "Failed to refresh memo list '{0}'"
-msgstr "Malsukcesis aktualigi notoliston '{0}'"
+#: ../src/calendar/calendar.error.xml.h:171
+#, fuzzy
+#| msgid "Failed to refresh memo list “{0}”"
+msgid "Failed to refresh memo list “{0}”"
+msgstr "Malsukcesis aktualigi notoliston “{0}”"
 
-#: ../calendar/calendar.error.xml.h:158
+#: ../src/calendar/calendar.error.xml.h:172
 #, fuzzy
 #| msgid "Make this Occurrence _Movable"
 msgid "Failed to make an occurrence movable"
 msgstr "Igi tiun okazon movebla"
 
-#: ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/e-calendar-table.etspec.h:4
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:375
+#: ../src/calendar/calendar.error.xml.h:173
+msgid "Something has gone wrong when displaying the event"
+msgstr ""
+
+#: ../src/calendar/calendar.error.xml.h:174
+msgid ""
+"A WebKitWebProcess crashed when displaying the event. You can try again by "
+"moving to another event and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
+msgstr ""
+
+#: ../src/calendar/calendar.error.xml.h:175
+msgid "Something has gone wrong when displaying the memo"
+msgstr ""
+
+#: ../src/calendar/calendar.error.xml.h:176
+msgid ""
+"A WebKitWebProcess crashed when displaying the memo. You can try again by "
+"moving to another memo and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
+msgstr ""
+
+#: ../src/calendar/calendar.error.xml.h:177
+msgid "Something has gone wrong when displaying the task"
+msgstr ""
+
+#: ../src/calendar/calendar.error.xml.h:178
+msgid ""
+"A WebKitWebProcess crashed when displaying the task. You can try again by "
+"moving to another task and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
+msgstr ""
+
+#: ../src/calendar/gui/caltypes.xml.in.h:1
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:3
+#: ../src/calendar/gui/e-memo-table.etspec.h:2
+#: ../src/calendar/gui/e-task-table.etspec.h:4
+#: ../src/calendar/gui/memotypes.xml.in.h:1
+#: ../src/calendar/gui/tasktypes.xml.in.h:1
+#: ../src/plugins/save-calendar/csv-format.c:373
 msgid "Summary"
 msgstr "Resumo"
 
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2 ../mail/filtertypes.xml.in.h:2
-#: ../mail/searchtypes.xml.in.h:2 ../mail/vfoldertypes.xml.in.h:2
+#: ../src/calendar/gui/caltypes.xml.in.h:2
+#: ../src/calendar/gui/memotypes.xml.in.h:2
+#: ../src/calendar/gui/tasktypes.xml.in.h:2 ../src/mail/filtertypes.xml.in.h:2
+#: ../src/mail/searchtypes.xml.in.h:2 ../src/mail/vfoldertypes.xml.in.h:2
 msgid "contains"
 msgstr "entenas"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3 ../mail/filtertypes.xml.in.h:3
-#: ../mail/searchtypes.xml.in.h:3 ../mail/vfoldertypes.xml.in.h:3
+#: ../src/calendar/gui/caltypes.xml.in.h:3
+#: ../src/calendar/gui/memotypes.xml.in.h:3
+#: ../src/calendar/gui/tasktypes.xml.in.h:3 ../src/mail/filtertypes.xml.in.h:3
+#: ../src/mail/searchtypes.xml.in.h:3 ../src/mail/vfoldertypes.xml.in.h:3
 msgid "does not contain"
 msgstr "ne entenas"
 
-#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../e-util/e-attachment-tree-view.c:527 ../e-util/e-table-config.ui.h:7
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
+#: ../src/calendar/gui/caltypes.xml.in.h:4
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:4
+#: ../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-table-config.ui.h:20
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Description"
 msgstr "Priskribo"
 
-#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:5
-#: ../calendar/gui/tasktypes.xml.h:7
+#: ../src/calendar/gui/caltypes.xml.in.h:5
+#: ../src/calendar/gui/memotypes.xml.in.h:5
+#: ../src/calendar/gui/tasktypes.xml.in.h:7
 msgid "Any Field"
 msgstr "Iu kampo"
 
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:7
+#: ../src/calendar/gui/caltypes.xml.in.h:6
+#: ../src/calendar/gui/memotypes.xml.in.h:7
 msgid "Classification"
 msgstr "Kategoriado"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:9 ../mail/filtertypes.xml.in.h:4
-#: ../mail/searchtypes.xml.in.h:4 ../mail/vfoldertypes.xml.in.h:4
+#: ../src/calendar/gui/caltypes.xml.in.h:7
+#: ../src/calendar/gui/memotypes.xml.in.h:8
+#: ../src/calendar/gui/tasktypes.xml.in.h:9 ../src/mail/filtertypes.xml.in.h:4
+#: ../src/mail/searchtypes.xml.in.h:4 ../src/mail/vfoldertypes.xml.in.h:4
 msgid "is"
 msgstr "estas"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:10 ../mail/filtertypes.xml.in.h:5
-#: ../mail/searchtypes.xml.in.h:5 ../mail/vfoldertypes.xml.in.h:5
+#: ../src/calendar/gui/caltypes.xml.in.h:8
+#: ../src/calendar/gui/memotypes.xml.in.h:9
+#: ../src/calendar/gui/tasktypes.xml.in.h:10 ../src/mail/filtertypes.xml.in.h:5
+#: ../src/mail/searchtypes.xml.in.h:5 ../src/mail/vfoldertypes.xml.in.h:5
 msgid "is not"
 msgstr "ne estas"
 
-#. To Translators: This is task classification
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
-#: ../calendar/gui/e-cal-list-view.c:246 ../calendar/gui/e-cal-model.c:278
-#: ../calendar/gui/e-cal-model.c:285 ../calendar/gui/e-task-table.c:498
-#: ../calendar/gui/memotypes.xml.h:10
+#: ../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/memotypes.xml.in.h:10
 msgid "Public"
 msgstr "Publike"
 
-#. To Translators: This is task classification
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4
-#: ../calendar/gui/e-cal-list-view.c:247 ../calendar/gui/e-cal-model.c:287
-#: ../calendar/gui/e-task-table.c:499 ../calendar/gui/memotypes.xml.h:11
+#: ../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/memotypes.xml.in.h:11
 msgid "Private"
 msgstr "Private"
 
-#. To Translators: This is task classification
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
-#: ../calendar/gui/e-cal-list-view.c:248 ../calendar/gui/e-cal-model.c:289
-#: ../calendar/gui/e-task-table.c:500 ../calendar/gui/memotypes.xml.h:12
-#: ../e-util/e-html-editor-page-dialog.c:116 ../e-util/e-send-options.ui.h:7
+#: ../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/memotypes.xml.in.h:12
+#: ../src/e-util/e-html-editor-page-dialog.c:113
+#: ../src/e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Konfidence"
 
-#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:6
-#: ../calendar/gui/tasktypes.xml.h:5
+#: ../src/calendar/gui/caltypes.xml.in.h:12
+#: ../src/calendar/gui/memotypes.xml.in.h:6
+#: ../src/calendar/gui/tasktypes.xml.in.h:5
 msgid "Organizer"
 msgstr "Organizilo"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
-#: ../calendar/gui/tasktypes.xml.h:6
+#: ../src/calendar/gui/caltypes.xml.in.h:13
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:2
+#: ../src/calendar/gui/tasktypes.xml.in.h:6
 msgid "Attendee"
 msgstr "Partoprenantoj"
 
-#: ../calendar/gui/caltypes.xml.h:14
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:903
-#: ../plugins/publish-calendar/publish-calendar.ui.h:22
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../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/save-calendar/csv-format.c:387
 msgid "Location"
 msgstr "Loko"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:327
+#: ../src/calendar/gui/caltypes.xml.in.h:15
+#: ../src/calendar/gui/memotypes.xml.in.h:13
+#: ../src/calendar/gui/tasktypes.xml.in.h:23
+#: ../src/e-util/e-categories-selector.c:328
 msgid "Category"
 msgstr "Kategorio"
 
-#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
-#: ../em-format/e-mail-formatter-print-headers.c:157
-#: ../mail/filtertypes.xml.in.h:46 ../mail/searchtypes.xml.in.h:48
-#: ../mail/vfoldertypes.xml.in.h:49
+#: ../src/calendar/gui/caltypes.xml.in.h:16
+#: ../src/calendar/gui/memotypes.xml.in.h:14
+#: ../src/calendar/gui/tasktypes.xml.in.h:15
+#: ../src/em-format/e-mail-formatter-print.c:51
+#: ../src/em-format/e-mail-formatter-print-headers.c:155
+#: ../src/mail/filtertypes.xml.in.h:47 ../src/mail/searchtypes.xml.in.h:49
+#: ../src/mail/vfoldertypes.xml.in.h:50
 msgid "Attachments"
 msgstr "Aldonaĵoj"
 
-#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:47
-#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
+#: ../src/calendar/gui/caltypes.xml.in.h:17
+#: ../src/calendar/gui/memotypes.xml.in.h:15
+#: ../src/calendar/gui/tasktypes.xml.in.h:16
+#: ../src/mail/filtertypes.xml.in.h:48 ../src/mail/searchtypes.xml.in.h:50
+#: ../src/mail/vfoldertypes.xml.in.h:51
 msgid "Exist"
 msgstr "Ekzistas"
 
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:48
-#: ../mail/searchtypes.xml.in.h:50 ../mail/vfoldertypes.xml.in.h:51
+#: ../src/calendar/gui/caltypes.xml.in.h:18
+#: ../src/calendar/gui/memotypes.xml.in.h:16
+#: ../src/calendar/gui/tasktypes.xml.in.h:17
+#: ../src/mail/filtertypes.xml.in.h:49 ../src/mail/searchtypes.xml.in.h:51
+#: ../src/mail/vfoldertypes.xml.in.h:52
 msgid "Do Not Exist"
 msgstr "Ne ekzistas"
 
-#: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:309
-#: ../calendar/gui/dialogs/event-editor.c:330
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:15
+#: ../src/calendar/gui/caltypes.xml.in.h:19
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2003
 msgid "Recurrence"
 msgstr "Rikuro"
 
-#: ../calendar/gui/caltypes.xml.h:20
+#: ../src/calendar/gui/caltypes.xml.in.h:20
 msgid "Occurs"
 msgstr "Okazas"
 
-#: ../calendar/gui/caltypes.xml.h:21
+#: ../src/calendar/gui/caltypes.xml.in.h:21
 msgid "Less Than"
 msgstr "Malpli ol"
 
-#: ../calendar/gui/caltypes.xml.h:22
+#: ../src/calendar/gui/caltypes.xml.in.h:22
 msgid "Exactly"
 msgstr "Ekzakte"
 
-#: ../calendar/gui/caltypes.xml.h:23
+#: ../src/calendar/gui/caltypes.xml.in.h:23
 msgid "More Than"
 msgstr "Pli ol"
 
-#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:28
+#: ../src/calendar/gui/caltypes.xml.in.h:24
+#: ../src/calendar/gui/memotypes.xml.in.h:17
+#: ../src/calendar/gui/tasktypes.xml.in.h:28
 msgid "Summary Contains"
 msgstr "Resumo entenas"
 
-#: ../calendar/gui/caltypes.xml.h:25 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:29
+#: ../src/calendar/gui/caltypes.xml.in.h:25
+#: ../src/calendar/gui/memotypes.xml.in.h:18
+#: ../src/calendar/gui/tasktypes.xml.in.h:29
 msgid "Description Contains"
 msgstr "Description entenas"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:668
-msgid "Edit Reminder"
-msgstr "Redakti memorigaĵon"
+#: ../src/calendar/gui/ea-cal-view.c:281
+msgid "New Appointment"
+msgstr "Nova rendevuo"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:896
-#: ../calendar/gui/e-alarm-list.c:424
-msgid "Pop up an alert"
-msgstr "Ŝpruci averton"
+#: ../src/calendar/gui/ea-cal-view.c:282
+msgid "New All Day Event"
+msgstr "Nova tuttaga evento"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:897
-#: ../calendar/gui/e-alarm-list.c:420
-msgid "Play a sound"
-msgstr "Ludi sonon"
+#: ../src/calendar/gui/ea-cal-view.c:283
+msgid "New Meeting"
+msgstr "Nova Kunsido"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:898
-#: ../calendar/gui/e-alarm-list.c:432
-msgid "Run a program"
-msgstr "Lanĉi programon"
+#: ../src/calendar/gui/ea-cal-view.c:284
+msgid "Go to Today"
+msgstr "Iri al hodiaŭ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:899
-#: ../calendar/gui/e-alarm-list.c:428
-msgid "Send an email"
-msgstr "Sundu retpoŝton"
+#: ../src/calendar/gui/ea-cal-view.c:285
+msgid "Go to Date"
+msgstr "Iri al dato"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:908
-msgid "before"
-msgstr "antaŭ"
+#: ../src/calendar/gui/ea-cal-view-event.c:232
+msgid "It has reminders."
+msgstr "Ĝi havas memorigaĵojn."
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:909
-msgid "after"
-msgstr "post"
+#: ../src/calendar/gui/ea-cal-view-event.c:235
+msgid "It has recurrences."
+msgstr "Ĝi havas rikurojn."
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:918
-msgid "start of appointment"
-msgstr "komenco de rendevuo"
+#: ../src/calendar/gui/ea-cal-view-event.c:238
+msgid "It is a meeting."
+msgstr "Ĝi estas kunsido."
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:919
-msgid "end of appointment"
-msgstr "fino de rendevuo"
+#: ../src/calendar/gui/ea-cal-view-event.c:245
+#, c-format
+msgid "Calendar Event: Summary is %s."
+msgstr "Kalendara evento: resumo estas %s."
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "minute(s)"
-msgstr "minuto(j)"
+#: ../src/calendar/gui/ea-cal-view-event.c:248
+msgid "Calendar Event: It has no summary."
+msgstr "Kalendara evento: ne havas resumon."
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-msgid "hour(s)"
-msgstr "horo(j)"
+#: ../src/calendar/gui/ea-cal-view-event.c:271
+msgid "calendar view event"
+msgstr "kalendare vidi eventon"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
-msgid "day(s)"
-msgstr "tago(j)"
+#: ../src/calendar/gui/ea-cal-view-event.c:503
+msgid "Grab Focus"
+msgstr "Kapti fokuson"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
-msgid "Add Reminder"
-msgstr "Aldoni memorigaĵon"
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../src/calendar/gui/ea-day-view.c:105 ../src/calendar/gui/ea-week-view.c:105
+#, c-format
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "Ĝi havas %d eventon."
+msgstr[1] "Ĝi havas %d eventojn."
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
-#: ../calendar/gui/dialogs/event-editor.c:352
-msgid "Reminder"
-msgstr "Memorigilo"
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../src/calendar/gui/ea-day-view.c:112 ../src/calendar/gui/ea-week-view.c:108
+msgid "It has no events."
+msgstr "Ĝi ne havas eventojn."
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
-msgid "Repeat"
-msgstr "Ripeti"
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../src/calendar/gui/ea-day-view.c:119
+#, c-format
+msgid "Work Week View: %s. %s"
+msgstr "Labora semanjo vido: %s. %s"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the reminder"
-msgstr "_Ripeti la memorigilaĵon"
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../src/calendar/gui/ea-day-view.c:126
+#, c-format
+msgid "Day View: %s. %s"
+msgstr "Taga vido: %s. %s"
 
-#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
-msgid "extra times every"
-msgstr "aldona tempo ĉiuj"
+#: ../src/calendar/gui/ea-day-view.c:155
+msgid "calendar view for a work week"
+msgstr "kalendara vido por labora semanjo"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-msgid "Custom _message"
-msgstr "Propra _mesaĝo"
+#: ../src/calendar/gui/ea-day-view.c:157
+msgid "calendar view for one or more days"
+msgstr "kalendara vido por unu aŭ plu tagoj"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
-msgid "Mes_sage:"
-msgstr "Me_saĝo:"
+#: ../src/calendar/gui/ea-day-view-main-item.c:264
+#: ../src/calendar/gui/ea-week-view-main-item.c:293
+msgid "a table to view and select the current time range"
+msgstr "tabelo por vidi kaj elekti la tempintervalon"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
-msgid "Custom reminder sound"
-msgstr "Propra memorigsono"
+#: ../src/calendar/gui/ea-jump-button.c:148
+msgid "Jump button"
+msgstr "Salt-butono"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
-msgid "_Sound:"
-msgstr "_Sono:"
+#: ../src/calendar/gui/ea-jump-button.c:157
+msgid "Click here, you can find more events."
+msgstr "Klaku ĉi tien, vi povas trovi pluajn eventojn."
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
-msgid "Select A File"
-msgstr "Elekti dosieron"
+#. Translator: Entire string is like "Pop up an alert %d weeks before start"
+#: ../src/calendar/gui/e-alarm-list.c:374
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d semajno"
+msgstr[1] "%d semajnoj"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-msgid "_Program:"
-msgstr "_Programo:"
+#. 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:1811
+#, fuzzy
+#| msgid "Play a sound"
+msgctxt "cal-reminders"
+msgid "Play a sound"
+msgstr "Ludi sonon"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-msgid "_Arguments:"
-msgstr "_Argumentoj:"
+#. 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:1809
+#, fuzzy
+#| msgid "Pop up an alert"
+msgctxt "cal-reminders"
+msgid "Pop up an alert"
+msgstr "Ŝpruci averton"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-msgid "Send To:"
-msgstr "Sendi al:"
+#. 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:1815
+#, fuzzy
+#| msgid "Send an email"
+msgctxt "cal-reminders"
+msgid "Send an email"
+msgstr "Sundu retpoŝton"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:239
-msgid "Action/Trigger"
-msgstr "Ago/Ekagigo"
+#. 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:1813
+#, fuzzy
+#| msgid "Run a program"
+msgctxt "cal-reminders"
+msgid "Run a program"
+msgstr "Lanĉi programon"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
-#: ../calendar/gui/dialogs/event-page.ui.h:28
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
-msgid "Reminders"
-msgstr "Memorigaĵoj"
+#: ../src/calendar/gui/e-alarm-list.c:437
+#, fuzzy
+#| msgid "Unknown action to be performed"
+msgctxt "cal-reminders"
+msgid "Unknown action to be performed"
+msgstr "Efektivigota ago oni ne konas"
 
-#: ../calendar/gui/dialogs/changed-comp.c:59
-msgid "This event has been deleted."
-msgstr "Tiu evento estas forigita."
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../src/calendar/gui/e-alarm-list.c:452
+#, fuzzy, c-format
+#| msgid "%s %s before the start of the appointment"
+msgctxt "cal-reminders"
+msgid "%s %s before the start"
+msgstr "%s %s antaŭ la starto de la rendevuo"
 
-#: ../calendar/gui/dialogs/changed-comp.c:63
-msgid "This task has been deleted."
-msgstr "Tiu tasko estas forigita."
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../src/calendar/gui/e-alarm-list.c:458
+#, fuzzy, c-format
+#| msgid "%s %s after the start of the appointment"
+msgctxt "cal-reminders"
+msgid "%s %s after the start"
+msgstr "%s %s post la starto de la rendevuo"
 
-#: ../calendar/gui/dialogs/changed-comp.c:67
-msgid "This memo has been deleted."
-msgstr "Tiu noto estas forigite."
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../src/calendar/gui/e-alarm-list.c:465
+#, fuzzy, c-format
+#| msgid "%s attachment"
+msgctxt "cal-reminders"
+msgid "%s at the start"
+msgstr "%s aldonaĵo"
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
-#, c-format
-msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr ""
-"%s  Vi faris ŝanĝojn. Ĉu forgesi tiajn ŝanĝojn kaj fermi la redaktilon?"
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../src/calendar/gui/e-alarm-list.c:477
+#, fuzzy, c-format
+#| msgid "%s %s before the end of the appointment"
+msgctxt "cal-reminders"
+msgid "%s %s before the end"
+msgstr "%s %s antaŭ la fino de la rendevuo"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
-#, c-format
-msgid "%s  You have made no changes, close the editor?"
-msgstr "%s  Vi ne faris ŝanĝojn. Ĉu fermi la redaktilon?"
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../src/calendar/gui/e-alarm-list.c:483
+#, fuzzy, c-format
+#| msgid "%s %s after the start of the appointment"
+msgctxt "cal-reminders"
+msgid "%s %s after the end"
+msgstr "%s %s post la starto de la rendevuo"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
-msgid "This event has been changed."
-msgstr "Tiu evento estas ŝanĝita."
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../src/calendar/gui/e-alarm-list.c:490
+#, fuzzy, c-format
+#| msgid "%s attachment"
+msgctxt "cal-reminders"
+msgid "%s at the end"
+msgstr "%s aldonaĵo"
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
-msgid "This task has been changed."
-msgstr "Tiu tasko estas ŝanĝita."
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
+#: ../src/calendar/gui/e-alarm-list.c:514
+#, fuzzy, c-format
+#| msgid "%s at %s"
+msgctxt "cal-reminders"
+msgid "%s at %s"
+msgstr "%s je %s"
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
-msgid "This memo has been changed."
-msgstr "Tiu noto estas ŝanĝite."
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound". "Trigger types" are absolute or relative dates
+#: ../src/calendar/gui/e-alarm-list.c:522
+#, fuzzy, c-format
+#| msgid "%s for an unknown trigger type"
+msgctxt "cal-reminders"
+msgid "%s for an unknown trigger type"
+msgstr "%s por nekonata tipo de ekagilo"
 
-#: ../calendar/gui/dialogs/changed-comp.c:102
+#: ../src/calendar/gui/ea-week-view.c:112
 #, c-format
-msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr ""
-"%s  Vi faris ŝanĝojn. Ĉu forgesi tiajn ŝanĝojn kaj ĝisdatigi la redaktilon?"
+msgid "Month View: %s. %s"
+msgstr "Monata Vido: %s. %s"
 
-#: ../calendar/gui/dialogs/changed-comp.c:104
+#: ../src/calendar/gui/ea-week-view.c:117
 #, c-format
-msgid "%s  You have made no changes, update the editor?"
-msgstr "%s  Vi ne faris ŝanĝojn, ĉu aktualigi la redaktilon?"
+msgid "Week View: %s. %s"
+msgstr "Semanja Vido: %s. %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:271
-msgid "Could not save attachments"
-msgstr "Ne eblis konservi aldonaĵojn"
+#: ../src/calendar/gui/ea-week-view.c:146
+msgid "calendar view for a month"
+msgstr "kalendara vido por monato"
 
-#: ../calendar/gui/dialogs/comp-editor.c:625
-msgid "Could not update object"
-msgstr "Ne eblis aktualigi onjekton"
+#: ../src/calendar/gui/ea-week-view.c:148
+msgid "calendar view for one or more weeks"
+msgstr "kalendara vido por unu aŭ plu semanjoj"
 
-#: ../calendar/gui/dialogs/comp-editor.c:759
-msgid "Edit Appointment"
-msgstr "Redakti rendevuon"
+#: ../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
+msgid "Untitled"
+msgstr "Sentitole"
 
-#: ../calendar/gui/dialogs/comp-editor.c:766
-#, c-format
-msgid "Meeting - %s"
-msgstr "Kunsido - %s"
+#: ../src/calendar/gui/e-cal-component-preview.c:222
+msgid "Categories:"
+msgstr "Kategorioj:"
 
-#: ../calendar/gui/dialogs/comp-editor.c:768
-#, c-format
-msgid "Appointment - %s"
-msgstr "Rendevuo - %s"
+#: ../src/calendar/gui/e-cal-component-preview.c:256
+msgid "Summary:"
+msgstr "Resumo:"
 
-#: ../calendar/gui/dialogs/comp-editor.c:774
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Asignitaj taskoj - %s"
+#: ../src/calendar/gui/e-cal-component-preview.c:264
+msgid "Start Date:"
+msgstr "Komencodato:"
 
-#: ../calendar/gui/dialogs/comp-editor.c:776
-#, c-format
-msgid "Task - %s"
-msgstr "Tasko - %s"
+#: ../src/calendar/gui/e-cal-component-preview.c:275
+msgid "End Date:"
+msgstr "Findato:"
 
-#: ../calendar/gui/dialogs/comp-editor.c:781
-#, c-format
-msgid "Memo - %s"
-msgstr "Noto - %s"
+#: ../src/calendar/gui/e-cal-component-preview.c:286
+msgid "Due Date:"
+msgstr "Limdato:"
 
-#: ../calendar/gui/dialogs/comp-editor.c:797
-msgid "No Summary"
-msgstr "Neniu resumo"
+#: ../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
+msgid "Status:"
+msgstr "Stato:"
 
-#: ../calendar/gui/dialogs/comp-editor.c:918
-msgid "Keep original item?"
-msgstr "Ĉu manteni originan eron?"
+#: ../src/calendar/gui/e-cal-component-preview.c:302
+#: ../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:3590
+msgid "In Progress"
+msgstr "Progresante"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
-#: ../calendar/gui/dialogs/comp-editor.c:1109
-msgid "Unable to synchronize with the server"
-msgstr "Ne eblas sinkronigi kun la servilo"
+#: ../src/calendar/gui/e-cal-component-preview.c:305
+#: ../src/calendar/gui/e-cal-model-tasks.c:312
+#: ../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:3593
+#: ../src/calendar/gui/tasktypes.xml.in.h:13
+#: ../src/plugins/save-calendar/csv-format.c:377
+msgid "Completed"
+msgstr "Plenumite"
 
-#. == Button box ==
-#: ../calendar/gui/dialogs/comp-editor.c:1221
-#: ../calendar/gui/dialogs/event-editor.c:116
-#: ../calendar/gui/dialogs/event-editor.c:310
-#: ../calendar/gui/dialogs/event-page.ui.h:29
-#: ../composer/e-composer-actions.c:387 ../e-util/e-html-editor-dialog.c:196
-#: ../e-util/e-mail-signature-editor.c:295
-#: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:388
-#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:126
-#: ../mail/em-folder-properties.c:418 ../mail/em-subscription-editor.c:1714
-#: ../modules/plugin-manager/evolution-plugin-manager.c:256
-#: ../shell/e-shell-window-actions.c:342 ../shell/e-shell-window-actions.c:908
-#: ../smime/gui/certificate-manager.c:2064
-msgid "_Close"
-msgstr "_Fermi"
+#: ../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:3587
+#: ../src/calendar/gui/tasktypes.xml.in.h:11
+msgid "Not Started"
+msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1223
-msgid "Close the current window"
-msgstr "Fermi la aktualan fenestron"
+#: ../src/calendar/gui/e-cal-component-preview.c:325
+msgid "Priority:"
+msgstr "Prioritato:"
 
-#. copy menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1228 ../e-util/e-focus-tracker.c:775
-#: ../e-util/e-html-editor-actions.c:1094 ../e-util/e-text.c:2089
-#: ../e-util/e-web-view.c:349 ../mail/e-mail-browser.c:133
-#: ../shell/e-shell-window-actions.c:929
-msgid "_Copy"
-msgstr "_Kopii"
+#: ../src/calendar/gui/e-cal-component-preview.c:327
+#: ../src/calendar/gui/e-task-table.c:548
+#: ../src/calendar/gui/tasktypes.xml.in.h:19
+#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:323
+msgid "High"
+msgstr "Alta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1230 ../e-util/e-focus-tracker.c:175
-#: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284
-#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:351
-#: ../e-util/e-web-view.c:1365 ../mail/e-mail-browser.c:135
-#: ../shell/e-shell-window-actions.c:931
-msgid "Copy the selection"
-msgstr "Kopii la elektaĵon"
+#: ../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/tasktypes.xml.in.h:20
+#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:322
+msgid "Normal"
+msgstr "Normala"
 
-#. cut menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1235 ../e-util/e-focus-tracker.c:770
-#: ../e-util/e-html-editor-actions.c:1101 ../e-util/e-text.c:2075
-#: ../mail/e-mail-browser.c:140 ../shell/e-shell-window-actions.c:936
-msgid "Cu_t"
-msgstr "El_tondi"
+#: ../src/calendar/gui/e-cal-component-preview.c:331
+#: ../src/calendar/gui/e-task-table.c:550
+#: ../src/calendar/gui/tasktypes.xml.in.h:21
+#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:321
+msgid "Low"
+msgstr "Malalta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1237 ../e-util/e-focus-tracker.c:168
-#: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278
-#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1359
-#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:938
-msgid "Cut the selection"
-msgstr "Eltondi la elektaĵon"
+#: ../src/calendar/gui/e-cal-component-preview.c:350
+#: ../src/mail/e-mail-config-service-page.c:531
+msgid "Description:"
+msgstr "Priskribo:"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1244 ../e-util/e-focus-tracker.c:189
-#: ../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786
-#: ../shell/e-shell-window-actions.c:945
-msgid "Delete the selection"
-msgstr "Forigi la elektitaĵon"
+#: ../src/calendar/gui/e-cal-component-preview.c:381
+msgid "Web Page:"
+msgstr "Retpaĝo:"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1251
-msgid "View help"
-msgstr "Montri helpon"
+#: ../src/calendar/gui/e-cal-data-model.c:1631
+#, fuzzy, c-format
+#| msgid "Creating view for calendar “%s”"
+msgid "Creating view for calendar “%s”"
+msgstr "Kreante vidon por kalendaro “%s”"
 
-#. paste menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:780
-#: ../e-util/e-html-editor-actions.c:1108 ../e-util/e-text.c:2101
-#: ../mail/e-mail-browser.c:147 ../shell/e-shell-window-actions.c:964
-msgid "_Paste"
-msgstr "_Alglui"
+#: ../src/calendar/gui/e-cal-data-model.c:1635
+#, fuzzy, c-format
+#| msgid "Creating view for task list “%s”"
+msgid "Creating view for task list “%s”"
+msgstr "Kreante vidon por taskolisto “%s”"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1258 ../e-util/e-focus-tracker.c:182
-#: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290
-#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1371
-#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:966
-msgid "Paste the clipboard"
-msgstr "Enmeti la tondujon"
+#: ../src/calendar/gui/e-cal-data-model.c:1639
+#, fuzzy, c-format
+#| msgid "Creating view for memo list “%s”"
+msgid "Creating view for memo list “%s”"
+msgstr "Kreante vidon por notolisto “%s”"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1263
-#: ../composer/e-composer-actions.c:441 ../mail/e-mail-reader.c:2262
-#: ../modules/addressbook/e-book-shell-view-actions.c:1205
-#: ../modules/addressbook/e-book-shell-view-actions.c:1219
-msgid "_Print..."
-msgstr "_Presi..."
+#: ../src/calendar/gui/e-cal-dialogs.c:219 ../src/calendar/gui/e-cal-ops.c:1966
+msgid "Destination is read only"
+msgstr "Celo estas nur legebla"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1270 ../mail/e-mail-reader.c:2269
-#: ../modules/addressbook/e-book-shell-view-actions.c:1212
-#: ../modules/calendar/e-cal-shell-view-actions.c:1642
-#: ../modules/calendar/e-memo-shell-view-actions.c:764
-#: ../modules/calendar/e-task-shell-view-actions.c:964
-msgid "Pre_view..."
-msgstr "Antaŭri_gardo..."
+#: ../src/calendar/gui/e-cal-dialogs.c:299
+#, fuzzy, c-format
+#| msgid "Copying events to the calendar “%s”"
+msgid "Copying events to the calendar “%s”"
+msgstr "Kopiante eventojn al kalendaro “%s”"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1279
-msgid "Save current changes"
-msgstr "Konservi aktualajn ŝanĝojn"
+#: ../src/calendar/gui/e-cal-dialogs.c:305
+#, fuzzy, c-format
+#| msgid "Copying memos to the memo list “%s”"
+msgid "Copying memos to the memo list “%s”"
+msgstr "Kopiante notojn al notlisto “%s”"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1284
-#: ../e-util/e-mail-signature-editor.c:304
-msgid "Save and Close"
-msgstr "Konservi kaj fermi"
+#: ../src/calendar/gui/e-cal-dialogs.c:311
+#, fuzzy, c-format
+#| msgid "Copying tasks to the task list “%s”"
+msgid "Copying tasks to the task list “%s”"
+msgstr "Kopiante taskojn en taskoliston “%s”"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1286
-msgid "Save current changes and close editor"
-msgstr "Konservi aktualajn ŝanĝojn kaj fermi redaktilon"
+#: ../src/calendar/gui/e-cal-dialogs.c:530
+#, fuzzy
+#| msgid "_Delete this item from all other recipient's mailboxes?"
+msgid "_Delete this item from all other recipient’s mailboxes?"
+msgstr "Ĉu _forigi tiun ĉi eron el aliaj ricevantaj retkestoj?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1291 ../e-util/e-focus-tracker.c:790
-#: ../e-util/e-html-editor-actions.c:1122 ../e-util/e-web-view.c:359
-#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1041
-msgid "Select _All"
-msgstr "Elekti ĉ_ion"
+#: ../src/calendar/gui/e-cal-dialogs.c:533
+msgid "_Retract comment"
+msgstr "_Rezigni komenton"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1293 ../e-util/e-focus-tracker.c:196
-#: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791
-#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:1043
-msgid "Select all text"
-msgstr "Elekti tutan tekston"
+#: ../src/calendar/gui/e-cal-dialogs.c:692
+msgid "Select Date"
+msgstr "Elekti daton"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1314
-msgid "_Classification"
-msgstr "_Kategoriado"
+#: ../src/calendar/gui/e-cal-dialogs.c:693
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1288
+msgid "Select _Today"
+msgstr "Elekti _hodiaŭ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1328
-#: ../e-util/e-html-editor-actions.c:1145
-#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:163
-#: ../shell/e-shell-window-actions.c:1078
-msgid "_File"
-msgstr "_Dosiero"
+#: ../src/calendar/gui/e-cal-dialogs.c:712
+msgid "January"
+msgstr "Januaro"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1342
-#: ../e-util/e-html-editor-actions.c:1166
-msgid "_Insert"
-msgstr "_Enmeti"
+#: ../src/calendar/gui/e-cal-dialogs.c:713
+msgid "February"
+msgstr "Februaro"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1349
-#: ../composer/e-composer-actions.c:431
-msgid "_Options"
-msgstr "_Agordoj"
+#: ../src/calendar/gui/e-cal-dialogs.c:714
+msgid "March"
+msgstr "Marto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1356
-#: ../e-util/e-html-editor-actions.c:1187 ../mail/e-mail-browser.c:177
-#: ../shell/e-shell-window-actions.c:1121
-#: ../smime/gui/certificate-manager.c:1649 ../smime/gui/smime-ui.ui.h:5
-msgid "_View"
-msgstr "_Vido"
+#: ../src/calendar/gui/e-cal-dialogs.c:715
+msgid "April"
+msgstr "Aprilo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1366
-#: ../composer/e-composer-actions.c:380
-msgid "_Attachment..."
-msgstr "_Aldonaĵo..."
+#: ../src/calendar/gui/e-cal-dialogs.c:716
+msgid "May"
+msgstr "Majo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1368
-#: ../composer/e-composer-actions.c:382 ../e-util/e-attachment-view.c:412
-msgid "Attach a file"
-msgstr "Aldoni dosieron"
+#: ../src/calendar/gui/e-cal-dialogs.c:717
+msgid "June"
+msgstr "Junio"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1376
-msgid "_Categories"
-msgstr "_Kategorioj"
+#: ../src/calendar/gui/e-cal-dialogs.c:718
+msgid "July"
+msgstr "Julio"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1378
-#, fuzzy
-msgid "Toggles whether to display categories"
-msgstr "Tio ĉi baskulas montron de kategorioj"
+#: ../src/calendar/gui/e-cal-dialogs.c:719
+msgid "August"
+msgstr "Aŭgusto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1384
-msgid "Time _Zone"
-msgstr "Hor_zono"
+#: ../src/calendar/gui/e-cal-dialogs.c:720
+msgid "September"
+msgstr "Septembro"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1386
-#, fuzzy
-msgid "Toggles whether the time zone is displayed"
-msgstr "Tio ĉi baskulas montron de horzono"
+#: ../src/calendar/gui/e-cal-dialogs.c:721
+msgid "October"
+msgstr "Oktobro"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
-msgid "Pu_blic"
-msgstr "Pu_blike"
+#: ../src/calendar/gui/e-cal-dialogs.c:722
+msgid "November"
+msgstr "Novembro"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1397
-msgid "Classify as public"
-msgstr "Kategoriigi kiel publike"
+#: ../src/calendar/gui/e-cal-dialogs.c:723
+msgid "December"
+msgstr "Decembro"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1402
-msgid "_Private"
-msgstr "_Private"
+#: ../src/calendar/gui/e-cal-dialogs.c:873
+#, c-format
+msgid "You are modifying a recurring event. What would you like to modify?"
+msgstr "Vi modifas rikuran eventon. Kion vi volas modifi?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1404
-msgid "Classify as private"
-msgstr "Kategoriigi kiel private"
+#: ../src/calendar/gui/e-cal-dialogs.c:875
+#, c-format
+msgid "You are delegating a recurring event. What would you like to delegate?"
+msgstr "Vi delegas rikuran eventon. Kion vi volas delegi?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1409
-msgid "_Confidential"
-msgstr "_Konfidence"
+#: ../src/calendar/gui/e-cal-dialogs.c:879
+#, c-format
+msgid "You are modifying a recurring task. What would you like to modify?"
+msgstr "Vi modifas rikuran taskon. Kion vi volas modifi?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1411
-msgid "Classify as confidential"
-msgstr "Kategoriigi kiel konfidence"
+#: ../src/calendar/gui/e-cal-dialogs.c:883
+#, c-format
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr "Vi modifas rikuran noton. Kion vi volas modifi?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1419
-#, fuzzy
-msgid "R_ole Field"
-msgstr "R_ola kampo"
+#: ../src/calendar/gui/e-cal-dialogs.c:909
+msgid "This Instance Only"
+msgstr "Nur tiu ĉi ekzemplo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1421
-#, fuzzy
-msgid "Toggles whether the Role field is displayed"
-msgstr "Tio ĉi baskulas montron de rola kampo"
+#: ../src/calendar/gui/e-cal-dialogs.c:913
+msgid "This and Prior Instances"
+msgstr "Tiu ĉi kaj antaŭaj ekzemploj"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1427
-msgid "_RSVP"
-msgstr "_RSVP"
+#: ../src/calendar/gui/e-cal-dialogs.c:919
+msgid "This and Future Instances"
+msgstr "Tiu ĉi kaj estontaj ekzemploj"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
-#, fuzzy
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Tio ĉi baskulas montron de RSVP-kampo"
+#: ../src/calendar/gui/e-cal-dialogs.c:924
+msgid "All Instances"
+msgstr "Ĉiuj ekzemploj"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1435
-msgid "_Status Field"
-msgstr "_Statokampo"
+#: ../src/calendar/gui/e-cal-dialogs.c:1174
+#: ../src/calendar/gui/e-cal-dialogs.c:1256
+msgid "Send my reminders with this event"
+msgstr "Sendi miajn memorigojn kun tiu ĉi evento"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../src/calendar/gui/e-cal-dialogs.c:1176
+#: ../src/calendar/gui/e-cal-dialogs.c:1258
 #, fuzzy
-msgid "Toggles whether the Status field is displayed"
-msgstr "Tio ĉi baskulas montron de Stato-kampo"
+msgid "Notify new attendees _only"
+msgstr "Sciigi _nur pri novaj alestantoj"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1443
-msgid "_Type Field"
-msgstr "_Tipokampo"
+#: ../src/calendar/gui/e-calendar-view.c:451
+msgid "Cut selected events to the clipboard"
+msgstr "Eltondi elektitajn eventojn al la tondejo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
-#, fuzzy
-msgid "Toggles whether the Attendee Type is displayed"
-msgstr "Tio ĉi baskulas montron de tipo de alestanto"
+#: ../src/calendar/gui/e-calendar-view.c:457
+msgid "Copy selected events to the clipboard"
+msgstr "Kopii elektitajn eventojn al la tondejo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2232
-#: ../composer/e-composer-actions.c:665
-msgid "Attach"
-msgstr "Aldoni"
+#: ../src/calendar/gui/e-calendar-view.c:463
+msgid "Paste events from the clipboard"
+msgstr "Alglui eventojn el la tondejo"
+
+#: ../src/calendar/gui/e-calendar-view.c:469
+msgid "Delete selected events"
+msgstr "Forigi elektitajn eventojn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2563
-#: ../calendar/gui/dialogs/comp-editor.c:2773
-#: ../calendar/gui/dialogs/comp-editor.c:3786
+#: ../src/calendar/gui/e-calendar-view.c:853
 #, fuzzy
-msgid "Changes made to this item may be discarded if an update arrives"
-msgstr "Ŝanĝoj de tiu ĉi ero povus ne esti konservitaj, se ĝisdatigo alvenas"
+#| msgid "Pasted text doesn't contain valid iCalendar data"
+msgid "Pasted text doesn’t contain valid iCalendar data"
+msgstr "Algluita teksto enhavas nevalidajn iCalendar-datumojn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3748
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
-msgid "attachment"
-msgstr "aldonaĵo"
+#: ../src/calendar/gui/e-calendar-view.c:864
+#: ../src/calendar/gui/e-cal-ops.c:1556
+msgid "Default calendar not found"
+msgstr "Defaŭlta kalendaro ne trovita"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3818
-msgid "Unable to use current version!"
-msgstr "Ne eblas uzi aktualan version!"
+#: ../src/calendar/gui/e-calendar-view.c:869
+#: ../src/calendar/gui/e-cal-ops.c:1559
+msgid "Default memo list not found"
+msgstr "Defaŭlta notolisto ne trovita"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:440
-#, c-format
-msgid "Validation error: %s"
-msgstr "Validig-eraro: %s"
+#: ../src/calendar/gui/e-calendar-view.c:874
+#: ../src/calendar/gui/e-cal-ops.c:1562
+msgid "Default task list not found"
+msgstr "Defaŭlta taskolisto ne trovita"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:129
-#: ../calendar/gui/e-cal-ops.c:1940
-msgid "Destination is read only"
-msgstr "Celo estas nur legebla"
+#: ../src/calendar/gui/e-calendar-view.c:963
+msgid "No suitable component found"
+msgstr "Taŭga elemento ne trovita"
+
+#: ../src/calendar/gui/e-calendar-view.c:1033
+msgid "Pasting iCalendar data"
+msgstr "Algluante iCalendar-datumojn"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:209
+#. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
+#. Translators: It will display
+#. * "Organizer: NameOfTheUser <email ofuser com>"
+#. To Translators: It will display
+#. * "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
 #, c-format
-msgid "Copying events to the calendar '%s'"
-msgstr "Kopiante eventojn al kalendaro '%s'"
+msgid "Organizer: %s <%s>"
+msgstr "Organizilo: %s <%s>"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:215
+#. With SunOne accouts, there may be no ':' in organiser.value
+#. With SunOne accounts, there may be no ':' in
+#. * 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
 #, c-format
-msgid "Copying memos to the memo list '%s'"
-msgstr "Kopiante notojn al notlisto '%s'"
+msgid "Organizer: %s"
+msgstr "Organizilo: %s"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:221
+#. 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:2671
+#: ../src/calendar/gui/e-to-do-pane.c:343 ../src/calendar/gui/print.c:3541
 #, c-format
-msgid "Copying tasks to the task list '%s'"
-msgstr "Kopiante taskojn en taskoliston '%s'"
+msgid "Location: %s"
+msgstr "Loko: %s"
 
-#: ../calendar/gui/dialogs/delete-comp.c:215
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "Ĉu _forigi tiun ĉi eron el aliaj ricevantaj retkestoj?"
+#. 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
+#, c-format
+msgid "Time: %s %s"
+msgstr "Tempo: %s %s"
 
-#: ../calendar/gui/dialogs/delete-comp.c:218
-msgid "_Retract comment"
-msgstr "_Rezigni komenton"
+#: ../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
+msgid "%d %b %Y"
+msgstr "%d %b %Y"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
-#, fuzzy
-msgid "Enter Delegate"
-msgstr "Enigi delegon"
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. * Don't use any other specifiers.
+#. 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-week-view-main-item.c:228
+msgid "%d %b"
+msgstr "%d %b"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:4
-msgid "Delegate To:"
-msgstr "Deligi al:"
+#: ../src/calendar/gui/e-calendar-view.c:2304
+msgid "%A %d %b %Y"
+msgstr "%A %d %b %Y"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:5
-msgid "Contacts..."
-msgstr "Kantaktoj..."
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. * %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. * %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-week-view-main-item.c:214
+msgid "%a %d %b"
+msgstr "%a %d %b"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
-msgid "_Reminders"
-msgstr "Momo_rigaĵoj"
+#: ../src/calendar/gui/e-calendar-view.c:2311
+#: ../src/calendar/gui/e-calendar-view.c:2317
+#: ../src/calendar/gui/e-calendar-view.c:2320
+msgid "%a %d %b %Y"
+msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/dialogs/event-editor.c:206
-msgid "Set or unset reminders for this event"
-msgstr "Ĉu agordi memorigojn por tiu ĉi evento"
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:1
+#: ../src/calendar/gui/e-memo-table.etspec.h:5
+msgid "Start Date"
+msgstr "Komencodato"
 
-#: ../calendar/gui/dialogs/event-editor.c:214
-msgid "Show Time as _Busy"
-msgstr "Montri tempon kiel _okupatan"
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Findato"
 
-#: ../calendar/gui/dialogs/event-editor.c:216
-#, fuzzy
-msgid "Toggles whether to show time as busy"
-msgstr "Baskuli montron de tempo kiel okupata"
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:7
+#: ../src/calendar/gui/e-memo-table.etspec.h:6
+#: ../src/calendar/gui/e-task-table.etspec.h:13
+#: ../src/plugins/save-calendar/csv-format.c:378
+msgid "Created"
+msgstr "Kreite"
 
-#: ../calendar/gui/dialogs/event-editor.c:225
-#, fuzzy
-msgid "_Recurrence"
-msgstr "_Rikuro"
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:8
+#: ../src/calendar/gui/e-memo-table.etspec.h:7
+#: ../src/calendar/gui/e-task-table.etspec.h:14
+msgid "Last modified"
+msgstr "Laste modifite"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
-msgid "Make this a recurring event"
-msgstr "Farigi tiun ĉi eventon rikura"
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:9
+#: ../src/calendar/gui/e-memo-table.etspec.h:8
+#: ../src/calendar/gui/e-task-table.etspec.h:15
+#: ../src/em-format/e-mail-formatter-source.c:118
+msgid "Source"
+msgstr "Fonto"
 
-#: ../calendar/gui/dialogs/event-editor.c:232 ../e-util/e-send-options.ui.h:14
-msgid "Send Options"
-msgstr "Send-agordoj"
+#: ../src/calendar/gui/e-cal-model.c:316
+#: ../src/calendar/gui/e-meeting-list-view.c:183
+#: ../src/calendar/gui/e-meeting-list-view.c:197
+#: ../src/calendar/gui/e-meeting-store.c:132
+#: ../src/calendar/gui/e-meeting-store.c:167
+#: ../src/calendar/gui/e-meeting-store.c:230 ../src/calendar/gui/print.c:1257
+#: ../src/calendar/gui/print.c:1274 ../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/plugin-manager/evolution-plugin-manager.c:97
+msgid "Unknown"
+msgstr "Nekonate"
 
-#: ../calendar/gui/dialogs/event-editor.c:234
-#: ../calendar/gui/dialogs/task-editor.c:95
-msgid "Insert advanced send options"
-msgstr "Enmeti specialajn opciojn de sendo"
+#: ../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
+#, fuzzy, c-format
+#| msgid "Source with UID “%s” not found"
+msgid "Source with UID “%s” not found"
+msgstr "Fonto kun UID “%s” ne trovita"
 
-#: ../calendar/gui/dialogs/event-editor.c:242
-msgid "All _Day Event"
-msgstr "Tut_taga evento"
+#: ../src/calendar/gui/e-cal-model.c:1507 ../src/calendar/gui/e-cal-ops.c:186
+#: ../src/calendar/gui/e-cal-ops.c:1367
+msgid "Creating an event"
+msgstr "Kreante eventon"
 
-#: ../calendar/gui/dialogs/event-editor.c:244
-msgid "Toggles whether to have All Day Event"
-msgstr "Baskulias ĉu igi eventon tuttaga"
+#: ../src/calendar/gui/e-cal-model.c:1511 ../src/calendar/gui/e-cal-ops.c:190
+#: ../src/calendar/gui/e-cal-ops.c:1371
+msgid "Creating a memo"
+msgstr "Kreante noton"
 
-#: ../calendar/gui/dialogs/event-editor.c:253
-msgid "_Free/Busy"
-msgstr "_Libere/okupite"
+#: ../src/calendar/gui/e-cal-model.c:1515 ../src/calendar/gui/e-cal-ops.c:194
+#: ../src/calendar/gui/e-cal-ops.c:1375
+msgid "Creating a task"
+msgstr "Kreante taskon"
 
-#: ../calendar/gui/dialogs/event-editor.c:255
-msgid "Query free / busy information for the attendees"
-msgstr "Informpeti pri stato (malokupata / okupata) de la alestantoj"
+#: ../src/calendar/gui/e-cal-model.c:1892
+msgid "Recurring"
+msgstr "Rikura"
 
-#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3486
-msgid "Appointment"
-msgstr "Rendevuo"
+#: ../src/calendar/gui/e-cal-model.c:1894
+msgid "Assigned"
+msgstr "Atribuita"
 
-#: ../calendar/gui/dialogs/event-editor.c:376
-#: ../calendar/gui/dialogs/event-page.ui.h:27
-#: ../calendar/gui/e-meeting-list-view.c:164
-msgid "Attendees"
-msgstr "Alestantoj"
+#: ../src/calendar/gui/e-cal-model.c:1896
+#: ../src/calendar/gui/e-cal-model-tasks.c:1136
+#: ../src/calendar/gui/e-meeting-list-view.c:207
+#: ../src/calendar/gui/e-meeting-store.c:174
+#: ../src/calendar/gui/e-meeting-store.c:184
+#: ../src/calendar/gui/e-meeting-store.c:1021
+msgid "Yes"
+msgstr "Jes"
 
-#: ../calendar/gui/dialogs/event-editor.c:573
-msgid "Print this event"
-msgstr "Presi tiun eventon"
+#: ../src/calendar/gui/e-cal-model.c:1896
+#: ../src/calendar/gui/e-cal-model-tasks.c:1136
+#: ../src/calendar/gui/e-meeting-list-view.c:208
+#: ../src/calendar/gui/e-meeting-store.c:186
+msgid "No"
+msgstr "Ne"
 
-#: ../calendar/gui/dialogs/event-page.c:557
-msgid "Event's start time is in the past"
-msgstr "Komenctempo de evento estas en la pasinteco"
+#: ../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
+msgid "Accepted"
+msgstr "Akceptite"
 
-#: ../calendar/gui/dialogs/event-page.c:634
-msgid "Event cannot be edited, because the selected calendar is read only"
-msgstr "Ne eblas redakti eventon, ĉar la elektita kalendaro estas nurlega"
+#: ../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
+msgid "Declined"
+msgstr "Malakceptite"
 
-#: ../calendar/gui/dialogs/event-page.c:638
-msgid "Event cannot be fully edited, because you are not the organizer"
-msgstr "Ne eblas plene redakti eventon, ĉar vi ne estas la organizanto"
+#: ../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:523
+msgid "Tentative"
+msgstr "Provizore"
 
-#: ../calendar/gui/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3178
-msgid "This event has reminders"
-msgstr "Tiu evento havas memorigaĵojn"
+#: ../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
+msgid "Delegated"
+msgstr "Delegite"
 
-#: ../calendar/gui/dialogs/event-page.c:717
-#: ../calendar/gui/dialogs/event-page.ui.h:13
-msgid "Or_ganizer:"
-msgstr "Or_ganizilo:"
+#: ../src/calendar/gui/e-cal-model.c:3804
+msgid "Needs action"
+msgstr "Bezonas agon"
+
+#. 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: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
+#: ../src/calendar/gui/tasktypes.xml.in.h:8 ../src/mail/filtertypes.xml.in.h:36
+#: ../src/mail/message-list.etspec.h:1 ../src/mail/searchtypes.xml.in.h:38
+#: ../src/mail/vfoldertypes.xml.in.h:38
+msgid "Status"
+msgstr "Stato"
 
-#: ../calendar/gui/dialogs/event-page.c:1309
-msgid "Event with no start date"
-msgstr "Evento sen komencdato"
+#: ../src/calendar/gui/e-cal-model-calendar.c:148
+#: ../src/calendar/gui/e-task-table.c:606
+msgid "Free"
+msgstr "Libere"
 
-#: ../calendar/gui/dialogs/event-page.c:1312
-msgid "Event with no end date"
-msgstr "Evento sen findato"
+#: ../src/calendar/gui/e-cal-model-calendar.c:151
+#: ../src/calendar/gui/e-meeting-time-sel.c:524
+#: ../src/calendar/gui/e-task-table.c:607
+msgid "Busy"
+msgstr "Okupite"
 
-#: ../calendar/gui/dialogs/event-page.c:1490
-#: ../calendar/gui/dialogs/memo-page.c:732
-#: ../calendar/gui/dialogs/task-page.c:1032
-msgid "Start date is wrong"
-msgstr "Komencdato estas neĝusta"
+#: ../src/calendar/gui/e-cal-model-tasks.c:496
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1501
-msgid "End date is wrong"
-msgstr "Findato estas neĝusta"
+#. Translators: "None" for task's status
+#: ../src/calendar/gui/e-cal-model-tasks.c:548
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "Nenio"
 
-#: ../calendar/gui/dialogs/event-page.c:1525
-msgid "Start time is wrong"
-msgstr "Komenctempo estas neĝusta"
+#: ../src/calendar/gui/e-cal-ops.c:305
+msgid "Modifying an event"
+msgstr "Modifante eventon"
 
-#: ../calendar/gui/dialogs/event-page.c:1533
-msgid "End time is wrong"
-msgstr "Fintempo estas neĝusta"
+#: ../src/calendar/gui/e-cal-ops.c:309
+msgid "Modifying a memo"
+msgstr "Modifante noton"
 
-#: ../calendar/gui/dialogs/event-page.c:1697
-#: ../calendar/gui/dialogs/memo-page.c:771
-#: ../calendar/gui/dialogs/task-page.c:1086
-msgid "An organizer is required."
-msgstr "Organizilo estas bezonata."
+#: ../src/calendar/gui/e-cal-ops.c:313
+msgid "Modifying a task"
+msgstr "Modifante taskon"
 
-#: ../calendar/gui/dialogs/event-page.c:1732
-#: ../calendar/gui/dialogs/task-page.c:1121
-msgid "At least one attendee is required."
-msgstr "Necesas almenaŭ unu alestanto."
+#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1812
+msgid "Removing an event"
+msgstr "Provizore forigante eventon"
 
-#: ../calendar/gui/dialogs/event-page.c:1938
-msgid "_Delegatees"
-msgstr "_Delegantoj"
+#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1816
+msgid "Removing a memo"
+msgstr "Provizore forigante taskon"
 
-#: ../calendar/gui/dialogs/event-page.c:1940
-msgid "Atte_ndees"
-msgstr "Alestan_toj"
+#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1820
+msgid "Removing a task"
+msgstr "Provizore forigante taskon"
 
-#: ../calendar/gui/dialogs/event-page.c:3458
+#: ../src/calendar/gui/e-cal-ops.c:511
 #, c-format
-msgid "%d day before appointment"
-msgid_plural "%d days before appointment"
-msgstr[0] "%d tago antaŭ la rendevuo"
-msgstr[1] "%d tagoj antaŭ la rendevuo"
+msgid "Deleting an event"
+msgid_plural "Deleting %d events"
+msgstr[0] "Forigante eventon"
+msgstr[1] "Forigante %d eventojn"
 
-#: ../calendar/gui/dialogs/event-page.c:3464
+#: ../src/calendar/gui/e-cal-ops.c:515
 #, c-format
-msgid "%d hour before appointment"
-msgid_plural "%d hours before appointment"
-msgstr[0] "%d horo antaŭ la rendevuo"
-msgstr[1] "%d horoj antaŭ la rendevuo"
+msgid "Deleting a memo"
+msgid_plural "Deleting %d memos"
+msgstr[0] "Forigante noton"
+msgstr[1] "Forigante %d notojn"
 
-#: ../calendar/gui/dialogs/event-page.c:3470
+#: ../src/calendar/gui/e-cal-ops.c:519
 #, c-format
-msgid "%d minute before appointment"
-msgid_plural "%d minutes before appointment"
-msgstr[0] "%d minuto antaŭ la rendevuo"
-msgstr[1] "%d minutoj antaŭ la rendevuo"
+msgid "Deleting a task"
+msgid_plural "Deleting %d tasks"
+msgstr[0] "Forigante taskon"
+msgstr[1] "Forigante %d taskojn"
 
-#: ../calendar/gui/dialogs/event-page.c:3491
-msgid "Custom"
-msgstr "Propra"
+#: ../src/calendar/gui/e-cal-ops.c:722
+#, c-format
+msgid "Pasting an event"
+msgid_plural "Pasting %d events"
+msgstr[0] "Algluante eventon"
+msgstr[1] "Algluante %d eventojn"
 
-#. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3498
-msgctxt "cal-reminders"
-msgid "None"
-msgstr "Neniu"
+#: ../src/calendar/gui/e-cal-ops.c:737
+#, c-format
+msgid "Pasting a memo"
+msgid_plural "Pasting %d memos"
+msgstr[0] "Algluante noton"
+msgstr[1] "Algluante %d notojn"
 
-#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] 
minutes
-#: ../calendar/gui/dialogs/event-page.ui.h:2
-msgctxt "eventpage"
-msgid "for"
-msgstr "por"
+#: ../src/calendar/gui/e-cal-ops.c:752
+#, c-format
+msgid "Pasting a task"
+msgid_plural "Pasting %d tasks"
+msgstr[0] "Algluante taskon"
+msgstr[1] "Algluante %d taskojn"
 
-#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
-#: ../calendar/gui/dialogs/event-page.ui.h:4
-msgctxt "eventpage"
-msgid "until"
-msgstr "ĝis"
+#: ../src/calendar/gui/e-cal-ops.c:851
+msgid "Updating an event"
+msgstr "Ĝisdatigante eventon"
 
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgctxt "eventpage"
-msgid "15 minutes before appointment"
-msgstr "15 minutoj antaŭ la rendevuo"
-
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:8
-msgctxt "eventpage"
-msgid "1 hour before appointment"
-msgstr "1 horo antaŭ la rendevuo"
-
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-msgctxt "eventpage"
-msgid "1 day before appointment"
-msgstr "1 tago antaŭ la rendevuo"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:11
-msgid "_Location:"
-msgstr "_Loko:"
+#: ../src/calendar/gui/e-cal-ops.c:855
+msgid "Updating a memo"
+msgstr "Ĝisdatigante noton"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:2
-#: ../calendar/gui/dialogs/task-page.ui.h:29
-#: ../e-util/e-attachment-dialog.c:356
-#: ../e-util/e-html-editor-image-dialog.c:558
-#: ../e-util/e-html-editor-link-dialog.c:374
-msgid "_Description:"
-msgstr "_Priskribo:"
+#: ../src/calendar/gui/e-cal-ops.c:859
+msgid "Updating a task"
+msgstr "Ĝisdatigante taskon"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:14
-msgid "_Time:"
-msgstr "_Tempo:"
+#: ../src/calendar/gui/e-cal-ops.c:967
+#, fuzzy, c-format
+#| msgid "Unable to open the calendar “%s”: %s"
+msgid "Getting events to purge in the calendar “%s”"
+msgstr "Ne eblis malfermi la kalendaron “%s”"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
-msgid "Time _zone:"
-msgstr "Hor_zono:"
+#: ../src/calendar/gui/e-cal-ops.c:971
+#, fuzzy, c-format
+#| msgid "Copying memos to the memo list “%s”"
+msgid "Getting memos to purge in the memo list “%s”"
+msgstr "Kopiante notojn al notlisto “%s”"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-msgid "_Summary:"
-msgstr "_Resumo:"
+#: ../src/calendar/gui/e-cal-ops.c:975
+#, fuzzy, c-format
+#| msgid "Copying tasks to the task list “%s”"
+msgid "Getting tasks to purge in the task list “%s”"
+msgstr "Kopiante taskojn en taskoliston “%s”"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:21
-msgid "Event Description"
-msgstr "Event-priskribo"
+#: ../src/calendar/gui/e-cal-ops.c:1001
+#, fuzzy, c-format
+#| msgid "Purging events in the calendar “%s”"
+msgid "Purging events in the calendar “%s”"
+msgstr "Senrubigante eventojn en la kalendaro “%s”"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:26
-#: ../calendar/gui/dialogs/task-page.ui.h:33
-#: ../calendar/gui/e-meeting-time-sel.c:549
-msgid "Atte_ndees..."
-msgstr "Alesta_ntoj..."
+#: ../src/calendar/gui/e-cal-ops.c:1005
+#, fuzzy, c-format
+#| msgid "Purging memos in the memo list “%s”"
+msgid "Purging memos in the memo list “%s”"
+msgstr "Senrubigante notojn en la notolisto “%s”"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:30
-msgid "_Reminder"
-msgstr "Memo_rigaĵo"
+#: ../src/calendar/gui/e-cal-ops.c:1009
+#, fuzzy, c-format
+#| msgid "Purging tasks in the task list “%s”"
+msgid "Purging tasks in the task list “%s”"
+msgstr "Senrubigante taskojn en la taskolisto “%s”"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:1
-msgid "January"
-msgstr "Januaro"
+#: ../src/calendar/gui/e-cal-ops.c:1109
+msgid "Purging events"
+msgstr "Senrubigante eventojn"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:2
-msgid "February"
-msgstr "Februaro"
+#: ../src/calendar/gui/e-cal-ops.c:1113
+msgid "Purging memos"
+msgstr "Senrubigante notojn"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:3
-msgid "March"
-msgstr "Marto"
+#: ../src/calendar/gui/e-cal-ops.c:1117
+msgid "Purging tasks"
+msgstr "Senrubigante taskojn"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:4
-msgid "April"
-msgstr "Aprilo"
+#: ../src/calendar/gui/e-cal-ops.c:1219
+msgid "Expunging completed tasks"
+msgstr "Forviŝi finitajn taskojn"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:5
-msgid "May"
-msgstr "Majo"
+#: ../src/calendar/gui/e-cal-ops.c:2060
+#, c-format
+msgid "Moving an event"
+msgid_plural "Moving %d events"
+msgstr[0] "Movante eventon"
+msgstr[1] "Movante %d eventojn"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:6
-msgid "June"
-msgstr "Junio"
+#: ../src/calendar/gui/e-cal-ops.c:2061
+#, c-format
+msgid "Copying an event"
+msgid_plural "Copying %d events"
+msgstr[0] "Kopiante eventon"
+msgstr[1] "Kopiante %d eventojn"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
-msgid "July"
-msgstr "Julio"
+#: ../src/calendar/gui/e-cal-ops.c:2067
+#, c-format
+msgid "Moving a memo"
+msgid_plural "Moving %d memos"
+msgstr[0] "Movante noton"
+msgstr[1] "Movante %d notojn"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:8
-msgid "August"
-msgstr "Aŭgusto"
+#: ../src/calendar/gui/e-cal-ops.c:2068
+#, c-format
+msgid "Copying a memo"
+msgid_plural "Copying %d memos"
+msgstr[0] "Kopiante noton"
+msgstr[1] "Kopiante %d notojn"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:9
-msgid "September"
-msgstr "Septembro"
+#: ../src/calendar/gui/e-cal-ops.c:2074
+#, c-format
+msgid "Moving a task"
+msgid_plural "Moving %d tasks"
+msgstr[0] "Movante taskon"
+msgstr[1] "Movante %d taskojn"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:10
-msgid "October"
-msgstr "Oktobro"
+#: ../src/calendar/gui/e-cal-ops.c:2075
+#, c-format
+msgid "Copying a task"
+msgid_plural "Copying %d tasks"
+msgstr[0] "Kopiante taskon"
+msgstr[1] "Kopiante %d taskojn"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
-msgid "November"
-msgstr "Novembro"
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: ../src/calendar/gui/e-cell-date-edit-text.c:163
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr ""
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:12
-msgid "December"
-msgstr "Decembro"
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: ../src/calendar/gui/e-cell-date-edit-text.c:166
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr ""
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
-msgid "Select Date"
-msgstr "Elekti daton"
+#: ../src/calendar/gui/e-cell-date-edit-text.c:174
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"%s"
+msgstr ""
+"Oni devas enigi la daton tiamaniere: \n"
+"%s"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1219
-msgid "Select _Today"
-msgstr "Elekti _hodiaŭ"
+#: ../src/calendar/gui/e-comp-editor-event.c:99
+#, fuzzy
+#| msgid "Event's start time is in the past"
+msgid "Event’s time is in the past"
+msgstr "Komenctempo de evento estas en la pasinteco"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3490
-msgid "Memo"
-msgstr "Noto"
+#: ../src/calendar/gui/e-comp-editor-event.c:200
+#, fuzzy
+#| msgid "Event cannot be edited, because the selected calendar is read only"
+msgid ""
+"Event cannot be edited, because the selected calendar could not be opened"
+msgstr "Ne eblas redakti eventon, ĉar la elektita kalendaro estas nurlega"
 
-#: ../calendar/gui/dialogs/memo-editor.c:155
-msgid "Print this memo"
-msgstr "Presi tiun noton"
+#: ../src/calendar/gui/e-comp-editor-event.c:202
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr "Ne eblas redakti eventon, ĉar la elektita kalendaro estas nurlega"
 
-#: ../calendar/gui/dialogs/memo-page.c:424
-msgid "Memo's start date is in the past"
-msgstr "La startdato de la noto estas en la pasinteco"
+#: ../src/calendar/gui/e-comp-editor-event.c:204
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr "Ne eblas plene redakti eventon, ĉar vi ne estas la organizanto"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:436
+#: ../src/calendar/gui/e-comp-editor-task.c:522
+#, fuzzy
+#| msgid "File is not a valid .desktop file"
+msgid "Start date is not a valid date"
+msgstr "Dosiero ne estas valida .desktop-dosiero"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:438
+#, fuzzy
+#| msgid "File is not a valid .desktop file"
+msgid "Start time is not a valid time"
+msgstr "Dosiero ne estas valida .desktop-dosiero"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:442
+#: ../src/calendar/gui/e-comp-editor-event.c:458
+#: ../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:2081 ../src/mail/e-mail-reader-utils.c:806
+#: ../src/mail/mail-send-recv.c:490 ../src/mail/mail-send-recv.c:1288
+#: ../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
+msgid "Unknown error"
+msgstr "Nekonata eraro"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:452
+#, fuzzy
+#| msgid "File is not a valid .desktop file"
+msgid "End date is not a valid date"
+msgstr "Dosiero ne estas valida .desktop-dosiero"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:454
+#, fuzzy
+#| msgid "File is not a valid .desktop file"
+msgid "End time is not a valid time"
+msgstr "Dosiero ne estas valida .desktop-dosiero"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:586
+#: ../src/calendar/gui/e-comp-editor-memo.c:126
+#: ../src/calendar/gui/e-comp-editor-task.c:591
+msgid "_Categories"
+msgstr "_Kategorioj"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:588
+#: ../src/calendar/gui/e-comp-editor-memo.c:128
+#: ../src/calendar/gui/e-comp-editor-task.c:593
+#, fuzzy
+msgid "Toggles whether to display categories"
+msgstr "Tio ĉi baskulas montron de kategorioj"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:594
+#: ../src/calendar/gui/e-comp-editor-task.c:599
+msgid "Time _Zone"
+msgstr "Hor_zono"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:596
+#: ../src/calendar/gui/e-comp-editor-task.c:601
+#, fuzzy
+msgid "Toggles whether the time zone is displayed"
+msgstr "Tio ĉi baskulas montron de horzono"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:602
+msgid "All _Day Event"
+msgstr "Tut_taga evento"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:604
+msgid "Toggles whether to have All Day Event"
+msgstr "Baskulias ĉu igi eventon tuttaga"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:610
+msgid "Show Time as _Busy"
+msgstr "Montri tempon kiel _okupatan"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:612
+#, fuzzy
+msgid "Toggles whether to show time as busy"
+msgstr "Baskuli montron de tempo kiel okupata"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:621
+msgid "Pu_blic"
+msgstr "Pu_blike"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:623
+msgid "Classify as public"
+msgstr "Kategoriigi kiel publike"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:628
+msgid "_Private"
+msgstr "_Private"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:630
+msgid "Classify as private"
+msgstr "Kategoriigi kiel private"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:635
+msgid "_Confidential"
+msgstr "_Konfidence"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:637
+msgid "Classify as confidential"
+msgstr "Kategoriigi kiel konfidence"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:738
+#, fuzzy
+#| msgid "_Start time:"
+msgctxt "ECompEditor"
+msgid "_Start time:"
+msgstr "_Komenctempo:"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:743
+#, fuzzy
+#| msgid "_End time:"
+msgctxt "ECompEditor"
+msgid "_End time:"
+msgstr "_Fintempo:"
 
-#: ../calendar/gui/dialogs/memo-page.c:460
+#: ../src/calendar/gui/e-comp-editor-event.c:753
+#, fuzzy
+#| msgid "All _Day Event"
+msgctxt "ECompEditor"
+msgid "All da_y event"
+msgstr "Tut_taga evento"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:806
+#: ../src/calendar/gui/e-comp-editor-memo.c:213
+#: ../src/calendar/gui/e-comp-editor-task.c:765
+#, fuzzy
+#| msgid "General"
+msgctxt "ECompEditorPage"
+msgid "General"
+msgstr "Ĝenerale"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:809
+#: ../src/calendar/gui/e-comp-editor-task.c:782
+#, fuzzy
+#| msgid "Reminders"
+msgctxt "ECompEditorPage"
+msgid "Reminders"
+msgstr "Memorigaĵoj"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:812
+#, fuzzy
+#| msgid "Recurrence"
+msgctxt "ECompEditorPage"
+msgid "Recurrence"
+msgstr "Rikuro"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:815
+#: ../src/calendar/gui/e-comp-editor-memo.c:216
+#: ../src/calendar/gui/e-comp-editor-task.c:785
+#, fuzzy
+#| msgid "Attachments"
+msgctxt "ECompEditorPage"
+msgid "Attachments"
+msgstr "Aldonaĵoj"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:825
+msgctxt "ECompEditorPage"
+msgid "Schedule"
+msgstr ""
+
+#: ../src/calendar/gui/e-comp-editor-event.c:857
+#, fuzzy, c-format
+#| msgid "Meeting - %s"
+msgid "Meeting — %s"
+msgstr "Kunsido - %s"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:858
+#, fuzzy, c-format
+#| msgid "Appointment - %s"
+msgid "Appointment — %s"
+msgstr "Rendevuo - %s"
+
+#: ../src/calendar/gui/e-comp-editor-memo.c:88
+#, fuzzy
+#| msgid "Memo cannot be edited, because the selected memo list is read only"
+msgid ""
+"Memo cannot be edited, because the selected memo list could not be opened"
+msgstr "Ne eblas redakti la noton, ĉar la elektita memo estas nurlega"
+
+#: ../src/calendar/gui/e-comp-editor-memo.c:90
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "Ne eblas redakti la noton, ĉar la elektita memo estas nurlega"
 
-#: ../calendar/gui/dialogs/memo-page.c:464
+#: ../src/calendar/gui/e-comp-editor-memo.c:92
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Ne eblas plene redakti la noton, ĉar vi ne estas la organizanto"
 
-#: ../calendar/gui/dialogs/memo-page.c:1166
-#: ../em-format/e-mail-formatter-utils.c:202
-#: ../em-format/e-mail-formatter-utils.c:219
-#: ../em-format/e-mail-part-headers.c:48 ../mail/message-list.etspec.h:9
-#: ../mail/searchtypes.xml.in.h:11 ../mail/vfoldertypes.xml.in.h:11
-#: ../modules/mail/em-mailer-prefs.c:64
-msgid "To"
-msgstr "Al"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:426
-#: ../calendar/gui/dialogs/task-page.ui.h:34
+#: ../src/calendar/gui/e-comp-editor-memo.c:188
+#: ../src/calendar/gui/e-comp-editor-task.c:700
 msgid "_List:"
 msgstr "_Listo:"
 
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.c:434
-#: ../calendar/gui/dialogs/task-page.ui.h:24
-msgid "Organi_zer:"
-msgstr "Organi_zilo:"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:5
-msgid "T_o:"
-msgstr "_Al:"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../calendar/gui/dialogs/task-page.ui.h:26
+#: ../src/calendar/gui/e-comp-editor-memo.c:195
+#: ../src/calendar/gui/e-comp-editor-task.c:707
+#, fuzzy
+#| msgid "Sta_rt date:"
+msgctxt "ECompEditor"
 msgid "Sta_rt date:"
 msgstr "_Komecdato:"
 
-#: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.ui.h:23
-msgid "Su_mmary:"
-msgstr "_Resumo:"
+#: ../src/calendar/gui/e-comp-editor-memo.c:247
+#, fuzzy, c-format
+#| msgid "Assigned Task - %s"
+msgid "Assigned Memo — %s"
+msgstr "Asignitaj taskoj - %s"
+
+#: ../src/calendar/gui/e-comp-editor-memo.c:248
+#, fuzzy, c-format
+#| msgid "Memo - %s"
+msgid "Memo — %s"
+msgstr "Noto - %s"
+
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:123
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:128
+#: ../src/em-format/e-mail-formatter-attachment.c:333
+#: ../src/e-util/e-attachment-bar.c:101 ../src/e-util/e-attachment-bar.c:106
+#: ../src/e-util/e-attachment-paned.c:175
+#: ../src/e-util/e-attachment-paned.c:180 ../src/mail/message-list.etspec.h:4
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Aldonaĵo"
+msgstr[1] "Aldonaĵoj"
+
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:201
+#: ../src/e-util/e-attachment.c:2442
+#, fuzzy, c-format
+#| msgid "Could not load “%s”"
+msgid "Could not load “%s”"
+msgstr "Ne eblis ŝargi na “%s”"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:203
+#: ../src/e-util/e-attachment.c:2445
 #, c-format
-msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr "Vi modifas rikuran eventon. Kion vi volas modifi?"
+msgid "Could not load the attachment"
+msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:422
+#, fuzzy
+#| msgid ""
+#| "Some attachments are being downloaded. Saving the task would result in "
+#| "the loss of these attachments."
+msgid ""
+"Some attachments are still being downloaded. Please wait until the download "
+"is finished."
+msgstr ""
+"Kelkaj kunsendaĵoj estas elŝutotaj. Konservi la taskon perdigos ĉi tiujn "
+"kunsendaĵojn."
+
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:452
 #, c-format
-msgid "You are delegating a recurring event. What would you like to delegate?"
-msgstr "Vi delegas rikuran eventon. Kion vi volas delegi?"
+msgid "Attachment “%s” cannot be found, remove it from the list, please"
+msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:469
 #, c-format
-msgid "You are modifying a recurring task. What would you like to modify?"
-msgstr "Vi modifas rikuran taskon. Kion vi volas modifi?"
+msgid "Attachment “%s” doesn’t have valid URI, remove it from the list, please"
+msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:647
+#: ../src/composer/e-composer-actions.c:320
+msgid "_Attachment..."
+msgstr "_Aldonaĵo..."
+
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:649
+#: ../src/composer/e-composer-actions.c:322
+#: ../src/e-util/e-attachment-view.c:344
+msgid "Attach a file"
+msgstr "Aldoni dosieron"
+
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:656
+#| msgid "Attachments"
+msgid "_Attachments"
+msgstr "_Aldonaĵoj"
+
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:658
+#| msgctxt "iCalImp"
+#| msgid "has attachments"
+msgid "Show attachments"
+msgstr "Montri aldonaĵojn"
+
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:811
+#: ../src/e-util/e-attachment-bar.c:764 ../src/e-util/e-attachment-paned.c:725
+msgid "Icon View"
+msgstr "Piktograma vido"
+
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:813
+#: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:727
+msgid "List View"
+msgstr "Lista vido"
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:311
 #, c-format
-msgid "You are modifying a recurring memo. What would you like to modify?"
-msgstr "Vi modifas rikuran noton. Kion vi volas modifi?"
+msgid "Cannot find attendee “%s” in the list of attendees"
+msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:88
-msgid "This Instance Only"
-msgstr "Nur tiu ĉi ekzemplo"
+#: ../src/calendar/gui/e-comp-editor-page-general.c:318
+#, c-format
+msgid "Not enough rights to delete attendee “%s”"
+msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:92
-msgid "This and Prior Instances"
-msgstr "Tiu ĉi kaj antaŭaj ekzemploj"
+#: ../src/calendar/gui/e-comp-editor-page-general.c:348
+#, fuzzy
+#| msgid "Failed to delete contact"
+msgid "Failed to delete selected attendee"
+msgid_plural "Failed to delete selected attendees"
+msgstr[0] "Forigo de kontakto malsukcesis"
+msgstr[1] "Forigo de kontakto malsukcesis"
 
-#: ../calendar/gui/dialogs/recur-comp.c:98
-msgid "This and Future Instances"
-msgstr "Tiu ĉi kaj estontaj ekzemploj"
+#: ../src/calendar/gui/e-comp-editor-page-general.c:581
+#, fuzzy
+#| msgid "Attendees"
+msgid "A_ttendees"
+msgstr "Ales_tantoj"
 
-#: ../calendar/gui/dialogs/recur-comp.c:103
-msgid "All Instances"
-msgstr "Ĉiuj ekzemploj"
+#: ../src/calendar/gui/e-comp-editor-page-general.c:583
+#, fuzzy
+msgid "Toggles whether the Attendees are displayed"
+msgstr "Tio ĉi baskulas montron de tipo de alestanto"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:574
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Tiu ĉi rendevuo enhavas rikurojn, kiujn Evolucio ne povas redakti."
+#: ../src/calendar/gui/e-comp-editor-page-general.c:592
+#, fuzzy
+msgid "R_ole Field"
+msgstr "R_ola kampo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1001
-msgid "Recurrence date is invalid"
-msgstr "Rikura dato estas nevalida"
+#: ../src/calendar/gui/e-comp-editor-page-general.c:594
+#, fuzzy
+msgid "Toggles whether the Role field is displayed"
+msgstr "Tio ĉi baskulas montron de rola kampo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
-msgid "End time of the recurrence was before event's start"
-msgstr "Fintempo de la rikuro estis antaŭ la eventokomenco"
+#: ../src/calendar/gui/e-comp-editor-page-general.c:600
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:602
+#, fuzzy
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Tio ĉi baskulas montron de RSVP-kampo"
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:608
+msgid "_Status Field"
+msgstr "_Statokampo"
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:610
+#, fuzzy
+msgid "Toggles whether the Status field is displayed"
+msgstr "Tio ĉi baskulas montron de Stato-kampo"
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:616
+msgid "_Type Field"
+msgstr "_Tipokampo"
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:618
+#, fuzzy
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Tio ĉi baskulas montron de tipo de alestanto"
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:943
+msgid "An organizer is required."
+msgstr "Organizilo estas bezonata."
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:953
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1084
+msgid "At least one attendee is required."
+msgstr "Necesas almenaŭ unu alestanto."
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1207
+msgid "Or_ganizer:"
+msgstr "Or_ganizilo:"
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1286
+#, fuzzy
+#| msgid "Atte_ndees..."
+msgctxt "ECompEditor"
+msgid "Atte_ndees..."
+msgstr "Alesta_ntoj..."
+
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:325
+msgid "Add exception"
+msgstr "Aldoni escepton"
+
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:363
+msgid "Modify exception"
+msgstr "Modifi escepton"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1074
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:488
 msgid "on"
 msgstr "je"
 
@@ -3729,7 +7479,10 @@ msgstr "je"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1155
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:569
+#, fuzzy
+#| msgid "first"
+msgctxt "ECompEditorPageRecur"
 msgid "first"
 msgstr "unua"
 
@@ -3738,7 +7491,10 @@ msgstr "unua"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1161
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:575
+#, fuzzy
+#| msgid "second"
+msgctxt "ECompEditorPageRecur"
 msgid "second"
 msgstr "dua"
 
@@ -3746,7 +7502,10 @@ msgstr "dua"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1166
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:580
+#, fuzzy
+#| msgid "third"
+msgctxt "ECompEditorPageRecur"
 msgid "third"
 msgstr "tria"
 
@@ -3754,7 +7513,10 @@ msgstr "tria"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1171
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:585
+#, fuzzy
+#| msgid "fourth"
+msgctxt "ECompEditorPageRecur"
 msgid "fourth"
 msgstr "kvara"
 
@@ -3762,7 +7524,10 @@ msgstr "kvara"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1176
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:590
+#, fuzzy
+#| msgid "fifth"
+msgctxt "ECompEditorPageRecur"
 msgid "fifth"
 msgstr "kvina"
 
@@ -3770,13 +7535,19 @@ msgstr "kvina"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1181
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:595
+#, fuzzy
+#| msgid "last"
+msgctxt "ECompEditorPageRecur"
 msgid "last"
 msgstr "lasta"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1205
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:622
+#, fuzzy
+#| msgid "Other Date"
+msgctxt "ECompEditorPageRecur"
 msgid "Other Date"
 msgstr "Alia dato"
 
@@ -3784,7 +7555,10 @@ msgstr "Alia dato"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1211
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:628
+#, fuzzy
+#| msgid "1st to 10th"
+msgctxt "ECompEditorPageRecur"
 msgid "1st to 10th"
 msgstr "1a ĝis 10a"
 
@@ -3792,7 +7566,10 @@ msgstr "1a ĝis 10a"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1217
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:634
+#, fuzzy
+#| msgid "11th to 20th"
+msgctxt "ECompEditorPageRecur"
 msgid "11th to 20th"
 msgstr "11a ĝis 20a"
 
@@ -3800,1033 +7577,874 @@ msgstr "11a ĝis 20a"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1223
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:640
+#, fuzzy
+#| msgid "21st to 31st"
+msgctxt "ECompEditorPageRecur"
 msgid "21st to 31st"
 msgstr "21a ĝis 31a"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1250
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
+#. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:666
+#, fuzzy
+#| msgid "day"
+#| msgid_plural "days"
+msgctxt "ECompEditorPageRecur"
+msgid "day"
+msgstr "tago"
+
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:667
+#, fuzzy
+#| msgid "Monday"
+msgctxt "ECompEditorPageRecur"
 msgid "Monday"
 msgstr "Lundo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1251
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:668
+#, fuzzy
+#| msgid "Tuesday"
+msgctxt "ECompEditorPageRecur"
 msgid "Tuesday"
 msgstr "Mardo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1252
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:669
+#, fuzzy
+#| msgid "Wednesday"
+msgctxt "ECompEditorPageRecur"
 msgid "Wednesday"
 msgstr "Merkredo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1253
-#: ../modules/calendar/e-calendar-preferences.ui.h:34
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:670
+#, fuzzy
+#| msgid "Thursday"
+msgctxt "ECompEditorPageRecur"
 msgid "Thursday"
 msgstr "Ĵaŭdo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1254
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:671
+#, fuzzy
+#| msgid "Friday"
+msgctxt "ECompEditorPageRecur"
 msgid "Friday"
 msgstr "Vendredo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1255
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:672
+#, fuzzy
+#| msgid "Saturday"
+msgctxt "ECompEditorPageRecur"
 msgid "Saturday"
 msgstr "Sabato"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1256
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:673
+#, fuzzy
+#| msgid "Sunday"
+msgctxt "ECompEditorPageRecur"
 msgid "Sunday"
 msgstr "Dimanĉo"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1387
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:802
+#, fuzzy
+#| msgid "on the"
+msgctxt "ECompEditorPageRecur"
 msgid "on the"
 msgstr "je"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1572
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:992
+#, fuzzy
+#| msgid "occurrences"
+msgctxt "ECompEditorPageRecur"
 msgid "occurrences"
 msgstr "okazoj"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2342
-msgid "Add exception"
-msgstr "Aldoni escepton"
+#. 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
+#, fuzzy
+msgctxt "ECompEditorPageRecur"
+msgid "This appointment rec_urs"
+msgstr "Tiu ĉi rendevuo rik_uras"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2384
-msgid "Could not get a selection to modify."
-msgstr "Ne eblis akiri modifotan elekton."
+#. 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
+#, fuzzy
+msgctxt "ECompEditorPageRecur"
+msgid "This task rec_urs"
+msgstr "Tiu ĉi rendevuo rik_uras"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2390
-msgid "Modify exception"
-msgstr "Modifi escepton"
+#. 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
+#, fuzzy
+msgctxt "ECompEditorPageRecur"
+msgid "This memo rec_urs"
+msgstr "Tiu ĉi rendevuo rik_uras"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2436
-msgid "Could not get a selection to delete."
-msgstr "Ne eblis akiri forigotan elekton."
+#. 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
+#, fuzzy
+msgctxt "ECompEditorPageRecur"
+msgid "This component rec_urs"
+msgstr "Tiu ĉi rendevuo rik_uras"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2577
-msgid "Date/Time"
-msgstr "Dato/tempo"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1861
+#, fuzzy
+#| msgid "Recurrence date is invalid"
+msgid "Recurrence exception date is invalid"
+msgstr "Rikura dato estas nevalida"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
-msgctxt "recurrpage"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1909
+#, fuzzy
+#| msgid "End time of the recurrence was before event's start"
+msgid "End time of the recurrence is before the start"
+msgstr "Fintempo de la rikuro estis antaŭ la eventokomenco"
+
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1952
+#, fuzzy
+#| msgid "Recurrence"
+msgid "R_ecurrence"
+msgstr "R_ikuro"
+
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1954
+#, fuzzy
+#| msgid "It has recurrences."
+msgid "Set or unset recurrence"
+msgstr "Ĝi havas rikurojn"
+
+#. 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:2047
+#, fuzzy
+#| msgid "Every"
+msgctxt "ECompEditorPageRecur"
+msgid "Every"
+msgstr "Ĉiun"
+
+#. 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:2082
+#, fuzzy
+#| msgid "day(s)"
+msgctxt "ECompEditorPageRecur"
 msgid "day(s)"
 msgstr "tago(j)"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
-msgctxt "recurrpage"
+#. 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:2084
+#, fuzzy
+#| msgctxt "recurrpage"
+#| msgid "week(s)"
+msgctxt "ECompEditorPageRecur"
 msgid "week(s)"
 msgstr "semajno(j)"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6
-msgctxt "recurrpage"
+#. 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:2086
+#, fuzzy
+#| msgctxt "recurrpage"
+#| msgid "month(s)"
+msgctxt "ECompEditorPageRecur"
 msgid "month(s)"
 msgstr "monato(j)"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
-msgctxt "recurrpage"
+#. 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:2088
+#, fuzzy
+#| msgctxt "recurrpage"
+#| msgid "year(s)"
+msgctxt "ECompEditorPageRecur"
 msgid "year(s)"
 msgstr "jaro(j)"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
-msgctxt "recurrpage"
+#. 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:2117
+#, fuzzy
+#| msgctxt "eventpage"
+#| msgid "for"
+msgctxt "ECompEditorPageRecur"
 msgid "for"
 msgstr "por"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
-msgctxt "recurrpage"
+#. 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:2119
+#, fuzzy
+#| msgctxt "eventpage"
+#| msgid "until"
+msgctxt "ECompEditorPageRecur"
 msgid "until"
 msgstr "ĝis"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
-msgctxt "recurrpage"
+#. 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:2121
+#, fuzzy
+#| msgctxt "recurrpage"
+#| msgid "forever"
+msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "ĉiam"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
-#, fuzzy
-msgid "This appointment rec_urs"
-msgstr "Tiu ĉi rendevuo rik_uras"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:17
-msgid "Every"
-msgstr "Ĉiun"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2137
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Tiu ĉi rendevuo enhavas rikurojn, kiujn Evolucio ne povas redakti."
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2150
 msgid "Exceptions"
 msgstr "Esceptoj"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:22
-msgid "Preview"
-msgstr "Antaŭrigardo"
-
-#: ../calendar/gui/dialogs/send-comp.c:172
-#: ../calendar/gui/dialogs/send-comp.c:254
-msgid "Send my reminders with this event"
-msgstr "Sendi miajn memorigojn kun tiu ĉi evento"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2215
+#: ../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 "_Aldoni"
 
-#: ../calendar/gui/dialogs/send-comp.c:174
-#: ../calendar/gui/dialogs/send-comp.c:256
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2231
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1773
+#: ../src/mail/mail-config.ui.h:67
 #, fuzzy
-msgid "Notify new attendees _only"
-msgstr "Sciigi _nur pri novaj alestantoj"
-
-#: ../calendar/gui/dialogs/task-editor.c:93
-msgid "_Send Options"
-msgstr "_Send-agordoj"
+#| msgid "_Remove"
+msgid "Re_move"
+msgstr "Fo_rigi"
 
-#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3488
-#: ../e-util/e-send-options.c:553
-msgid "Task"
-msgstr "Tasko"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2239
+msgid "Preview"
+msgstr "Antaŭrigardo"
 
-#: ../calendar/gui/dialogs/task-editor.c:285
-msgid "Print this task"
-msgstr "Presi la taskon"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:39
+#| msgid "Send To:"
+msgid "Send To"
+msgstr "Sendi al"
 
-#: ../calendar/gui/dialogs/task-page.c:330
-#, fuzzy
-msgid "Task's start date is in the past"
-msgstr "Komencodato de la tasko estas en la pasinteco"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1550
+msgid "_Reminders"
+msgstr "Momo_rigaĵoj"
 
-#: ../calendar/gui/dialogs/task-page.c:331
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1552
 #, fuzzy
-msgid "Task's due date is in the past"
-msgstr "Limdato de la tasko estas en la pasinteco"
-
-#: ../calendar/gui/dialogs/task-page.c:364
-msgid "Task cannot be edited, because the selected task list is read only"
-msgstr "Ne eblas redakti taskon, ĉar la elektita tasko estas nurlega"
-
-#: ../calendar/gui/dialogs/task-page.c:368
-msgid "Task cannot be fully edited, because you are not the organizer"
-msgstr "Ne eblas plene redakti la taskon, ĉar vi ne estas la organizanto"
-
-#: ../calendar/gui/dialogs/task-page.c:372
-msgid ""
-"Task cannot be edited, because the selected task list does not support "
-"assigned tasks"
-msgstr ""
-"Ne eblas redakti taskon, ĉar la elektita tasko ne subtenas atribuitajn "
-"taskojn"
-
-#: ../calendar/gui/dialogs/task-page.c:1013
-msgid "Due date is wrong"
-msgstr "Limdato estas erara"
-
-#: ../calendar/gui/dialogs/task-page.c:1181
-#: ../calendar/gui/dialogs/task-page.c:1206
-msgid "Completed date is wrong"
-msgstr ""
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:338
-#: ../calendar/gui/e-task-table.c:524 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:313
-msgid "High"
-msgstr "Alta"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:340
-#: ../calendar/gui/e-cal-model.c:1643 ../calendar/gui/e-task-table.c:525
-#: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:312
-msgid "Normal"
-msgstr "Normala"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:342
-#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:311
-msgid "Low"
-msgstr "Malalta"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:14
-#: ../calendar/gui/e-task-table.c:527 ../calendar/gui/tasktypes.xml.h:22
-#: ../e-util/e-send-options.ui.h:1
-msgid "Undefined"
-msgstr "Nedifinite"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:323
-#: ../calendar/gui/e-cal-model-tasks.c:310
-#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:207
-#: ../calendar/gui/e-task-table.c:222 ../calendar/gui/e-task-table.c:607
-#: ../calendar/gui/print.c:3573 ../calendar/gui/tasktypes.xml.h:11
-msgid "Not Started"
-msgstr ""
+#| msgid "Set or unset reminders for this event"
+msgid "Set or unset reminders"
+msgstr "Ĉu agordi memorigojn por tiu ĉi evento"
 
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:18
-#: ../calendar/gui/e-cal-component-preview.c:313
-#: ../calendar/gui/e-cal-model-tasks.c:312
-#: ../calendar/gui/e-cal-model-tasks.c:554
-#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:608
-#: ../calendar/gui/print.c:3576
-msgid "In Progress"
-msgstr "Progresante"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1605
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
+msgid "Reminders"
+msgstr "Memorigaĵoj"
 
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:20
-#: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model-tasks.c:314
-#: ../calendar/gui/e-cal-model-tasks.c:556
-#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../calendar/gui/e-task-table.c:211 ../calendar/gui/e-task-table.c:226
-#: ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3579
-#: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:379
-msgid "Completed"
-msgstr "Plenumite"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1630
+msgid "_Reminder"
+msgstr "Memo_rigaĵo"
 
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:22
-#: ../calendar/gui/e-cal-component-preview.c:319
-#: ../calendar/gui/e-cal-model-tasks.c:316
-#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
-#: ../calendar/gui/print.c:3582 ../mail/mail-send-recv.c:958
-msgid "Canceled"
-msgstr "Nuligite"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1663
+#, fuzzy, c-format
+#| msgid "%d day before appointment"
+#| msgid_plural "%d days before appointment"
+msgid "%d day before"
+msgid_plural "%d days before"
+msgstr[0] "%d tago antaŭ la rendevuo"
+msgstr[1] "%d tagoj antaŭ la rendevuo"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:25
-msgid "D_ue date:"
-msgstr "L_imdato:"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1670
+#, fuzzy, c-format
+#| msgid "%d hour before appointment"
+#| msgid_plural "%d hours before appointment"
+msgid "%d hour before"
+msgid_plural "%d hours before"
+msgstr[0] "%d horo antaŭ la rendevuo"
+msgstr[1] "%d horoj antaŭ la rendevuo"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:28
-msgid "Time zone:"
-msgstr "Horzono:"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1677
+#, fuzzy, c-format
+#| msgid "%d minute before appointment"
+#| msgid_plural "%d minutes before appointment"
+msgid "%d minute before"
+msgid_plural "%d minutes before"
+msgstr[0] "%d minuto antaŭ la rendevuo"
+msgstr[1] "%d minutoj antaŭ la rendevuo"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:35
-msgid "_Status:"
-msgstr "_Stato:"
+#. Translators: "None" for "No reminder set"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1685
+msgctxt "cal-reminders"
+msgid "None"
+msgstr "Neniu"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:36
+#. Translators: Predefined reminder's description
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1687
 #, fuzzy
-#| msgid "Delete completed tasks"
-msgid "Date _completed:"
-msgstr "Forigi _plenumitaj taskoj:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:37
-msgid "_Percent complete:"
-msgstr "_Procento da kompletigo:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:38
-msgid "Priorit_y:"
-msgstr "Priorita_to:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:39
-msgid "C_lassification:"
-msgstr "K_lasado:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:40
-msgid "_Web Page:"
-msgstr "_Retpaĝo:"
-
-#: ../calendar/gui/ea-cal-view.c:284
-msgid "New Appointment"
-msgstr "Nova rendevuo"
-
-#: ../calendar/gui/ea-cal-view.c:285
-msgid "New All Day Event"
-msgstr "Nova tuttaga evento"
-
-#: ../calendar/gui/ea-cal-view.c:286
-msgid "New Meeting"
-msgstr "Nova Kunsido"
-
-#: ../calendar/gui/ea-cal-view.c:287
-msgid "Go to Today"
-msgstr "Iri al hodiaŭ"
-
-#: ../calendar/gui/ea-cal-view.c:288
-msgid "Go to Date"
-msgstr "Iri al dato"
-
-#: ../calendar/gui/ea-cal-view-event.c:234
-msgid "It has reminders."
-msgstr "Ĝi havas memorigaĵojn."
-
-#: ../calendar/gui/ea-cal-view-event.c:237
-msgid "It has recurrences."
-msgstr "Ĝi havas rikurojn."
+#| msgid "15 minutes"
+msgctxt "cal-reminders"
+msgid "15 minutes before"
+msgstr "15 minutoj"
 
-#: ../calendar/gui/ea-cal-view-event.c:240
-msgid "It is a meeting."
-msgstr "Ĝi estas kunsido."
+#. Translators: Predefined reminder's description
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1689
+#, fuzzy
+#| msgid "1 hour ago"
+#| msgid_plural "%d hours ago"
+msgctxt "cal-reminders"
+msgid "1 hour before"
+msgstr "antaŭ 1 horo"
 
-#: ../calendar/gui/ea-cal-view-event.c:247
-#, c-format
-msgid "Calendar Event: Summary is %s."
-msgstr "Kalendara evento: resumo estas %s."
+#. Translators: Predefined reminder's description
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1691
+#| msgid "is before"
+msgctxt "cal-reminders"
+msgid "1 day before"
+msgstr "1 tago antaŭe"
 
-#: ../calendar/gui/ea-cal-view-event.c:250
-msgid "Calendar Event: It has no summary."
-msgstr "Kalendara evento: ne havas resumon."
+#. Translators: "Custom" for "Custom reminder set"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1703
+#, fuzzy
+#| msgid "Custom"
+msgctxt "cal-reminders"
+msgid "Custom"
+msgstr "Propra"
 
-#: ../calendar/gui/ea-cal-view-event.c:273
-msgid "calendar view event"
-msgstr "kalendare vidi eventon"
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1846
+#, fuzzy
+#| msgid "minute(s)"
+msgctxt "cal-reminders"
+msgid "minute(s)"
+msgstr "minuto(j)"
 
-#: ../calendar/gui/ea-cal-view-event.c:505
-msgid "Grab Focus"
-msgstr "Kapti fokuson"
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1848
+#, fuzzy
+#| msgid "hour(s)"
+msgctxt "cal-reminders"
+msgid "hour(s)"
+msgstr "horo(j)"
 
-#: ../calendar/gui/ea-day-view.c:107 ../calendar/gui/ea-week-view.c:107
-#, c-format
-msgid "It has %d event."
-msgid_plural "It has %d events."
-msgstr[0] "Ĝi havas %d eventon."
-msgstr[1] "Ĝi havas %d eventojn."
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1850
+#, fuzzy
+#| msgid "day(s)"
+msgctxt "cal-reminders"
+msgid "day(s)"
+msgstr "tago(j)"
 
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:114 ../calendar/gui/ea-week-view.c:110
-msgid "It has no events."
-msgstr "Ĝi ne havas eventojn."
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1867
+#, fuzzy
+#| msgid "before"
+msgctxt "cal-reminders"
+msgid "before"
+msgstr "antaŭ"
 
-#: ../calendar/gui/ea-day-view.c:121
-#, c-format
-msgid "Work Week View: %s. %s"
-msgstr "Labora semanjo vido: %s. %s"
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1869
+#, fuzzy
+#| msgid "after"
+msgctxt "cal-reminders"
+msgid "after"
+msgstr "post"
 
-#: ../calendar/gui/ea-day-view.c:128
-#, c-format
-msgid "Day View: %s. %s"
-msgstr "Taga vido: %s. %s"
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1885
+#| msgid "Start"
+msgctxt "cal-reminders"
+msgid "start"
+msgstr "komenco"
 
-#: ../calendar/gui/ea-day-view.c:157
-msgid "calendar view for a work week"
-msgstr "kalendara vido por labora semanjo"
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1887
+#| msgid "_Send"
+msgctxt "cal-reminders"
+msgid "end"
+msgstr "fino"
 
-#: ../calendar/gui/ea-day-view.c:159
-msgid "calendar view for one or more days"
-msgstr "kalendara vido por unu aŭ plu tagoj"
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1906
+#, fuzzy
+#| msgid "_Repeat the reminder"
+msgid "Re_peat the reminder"
+msgstr "_Ripeti la memorigilaĵon"
 
-#: ../calendar/gui/ea-day-view-main-item.c:266
-#: ../calendar/gui/ea-week-view-main-item.c:295
-msgid "a table to view and select the current time range"
-msgstr "tabelo por vidi kaj elekti la tempintervalon"
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1931
+#, fuzzy
+#| msgid "extra times every"
+msgctxt "cal-reminders"
+msgid "extra times every"
+msgstr "aldona tempo ĉiuj"
 
-#: ../calendar/gui/ea-jump-button.c:150
-msgid "Jump button"
-msgstr "Salt-butono"
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1968
+#, fuzzy
+#| msgid "minutes"
+msgctxt "cal-reminders"
+msgid "minutes"
+msgstr "minutoj"
 
-#: ../calendar/gui/ea-jump-button.c:159
-msgid "Click here, you can find more events."
-msgstr "Klaku ĉi tien, vi povas trovi pluajn eventojn."
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1970
+#, fuzzy
+#| msgid "hours"
+msgctxt "cal-reminders"
+msgid "hours"
+msgstr "horoj"
 
-#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:370 ../calendar/gui/misc.c:97
-#, c-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d tago"
-msgstr[1] "%d tagoj"
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1972
+#, fuzzy
+#| msgid "days"
+msgctxt "cal-reminders"
+msgid "days"
+msgstr "tagoj"
 
-#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:376
-#, c-format
-msgid "%d week"
-msgid_plural "%d weeks"
-msgstr[0] "%d semajno"
-msgstr[1] "%d semajnoj"
+#. page_reminders->priv->custom_email_entry is initialized on demand
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2009
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2166
+#, fuzzy
+#| msgid "Custom _message"
+msgctxt "cal-reminders"
+msgid "Custom _message"
+msgstr "Propra _mesaĝo"
 
-#: ../calendar/gui/e-alarm-list.c:438
-msgid "Unknown action to be performed"
-msgstr "Efektivigota ago oni ne konas"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2053
+#| msgid "Custom reminder sound"
+msgctxt "cal-reminders"
+msgid "Custom reminder _sound"
+msgstr "Propra memorig_sono"
 
-#: ../calendar/gui/e-alarm-list.c:453
-#, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "%s %s antaŭ la starto de la rendevuo"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2064
+#, fuzzy
+#| msgid "Select sound file"
+msgid "Select a sound file"
+msgstr "Elekti sondosieron"
 
-#: ../calendar/gui/e-alarm-list.c:459
-#, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "%s %s post la starto de la rendevuo"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2092
+msgid "_Program:"
+msgstr "_Programo:"
 
-#. Translator: The %s refers to the base, which would be actions like
-#. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:466
-#, c-format
-msgid "%s at the start of the appointment"
-msgstr "%s je la starto de la rendevuo"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2117
+msgid "_Arguments:"
+msgstr "_Argumentoj:"
 
-#: ../calendar/gui/e-alarm-list.c:478
-#, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "%s %s antaŭ la fino de la rendevuo"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2149
+#| msgid "Send To:"
+msgid "_Send To:"
+msgstr "_Sendi al:"
 
-#: ../calendar/gui/e-alarm-list.c:484
-#, c-format
-msgid "%s %s after the end of the appointment"
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:443
+msgid "_Schedule"
 msgstr ""
 
-#. Translator: The %s refers to the base, which would be actions like
-#. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:491
-#, c-format
-msgid "%s at the end of the appointment"
-msgstr "%s je la fino de la rendevuo"
-
-#. Translator: The first %s refers to the base, which would be actions like
-#. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:515
-#, c-format
-msgid "%s at %s"
-msgstr "%s je %s"
-
-#. Translator: The %s refers to the base, which would be actions like
-#. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:523
-#, c-format
-msgid "%s for an unknown trigger type"
-msgstr "%s por nekonata tipo de ekagilo"
-
-#: ../calendar/gui/ea-week-view.c:114
-#, c-format
-msgid "Month View: %s. %s"
-msgstr "Monata Vido: %s. %s"
-
-#: ../calendar/gui/ea-week-view.c:119
-#, c-format
-msgid "Week View: %s. %s"
-msgstr "Semanja Vido: %s. %s"
-
-#: ../calendar/gui/ea-week-view.c:148
-msgid "calendar view for a month"
-msgstr "kalendara vido por monato"
-
-#: ../calendar/gui/ea-week-view.c:150
-msgid "calendar view for one or more weeks"
-msgstr "kalendara vido por unu aŭ plu semanjoj"
-
-#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:758
-#: ../mail/e-mail-config-page.c:125
-msgid "Untitled"
-msgstr "Sentitole"
-
-#: ../calendar/gui/e-cal-component-preview.c:230
-msgid "Categories:"
-msgstr "Kategorioj:"
-
-#: ../calendar/gui/e-cal-component-preview.c:264
-msgid "Summary:"
-msgstr "Resumo:"
-
-#: ../calendar/gui/e-cal-component-preview.c:273
-msgid "Start Date:"
-msgstr "Komencodato:"
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:445
+msgid "Query free / busy information for the attendees"
+msgstr "Informpeti pri stato (malokupata / okupata) de la alestantoj"
 
-#: ../calendar/gui/e-cal-component-preview.c:285
-msgid "End Date:"
-msgstr "Findato:"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:79
+#, fuzzy
+#| msgid "_Summary:"
+msgctxt "ECompEditor"
+msgid "_Summary:"
+msgstr "_Resumo:"
 
-#: ../calendar/gui/e-cal-component-preview.c:297
-msgid "Due Date:"
-msgstr "Limdato:"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:323
+#, fuzzy
+#| msgid "_Location:"
+msgctxt "ECompEditor"
+msgid "_Location:"
+msgstr "_Loko:"
 
-#: ../calendar/gui/e-cal-component-preview.c:309
-#: ../modules/itip-formatter/itip-view.c:1519
-#: ../modules/itip-formatter/itip-view.c:1636
-msgid "Status:"
-msgstr "Stato:"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:456
+#, fuzzy
+#| msgid "Ca_tegories..."
+msgctxt "ECompEditor"
+msgid "_Categories..."
+msgstr "Ka_tegorioj..."
 
-#: ../calendar/gui/e-cal-component-preview.c:336
-msgid "Priority:"
-msgstr "Prioritato:"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:555
+#, fuzzy
+#| msgid "_Description:"
+msgctxt "ECompEditor"
+msgid "_Description:"
+msgstr "_Priskribo:"
 
-#: ../calendar/gui/e-cal-component-preview.c:361
-#: ../mail/e-mail-config-service-page.c:670
-msgid "Description:"
-msgstr "Priskribo:"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:686
+#, fuzzy
+#| msgid "_Web Page:"
+msgctxt "ECompEditor"
+msgid "_Web page:"
+msgstr "_Retpaĝo:"
 
-#: ../calendar/gui/e-cal-component-preview.c:392
-msgid "Web Page:"
-msgstr "Retpaĝo:"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1057
+#, fuzzy
+#| msgid "D_ue date:"
+msgctxt "ECompEditor"
+msgid "D_ue date:"
+msgstr "L_imdato:"
 
-#: ../calendar/gui/e-cal-data-model.c:1625
-#, c-format
-msgid "Creating view for calendar '%s'"
-msgstr "Kreante vidon por kalendaro '%s'"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1117
+#, fuzzy
+#| msgid "Delete completed tasks"
+msgctxt "ECompEditor"
+msgid "Date _completed:"
+msgstr "Forigi _plenumitaj taskoj:"
 
-#: ../calendar/gui/e-cal-data-model.c:1629
-#, c-format
-msgid "Creating view for task list '%s'"
-msgstr "Kreante vidon por taskolisto '%s'"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1133
+#, fuzzy
+#| msgid "Public"
+msgctxt "ECompEditor"
+msgid "Public"
+msgstr "Publike"
 
-#: ../calendar/gui/e-cal-data-model.c:1633
-#, c-format
-msgid "Creating view for memo list '%s'"
-msgstr "Kreante vidon por notolisto '%s'"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1134
+#, fuzzy
+#| msgid "Private"
+msgctxt "ECompEditor"
+msgid "Private"
+msgstr "Private"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:1
-msgid "Click to add a task"
-msgstr "Klaku por aldoni taskon"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1135
+#, fuzzy
+#| msgid "Confidential"
+msgctxt "ECompEditor"
+msgid "Confidential"
+msgstr "Konfidence"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:2
-msgid "Start date"
-msgstr "Komencdato"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1151
+#, fuzzy
+#| msgid "C_lassification:"
+msgctxt "ECompEditor"
+msgid "C_lassification:"
+msgstr "K_lasado:"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:652
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../e-util/e-attachment-tree-view.c:585
-#: ../mail/e-mail-account-tree-view.c:157
-msgid "Type"
-msgstr "Tipo"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1170
+#, fuzzy
+#| msgid "Not sorted"
+msgctxt "ECompEditor"
+msgid "Not Started"
+msgstr "Ne ordigite"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5
-msgid "Completion date"
-msgstr "Plenumdato"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1171
+#, fuzzy
+#| msgid "In Progress"
+msgctxt "ECompEditor"
+msgid "In Progress"
+msgstr "Progresante"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:960
-msgid "Complete"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1172
+#, fuzzy
+#| msgid "Completed"
+msgctxt "ECompEditor"
+msgid "Completed"
 msgstr "Plenumite"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
-msgid "Due date"
-msgstr "Limdato"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:9
-#, no-c-format
-msgid "% Complete"
-msgstr "% plenumite"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:386
-msgid "Priority"
-msgstr "Prioritato"
-
-#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. * Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:3088
-#: ../calendar/gui/e-meeting-list-view.c:695
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/filtertypes.xml.in.h:34
-#: ../mail/message-list.etspec.h:1 ../mail/searchtypes.xml.in.h:36
-#: ../mail/vfoldertypes.xml.in.h:36
-msgid "Status"
-msgstr "Stato"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
-#: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../plugins/save-calendar/csv-format.c:380
-msgid "Created"
-msgstr "Kreite"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-cal-list-view.etspec.h:8
-#: ../calendar/gui/e-memo-table.etspec.h:7
-msgid "Last modified"
-msgstr "Laste modifite"
-
-#: ../calendar/gui/e-calendar-view.c:411
-msgid "Cut selected events to the clipboard"
-msgstr "Eltondi elektitajn eventojn al la tondejo"
-
-#: ../calendar/gui/e-calendar-view.c:417
-msgid "Copy selected events to the clipboard"
-msgstr "Kopii elektitajn eventojn al la tondejo"
-
-#: ../calendar/gui/e-calendar-view.c:423
-msgid "Paste events from the clipboard"
-msgstr "Alglui eventojn el la tondejo"
-
-#: ../calendar/gui/e-calendar-view.c:429
-msgid "Delete selected events"
-msgstr "Forigi elektitajn eventojn"
-
-#: ../calendar/gui/e-calendar-view.c:810
-msgid "Pasted text doesn't contain valid iCalendar data"
-msgstr "Algluita teksto enhavas nevalidajn iCalendar-datumojn"
-
-#: ../calendar/gui/e-calendar-view.c:821 ../calendar/gui/e-cal-ops.c:1540
-msgid "Default calendar not found"
-msgstr "Defaŭlta kalendaro ne trovita"
-
-#: ../calendar/gui/e-calendar-view.c:826 ../calendar/gui/e-cal-ops.c:1543
-msgid "Default memo list not found"
-msgstr "Defaŭlta notolisto ne trovita"
-
-#: ../calendar/gui/e-calendar-view.c:831 ../calendar/gui/e-cal-ops.c:1546
-msgid "Default task list not found"
-msgstr "Defaŭlta taskolisto ne trovita"
-
-#: ../calendar/gui/e-calendar-view.c:918
-msgid "No suitable component found"
-msgstr "Taŭga elemento ne trovita"
-
-#: ../calendar/gui/e-calendar-view.c:988
-msgid "Pasting iCalendar data"
-msgstr "Algluante iCalendar-datumojn"
-
-#. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#. To Translators: It will display
-#. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1791 ../calendar/gui/e-memo-table.c:495
-#: ../calendar/gui/e-task-table.c:796
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organizilo: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#. With SunOne accounts, there may be no ':' in
-#. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1795 ../calendar/gui/e-memo-table.c:500
-#: ../calendar/gui/e-task-table.c:800
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organizilo: %s"
-
-#. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1811
-#: ../calendar/gui/e-meeting-time-sel.c:2663 ../calendar/gui/print.c:3527
-#, c-format
-msgid "Location: %s"
-msgstr "Loko: %s"
-
-#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1851
-#, c-format
-msgid "Time: %s %s"
-msgstr "Tempo: %s %s"
-
-#: ../calendar/gui/e-calendar-view.c:2228
-#: ../calendar/gui/e-calendar-view.c:2235
-#: ../calendar/gui/e-calendar-view.c:2242
-#: ../calendar/gui/e-calendar-view.c:2245
-msgid "%d %b %Y"
-msgstr "%d %b %Y"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. * Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. * month name. You can change the order but don't
-#. * change the specifiers or add anything.
-#: ../calendar/gui/e-calendar-view.c:2233 ../calendar/gui/e-day-view.c:2943
-#: ../calendar/gui/e-day-view-top-item.c:859
-#: ../calendar/gui/e-week-view-main-item.c:230
-msgid "%d %b"
-msgstr "%d %b"
-
-#: ../calendar/gui/e-calendar-view.c:2255
-msgid "%A %d %b %Y"
-msgstr "%A %d %b %Y"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. * %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. * %d = day of month, %b = abbreviated month name.
-#. * You can change the order but don't change the
-#. * specifiers or add anything.
-#: ../calendar/gui/e-calendar-view.c:2259 ../calendar/gui/e-day-view.c:2927
-#: ../calendar/gui/e-day-view-top-item.c:855
-#: ../calendar/gui/e-week-view-main-item.c:216
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#: ../calendar/gui/e-calendar-view.c:2262
-#: ../calendar/gui/e-calendar-view.c:2268
-#: ../calendar/gui/e-calendar-view.c:2271
-msgid "%a %d %b %Y"
-msgstr "%a %d %b %Y"
-
-#: ../calendar/gui/e-cal-list-view.etspec.h:1
-#: ../calendar/gui/e-memo-table.etspec.h:5
-msgid "Start Date"
-msgstr "Komencodato"
-
-#: ../calendar/gui/e-cal-list-view.etspec.h:2
-msgid "End Date"
-msgstr "Findato"
-
-#: ../calendar/gui/e-cal-model.c:291 ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1250
-#: ../calendar/gui/print.c:1267 ../e-util/e-charset.c:51
-#: ../modules/itip-formatter/itip-view.c:3606
-#: ../modules/itip-formatter/itip-view.c:6196
-#: ../modules/plugin-manager/evolution-plugin-manager.c:99
-msgid "Unknown"
-msgstr "Nekonate"
-
-#: ../calendar/gui/e-cal-model.c:1183 ../calendar/gui/e-cal-ops.c:586
-#: ../calendar/gui/e-cal-ops.c:1209
-#: ../modules/calendar/e-cal-base-shell-backend.c:361
-#, c-format
-msgid "Source with UID '%s' not found"
-msgstr "Fonto kun UID '%s' ne trovita"
-
-#: ../calendar/gui/e-cal-model.c:1267 ../calendar/gui/e-cal-ops.c:184
-#: ../calendar/gui/e-cal-ops.c:1325
-msgid "Creating an event"
-msgstr "Kreante eventon"
-
-#: ../calendar/gui/e-cal-model.c:1271 ../calendar/gui/e-cal-ops.c:188
-#: ../calendar/gui/e-cal-ops.c:1329
-msgid "Creating a memo"
-msgstr "Kreante noton"
-
-#: ../calendar/gui/e-cal-model.c:1275 ../calendar/gui/e-cal-ops.c:192
-#: ../calendar/gui/e-cal-ops.c:1333
-msgid "Creating a task"
-msgstr "Kreante taskon"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1173
+#, fuzzy
+#| msgid "Cancelled"
+msgctxt "ECompEditor"
+msgid "Cancelled"
+msgstr "Nuligite"
 
-#: ../calendar/gui/e-cal-model.c:1645
-msgid "Recurring"
-msgstr "Rikura"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1182
+#, fuzzy
+#| msgid "_Status:"
+msgctxt "ECompEditor"
+msgid "_Status:"
+msgstr "_Stato:"
 
-#: ../calendar/gui/e-cal-model.c:1647
-msgid "Assigned"
-msgstr "Atribuita"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1212
+#, fuzzy
+#| msgid "Undefined"
+msgctxt "ECompEditor"
+msgid "Undefined"
+msgstr "Nedifinite"
 
-#: ../calendar/gui/e-cal-model.c:1649 ../calendar/gui/e-cal-model-tasks.c:1139
-#: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:186
-#: ../calendar/gui/e-meeting-store.c:1023
-msgid "Yes"
-msgstr "Jes"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1213
+#, fuzzy
+#| msgid "High"
+msgctxt "ECompEditor"
+msgid "High"
+msgstr "Alta"
 
-#: ../calendar/gui/e-cal-model.c:1649 ../calendar/gui/e-cal-model-tasks.c:1139
-#: ../calendar/gui/e-meeting-list-view.c:209
-#: ../calendar/gui/e-meeting-store.c:188
-msgid "No"
-msgstr "Ne"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1214
+#, fuzzy
+#| msgid "Normal"
+msgctxt "ECompEditor"
+msgid "Normal"
+msgstr "Normala"
 
-#: ../calendar/gui/e-cal-model.c:3029
-#: ../calendar/gui/e-meeting-list-view.c:220
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../modules/itip-formatter/itip-view.c:6184
-msgid "Accepted"
-msgstr "Akceptite"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1215
+#, fuzzy
+#| msgid "Low"
+msgctxt "ECompEditor"
+msgid "Low"
+msgstr "Malalta"
 
-#: ../calendar/gui/e-cal-model.c:3030
-#: ../calendar/gui/e-meeting-list-view.c:221
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../modules/itip-formatter/itip-view.c:6190
-msgid "Declined"
-msgstr "Malakceptite"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1224
+#, fuzzy
+#| msgid "Priorit_y:"
+msgctxt "ECompEditor"
+msgid "Priorit_y:"
+msgstr "Priorita_to:"
 
-#: ../calendar/gui/e-cal-model.c:3031
-#: ../calendar/gui/e-meeting-list-view.c:222
-#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../calendar/gui/e-meeting-time-sel.c:529
-msgid "Tentative"
-msgstr "Provizore"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1278
+#| msgid "_Percent complete:"
+msgctxt "ECompEditor"
+msgid "Percent complete:"
+msgstr "Procento da kompletigo:"
 
-#: ../calendar/gui/e-cal-model.c:3032
-#: ../calendar/gui/e-meeting-list-view.c:223
-#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:6193
-msgid "Delegated"
-msgstr "Delegite"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1359
+#, fuzzy
+#| msgid "Time _zone:"
+msgctxt "ECompEditor"
+msgid "Time _zone:"
+msgstr "Hor_zono:"
 
-#: ../calendar/gui/e-cal-model.c:3033
-msgid "Needs action"
-msgstr "Bezonas agon"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1484
+#, fuzzy
+#| msgid "Show Time as _Busy"
+msgctxt "ECompEditor"
+msgid "Show time as _busy"
+msgstr "Montri tempon kiel _okupatan"
 
-#: ../calendar/gui/e-cal-model-calendar.c:123
-#: ../calendar/gui/e-task-table.c:582
-msgid "Free"
-msgstr "Libere"
+#: ../src/calendar/gui/e-comp-editor-task.c:224
+#, fuzzy
+msgid "Task’s start date is in the past"
+msgstr "Komencodato de la tasko estas en la pasinteco"
 
-#: ../calendar/gui/e-cal-model-calendar.c:126
-#: ../calendar/gui/e-meeting-time-sel.c:530 ../calendar/gui/e-task-table.c:583
-msgid "Busy"
-msgstr "Okupite"
+#: ../src/calendar/gui/e-comp-editor-task.c:232
+#, fuzzy
+msgid "Task’s due date is in the past"
+msgstr "Limdato de la tasko estas en la pasinteco"
 
-#: ../calendar/gui/e-cal-model-tasks.c:498
+#: ../src/calendar/gui/e-comp-editor-task.c:461
+#, fuzzy
+#| msgid "Task cannot be edited, because the selected task list is read only"
 msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
+"Task cannot be edited, because the selected task list could not be opened"
+msgstr "Ne eblas redakti taskon, ĉar la elektita tasko estas nurlega"
 
-#. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:550
-msgctxt "cal-task-status"
-msgid "None"
-msgstr "Nenio"
+#: ../src/calendar/gui/e-comp-editor-task.c:463
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr "Ne eblas redakti taskon, ĉar la elektita tasko estas nurlega"
 
-#: ../calendar/gui/e-cal-ops.c:283
-msgid "Modifying an event"
-msgstr "Modifante eventon"
+#: ../src/calendar/gui/e-comp-editor-task.c:465
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "Ne eblas plene redakti la taskon, ĉar vi ne estas la organizanto"
 
-#: ../calendar/gui/e-cal-ops.c:287
-msgid "Modifying a memo"
-msgstr "Modifante noton"
+#: ../src/calendar/gui/e-comp-editor-task.c:533
+#, fuzzy
+#| msgid "File is not a valid .desktop file"
+msgid "Due date is not a valid date"
+msgstr "Dosiero ne estas valida .desktop-dosiero"
 
-#: ../calendar/gui/e-cal-ops.c:291
-msgid "Modifying a task"
-msgstr "Modifante taskon"
+#: ../src/calendar/gui/e-comp-editor-task.c:544
+#, fuzzy
+#| msgid "File is not a valid .desktop file"
+msgid "Completed date is not a valid date"
+msgstr "Dosiero ne estas valida .desktop-dosiero"
 
-#: ../calendar/gui/e-cal-ops.c:387
-msgid "Removing an event"
-msgstr "Provizore forigante eventon"
+#: ../src/calendar/gui/e-comp-editor-task.c:555
+#| msgid "1 minute in the future"
+#| msgid_plural "%d minutes in the future"
+msgid "Completed date cannot be in the future"
+msgstr "Plenumita dato ne povas esti en la estonteco"
 
-#: ../calendar/gui/e-cal-ops.c:391
-msgid "Removing a memo"
-msgstr "Provizore forigante taskon"
+#: ../src/calendar/gui/e-comp-editor-task.c:607
+#, fuzzy
+#| msgid "All _Day Event"
+msgid "All _Day Task"
+msgstr "Tut_taga evento"
 
-#: ../calendar/gui/e-cal-ops.c:395
-msgid "Removing a task"
-msgstr "Provizore forigante taskon"
+#: ../src/calendar/gui/e-comp-editor-task.c:609
+#, fuzzy
+#| msgid "Toggles whether to have All Day Event"
+msgid "Toggles whether to have All Day Task"
+msgstr "Baskulias ĉu igi eventon tuttaga"
 
-#: ../calendar/gui/e-cal-ops.c:484
-#, c-format
-msgid "Deleting an event"
-msgid_plural "Deleting %d events"
-msgstr[0] "Forigante eventon"
-msgstr[1] "Forigante %d eventojn"
+#: ../src/calendar/gui/e-comp-editor-task.c:818
+#, fuzzy, c-format
+#| msgid "Assigned Task - %s"
+msgid "Assigned Task — %s"
+msgstr "Asignitaj taskoj - %s"
 
-#: ../calendar/gui/e-cal-ops.c:488
-#, c-format
-msgid "Deleting a memo"
-msgid_plural "Deleting %d memos"
-msgstr[0] "Forigante noton"
-msgstr[1] "Forigante %d notojn"
+#: ../src/calendar/gui/e-comp-editor-task.c:819
+#, fuzzy, c-format
+#| msgid "Task - %s"
+msgid "Task — %s"
+msgstr "Tasko - %s"
 
-#: ../calendar/gui/e-cal-ops.c:492
-#, c-format
-msgid "Deleting a task"
-msgid_plural "Deleting %d tasks"
-msgstr[0] "Forigante taskon"
-msgstr[1] "Forigante %d taskojn"
+#: ../src/calendar/gui/e-comp-editor.c:253
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:125
+msgid "attachment"
+msgstr "aldonaĵo"
 
-#: ../calendar/gui/e-cal-ops.c:692
-#, c-format
-msgid "Pasting an event"
-msgid_plural "Pasting %d events"
-msgstr[0] "Algluante eventon"
-msgstr[1] "Algluante %d eventojn"
+#: ../src/calendar/gui/e-comp-editor.c:608
+msgid "Sending notifications to attendees..."
+msgstr ""
 
-#: ../calendar/gui/e-cal-ops.c:707
-#, c-format
-msgid "Pasting a memo"
-msgid_plural "Pasting %d memos"
-msgstr[0] "Algluante noton"
-msgstr[1] "Algluante %d notojn"
+#: ../src/calendar/gui/e-comp-editor.c:997
+#| msgid "_Save Changes"
+msgid "Saving changes..."
+msgstr "Konservi ŝanĝojn..."
 
-#: ../calendar/gui/e-cal-ops.c:722
-#, c-format
-msgid "Pasting a task"
-msgid_plural "Pasting %d tasks"
-msgstr[0] "Algluante taskon"
-msgstr[1] "Algluante %d taskojn"
+#: ../src/calendar/gui/e-comp-editor.c:1257
+msgid "No Summary"
+msgstr "Neniu resumo"
 
-#: ../calendar/gui/e-cal-ops.c:820
-msgid "Updating an event"
-msgstr "Ĝisdatigante eventon"
+#. == Button box ==
+#: ../src/calendar/gui/e-comp-editor.c:1984
+#: ../src/composer/e-composer-actions.c:327
+#: ../src/e-util/e-accounts-window.c:1692
+#: ../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:128 ../src/mail/e-mail-notes.c:931
+#: ../src/mail/em-folder-properties.c:1158
+#: ../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
+#: ../src/smime/gui/certificate-manager.c:2212
+msgid "_Close"
+msgstr "_Fermi"
 
-#: ../calendar/gui/e-cal-ops.c:824
-msgid "Updating a memo"
-msgstr "Ĝisdatigante noton"
+#: ../src/calendar/gui/e-comp-editor.c:1986
+msgid "Close the current window"
+msgstr "Fermi la aktualan fenestron"
 
-#: ../calendar/gui/e-cal-ops.c:828
-msgid "Updating a task"
-msgstr "Ĝisdatigante taskon"
+#. 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:2086
+#: ../src/e-util/e-web-view.c:407 ../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 "_Kopii"
 
-#: ../calendar/gui/e-cal-ops.c:933
-#, fuzzy, c-format
-#| msgid "Unable to open the calendar '%s': %s"
-msgid "Getting events to purge in the calendar '%s'"
-msgstr "Ne eblis malfermi la kalendaron '%s'"
+#: ../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:137
+#: ../src/shell/e-shell-window-actions.c:840
+msgid "Copy the selection"
+msgstr "Kopii la elektaĵon"
 
-#: ../calendar/gui/e-cal-ops.c:937
-#, c-format
-msgid "Getting memos to purge in the memo list '%s'"
-msgstr ""
+#. 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:2072
+#: ../src/mail/e-mail-browser.c:142 ../src/shell/e-shell-window-actions.c:845
+msgid "Cu_t"
+msgstr "El_tondi"
 
-#: ../calendar/gui/e-cal-ops.c:941
-#, c-format
-msgid "Getting tasks to purge in the task list '%s'"
-msgstr ""
+#: ../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:144 ../src/shell/e-shell-window-actions.c:847
+msgid "Cut the selection"
+msgstr "Eltondi la elektaĵon"
 
-#: ../calendar/gui/e-cal-ops.c:962
-#, c-format
-msgid "Purging events in the calendar '%s'"
-msgstr "Senrubigante eventojn en la kalendaro '%s'"
+#: ../src/calendar/gui/e-comp-editor.c:2007 ../src/e-util/e-focus-tracker.c:187
+#: ../src/e-util/e-focus-tracker.c:243 ../src/e-util/e-focus-tracker.c:784
+#: ../src/shell/e-shell-window-actions.c:854
+msgid "Delete the selection"
+msgstr "Forigi la elektitaĵon"
 
-#: ../calendar/gui/e-cal-ops.c:966
-#, c-format
-msgid "Purging memos in the memo list '%s'"
-msgstr "Senrubigante notojn en la notolisto '%s'"
+#: ../src/calendar/gui/e-comp-editor.c:2014
+msgid "View help"
+msgstr "Montri helpon"
 
-#: ../calendar/gui/e-cal-ops.c:970
-#, c-format
-msgid "Purging tasks in the task list '%s'"
-msgstr "Senrubigante taskojn en la taskolisto '%s'"
+#. 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:2098
+#: ../src/mail/e-mail-browser.c:149 ../src/shell/e-shell-window-actions.c:873
+msgid "_Paste"
+msgstr "_Alglui"
 
-#: ../calendar/gui/e-cal-ops.c:1068
-msgid "Purging events"
-msgstr "Senrubigante eventojn"
+#: ../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:151 ../src/shell/e-shell-window-actions.c:875
+msgid "Paste the clipboard"
+msgstr "Enmeti la tondujon"
 
-#: ../calendar/gui/e-cal-ops.c:1072
-msgid "Purging memos"
-msgstr "Senrubigante notojn"
+#: ../src/calendar/gui/e-comp-editor.c:2026
+#: ../src/composer/e-composer-actions.c:381 ../src/mail/e-mail-reader.c:2322
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1235
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1249
+msgid "_Print..."
+msgstr "_Presi..."
 
-#: ../calendar/gui/e-cal-ops.c:1076
-msgid "Purging tasks"
-msgstr "Senrubigante taskojn"
+#: ../src/calendar/gui/e-comp-editor.c:2033 ../src/mail/e-mail-reader.c:2329
+#: ../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
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1014
+msgid "Pre_view..."
+msgstr "Antaŭri_gardo..."
 
-#: ../calendar/gui/e-cal-ops.c:1178
-msgid "Expunging completed tasks"
-msgstr "Forviŝi finitajn taskojn"
+#: ../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:156 ../src/shell/e-shell-window-actions.c:950
+msgid "Select _All"
+msgstr "Elekti ĉ_ion"
 
-#: ../calendar/gui/e-cal-ops.c:2034
-#, c-format
-msgid "Moving an event"
-msgid_plural "Moving %d events"
-msgstr[0] "Movante eventon"
-msgstr[1] "Movante %d eventojn"
+#: ../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:158 ../src/shell/e-shell-window-actions.c:952
+msgid "Select all text"
+msgstr "Elekti tutan tekston"
 
-#: ../calendar/gui/e-cal-ops.c:2035
-#, c-format
-msgid "Copying an event"
-msgid_plural "Copying %d events"
-msgstr[0] "Kopiante eventon"
-msgstr[1] "Kopiante %d eventojn"
+#: ../src/calendar/gui/e-comp-editor.c:2063
+msgid "_Classification"
+msgstr "_Kategoriado"
 
-#: ../calendar/gui/e-cal-ops.c:2041
-#, c-format
-msgid "Moving a memo"
-msgid_plural "Moving %d memos"
-msgstr[0] "Movante noton"
-msgstr[1] "Movante %d notojn"
+#: ../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:165
+#: ../src/mail/e-mail-notes.c:945 ../src/shell/e-shell-window-actions.c:987
+msgid "_File"
+msgstr "_Dosiero"
 
-#: ../calendar/gui/e-cal-ops.c:2042
-#, c-format
-msgid "Copying a memo"
-msgid_plural "Copying %d memos"
-msgstr[0] "Kopiante noton"
-msgstr[1] "Kopiante %d notojn"
+#: ../src/calendar/gui/e-comp-editor.c:2091
+#: ../src/e-util/e-html-editor-actions.c:950
+msgid "_Insert"
+msgstr "_Enmeti"
 
-#: ../calendar/gui/e-cal-ops.c:2048
-#, c-format
-msgid "Moving a task"
-msgid_plural "Moving %d tasks"
-msgstr[0] "Movante taskon"
-msgstr[1] "Movante %d taskojn"
+#: ../src/calendar/gui/e-comp-editor.c:2098
+#: ../src/composer/e-composer-actions.c:371
+msgid "_Options"
+msgstr "_Agordoj"
 
-#: ../calendar/gui/e-cal-ops.c:2049
-#, c-format
-msgid "Copying a task"
-msgid_plural "Copying %d tasks"
-msgstr[0] "Kopiante taskon"
-msgstr[1] "Kopiante %d taskojn"
+#: ../src/calendar/gui/e-comp-editor.c:2105
+#: ../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"
+msgstr "_Vido"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:165
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr ""
+#: ../src/calendar/gui/e-comp-editor.c:2117
+msgid "Save current changes"
+msgstr "Konservi aktualajn ŝanĝojn"
 
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:168
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr ""
+#: ../src/calendar/gui/e-comp-editor.c:2122
+#: ../src/e-util/e-mail-signature-editor.c:318 ../src/mail/e-mail-notes.c:940
+msgid "Save and Close"
+msgstr "Konservi kaj fermi"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:176
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"%s"
-msgstr ""
-"Oni devas enigi la daton tiamaniere: \n"
-"%s"
+#: ../src/calendar/gui/e-comp-editor.c:2124
+msgid "Save current changes and close editor"
+msgstr "Konservi aktualajn ŝanĝojn kaj fermi redaktilon"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:2061 ../calendar/gui/e-week-view.c:1692
-#: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
-#: ../calendar/gui/print.c:2622 ../calendar/gui/print.c:2642
+#: ../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:1080
+#: ../src/calendar/gui/print.c:1099 ../src/calendar/gui/print.c:2636
+#: ../src/calendar/gui/print.c:2656
 msgid "am"
 msgstr "atm"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:2064 ../calendar/gui/e-week-view.c:1695
-#: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
-#: ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
+#: ../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:1085
+#: ../src/calendar/gui/print.c:1101 ../src/calendar/gui/print.c:2641
+#: ../src/calendar/gui/print.c:2658
 msgid "pm"
 msgstr "ptm"
 
@@ -4836,13 +8454,15 @@ msgstr "ptm"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:2910 ../calendar/gui/e-day-view-top-item.c:851
-#: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2089
+#: ../src/calendar/gui/e-day-view.c:3045
+#: ../src/calendar/gui/e-day-view-top-item.c:841
+#: ../src/calendar/gui/e-week-view-main-item.c:205
+#: ../src/calendar/gui/print.c:2103
 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
-#: ../calendar/gui/e-day-view.c:3574
+#: ../src/calendar/gui/e-day-view.c:3766
 #, c-format
 msgid "Week %d"
 msgstr "Semajno %d"
@@ -4853,192 +8473,217 @@ msgstr "Semajno %d"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:802
+#: ../src/calendar/gui/e-day-view-time-item.c:804
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
-#: ../calendar/gui/e-day-view-time-item.c:827
+#: ../src/calendar/gui/e-day-view-time-item.c:829
 msgid "Show the second time zone"
 msgstr "Montri la duan horzonon"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:844
-#: ../modules/calendar/e-calendar-preferences.c:305
-#: ../modules/calendar/e-calendar-preferences.c:357
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
+#: ../src/calendar/gui/e-day-view-time-item.c:846
+#: ../src/modules/calendar/e-calendar-preferences.c:313
+#: ../src/modules/calendar/e-calendar-preferences.c:365
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Nenio"
 
-#: ../calendar/gui/e-day-view-time-item.c:878
-#: ../calendar/gui/e-timezone-entry.c:323
-#: ../modules/calendar/e-calendar-preferences.c:388
+#: ../src/calendar/gui/e-day-view-time-item.c:880
+#: ../src/calendar/gui/e-timezone-entry.c:322
+#: ../src/modules/calendar/e-calendar-preferences.c:396
 msgid "Select..."
 msgstr "Elekti..."
 
-#: ../calendar/gui/e-meeting-list-view.c:63
+#: ../src/calendar/gui/e-meeting-list-view.c:62
 msgid "Chair Persons"
 msgstr "Prezidaj personoj"
 
-#: ../calendar/gui/e-meeting-list-view.c:64
+#: ../src/calendar/gui/e-meeting-list-view.c:63
 msgid "Required Participants"
 msgstr "Nepraj partoprenantoj"
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../src/calendar/gui/e-meeting-list-view.c:64
 msgid "Optional Participants"
 msgstr "Malnepraj partoprenantoj"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../src/calendar/gui/e-meeting-list-view.c:65
 msgid "Resources"
 msgstr "Risurcoj"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:126
-#: ../calendar/gui/e-meeting-store.c:1017 ../calendar/gui/print.c:1246
+#: ../src/calendar/gui/e-meeting-list-view.c:163
+msgid "Attendees"
+msgstr "Alestantoj"
+
+#: ../src/calendar/gui/e-meeting-list-view.c:179
+#: ../src/calendar/gui/e-meeting-store.c:107
+#: ../src/calendar/gui/e-meeting-store.c:124
+#: ../src/calendar/gui/e-meeting-store.c:1015 ../src/calendar/gui/print.c:1253
 msgid "Individual"
 msgstr "Individue"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/print.c:1247 ../e-util/e-table-config.ui.h:8
+#: ../src/calendar/gui/e-meeting-list-view.c:180
+#: ../src/calendar/gui/e-meeting-store.c:109
+#: ../src/calendar/gui/e-meeting-store.c:126 ../src/calendar/gui/print.c:1254
+#: ../src/e-util/e-table-config.ui.h:1
 msgid "Group"
 msgstr "Grupo"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/print.c:1248
+#: ../src/calendar/gui/e-meeting-list-view.c:181
+#: ../src/calendar/gui/e-meeting-store.c:111
+#: ../src/calendar/gui/e-meeting-store.c:128 ../src/calendar/gui/print.c:1255
 msgid "Resource"
 msgstr "Risurco"
 
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1249
+#: ../src/calendar/gui/e-meeting-list-view.c:182
+#: ../src/calendar/gui/e-meeting-store.c:113
+#: ../src/calendar/gui/e-meeting-store.c:130 ../src/calendar/gui/print.c:1256
 msgid "Room"
 msgstr "Ĉambro"
 
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:161
-#: ../calendar/gui/print.c:1263
+#: ../src/calendar/gui/e-meeting-list-view.c:193
+#: ../src/calendar/gui/e-meeting-store.c:142
+#: ../src/calendar/gui/e-meeting-store.c:159 ../src/calendar/gui/print.c:1270
 msgid "Chair"
 msgstr "Seĝo"
 
-#: ../calendar/gui/e-meeting-list-view.c:195
-#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1264
+#: ../src/calendar/gui/e-meeting-list-view.c:194
+#: ../src/calendar/gui/e-meeting-store.c:144
+#: ../src/calendar/gui/e-meeting-store.c:161
+#: ../src/calendar/gui/e-meeting-store.c:1018 ../src/calendar/gui/print.c:1271
 msgid "Required Participant"
 msgstr "Nepra partoprenanto"
 
-#: ../calendar/gui/e-meeting-list-view.c:196
-#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/print.c:1265
+#: ../src/calendar/gui/e-meeting-list-view.c:195
+#: ../src/calendar/gui/e-meeting-store.c:146
+#: ../src/calendar/gui/e-meeting-store.c:163 ../src/calendar/gui/print.c:1272
 msgid "Optional Participant"
 msgstr "Malnepra partoprenanto"
 
-#: ../calendar/gui/e-meeting-list-view.c:197
-#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/print.c:1266
+#: ../src/calendar/gui/e-meeting-list-view.c:196
+#: ../src/calendar/gui/e-meeting-store.c:148
+#: ../src/calendar/gui/e-meeting-store.c:165 ../src/calendar/gui/print.c:1273
 msgid "Non-Participant"
 msgstr "Ne partoprenanta"
 
-#: ../calendar/gui/e-meeting-list-view.c:219
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/e-meeting-store.c:1030
+#: ../src/calendar/gui/e-meeting-list-view.c:218
+#: ../src/calendar/gui/e-meeting-store.c:192
+#: ../src/calendar/gui/e-meeting-store.c:215
+#: ../src/calendar/gui/e-meeting-store.c:1028
 msgid "Needs Action"
 msgstr "Necesas agon"
 
-#: ../calendar/gui/e-meeting-list-view.c:626
+#: ../src/calendar/gui/e-meeting-list-view.c:618
 msgid "Attendee                          "
 msgstr "Alestanto                          "
 
-#: ../calendar/gui/e-meeting-list-view.c:681
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+#: ../src/calendar/gui/e-meeting-list-view.c:644
+#: ../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-attachment-tree-view.c:205
+#: ../src/e-util/e-webdav-browser.c:2381
+#: ../src/mail/e-mail-account-tree-view.c:158
+msgid "Type"
+msgstr "Tipo"
+
+#. To translators: RSVP means "please reply"
+#: ../src/calendar/gui/e-meeting-list-view.c:673
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
+#: ../src/calendar/gui/e-meeting-store.c:204
+#: ../src/calendar/gui/e-meeting-store.c:227
 msgid "In Process"
 msgstr "Procezate"
 
-#: ../calendar/gui/e-meeting-store.c:1909
+#: ../src/calendar/gui/e-meeting-store.c:1899
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "Enigu pasvorton por aliri libera-okipita-informo ĉe servilo %s kiel uzanto %s"
 
-#: ../calendar/gui/e-meeting-store.c:1919
+#: ../src/calendar/gui/e-meeting-store.c:1909
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Malsukcesa kialo: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1924
-#: ../plugins/publish-calendar/publish-calendar.c:351
-#: ../smime/gui/component.c:63
+#: ../src/calendar/gui/e-meeting-store.c:1914
+#: ../src/plugins/publish-calendar/publish-calendar.c:349
+#: ../src/smime/gui/component.c:61
 msgid "Enter password"
 msgstr "Enigi pasvorton"
 
-#: ../calendar/gui/e-meeting-time-sel.c:531
+#: ../src/calendar/gui/e-meeting-time-sel.c:525
 msgid "Out of Office"
 msgstr "For de oficejo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:533
+#: ../src/calendar/gui/e-meeting-time-sel.c:527
 msgid "No Information"
 msgstr "Nenia informo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:568
+#: ../src/calendar/gui/e-meeting-time-sel.c:543
+msgid "Atte_ndees..."
+msgstr "Alesta_ntoj..."
+
+#: ../src/calendar/gui/e-meeting-time-sel.c:562
 msgid "O_ptions"
 msgstr "_Agordoj"
 
-#: ../calendar/gui/e-meeting-time-sel.c:588
+#: ../src/calendar/gui/e-meeting-time-sel.c:583
 msgid "Show _only working hours"
 msgstr "M_ontri nur laborhorojn"
 
-#: ../calendar/gui/e-meeting-time-sel.c:601
+#: ../src/calendar/gui/e-meeting-time-sel.c:596
 msgid "Show _zoomed out"
 msgstr "Montri el_zome"
 
-#: ../calendar/gui/e-meeting-time-sel.c:619
+#: ../src/calendar/gui/e-meeting-time-sel.c:614
 msgid "_Update free/busy"
 msgstr "Ĝisdatigi malok_upata/okupata"
 
-#: ../calendar/gui/e-meeting-time-sel.c:636
+#: ../src/calendar/gui/e-meeting-time-sel.c:631
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../src/calendar/gui/e-meeting-time-sel.c:651
 msgid "_Autopick"
-msgstr "_Aŭtomate selekti"
+msgstr "_Aŭtomate elekti"
 
-#: ../calendar/gui/e-meeting-time-sel.c:673
+#: ../src/calendar/gui/e-meeting-time-sel.c:668
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:694
+#: ../src/calendar/gui/e-meeting-time-sel.c:690
 msgid "_All people and resources"
 msgstr "Ĉi_uj personoj kaj risurcoj"
 
-#: ../calendar/gui/e-meeting-time-sel.c:705
+#: ../src/calendar/gui/e-meeting-time-sel.c:701
 msgid "All _people and one resource"
 msgstr "Ĉiuj _personoj kaj unu risurco"
 
-#: ../calendar/gui/e-meeting-time-sel.c:716
+#: ../src/calendar/gui/e-meeting-time-sel.c:712
 #, fuzzy
 msgid "_Required people"
 msgstr "Ne_praj personoj"
 
-#: ../calendar/gui/e-meeting-time-sel.c:726
+#: ../src/calendar/gui/e-meeting-time-sel.c:722
 msgid "Required people and _one resource"
 msgstr "Nepraj personoj kaj unu risurc_o"
 
-#: ../calendar/gui/e-meeting-time-sel.c:765
+#: ../src/calendar/gui/e-meeting-time-sel.c:761
 msgid "_Start time:"
 msgstr "_Komenctempo:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:794
+#: ../src/calendar/gui/e-meeting-time-sel.c:790
 msgid "_End time:"
 msgstr "_Fintempo:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2659
+#: ../src/calendar/gui/e-meeting-time-sel.c:2667
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -5047,160 +8692,260 @@ msgstr ""
 "Resumo: %s\n"
 "Loko: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2661 ../calendar/gui/print.c:3516
+#: ../src/calendar/gui/e-meeting-time-sel.c:2669
+#: ../src/calendar/gui/print.c:3530
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Click here to add an attendee"
 msgstr "Alklaku ĉi tien por aldoni alestanton"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Member"
 msgstr "Membro"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Delegated To"
 msgstr "Delegita al"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Delegated From"
 msgstr "Delegita el"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:10
 msgid "Common Name"
 msgstr "Komuna nomo"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Language"
 msgstr "Lingvo"
 
-#: ../calendar/gui/e-memo-table.c:371
-#: ../modules/calendar/e-cal-shell-content.c:1600
-#: ../modules/calendar/e-memo-shell-view-actions.c:180
-#: ../modules/calendar/e-memo-shell-view-actions.c:195
-#: ../modules/calendar/e-memo-shell-view.c:308
-msgid "Memos"
-msgstr "Notoj"
-
-#: ../calendar/gui/e-memo-table.c:457 ../calendar/gui/e-task-table.c:759
+#: ../src/calendar/gui/e-memo-table.c:455
+#: ../src/calendar/gui/e-task-table.c:781
 msgid "* No Summary *"
 msgstr "* Neniu resumo *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:544 ../calendar/gui/e-task-table.c:843
+#: ../src/calendar/gui/e-memo-table.c:540
+#: ../src/calendar/gui/e-task-table.c:863
 msgid "Start: "
 msgstr "Komenco: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:563 ../calendar/gui/e-task-table.c:861
+#: ../src/calendar/gui/e-memo-table.c:560
+#: ../src/calendar/gui/e-task-table.c:882
 msgid "Due: "
 msgstr "Limdato: "
 
-#: ../calendar/gui/e-memo-table.c:684
+#: ../src/calendar/gui/e-memo-table.c:745
 msgid "Cut selected memos to the clipboard"
 msgstr "Eltondi la elektitajn notojn al la tondujo"
 
-#: ../calendar/gui/e-memo-table.c:690
+#: ../src/calendar/gui/e-memo-table.c:751
 msgid "Copy selected memos to the clipboard"
 msgstr "Kopii la elektitajn notojn en la tondujon"
 
-#: ../calendar/gui/e-memo-table.c:696
+#: ../src/calendar/gui/e-memo-table.c:757
 msgid "Paste memos from the clipboard"
 msgstr "Enmeti notojn de la tondujo"
 
-#: ../calendar/gui/e-memo-table.c:702
-#: ../modules/calendar/e-memo-shell-view-actions.c:531
+#: ../src/calendar/gui/e-memo-table.c:763
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:558
 msgid "Delete selected memos"
 msgstr "Forigi la elektitajn notojn"
 
-#: ../calendar/gui/e-memo-table.c:708
+#: ../src/calendar/gui/e-memo-table.c:769
 msgid "Select all visible memos"
 msgstr "Elekti ĉiujn videblajn notojn"
 
-#: ../calendar/gui/e-memo-table.etspec.h:1
+#: ../src/calendar/gui/e-memo-table.etspec.h:1
 msgid "Click to add a memo"
 msgstr "Klaku por aldoni noton"
 
+#: ../src/calendar/gui/e-task-table.c:551
+#: ../src/calendar/gui/tasktypes.xml.in.h:22
+#: ../src/e-util/e-send-options.ui.h:1
+msgid "Undefined"
+msgstr "Nedifinite"
+
 #. Translators: "%d%%" is the percentage of a task done.
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:555
+#: ../src/calendar/gui/e-task-table.c:579
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2404
-#: ../calendar/importers/icalendar-importer.c:78
-#: ../calendar/importers/icalendar-importer.c:1062
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
-#: ../modules/calendar/e-cal-shell-content.c:1560
-#: ../modules/calendar/e-task-shell-view-actions.c:203
-#: ../modules/calendar/e-task-shell-view-actions.c:218
-#: ../modules/calendar/e-task-shell-view.c:466
-msgid "Tasks"
-msgstr "Taskoj"
-
-#: ../calendar/gui/e-task-table.c:999
+#: ../src/calendar/gui/e-task-table.c:1084
 msgid "Cut selected tasks to the clipboard"
 msgstr "Eltondi elektitajn taskojn al la tondujo"
 
-#: ../calendar/gui/e-task-table.c:1005
+#: ../src/calendar/gui/e-task-table.c:1090
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopii elektitajn taskojn al la tondujo"
 
-#: ../calendar/gui/e-task-table.c:1011
+#: ../src/calendar/gui/e-task-table.c:1096
 msgid "Paste tasks from the clipboard"
 msgstr "Enmeti taskojn de la tondujo"
 
-#: ../calendar/gui/e-task-table.c:1017
-#: ../modules/calendar/e-task-shell-view-actions.c:656
+#: ../src/calendar/gui/e-task-table.c:1102
+#: ../src/modules/calendar/e-task-shell-view-actions.c:684
 msgid "Delete selected tasks"
 msgstr "Forigi elektitajn taskojn"
 
-#: ../calendar/gui/e-task-table.c:1023
+#: ../src/calendar/gui/e-task-table.c:1108
 msgid "Select all visible tasks"
 msgstr "Elekti ĉiujn videblajn taskojn"
 
-#: ../calendar/gui/e-timezone-entry.c:334
+#: ../src/calendar/gui/e-task-table.etspec.h:1
+msgid "Click to add a task"
+msgstr "Klaku por aldoni taskon"
+
+#: ../src/calendar/gui/e-task-table.etspec.h:2
+msgid "Start date"
+msgstr "Komencdato"
+
+#: ../src/calendar/gui/e-task-table.etspec.h:5
+msgid "Completion date"
+msgstr "Plenumdato"
+
+#: ../src/calendar/gui/e-task-table.etspec.h:6 ../src/mail/mail-send-recv.c:968
+msgid "Complete"
+msgstr "Plenumite"
+
+#: ../src/calendar/gui/e-task-table.etspec.h:7
+msgid "Due date"
+msgstr "Limdato"
+
+#: ../src/calendar/gui/e-task-table.etspec.h:9
+#, no-c-format
+msgid "% Complete"
+msgstr "% plenumite"
+
+#: ../src/calendar/gui/e-task-table.etspec.h:10
+#: ../src/calendar/gui/tasktypes.xml.in.h:18
+#: ../src/plugins/save-calendar/csv-format.c:384
+msgid "Priority"
+msgstr "Prioritato"
+
+#: ../src/calendar/gui/e-timezone-entry.c:333
 msgid "Select Timezone"
 msgstr "Elekti horzonon"
 
+#. Translators: It will display "Due: DueDateAndTime"
+#: ../src/calendar/gui/e-to-do-pane.c:365
+#, c-format
+#| msgid "Due: "
+msgid "Due: %s"
+msgstr "Limdato: %s"
+
+#. Translators: It will display "Completed: DateAndTimeWhenCompleted"
+#: ../src/calendar/gui/e-to-do-pane.c:377
+#, c-format
+#| msgid "Completed "
+msgid "Completed: %s"
+msgstr "Plenumite: %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/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
+msgid "Today"
+msgstr "Hodiaŭ"
+
+#. strftime format of a weekday and a date.
+#: ../src/calendar/gui/e-to-do-pane.c:1330
+#: ../src/e-util/e-datetime-format.c:217
+#: ../src/modules/itip-formatter/itip-view.c:281
+msgid "Tomorrow"
+msgstr "Morgaŭ"
+
+#: ../src/calendar/gui/e-to-do-pane.c:1892
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1449
+msgid "New _Appointment..."
+msgstr "Nova _rendevuo..."
+
+#: ../src/calendar/gui/e-to-do-pane.c:1900
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1435
+msgid "New _Meeting..."
+msgstr "Nova _kunsido..."
+
+#: ../src/calendar/gui/e-to-do-pane.c:1908
+#| msgid "New _Task"
+msgid "New _Task..."
+msgstr "Nova _tasko..."
+
+#: ../src/calendar/gui/e-to-do-pane.c:1916
+#, fuzzy
+#| msgctxt "New"
+#| msgid "Assigne_d Task"
+msgid "_New Assigned Task..."
+msgstr "_Atribuita tasko..."
+
+#: ../src/calendar/gui/e-to-do-pane.c:1929
+#| msgid "_Open"
+msgid "_Open..."
+msgstr "_Malfermi..."
+
+#: ../src/calendar/gui/e-to-do-pane.c:1943
+#, fuzzy
+#| msgid "Delete This _Occurrence"
+msgid "_Delete This Instance..."
+msgstr "Forigi tiun _okazon..."
+
+#: ../src/calendar/gui/e-to-do-pane.c:1951
+#| msgid "All Instances"
+msgid "D_elete All Instances..."
+msgstr ""
+
+#: ../src/calendar/gui/e-to-do-pane.c:1959
+#| msgid "_Delete"
+msgid "_Delete..."
+msgstr "_Forigi..."
+
+#: ../src/calendar/gui/e-to-do-pane.c:2238
+#| msgid "_To Do"
+msgid "To Do"
+msgstr "Farenda"
+
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2068
+#: ../src/calendar/gui/e-week-view-main-item.c:222
+#: ../src/calendar/gui/print.c:2082
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
-#: ../calendar/gui/itip-utils.c:841
+#: ../src/calendar/gui/itip-utils.c:798 ../src/calendar/gui/itip-utils.c:860
+#: ../src/calendar/gui/itip-utils.c:994
 msgid "An organizer must be set."
 msgstr "Oni devas agordi organizanton."
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../src/calendar/gui/itip-utils.c:851
 msgid "At least one attendee is necessary"
 msgstr "Necesas almenaŭ unu alestanto"
 
-#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
+#: ../src/calendar/gui/itip-utils.c:1082 ../src/calendar/gui/itip-utils.c:1243
 msgid "Event information"
 msgstr "Event-informo"
 
-#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
+#: ../src/calendar/gui/itip-utils.c:1085 ../src/calendar/gui/itip-utils.c:1246
 msgid "Task information"
 msgstr "Task-informo"
 
-#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1096
+#: ../src/calendar/gui/itip-utils.c:1088 ../src/calendar/gui/itip-utils.c:1249
 msgid "Memo information"
 msgstr "Noto-informo"
 
-#: ../calendar/gui/itip-utils.c:938 ../calendar/gui/itip-utils.c:1114
+#: ../src/calendar/gui/itip-utils.c:1091 ../src/calendar/gui/itip-utils.c:1267
 msgid "Free/Busy information"
 msgstr "Malokupata/Okupata informo"
 
-#: ../calendar/gui/itip-utils.c:941
+#: ../src/calendar/gui/itip-utils.c:1094
 msgid "Calendar information"
 msgstr "Kalendar-informo"
 
@@ -5208,7 +8953,7 @@ msgstr "Kalendar-informo"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:978
+#: ../src/calendar/gui/itip-utils.c:1131
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Akceptite"
@@ -5217,7 +8962,7 @@ msgstr "Akceptite"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:985
+#: ../src/calendar/gui/itip-utils.c:1138
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Prove akceptita"
@@ -5229,7 +8974,7 @@ msgstr "Prove akceptita"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:992 ../calendar/gui/itip-utils.c:1040
+#: ../src/calendar/gui/itip-utils.c:1145 ../src/calendar/gui/itip-utils.c:1193
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Malakceptite"
@@ -5238,7 +8983,7 @@ msgstr "Malakceptite"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:999
+#: ../src/calendar/gui/itip-utils.c:1152
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegite"
@@ -5246,7 +8991,7 @@ msgstr "Delegite"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1012
+#: ../src/calendar/gui/itip-utils.c:1165
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Ĝisdatigite"
@@ -5254,7 +8999,7 @@ msgstr "Ĝisdatigite"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1019
+#: ../src/calendar/gui/itip-utils.c:1172
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Nuligi"
@@ -5262,7 +9007,7 @@ msgstr "Nuligi"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1026
+#: ../src/calendar/gui/itip-utils.c:1179
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Aktualigi"
@@ -5270,470 +9015,512 @@ msgstr "Aktualigi"
 #. 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".
-#: ../calendar/gui/itip-utils.c:1033
+#: ../src/calendar/gui/itip-utils.c:1186
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Kontraŭpropono"
 
-#: ../calendar/gui/itip-utils.c:1111
+#: ../src/calendar/gui/itip-utils.c:1264
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Malokupata/Okupata informo (%s al %s)"
 
-#: ../calendar/gui/itip-utils.c:1119
+#: ../src/calendar/gui/itip-utils.c:1272
 msgid "iCalendar information"
 msgstr "iCalendar-informo"
 
-#: ../calendar/gui/itip-utils.c:1148
+#: ../src/calendar/gui/itip-utils.c:1301
 #, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "Ne eblas mendi risurcon, la nova evento interferas kun iu alia."
 
-#: ../calendar/gui/itip-utils.c:1153
+#: ../src/calendar/gui/itip-utils.c:1306
 msgid "Unable to book a resource, error: "
 msgstr "Ne eblas mendi risurcon, eraro: "
 
-#: ../calendar/gui/itip-utils.c:1324
+#: ../src/calendar/gui/itip-utils.c:1477
 msgid "You must be an attendee of the event."
 msgstr "Vi devas esti alestanto de la evento."
 
-#: ../calendar/gui/itip-utils.c:1917
+#: ../src/calendar/gui/itip-utils.c:2209
 msgid "Sending an event"
 msgstr "Sendante eventon"
 
-#: ../calendar/gui/itip-utils.c:1921
+#: ../src/calendar/gui/itip-utils.c:2213
 msgid "Sending a memo"
 msgstr "Sendante noton"
 
-#: ../calendar/gui/itip-utils.c:1925
+#: ../src/calendar/gui/itip-utils.c:2217
 msgid "Sending a task"
 msgstr "Sendante taskon"
 
-#: ../calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:665
 msgid "1st"
 msgstr "1a"
 
-#: ../calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:665
 msgid "2nd"
 msgstr "2a"
 
-#: ../calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:665
 msgid "3rd"
 msgstr "3a"
 
-#: ../calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:665
 msgid "4th"
 msgstr "4a"
 
-#: ../calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:665
 msgid "5th"
 msgstr "5a"
 
-#: ../calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:666
 msgid "6th"
 msgstr "6a"
 
-#: ../calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:666
 msgid "7th"
 msgstr "7a"
 
-#: ../calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:666
 msgid "8th"
 msgstr "8a"
 
-#: ../calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:666
 msgid "9th"
 msgstr "9a"
 
-#: ../calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:666
 msgid "10th"
 msgstr "10a"
 
-#: ../calendar/gui/print.c:666
+#: ../src/calendar/gui/print.c:667
 msgid "11th"
 msgstr "11a"
 
-#: ../calendar/gui/print.c:666
+#: ../src/calendar/gui/print.c:667
 msgid "12th"
 msgstr "12a"
 
-#: ../calendar/gui/print.c:666
+#: ../src/calendar/gui/print.c:667
 msgid "13th"
 msgstr "13a"
 
-#: ../calendar/gui/print.c:666
+#: ../src/calendar/gui/print.c:667
 msgid "14th"
 msgstr "14a"
 
-#: ../calendar/gui/print.c:666
+#: ../src/calendar/gui/print.c:667
 msgid "15th"
 msgstr "15a"
 
-#: ../calendar/gui/print.c:667
+#: ../src/calendar/gui/print.c:668
 msgid "16th"
 msgstr "16a"
 
-#: ../calendar/gui/print.c:667
+#: ../src/calendar/gui/print.c:668
 msgid "17th"
 msgstr "17a"
 
-#: ../calendar/gui/print.c:667
+#: ../src/calendar/gui/print.c:668
 msgid "18th"
 msgstr "18a"
 
-#: ../calendar/gui/print.c:667
+#: ../src/calendar/gui/print.c:668
 msgid "19th"
 msgstr "19a"
 
-#: ../calendar/gui/print.c:667
+#: ../src/calendar/gui/print.c:668
 msgid "20th"
 msgstr "20a"
 
-#: ../calendar/gui/print.c:668
+#: ../src/calendar/gui/print.c:669
 msgid "21st"
 msgstr "21a"
 
-#: ../calendar/gui/print.c:668
+#: ../src/calendar/gui/print.c:669
 msgid "22nd"
 msgstr "22a"
 
-#: ../calendar/gui/print.c:668
+#: ../src/calendar/gui/print.c:669
 msgid "23rd"
 msgstr "23a"
 
-#: ../calendar/gui/print.c:668
+#: ../src/calendar/gui/print.c:669
 msgid "24th"
 msgstr "24a"
 
-#: ../calendar/gui/print.c:668
+#: ../src/calendar/gui/print.c:669
 msgid "25th"
 msgstr "25a"
 
-#: ../calendar/gui/print.c:669
+#: ../src/calendar/gui/print.c:670
 msgid "26th"
 msgstr "26a"
 
-#: ../calendar/gui/print.c:669
+#: ../src/calendar/gui/print.c:670
 msgid "27th"
 msgstr "27a"
 
-#: ../calendar/gui/print.c:669
+#: ../src/calendar/gui/print.c:670
 msgid "28th"
 msgstr "28a"
 
-#: ../calendar/gui/print.c:669
+#: ../src/calendar/gui/print.c:670
 msgid "29th"
 msgstr "29a"
 
-#: ../calendar/gui/print.c:669
+#: ../src/calendar/gui/print.c:670
 msgid "30th"
 msgstr "30a"
 
-#: ../calendar/gui/print.c:670
+#: ../src/calendar/gui/print.c:671
 msgid "31st"
 msgstr "31a"
 
+#. G_DATE_BAD_WEEKDAY
 #. Translators: These are workday abbreviations,
 #. * e.g. Su=Sunday and Th=thursday
-#. G_DATE_BAD_WEEKDAY
 #. G_DATE_MONDAY
-#: ../calendar/gui/print.c:730
+#: ../src/calendar/gui/print.c:731
 msgid "Mo"
 msgstr "Lu"
 
 #. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:731
+#: ../src/calendar/gui/print.c:732
 msgid "Tu"
 msgstr "Ma"
 
 #. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:732
+#: ../src/calendar/gui/print.c:733
 msgid "We"
 msgstr "Me"
 
 #. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:733
+#: ../src/calendar/gui/print.c:734
 msgid "Th"
 msgstr "Ĵa"
 
 #. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:734
+#: ../src/calendar/gui/print.c:735
 msgid "Fr"
 msgstr "Ve"
 
 #. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:735
+#: ../src/calendar/gui/print.c:736
 msgid "Sa"
 msgstr "Sa"
 
 #. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:736
+#: ../src/calendar/gui/print.c:737
 msgid "Su"
 msgstr "Di"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3309
+#: ../src/calendar/gui/print.c:3323
 msgid " to "
 msgstr " al "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3319
+#: ../src/calendar/gui/print.c:3333
 msgid " (Completed "
 msgstr " (Plenumite "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3325
+#: ../src/calendar/gui/print.c:3339
 msgid "Completed "
 msgstr "Plenumite "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3335
+#: ../src/calendar/gui/print.c:3349
 msgid " (Due "
 msgstr ""
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3342
+#: ../src/calendar/gui/print.c:3356
 msgid "Due "
 msgstr "Limdato "
 
-#: ../calendar/gui/print.c:3546
+#: ../src/calendar/gui/print.c:3500
+msgid "Appointment"
+msgstr "Rendevuo"
+
+#: ../src/calendar/gui/print.c:3502 ../src/e-util/e-send-options.c:551
+msgid "Task"
+msgstr "Tasko"
+
+#: ../src/calendar/gui/print.c:3504
+msgid "Memo"
+msgstr "Noto"
+
+#: ../src/calendar/gui/print.c:3560
 msgid "Attendees: "
 msgstr "Alestantoj: "
 
-#: ../calendar/gui/print.c:3590
+#: ../src/calendar/gui/print.c:3604
 #, c-format
 msgid "Status: %s"
 msgstr "Stato: %s"
 
-#: ../calendar/gui/print.c:3606
+#: ../src/calendar/gui/print.c:3620
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritato: %s"
 
-#: ../calendar/gui/print.c:3624
+#: ../src/calendar/gui/print.c:3638
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procento de kompletigo: %i"
 
-#: ../calendar/gui/print.c:3638
+#: ../src/calendar/gui/print.c:3652
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3652
+#: ../src/calendar/gui/print.c:3666
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorioj: %s"
 
-#: ../calendar/gui/print.c:3663
+#: ../src/calendar/gui/print.c:3677
 msgid "Contacts: "
 msgstr "Kontaktoj: "
 
-#: ../calendar/gui/tasktypes.xml.h:12
+#: ../src/calendar/gui/tasktypes.xml.in.h:12
 msgid "In progress"
 msgstr "Farate"
 
-#: ../calendar/gui/tasktypes.xml.h:25
+#: ../src/calendar/gui/tasktypes.xml.in.h:25
 #, no-c-format
 msgid "% Completed"
 msgstr "% plenumite"
 
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/filtertypes.xml.in.h:31
-#: ../mail/searchtypes.xml.in.h:33 ../mail/vfoldertypes.xml.in.h:33
+#: ../src/calendar/gui/tasktypes.xml.in.h:26
+#: ../src/mail/filtertypes.xml.in.h:31 ../src/mail/searchtypes.xml.in.h:33
+#: ../src/mail/vfoldertypes.xml.in.h:33
 msgid "is greater than"
 msgstr "pli granda ol"
 
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/filtertypes.xml.in.h:32
-#: ../mail/searchtypes.xml.in.h:34 ../mail/vfoldertypes.xml.in.h:34
+#: ../src/calendar/gui/tasktypes.xml.in.h:27
+#: ../src/mail/filtertypes.xml.in.h:32 ../src/mail/searchtypes.xml.in.h:34
+#: ../src/mail/vfoldertypes.xml.in.h:34
 msgid "is less than"
 msgstr "pli malgranda ol"
 
-#: ../calendar/importers/icalendar-importer.c:77
+#: ../src/calendar/importers/icalendar-importer.c:76
 msgid "Appointments and Meetings"
 msgstr "Rendevuoj kaj kunsidoj"
 
-#: ../calendar/importers/icalendar-importer.c:452
-#: ../calendar/importers/icalendar-importer.c:891
+#: ../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/calendar/e-cal-shell-view-actions.c:178
+msgid "New Calendar"
+msgstr "Nova kalendaro"
+
+#: ../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/calendar/e-task-shell-view-actions.c:202
+msgid "New Task List"
+msgstr "Nova tasklisto"
+
+#: ../src/calendar/importers/icalendar-importer.c:351
+#| msgid "Create a new calendar"
+msgid "Cre_ate new calendar"
+msgstr "_Krei novan kalendaron"
+
+#: ../src/calendar/importers/icalendar-importer.c:355
+#| msgid "Create a new task list"
+msgid "Cre_ate new task list"
+msgstr "_Krei novan taskliston"
+
+#: ../src/calendar/importers/icalendar-importer.c:501
+#: ../src/calendar/importers/icalendar-importer.c:944
 msgid "Opening calendar"
 msgstr "Malfermante kalendaron"
 
-#: ../calendar/importers/icalendar-importer.c:600
+#: ../src/calendar/importers/icalendar-importer.c:652
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar-dosieroj (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:601
+#: ../src/calendar/importers/icalendar-importer.c:653
 msgid "Evolution iCalendar importer"
 msgstr "Evolucio-iCalendar-enportilo"
 
-#: ../calendar/importers/icalendar-importer.c:693
+#: ../src/calendar/importers/icalendar-importer.c:745
 msgid "Reminder!"
 msgstr "Memorigilo!"
 
-#: ../calendar/importers/icalendar-importer.c:777
+#: ../src/calendar/importers/icalendar-importer.c:830
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar-dosieroj (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:778
+#: ../src/calendar/importers/icalendar-importer.c:831
 msgid "Evolution vCalendar importer"
 msgstr "Evolucio-vCalendar-enportilo"
 
-#: ../calendar/importers/icalendar-importer.c:1055
+#: ../src/calendar/importers/icalendar-importer.c:1107
 msgid "Calendar Events"
 msgstr "Kalendara-eventoj"
 
-#: ../calendar/importers/icalendar-importer.c:1098
-msgid "Gnome Calendar"
-msgstr "Gnomo Kalendaro"
+#: ../src/calendar/importers/icalendar-importer.c:1150
+#| msgid "New Calendar"
+msgid "GNOME Calendar"
+msgstr "GNOME-kalendaro"
 
-#: ../calendar/importers/icalendar-importer.c:1099
+#: ../src/calendar/importers/icalendar-importer.c:1151
 msgid "Evolution Calendar intelligent importer"
 msgstr "Inteligenta enportilo de Evolucio-Kalendaro"
 
-#: ../calendar/importers/icalendar-importer.c:1170
-#: ../calendar/importers/icalendar-importer.c:1484
+#: ../src/calendar/importers/icalendar-importer.c:1222
+#: ../src/calendar/importers/icalendar-importer.c:1536
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Kunsido"
 
-#: ../calendar/importers/icalendar-importer.c:1170
-#: ../calendar/importers/icalendar-importer.c:1484
+#: ../src/calendar/importers/icalendar-importer.c:1222
+#: ../src/calendar/importers/icalendar-importer.c:1536
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Evento"
 
-#: ../calendar/importers/icalendar-importer.c:1173
-#: ../calendar/importers/icalendar-importer.c:1485
+#: ../src/calendar/importers/icalendar-importer.c:1225
+#: ../src/calendar/importers/icalendar-importer.c:1537
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Tasko"
 
-#: ../calendar/importers/icalendar-importer.c:1176
-#: ../calendar/importers/icalendar-importer.c:1486
+#: ../src/calendar/importers/icalendar-importer.c:1228
+#: ../src/calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Noto"
 
-#: ../calendar/importers/icalendar-importer.c:1185
+#: ../src/calendar/importers/icalendar-importer.c:1237
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "havas rikurojn"
 
-#: ../calendar/importers/icalendar-importer.c:1190
+#: ../src/calendar/importers/icalendar-importer.c:1242
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "estas ekzemplo"
 
-#: ../calendar/importers/icalendar-importer.c:1195
+#: ../src/calendar/importers/icalendar-importer.c:1247
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "havas memorigaĵojn"
 
-#: ../calendar/importers/icalendar-importer.c:1200
+#: ../src/calendar/importers/icalendar-importer.c:1252
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "havas aldonaĵojn"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1213
+#: ../src/calendar/importers/icalendar-importer.c:1265
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Publike"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1216
+#: ../src/calendar/importers/icalendar-importer.c:1268
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Private"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1219
+#: ../src/calendar/importers/icalendar-importer.c:1271
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Konfidence"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1223
+#: ../src/calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Kategoriado"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1228
-#: ../calendar/importers/icalendar-importer.c:1528
+#. Translators: Column header for a component summary
+#: ../src/calendar/importers/icalendar-importer.c:1280
+#: ../src/calendar/importers/icalendar-importer.c:1580
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Resumo"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1234
+#: ../src/calendar/importers/icalendar-importer.c:1286
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Loko"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1242
-#: ../calendar/importers/icalendar-importer.c:1523
+#. Translators: Column header for a component start date/time
+#: ../src/calendar/importers/icalendar-importer.c:1294
+#: ../src/calendar/importers/icalendar-importer.c:1575
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Komenco"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1253
+#: ../src/calendar/importers/icalendar-importer.c:1305
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Limdato"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1265
+#: ../src/calendar/importers/icalendar-importer.c:1317
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Fino"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1275
+#: ../src/calendar/importers/icalendar-importer.c:1327
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Kategorioj"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1299
+#: ../src/calendar/importers/icalendar-importer.c:1351
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Plenumite"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1307
+#: ../src/calendar/importers/icalendar-importer.c:1359
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1318
-#: ../calendar/importers/icalendar-importer.c:1321
+#: ../src/calendar/importers/icalendar-importer.c:1370
+#: ../src/calendar/importers/icalendar-importer.c:1373
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organizilo"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1341
-#: ../calendar/importers/icalendar-importer.c:1344
+#: ../src/calendar/importers/icalendar-importer.c:1393
+#: ../src/calendar/importers/icalendar-importer.c:1396
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Alestantoj"
 
-#: ../calendar/importers/icalendar-importer.c:1358
+#: ../src/calendar/importers/icalendar-importer.c:1410
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Priskribo"
 
-#: ../calendar/importers/icalendar-importer.c:1518
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../src/calendar/importers/icalendar-importer.c:1570
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Tipo"
@@ -5761,1842 +9548,1831 @@ msgstr "Tipo"
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: ../calendar/zones.h:25
+#: ../src/calendar/zones.h:25
 msgid "Africa/Abidjan"
 msgstr "Afriko/Abiĝano"
 
-#: ../calendar/zones.h:26
+#: ../src/calendar/zones.h:26
 msgid "Africa/Accra"
 msgstr "Afriko/Akrao"
 
-#: ../calendar/zones.h:27
+#: ../src/calendar/zones.h:27
 msgid "Africa/Addis_Ababa"
 msgstr "Afriko/Adis-Abebo"
 
-#: ../calendar/zones.h:28
+#: ../src/calendar/zones.h:28
 msgid "Africa/Algiers"
 msgstr "Afriko/Alĝero"
 
-#: ../calendar/zones.h:29
+#: ../src/calendar/zones.h:29
 msgid "Africa/Asmera"
 msgstr "Afriko/Asmaro"
 
-#: ../calendar/zones.h:30
+#: ../src/calendar/zones.h:30
 msgid "Africa/Bamako"
 msgstr "Afriko/Bamako"
 
-#: ../calendar/zones.h:31
+#: ../src/calendar/zones.h:31
 msgid "Africa/Bangui"
 msgstr "Afriko/Bangio"
 
-#: ../calendar/zones.h:32
+#: ../src/calendar/zones.h:32
 msgid "Africa/Banjul"
 msgstr "Afriko/Banĵulo"
 
-#: ../calendar/zones.h:33
+#: ../src/calendar/zones.h:33
 msgid "Africa/Bissau"
 msgstr "Afriko/Bisaŭo"
 
-#: ../calendar/zones.h:34
+#: ../src/calendar/zones.h:34
 msgid "Africa/Blantyre"
 msgstr "Afriko/Blantyre"
 
-#: ../calendar/zones.h:35
+#: ../src/calendar/zones.h:35
 msgid "Africa/Brazzaville"
 msgstr "Afriko/Brazavilo"
 
-#: ../calendar/zones.h:36
+#: ../src/calendar/zones.h:36
 msgid "Africa/Bujumbura"
 msgstr "Afriko/Buĵumburo"
 
-#: ../calendar/zones.h:37
+#: ../src/calendar/zones.h:37
 msgid "Africa/Cairo"
 msgstr "Afriko/Kairo"
 
-#: ../calendar/zones.h:38
+#: ../src/calendar/zones.h:38
 msgid "Africa/Casablanca"
 msgstr "Afriko/Kazablanko"
 
-#: ../calendar/zones.h:39
+#: ../src/calendar/zones.h:39
 msgid "Africa/Ceuta"
 msgstr "Afriko/Ceŭto"
 
-#: ../calendar/zones.h:40
+#: ../src/calendar/zones.h:40
 msgid "Africa/Conakry"
 msgstr "Afriko/Konakrio"
 
-#: ../calendar/zones.h:41
+#: ../src/calendar/zones.h:41
 msgid "Africa/Dakar"
 msgstr "Afriko/Dakaro"
 
-#: ../calendar/zones.h:42
+#: ../src/calendar/zones.h:42
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afriko/Daresalamo"
 
-#: ../calendar/zones.h:43
+#: ../src/calendar/zones.h:43
 msgid "Africa/Djibouti"
 msgstr "Afriko/Ĝibutio"
 
-#: ../calendar/zones.h:44
+#: ../src/calendar/zones.h:44
 msgid "Africa/Douala"
 msgstr "Afriko/Dualao"
 
-#: ../calendar/zones.h:45
+#: ../src/calendar/zones.h:45
 msgid "Africa/El_Aaiun"
 msgstr "Afriko/Ajuno"
 
-#: ../calendar/zones.h:46
+#: ../src/calendar/zones.h:46
 msgid "Africa/Freetown"
 msgstr "Afriko/Fritaŭno"
 
-#: ../calendar/zones.h:47
+#: ../src/calendar/zones.h:47
 msgid "Africa/Gaborone"
 msgstr "Afriko/Gaborono"
 
-#: ../calendar/zones.h:48
+#: ../src/calendar/zones.h:48
 msgid "Africa/Harare"
 msgstr "Afriko/Harareo"
 
-#: ../calendar/zones.h:49
+#: ../src/calendar/zones.h:49
 msgid "Africa/Johannesburg"
 msgstr "Afriko/Johanesburgo"
 
-#: ../calendar/zones.h:50
+#: ../src/calendar/zones.h:50
 msgid "Africa/Kampala"
 msgstr "Afriko/Kampalo"
 
-#: ../calendar/zones.h:51
+#: ../src/calendar/zones.h:51
 msgid "Africa/Khartoum"
 msgstr "Afriko/Ĥartumo"
 
-#: ../calendar/zones.h:52
+#: ../src/calendar/zones.h:52
 msgid "Africa/Kigali"
 msgstr "Afriko/Kigalo"
 
-#: ../calendar/zones.h:53
+#: ../src/calendar/zones.h:53
 msgid "Africa/Kinshasa"
 msgstr "Afriko/Kinŝaso"
 
-#: ../calendar/zones.h:54
+#: ../src/calendar/zones.h:54
 msgid "Africa/Lagos"
 msgstr "Afriko/Lagoso"
 
-#: ../calendar/zones.h:55
+#: ../src/calendar/zones.h:55
 msgid "Africa/Libreville"
 msgstr "Afriko/Librevilo"
 
-#: ../calendar/zones.h:56
+#: ../src/calendar/zones.h:56
 msgid "Africa/Lome"
 msgstr "Afriko/Lomeo"
 
-#: ../calendar/zones.h:57
+#: ../src/calendar/zones.h:57
 msgid "Africa/Luanda"
 msgstr "Afriko/Luando"
 
-#: ../calendar/zones.h:58
+#: ../src/calendar/zones.h:58
 msgid "Africa/Lubumbashi"
 msgstr "Afriko/Lubumbaŝo"
 
-#: ../calendar/zones.h:59
+#: ../src/calendar/zones.h:59
 msgid "Africa/Lusaka"
 msgstr "Afriko/Lusako"
 
-#: ../calendar/zones.h:60
+#: ../src/calendar/zones.h:60
 msgid "Africa/Malabo"
 msgstr "Afriko/Malabo"
 
-#: ../calendar/zones.h:61
+#: ../src/calendar/zones.h:61
 msgid "Africa/Maputo"
 msgstr "Afriko/Maputo"
 
-#: ../calendar/zones.h:62
+#: ../src/calendar/zones.h:62
 msgid "Africa/Maseru"
 msgstr "Afriko/Maseruo"
 
-#: ../calendar/zones.h:63
+#: ../src/calendar/zones.h:63
 msgid "Africa/Mbabane"
 msgstr "Afriko/Mbabano"
 
-#: ../calendar/zones.h:64
+#: ../src/calendar/zones.h:64
 msgid "Africa/Mogadishu"
 msgstr "Afriko/Mogadiŝo"
 
-#: ../calendar/zones.h:65
+#: ../src/calendar/zones.h:65
 msgid "Africa/Monrovia"
 msgstr "Afriko/Monrovio"
 
-#: ../calendar/zones.h:66
+#: ../src/calendar/zones.h:66
 msgid "Africa/Nairobi"
 msgstr "Afriko/Najrobo"
 
-#: ../calendar/zones.h:67
+#: ../src/calendar/zones.h:67
 msgid "Africa/Ndjamena"
 msgstr "Afriko/Nĵameno"
 
-#: ../calendar/zones.h:68
+#: ../src/calendar/zones.h:68
 msgid "Africa/Niamey"
 msgstr "Afriko/Niameo"
 
-#: ../calendar/zones.h:69
+#: ../src/calendar/zones.h:69
 msgid "Africa/Nouakchott"
 msgstr "Afriko/Nuakŝoto"
 
-#: ../calendar/zones.h:70
+#: ../src/calendar/zones.h:70
 msgid "Africa/Ouagadougou"
 msgstr "Afriko/Uagaduguo"
 
-#: ../calendar/zones.h:71
+#: ../src/calendar/zones.h:71
 msgid "Africa/Porto-Novo"
 msgstr "Afriko/Porto-Novo"
 
-#: ../calendar/zones.h:72
+#: ../src/calendar/zones.h:72
 msgid "Africa/Sao_Tome"
 msgstr "Afriko/Sao_Tomeo"
 
-#: ../calendar/zones.h:73
+#: ../src/calendar/zones.h:73
 msgid "Africa/Timbuktu"
 msgstr "Afriko/Timbuktuo"
 
-#: ../calendar/zones.h:74
+#: ../src/calendar/zones.h:74
 msgid "Africa/Tripoli"
 msgstr "Afriko/Tripolo"
 
-#: ../calendar/zones.h:75
+#: ../src/calendar/zones.h:75
 msgid "Africa/Tunis"
 msgstr "Afriko/Tunizo"
 
-#: ../calendar/zones.h:76
+#: ../src/calendar/zones.h:76
 msgid "Africa/Windhoek"
 msgstr "Afriko/Vindhuko"
 
-#: ../calendar/zones.h:77
+#: ../src/calendar/zones.h:77
 msgid "America/Adak"
 msgstr "Ameriko/Adako"
 
-#: ../calendar/zones.h:78
+#: ../src/calendar/zones.h:78
 msgid "America/Anchorage"
 msgstr "Ameriko/Anchorage"
 
-#: ../calendar/zones.h:79
+#: ../src/calendar/zones.h:79
 msgid "America/Anguilla"
 msgstr "Ameriko/Angvilo"
 
-#: ../calendar/zones.h:80
+#: ../src/calendar/zones.h:80
 msgid "America/Antigua"
 msgstr "Ameriko/Antigvo"
 
-#: ../calendar/zones.h:81
+#: ../src/calendar/zones.h:81
 msgid "America/Araguaina"
 msgstr "Ameriko/Araguaína"
 
-#: ../calendar/zones.h:82
+#: ../src/calendar/zones.h:82
 msgid "America/Aruba"
 msgstr "Ameriko/Arubo"
 
-#: ../calendar/zones.h:83
+#: ../src/calendar/zones.h:83
 msgid "America/Asuncion"
 msgstr "Ameriko/Asunciono"
 
-#: ../calendar/zones.h:84
+#: ../src/calendar/zones.h:84
 msgid "America/Barbados"
 msgstr "Ameriko/Barbado"
 
-#: ../calendar/zones.h:85
+#: ../src/calendar/zones.h:85
 msgid "America/Belem"
 msgstr "Ameriko/Belemo"
 
-#: ../calendar/zones.h:86
+#: ../src/calendar/zones.h:86
 msgid "America/Belize"
 msgstr "Ameriko/Belizo"
 
-#: ../calendar/zones.h:87
+#: ../src/calendar/zones.h:87
 msgid "America/Boa_Vista"
 msgstr "Ameriko/Boa_Visto"
 
-#: ../calendar/zones.h:88
+#: ../src/calendar/zones.h:88
 msgid "America/Bogota"
 msgstr "Ameriko/Bogoto"
 
-#: ../calendar/zones.h:89
+#: ../src/calendar/zones.h:89
 msgid "America/Boise"
 msgstr "Ameriko/Boiso"
 
-#: ../calendar/zones.h:90
+#: ../src/calendar/zones.h:90
 msgid "America/Buenos_Aires"
 msgstr "Ameriko/Bonaero"
 
-#: ../calendar/zones.h:91
+#: ../src/calendar/zones.h:91
 msgid "America/Cambridge_Bay"
 msgstr "Ameriko/Cambridge_Bay"
 
-#: ../calendar/zones.h:92
+#: ../src/calendar/zones.h:92
 msgid "America/Cancun"
 msgstr "Ameriko/Kankuno"
 
-#: ../calendar/zones.h:93
+#: ../src/calendar/zones.h:93
 msgid "America/Caracas"
 msgstr "Ameriko/Karakaso"
 
-#: ../calendar/zones.h:94
+#: ../src/calendar/zones.h:94
 msgid "America/Catamarca"
 msgstr "Ameriko/Katamarko"
 
-#: ../calendar/zones.h:95
+#: ../src/calendar/zones.h:95
 msgid "America/Cayenne"
 msgstr "Ameriko/Kajeno"
 
-#: ../calendar/zones.h:96
+#: ../src/calendar/zones.h:96
 msgid "America/Cayman"
 msgstr "Ameriko/Kajmano"
 
-#: ../calendar/zones.h:97
+#: ../src/calendar/zones.h:97
 msgid "America/Chicago"
 msgstr "Ameriko/Ĉikago"
 
-#: ../calendar/zones.h:98
+#: ../src/calendar/zones.h:98
 msgid "America/Chihuahua"
 msgstr "Ameriko/Ĉiuaŭo"
 
-#: ../calendar/zones.h:99
+#: ../src/calendar/zones.h:99
 msgid "America/Cordoba"
 msgstr "Ameriko/Kordobo"
 
-#: ../calendar/zones.h:100
+#: ../src/calendar/zones.h:100
 msgid "America/Costa_Rica"
 msgstr "Ameriko/Kostariko"
 
-#: ../calendar/zones.h:101
+#: ../src/calendar/zones.h:101
 msgid "America/Cuiaba"
 msgstr "Ameriko/Cuiabá"
 
-#: ../calendar/zones.h:102
+#: ../src/calendar/zones.h:102
 msgid "America/Curacao"
 msgstr "Ameriko/Kuracao"
 
-#: ../calendar/zones.h:103
+#: ../src/calendar/zones.h:103
 msgid "America/Danmarkshavn"
 msgstr "Ameriko/Danmarkshavn"
 
-#: ../calendar/zones.h:104
+#: ../src/calendar/zones.h:104
 msgid "America/Dawson"
 msgstr "Ameriko/Dawson"
 
-#: ../calendar/zones.h:105
+#: ../src/calendar/zones.h:105
 msgid "America/Dawson_Creek"
 msgstr "Ameriko/Dawson_Creek"
 
-#: ../calendar/zones.h:106
+#: ../src/calendar/zones.h:106
 msgid "America/Denver"
 msgstr "Ameriko/Denvero"
 
-#: ../calendar/zones.h:107
+#: ../src/calendar/zones.h:107
 msgid "America/Detroit"
 msgstr "Ameriko/Detrojto"
 
-#: ../calendar/zones.h:108
+#: ../src/calendar/zones.h:108
 msgid "America/Dominica"
 msgstr "Ameriko/Dominiko"
 
-#: ../calendar/zones.h:109
+#: ../src/calendar/zones.h:109
 msgid "America/Edmonton"
 msgstr "Ameriko/Edmontono"
 
-#: ../calendar/zones.h:110
+#: ../src/calendar/zones.h:110
 msgid "America/Eirunepe"
 msgstr "Ameriko/Ejrunepo"
 
-#: ../calendar/zones.h:111
+#: ../src/calendar/zones.h:111
 msgid "America/El_Salvador"
 msgstr "Ameriko/Salvadoro"
 
-#: ../calendar/zones.h:112
+#: ../src/calendar/zones.h:112
 msgid "America/Fortaleza"
 msgstr "Ameriko/Fortalezo"
 
-#: ../calendar/zones.h:113
+#: ../src/calendar/zones.h:113
 msgid "America/Glace_Bay"
 msgstr "Ameriko/Glace_Bay"
 
-#: ../calendar/zones.h:114
+#: ../src/calendar/zones.h:114
 msgid "America/Godthab"
 msgstr "Ameriko/Nuko"
 
-#: ../calendar/zones.h:115
+#: ../src/calendar/zones.h:115
 msgid "America/Goose_Bay"
 msgstr "Ameriko/Goose_Bay"
 
-#: ../calendar/zones.h:116
+#: ../src/calendar/zones.h:116
 msgid "America/Grand_Turk"
 msgstr "Ameriko/Grand_Turk"
 
-#: ../calendar/zones.h:117
+#: ../src/calendar/zones.h:117
 msgid "America/Grenada"
 msgstr "Ameriko/Grenado"
 
-#: ../calendar/zones.h:118
+#: ../src/calendar/zones.h:118
 msgid "America/Guadeloupe"
 msgstr "Ameriko/Gvadelupo"
 
-#: ../calendar/zones.h:119
+#: ../src/calendar/zones.h:119
 msgid "America/Guatemala"
 msgstr "Ameriko/Gvatemalo"
 
-#: ../calendar/zones.h:120
+#: ../src/calendar/zones.h:120
 msgid "America/Guayaquil"
 msgstr "Ameriko/Guajakilo"
 
-#: ../calendar/zones.h:121
+#: ../src/calendar/zones.h:121
 msgid "America/Guyana"
 msgstr "Ameriko/Gujano"
 
-#: ../calendar/zones.h:122
+#: ../src/calendar/zones.h:122
 msgid "America/Halifax"
 msgstr "Ameriko/Halifax"
 
-#: ../calendar/zones.h:123
+#: ../src/calendar/zones.h:123
 msgid "America/Havana"
 msgstr "Ameriko/Havano"
 
-#: ../calendar/zones.h:124
+#: ../src/calendar/zones.h:124
 msgid "America/Hermosillo"
 msgstr "Ameriko/Hermosillo"
 
-#: ../calendar/zones.h:125
+#: ../src/calendar/zones.h:125
 msgid "America/Indiana/Indianapolis"
 msgstr "Ameriko/Indianao/Indianapolis"
 
-#: ../calendar/zones.h:126
+#: ../src/calendar/zones.h:126
 msgid "America/Indiana/Knox"
 msgstr "Ameriko/Indianao/Knox"
 
-#: ../calendar/zones.h:127
+#: ../src/calendar/zones.h:127
 msgid "America/Indiana/Marengo"
 msgstr "Ameriko/Indianao/Marengo"
 
-#: ../calendar/zones.h:128
+#: ../src/calendar/zones.h:128
 msgid "America/Indiana/Vevay"
 msgstr "Ameriko/Indianao/Vevay"
 
-#: ../calendar/zones.h:129
+#: ../src/calendar/zones.h:129
 msgid "America/Indianapolis"
 msgstr "Ameriko/Indianapolis"
 
-#: ../calendar/zones.h:130
+#: ../src/calendar/zones.h:130
 msgid "America/Inuvik"
 msgstr "Ameriko/Inuviko"
 
-#: ../calendar/zones.h:131
+#: ../src/calendar/zones.h:131
 msgid "America/Iqaluit"
 msgstr "Ameriko/Ikaluito"
 
-#: ../calendar/zones.h:132
+#: ../src/calendar/zones.h:132
 msgid "America/Jamaica"
 msgstr "Ameriko/Jamajko"
 
-#: ../calendar/zones.h:133
+#: ../src/calendar/zones.h:133
 msgid "America/Jujuy"
 msgstr "Ameriko/Jujuy"
 
-#: ../calendar/zones.h:134
+#: ../src/calendar/zones.h:134
 msgid "America/Juneau"
 msgstr "Ameriko/Juneau"
 
-#: ../calendar/zones.h:135
+#: ../src/calendar/zones.h:135
 msgid "America/Kentucky/Louisville"
 msgstr "Ameriko/Kentukio/Louisville"
 
-#: ../calendar/zones.h:136
+#: ../src/calendar/zones.h:136
 msgid "America/Kentucky/Monticello"
 msgstr "Ameriko/Kentukio/Monticello"
 
-#: ../calendar/zones.h:137
+#: ../src/calendar/zones.h:137
 msgid "America/La_Paz"
 msgstr "Ameriko/La-Pazo"
 
-#: ../calendar/zones.h:138
+#: ../src/calendar/zones.h:138
 msgid "America/Lima"
 msgstr "Ameriko/Limo"
 
-#: ../calendar/zones.h:139
+#: ../src/calendar/zones.h:139
 msgid "America/Los_Angeles"
 msgstr "Ameriko/Los-Anĝeleso"
 
-#: ../calendar/zones.h:140
+#: ../src/calendar/zones.h:140
 msgid "America/Louisville"
 msgstr "Ameriko/Louisville"
 
-#: ../calendar/zones.h:141
+#: ../src/calendar/zones.h:141
 msgid "America/Maceio"
 msgstr "Ameriko/Maceió"
 
-#: ../calendar/zones.h:142
+#: ../src/calendar/zones.h:142
 msgid "America/Managua"
 msgstr "Ameriko/Managvo"
 
-#: ../calendar/zones.h:143
+#: ../src/calendar/zones.h:143
 msgid "America/Manaus"
 msgstr "Ameriko/Manaŭo"
 
-#: ../calendar/zones.h:144
+#: ../src/calendar/zones.h:144
 msgid "America/Martinique"
 msgstr "Ameriko/Martiniko"
 
-#: ../calendar/zones.h:145
+#: ../src/calendar/zones.h:145
 msgid "America/Mazatlan"
 msgstr "Ameriko/Mazatlano"
 
-#: ../calendar/zones.h:146
+#: ../src/calendar/zones.h:146
 msgid "America/Mendoza"
 msgstr "Ameriko/Mendozo"
 
-#: ../calendar/zones.h:147
+#: ../src/calendar/zones.h:147
 msgid "America/Menominee"
 msgstr "Ameriko/Menominee"
 
-#: ../calendar/zones.h:148
+#: ../src/calendar/zones.h:148
 msgid "America/Merida"
 msgstr "Ameriko/Merida"
 
-#: ../calendar/zones.h:149
+#: ../src/calendar/zones.h:149
 msgid "America/Mexico_City"
 msgstr "Ameriko/Meksikurbo"
 
-#: ../calendar/zones.h:150
+#: ../src/calendar/zones.h:150
 msgid "America/Miquelon"
 msgstr "Ameriko/Miquelon"
 
-#: ../calendar/zones.h:151
+#: ../src/calendar/zones.h:151
 msgid "America/Monterrey"
 msgstr "Ameriko/Monterejo"
 
-#: ../calendar/zones.h:152
+#: ../src/calendar/zones.h:152
 msgid "America/Montevideo"
 msgstr "Ameriko/Montevideo"
 
-#: ../calendar/zones.h:153
+#: ../src/calendar/zones.h:153
 msgid "America/Montreal"
 msgstr "Ameriko/Montrealo"
 
-#: ../calendar/zones.h:154
+#: ../src/calendar/zones.h:154
 msgid "America/Montserrat"
 msgstr "Ameriko/Moncerato"
 
-#: ../calendar/zones.h:155
+#: ../src/calendar/zones.h:155
 msgid "America/Nassau"
 msgstr "Ameriko/Nassau"
 
-#: ../calendar/zones.h:156
+#: ../src/calendar/zones.h:156
 msgid "America/New_York"
 msgstr "Ameriko/Novjorko"
 
-#: ../calendar/zones.h:157
+#: ../src/calendar/zones.h:157
 msgid "America/Nipigon"
 msgstr "Ameriko/Nipigono"
 
-#: ../calendar/zones.h:158
+#: ../src/calendar/zones.h:158
 msgid "America/Nome"
 msgstr "Ameriko/Nome"
 
-#: ../calendar/zones.h:159
+#: ../src/calendar/zones.h:159
 msgid "America/Noronha"
 msgstr "Ameriko/Noronha"
 
-#: ../calendar/zones.h:160
+#: ../src/calendar/zones.h:160
 msgid "America/North_Dakota/Center"
 msgstr "Ameriko/Norda_Dakoto/Centro"
 
-#: ../calendar/zones.h:161
+#: ../src/calendar/zones.h:161
 msgid "America/Panama"
 msgstr "Ameriko/Panamo"
 
-#: ../calendar/zones.h:162
+#: ../src/calendar/zones.h:162
 msgid "America/Pangnirtung"
 msgstr "Ameriko/Pangnirtung"
 
-#: ../calendar/zones.h:163
+#: ../src/calendar/zones.h:163
 msgid "America/Paramaribo"
 msgstr "Ameriko/Paramaribo"
 
-#: ../calendar/zones.h:164
+#: ../src/calendar/zones.h:164
 msgid "America/Phoenix"
 msgstr "Ameriko/Fenikso"
 
-#: ../calendar/zones.h:165
+#: ../src/calendar/zones.h:165
 msgid "America/Port-au-Prince"
 msgstr "Ameriko/Portoprinco"
 
-#: ../calendar/zones.h:166
+#: ../src/calendar/zones.h:166
 msgid "America/Port_of_Spain"
 msgstr "Ameriko/Portospeno"
 
-#: ../calendar/zones.h:167
+#: ../src/calendar/zones.h:167
 msgid "America/Porto_Velho"
 msgstr "Ameriko/Porto_Velho"
 
-#: ../calendar/zones.h:168
+#: ../src/calendar/zones.h:168
 msgid "America/Puerto_Rico"
 msgstr "Ameriko/Porto-Riko"
 
-#: ../calendar/zones.h:169
+#: ../src/calendar/zones.h:169
 msgid "America/Rainy_River"
 msgstr "Ameriko/Rainy_River"
 
-#: ../calendar/zones.h:170
+#: ../src/calendar/zones.h:170
 msgid "America/Rankin_Inlet"
 msgstr "Ameriko/Rankin_Inlet"
 
-#: ../calendar/zones.h:171
+#: ../src/calendar/zones.h:171
 msgid "America/Recife"
 msgstr "Ameriko/Recifo"
 
-#: ../calendar/zones.h:172
+#: ../src/calendar/zones.h:172
 msgid "America/Regina"
 msgstr "Ameriko/Regina"
 
-#: ../calendar/zones.h:173
+#: ../src/calendar/zones.h:173
 msgid "America/Rio_Branco"
 msgstr "Ameriko/Rio_Branco"
 
-#: ../calendar/zones.h:174
+#: ../src/calendar/zones.h:174
 msgid "America/Rosario"
 msgstr "Ameriko/Rosario"
 
-#: ../calendar/zones.h:175
+#: ../src/calendar/zones.h:175
 msgid "America/Santiago"
 msgstr "Ameriko/Santiago"
 
-#: ../calendar/zones.h:176
+#: ../src/calendar/zones.h:176
 msgid "America/Santo_Domingo"
 msgstr "Ameriko/Sankta_Domingo"
 
-#: ../calendar/zones.h:177
+#: ../src/calendar/zones.h:177
 msgid "America/Sao_Paulo"
 msgstr "Ameriko/San-Paŭlo"
 
-#: ../calendar/zones.h:178
+#: ../src/calendar/zones.h:178
 msgid "America/Scoresbysund"
 msgstr "Ameriko/Scoresbysund"
 
-#: ../calendar/zones.h:179
+#: ../src/calendar/zones.h:179
 msgid "America/Shiprock"
 msgstr "Ameriko/Shiprock"
 
-#: ../calendar/zones.h:180
+#: ../src/calendar/zones.h:180
 msgid "America/St_Johns"
 msgstr "Ameriko/Santjonso"
 
-#: ../calendar/zones.h:181
+#: ../src/calendar/zones.h:181
 msgid "America/St_Kitts"
 msgstr "Ameriko/St_Kitts"
 
-#: ../calendar/zones.h:182
+#: ../src/calendar/zones.h:182
 msgid "America/St_Lucia"
 msgstr "Ameriko/Sankta_Lucio"
 
-#: ../calendar/zones.h:183
+#: ../src/calendar/zones.h:183
 msgid "America/St_Thomas"
 msgstr "Ameriko/St_Thomas"
 
-#: ../calendar/zones.h:184
+#: ../src/calendar/zones.h:184
 msgid "America/St_Vincent"
 msgstr "Ameriko/St_Vincent"
 
-#: ../calendar/zones.h:185
+#: ../src/calendar/zones.h:185
 msgid "America/Swift_Current"
 msgstr "Ameriko/Swift_Current"
 
-#: ../calendar/zones.h:186
+#: ../src/calendar/zones.h:186
 msgid "America/Tegucigalpa"
 msgstr "Ameriko/Tegucigalpo"
 
-#: ../calendar/zones.h:187
+#: ../src/calendar/zones.h:187
 msgid "America/Thule"
 msgstr "Ameriko/Qaanaaq"
 
-#: ../calendar/zones.h:188
+#: ../src/calendar/zones.h:188
 msgid "America/Thunder_Bay"
 msgstr "Ameriko/Thunder_Bay"
 
-#: ../calendar/zones.h:189
+#: ../src/calendar/zones.h:189
 msgid "America/Tijuana"
 msgstr "Ameriko/Tijuana"
 
-#: ../calendar/zones.h:190
+#: ../src/calendar/zones.h:190
 msgid "America/Tortola"
 msgstr "Ameriko/Tortola"
 
-#: ../calendar/zones.h:191
+#: ../src/calendar/zones.h:191
 msgid "America/Vancouver"
 msgstr "Ameriko/Vankuvero"
 
-#: ../calendar/zones.h:192
+#: ../src/calendar/zones.h:192
 msgid "America/Whitehorse"
 msgstr "Ameriko/Whitehorse"
 
-#: ../calendar/zones.h:193
+#: ../src/calendar/zones.h:193
 msgid "America/Winnipeg"
 msgstr "Ameriko/Vinipego"
 
-#: ../calendar/zones.h:194
+#: ../src/calendar/zones.h:194
 msgid "America/Yakutat"
 msgstr "Ameriko/Yakutat"
 
-#: ../calendar/zones.h:195
+#: ../src/calendar/zones.h:195
 msgid "America/Yellowknife"
 msgstr "Ameriko/Yellowknife"
 
-#: ../calendar/zones.h:196
+#: ../src/calendar/zones.h:196
 msgid "Antarctica/Casey"
 msgstr "Antarkto/Casey"
 
-#: ../calendar/zones.h:197
+#: ../src/calendar/zones.h:197
 msgid "Antarctica/Davis"
 msgstr "Antarkto/Davis"
 
-#: ../calendar/zones.h:198
+#: ../src/calendar/zones.h:198
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarkto/Dumont d'Urville"
 
-#: ../calendar/zones.h:199
+#: ../src/calendar/zones.h:199
 msgid "Antarctica/Mawson"
 msgstr "Antarkto/Mawson"
 
-#: ../calendar/zones.h:200
+#: ../src/calendar/zones.h:200
 msgid "Antarctica/McMurdo"
 msgstr "Antarkto/McMurdo"
 
-#: ../calendar/zones.h:201
+#: ../src/calendar/zones.h:201
 msgid "Antarctica/Palmer"
 msgstr "Antarkto/Palmer"
 
-#: ../calendar/zones.h:202
+#: ../src/calendar/zones.h:202
 msgid "Antarctica/South_Pole"
 msgstr "Antarkto/Suda_poluso"
 
-#: ../calendar/zones.h:203
+#: ../src/calendar/zones.h:203
 msgid "Antarctica/Syowa"
 msgstr "Antarkto/Syowa"
 
-#: ../calendar/zones.h:204
+#: ../src/calendar/zones.h:204
 msgid "Antarctica/Vostok"
 msgstr "Antarkto/Vostoko"
 
-#: ../calendar/zones.h:205
+#: ../src/calendar/zones.h:205
 msgid "Arctic/Longyearbyen"
 msgstr "Arkto/Longyearbyen"
 
-#: ../calendar/zones.h:206
+#: ../src/calendar/zones.h:206
 msgid "Asia/Aden"
 msgstr "Azio/Adeno"
 
-#: ../calendar/zones.h:207
+#: ../src/calendar/zones.h:207
 msgid "Asia/Almaty"
 msgstr "Azio/Almato"
 
-#: ../calendar/zones.h:208
+#: ../src/calendar/zones.h:208
 msgid "Asia/Amman"
 msgstr "Azio/Amano"
 
-#: ../calendar/zones.h:209
+#: ../src/calendar/zones.h:209
 msgid "Asia/Anadyr"
 msgstr "Azio/Anadiro"
 
-#: ../calendar/zones.h:210
+#: ../src/calendar/zones.h:210
 msgid "Asia/Aqtau"
 msgstr "Azio/Aqtau"
 
-#: ../calendar/zones.h:211
+#: ../src/calendar/zones.h:211
 msgid "Asia/Aqtobe"
 msgstr "Azio/Aqtobe"
 
-#: ../calendar/zones.h:212
+#: ../src/calendar/zones.h:212
 msgid "Asia/Ashgabat"
 msgstr "Azio/Aŝgabato"
 
-#: ../calendar/zones.h:213
+#: ../src/calendar/zones.h:213
 msgid "Asia/Baghdad"
 msgstr "Azio/Bagdado"
 
-#: ../calendar/zones.h:214
+#: ../src/calendar/zones.h:214
 msgid "Asia/Bahrain"
 msgstr "Azio/Barejno"
 
-#: ../calendar/zones.h:215
+#: ../src/calendar/zones.h:215
 msgid "Asia/Baku"
 msgstr "Azio/Bakuo"
 
-#: ../calendar/zones.h:216
+#: ../src/calendar/zones.h:216
 msgid "Asia/Bangkok"
 msgstr "Azio/Bankoko"
 
-#: ../calendar/zones.h:217
+#: ../src/calendar/zones.h:217
 msgid "Asia/Beirut"
 msgstr "Azio/Bejruto"
 
-#: ../calendar/zones.h:218
+#: ../src/calendar/zones.h:218
 msgid "Asia/Bishkek"
 msgstr "Azio/Biŝkeko"
 
-#: ../calendar/zones.h:219
+#: ../src/calendar/zones.h:219
 msgid "Asia/Brunei"
 msgstr "Azio/Brunejo"
 
-#: ../calendar/zones.h:220
+#: ../src/calendar/zones.h:220
 msgid "Asia/Calcutta"
 msgstr "Azio/Kolkato"
 
-#: ../calendar/zones.h:221
+#: ../src/calendar/zones.h:221
 msgid "Asia/Choibalsan"
 msgstr "Azio/Ĉoibalsano"
 
-#: ../calendar/zones.h:222
+#: ../src/calendar/zones.h:222
 msgid "Asia/Chongqing"
 msgstr "Azio/Ĉongĉingo"
 
-#: ../calendar/zones.h:223
+#: ../src/calendar/zones.h:223
 msgid "Asia/Colombo"
 msgstr "Azio/Kolombo"
 
-#: ../calendar/zones.h:224
+#: ../src/calendar/zones.h:224
 msgid "Asia/Damascus"
 msgstr "Azio/Damasko"
 
-#: ../calendar/zones.h:225
+#: ../src/calendar/zones.h:225
 msgid "Asia/Dhaka"
 msgstr "Azio/Dako"
 
-#: ../calendar/zones.h:226
+#: ../src/calendar/zones.h:226
 msgid "Asia/Dili"
 msgstr "Azio/Dilo"
 
-#: ../calendar/zones.h:227
+#: ../src/calendar/zones.h:227
 msgid "Asia/Dubai"
 msgstr "Azio/Dubajo"
 
-#: ../calendar/zones.h:228
+#: ../src/calendar/zones.h:228
 msgid "Asia/Dushanbe"
 msgstr "Azio/Duŝanbeo"
 
-#: ../calendar/zones.h:229
+#: ../src/calendar/zones.h:229
 msgid "Asia/Gaza"
 msgstr "Azio/Gazao"
 
-#: ../calendar/zones.h:230
+#: ../src/calendar/zones.h:230
 msgid "Asia/Harbin"
 msgstr "Azio/Harbino"
 
-#: ../calendar/zones.h:231
+#: ../src/calendar/zones.h:231
 msgid "Asia/Hong_Kong"
 msgstr "Azio/Honkongo"
 
-#: ../calendar/zones.h:232
+#: ../src/calendar/zones.h:232
 msgid "Asia/Hovd"
 msgstr "Azio/Hovd"
 
-#: ../calendar/zones.h:233
+#: ../src/calendar/zones.h:233
 msgid "Asia/Irkutsk"
 msgstr "Azio/Irkutsko"
 
-#: ../calendar/zones.h:234
+#: ../src/calendar/zones.h:234
 msgid "Asia/Istanbul"
 msgstr "Azio/Istanbulo"
 
-#: ../calendar/zones.h:235
+#: ../src/calendar/zones.h:235
 msgid "Asia/Jakarta"
 msgstr "Azio/Ĝakarto"
 
-#: ../calendar/zones.h:236
+#: ../src/calendar/zones.h:236
 msgid "Asia/Jayapura"
 msgstr "Azio/Jayapura"
 
-#: ../calendar/zones.h:237
+#: ../src/calendar/zones.h:237
 msgid "Asia/Jerusalem"
 msgstr "Azio/Jerusalemo"
 
-#: ../calendar/zones.h:238
+#: ../src/calendar/zones.h:238
 msgid "Asia/Kabul"
 msgstr "Azio/Kabulo"
 
-#: ../calendar/zones.h:239
+#: ../src/calendar/zones.h:239
 msgid "Asia/Kamchatka"
 msgstr "Azio/Kamĉatko"
 
-#: ../calendar/zones.h:240
+#: ../src/calendar/zones.h:240
 msgid "Asia/Karachi"
 msgstr "Azio/Karaĉo"
 
-#: ../calendar/zones.h:241
+#: ../src/calendar/zones.h:241
 msgid "Asia/Kashgar"
 msgstr "Azio/Kaŝgaro"
 
-#: ../calendar/zones.h:242
-msgid "Asia/Katmandu"
+#: ../src/calendar/zones.h:242
+#, fuzzy
+#| msgid "Asia/Katmandu"
+msgid "Asia/Kathmandu"
 msgstr "Azio/Katmanduo"
 
-#: ../calendar/zones.h:243
+#: ../src/calendar/zones.h:243
 msgid "Asia/Krasnoyarsk"
 msgstr "Azio/Krasnojarsko"
 
-#: ../calendar/zones.h:244
+#: ../src/calendar/zones.h:244
 msgid "Asia/Kuala_Lumpur"
 msgstr "Azio/Kuala-Lumpuro"
 
-#: ../calendar/zones.h:245
+#: ../src/calendar/zones.h:245
 msgid "Asia/Kuching"
 msgstr "Azio/Kuching"
 
-#: ../calendar/zones.h:246
+#: ../src/calendar/zones.h:246
 msgid "Asia/Kuwait"
 msgstr "Azio/Kuvajto"
 
-#: ../calendar/zones.h:247
+#: ../src/calendar/zones.h:247
 msgid "Asia/Macao"
 msgstr "Azio/Makao"
 
-#: ../calendar/zones.h:248
+#: ../src/calendar/zones.h:248
 msgid "Asia/Macau"
 msgstr "Azio/Makao"
 
-#: ../calendar/zones.h:249
+#: ../src/calendar/zones.h:249
 msgid "Asia/Magadan"
 msgstr "Azio/Magadano"
 
-#: ../calendar/zones.h:250
+#: ../src/calendar/zones.h:250
 msgid "Asia/Makassar"
 msgstr "Azio/Makassar"
 
-#: ../calendar/zones.h:251
+#: ../src/calendar/zones.h:251
 msgid "Asia/Manila"
 msgstr "Azio/Manilo"
 
-#: ../calendar/zones.h:252
+#: ../src/calendar/zones.h:252
 msgid "Asia/Muscat"
 msgstr "Azio/Maskato"
 
-#: ../calendar/zones.h:253
+#: ../src/calendar/zones.h:253
 msgid "Asia/Nicosia"
 msgstr "Azio/Nikozio"
 
-#: ../calendar/zones.h:254
+#: ../src/calendar/zones.h:254
 msgid "Asia/Novosibirsk"
 msgstr "Azio/Novosibirsko"
 
-#: ../calendar/zones.h:255
+#: ../src/calendar/zones.h:255
 msgid "Asia/Omsk"
 msgstr "Azio/Omsko"
 
-#: ../calendar/zones.h:256
+#: ../src/calendar/zones.h:256
 msgid "Asia/Oral"
 msgstr "Azio/Oral"
 
-#: ../calendar/zones.h:257
+#: ../src/calendar/zones.h:257
 msgid "Asia/Phnom_Penh"
 msgstr "Azio/Pnom-Peno"
 
-#: ../calendar/zones.h:258
+#: ../src/calendar/zones.h:258
 msgid "Asia/Pontianak"
 msgstr "Azio/Pontianak"
 
-#: ../calendar/zones.h:259
+#: ../src/calendar/zones.h:259
 msgid "Asia/Pyongyang"
 msgstr "Azio/Pjongjango"
 
-#: ../calendar/zones.h:260
+#: ../src/calendar/zones.h:260
 msgid "Asia/Qatar"
 msgstr "Azio/Kataro"
 
-#: ../calendar/zones.h:261
+#: ../src/calendar/zones.h:261
 msgid "Asia/Qyzylorda"
 msgstr "Azio/Qyzylorda"
 
-#: ../calendar/zones.h:262
+#: ../src/calendar/zones.h:262
 msgid "Asia/Rangoon"
 msgstr "Azio/Jangono"
 
-#: ../calendar/zones.h:263
+#: ../src/calendar/zones.h:263
 msgid "Asia/Riyadh"
 msgstr "Azio/Rijado"
 
-#: ../calendar/zones.h:264
+#: ../src/calendar/zones.h:264
 msgid "Asia/Saigon"
 msgstr "Azio/Ho-Ĉi-Min-urbo"
 
-#: ../calendar/zones.h:265
+#: ../src/calendar/zones.h:265
 msgid "Asia/Sakhalin"
 msgstr "Azio/Saĥaleno"
 
-#: ../calendar/zones.h:266
+#: ../src/calendar/zones.h:266
 msgid "Asia/Samarkand"
 msgstr "Azio/Samarkando"
 
-#: ../calendar/zones.h:267
+#: ../src/calendar/zones.h:267
 msgid "Asia/Seoul"
 msgstr "Azio/Seulo"
 
-#: ../calendar/zones.h:268
+#: ../src/calendar/zones.h:268
 msgid "Asia/Shanghai"
 msgstr "Azio/Ŝanhajo"
 
-#: ../calendar/zones.h:269
+#: ../src/calendar/zones.h:269
 msgid "Asia/Singapore"
 msgstr "Azio/Singapuro"
 
-#: ../calendar/zones.h:270
+#: ../src/calendar/zones.h:270
 msgid "Asia/Taipei"
 msgstr "Azio/Tajpeo"
 
-#: ../calendar/zones.h:271
+#: ../src/calendar/zones.h:271
 msgid "Asia/Tashkent"
 msgstr "Azio/Taŝkento"
 
-#: ../calendar/zones.h:272
+#: ../src/calendar/zones.h:272
 msgid "Asia/Tbilisi"
 msgstr "Azio/Tbiliso"
 
-#: ../calendar/zones.h:273
+#: ../src/calendar/zones.h:273
 msgid "Asia/Tehran"
 msgstr "Azio/Tehrano"
 
-#: ../calendar/zones.h:274
+#: ../src/calendar/zones.h:274
 msgid "Asia/Thimphu"
 msgstr "Azio/Timbuo"
 
-#: ../calendar/zones.h:275
+#: ../src/calendar/zones.h:275
 msgid "Asia/Tokyo"
 msgstr "Azio/Tokio"
 
-#: ../calendar/zones.h:276
+#: ../src/calendar/zones.h:276
 msgid "Asia/Ujung_Pandang"
 msgstr "Azio/Ujung_Pandang"
 
-#: ../calendar/zones.h:277
+#: ../src/calendar/zones.h:277
 msgid "Asia/Ulaanbaatar"
 msgstr "Azio/Ulaanbaataro"
 
-#: ../calendar/zones.h:278
+#: ../src/calendar/zones.h:278
 msgid "Asia/Urumqi"
 msgstr "Azio/Urumĉio"
 
-#: ../calendar/zones.h:279
+#: ../src/calendar/zones.h:279
 msgid "Asia/Vientiane"
 msgstr "Azio/Vjentiano"
 
-#: ../calendar/zones.h:280
+#: ../src/calendar/zones.h:280
 msgid "Asia/Vladivostok"
 msgstr "Azio/Vladivostok"
 
-#: ../calendar/zones.h:281
+#: ../src/calendar/zones.h:281
 msgid "Asia/Yakutsk"
 msgstr "Azio/Yakutsk"
 
-#: ../calendar/zones.h:282
+#: ../src/calendar/zones.h:282
 msgid "Asia/Yekaterinburg"
 msgstr "Azio/Jekaterinburgo"
 
-#: ../calendar/zones.h:283
+#: ../src/calendar/zones.h:283
 msgid "Asia/Yerevan"
 msgstr "Azio/Erevano"
 
-#: ../calendar/zones.h:284
+#: ../src/calendar/zones.h:284
 msgid "Atlantic/Azores"
 msgstr "Atlantiko/Acoroj"
 
-#: ../calendar/zones.h:285
+#: ../src/calendar/zones.h:285
 msgid "Atlantic/Bermuda"
 msgstr "Atlantiko/Bermudo"
 
-#: ../calendar/zones.h:286
+#: ../src/calendar/zones.h:286
 msgid "Atlantic/Canary"
 msgstr "Atlantiko/Kanarioj"
 
-#: ../calendar/zones.h:287
+#: ../src/calendar/zones.h:287
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantiko/Kabo-Verdo"
 
-#: ../calendar/zones.h:288
+#: ../src/calendar/zones.h:288
 msgid "Atlantic/Faeroe"
 msgstr "Atlantiko/Ferooj"
 
-#: ../calendar/zones.h:289
+#: ../src/calendar/zones.h:289
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantiko/Janmajeno"
 
-#: ../calendar/zones.h:290
+#: ../src/calendar/zones.h:290
 msgid "Atlantic/Madeira"
 msgstr "Atlantiko/Madejro"
 
-#: ../calendar/zones.h:291
+#: ../src/calendar/zones.h:291
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantiko/Rejkjaviko"
 
-#: ../calendar/zones.h:292
+#: ../src/calendar/zones.h:292
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantiko/Sud-Georgio"
 
-#: ../calendar/zones.h:293
+#: ../src/calendar/zones.h:293
 msgid "Atlantic/St_Helena"
 msgstr "Atlantiko/Sankta_Heleno"
 
-#: ../calendar/zones.h:294
+#: ../src/calendar/zones.h:294
 msgid "Atlantic/Stanley"
 msgstr "Atlantiko/Stanlejo"
 
-#: ../calendar/zones.h:295
+#: ../src/calendar/zones.h:295
 msgid "Australia/Adelaide"
 msgstr "Aŭstralio/Adelajdo"
 
-#: ../calendar/zones.h:296
+#: ../src/calendar/zones.h:296
 msgid "Australia/Brisbane"
 msgstr "Aŭstralio/Brisbano"
 
-#: ../calendar/zones.h:297
+#: ../src/calendar/zones.h:297
 msgid "Australia/Broken_Hill"
 msgstr "Aŭstralio/Broken_Hill"
 
-#: ../calendar/zones.h:298
+#: ../src/calendar/zones.h:298
 msgid "Australia/Darwin"
 msgstr "Aŭstralio/Darvino"
 
-#: ../calendar/zones.h:299
+#: ../src/calendar/zones.h:299
 msgid "Australia/Hobart"
 msgstr "Aŭstralio/Hobarto"
 
-#: ../calendar/zones.h:300
+#: ../src/calendar/zones.h:300
 msgid "Australia/Lindeman"
 msgstr "Aŭstralio/Lindemano"
 
-#: ../calendar/zones.h:301
+#: ../src/calendar/zones.h:301
 msgid "Australia/Lord_Howe"
 msgstr "Aŭstralio/Lord_Howe"
 
-#: ../calendar/zones.h:302
+#: ../src/calendar/zones.h:302
 msgid "Australia/Melbourne"
 msgstr "Aŭstralio/Melburno"
 
-#: ../calendar/zones.h:303
+#: ../src/calendar/zones.h:303
 msgid "Australia/Perth"
 msgstr "Aŭstralio/Perto"
 
-#: ../calendar/zones.h:304
+#: ../src/calendar/zones.h:304
 msgid "Australia/Sydney"
 msgstr "Aŭstralio/Sidnejo"
 
-#: ../calendar/zones.h:305
+#: ../src/calendar/zones.h:305
 msgid "Europe/Amsterdam"
 msgstr "Eŭropo/Amsterdamo"
 
-#: ../calendar/zones.h:306
+#: ../src/calendar/zones.h:306
 msgid "Europe/Andorra"
 msgstr "Eŭropo/Andoro"
 
-#: ../calendar/zones.h:307
+#: ../src/calendar/zones.h:307
 msgid "Europe/Athens"
 msgstr "Eŭropo/Ateno"
 
-#: ../calendar/zones.h:308
+#: ../src/calendar/zones.h:308
 msgid "Europe/Belfast"
 msgstr "Eŭropo/Belfasto"
 
-#: ../calendar/zones.h:309
+#: ../src/calendar/zones.h:309
 msgid "Europe/Belgrade"
 msgstr "Eŭropo/Beogrado"
 
-#: ../calendar/zones.h:310
+#: ../src/calendar/zones.h:310
 msgid "Europe/Berlin"
 msgstr "Eŭropo/Berlino"
 
-#: ../calendar/zones.h:311
+#: ../src/calendar/zones.h:311
 msgid "Europe/Bratislava"
 msgstr "Eŭropo/Bratislavo"
 
-#: ../calendar/zones.h:312
+#: ../src/calendar/zones.h:312
 msgid "Europe/Brussels"
 msgstr "Eŭropo/Bruselo"
 
-#: ../calendar/zones.h:313
+#: ../src/calendar/zones.h:313
 msgid "Europe/Bucharest"
 msgstr "Eŭropo/Bukareŝto"
 
-#: ../calendar/zones.h:314
+#: ../src/calendar/zones.h:314
 msgid "Europe/Budapest"
 msgstr "Eŭropo/Budapeŝto"
 
-#: ../calendar/zones.h:315
+#: ../src/calendar/zones.h:315
 msgid "Europe/Chisinau"
 msgstr "Eŭropo/Kiŝinevo"
 
-#: ../calendar/zones.h:316
+#: ../src/calendar/zones.h:316
 msgid "Europe/Copenhagen"
 msgstr "Eŭropo/Kopenhago"
 
-#: ../calendar/zones.h:317
+#: ../src/calendar/zones.h:317
 msgid "Europe/Dublin"
 msgstr "Eŭropo/Dublino"
 
-#: ../calendar/zones.h:318
+#: ../src/calendar/zones.h:318
 msgid "Europe/Gibraltar"
 msgstr "Eŭropo/Ĝibraltaro"
 
-#: ../calendar/zones.h:319
+#: ../src/calendar/zones.h:319
 msgid "Europe/Helsinki"
 msgstr "Eŭropo/Helsinko"
 
-#: ../calendar/zones.h:320
+#: ../src/calendar/zones.h:320
 msgid "Europe/Istanbul"
 msgstr "Eŭropo/Istanbulo"
 
-#: ../calendar/zones.h:321
+#: ../src/calendar/zones.h:321
 msgid "Europe/Kaliningrad"
 msgstr "Eŭropo/Kaliningrado"
 
-#: ../calendar/zones.h:322
+#: ../src/calendar/zones.h:322
 msgid "Europe/Kiev"
 msgstr "Eŭropo/Kievo"
 
-#: ../calendar/zones.h:323
+#: ../src/calendar/zones.h:323
 msgid "Europe/Lisbon"
 msgstr "Eŭropo/Lisbono"
 
-#: ../calendar/zones.h:324
+#: ../src/calendar/zones.h:324
 msgid "Europe/Ljubljana"
 msgstr "Eŭropo/Ljubljano"
 
-#: ../calendar/zones.h:325
+#: ../src/calendar/zones.h:325
 msgid "Europe/London"
 msgstr "Eŭropo/Londono"
 
-#: ../calendar/zones.h:326
+#: ../src/calendar/zones.h:326
 msgid "Europe/Luxembourg"
 msgstr "Eŭropo/Luksemburgo"
 
-#: ../calendar/zones.h:327
+#: ../src/calendar/zones.h:327
 msgid "Europe/Madrid"
 msgstr "Eŭropo/Madrido"
 
-#: ../calendar/zones.h:328
+#: ../src/calendar/zones.h:328
 msgid "Europe/Malta"
 msgstr "Eŭropo/Malto"
 
-#: ../calendar/zones.h:329
+#: ../src/calendar/zones.h:329
 msgid "Europe/Minsk"
 msgstr "Eŭropo/Minsko"
 
-#: ../calendar/zones.h:330
+#: ../src/calendar/zones.h:330
 msgid "Europe/Monaco"
 msgstr "Eŭropo/Monako"
 
-#: ../calendar/zones.h:331
+#: ../src/calendar/zones.h:331
 msgid "Europe/Moscow"
 msgstr "Eŭropo/Moskvo"
 
-#: ../calendar/zones.h:332
+#: ../src/calendar/zones.h:332
 msgid "Europe/Nicosia"
 msgstr "Eŭropo/Nicosia"
 
-#: ../calendar/zones.h:333
+#: ../src/calendar/zones.h:333
 msgid "Europe/Oslo"
 msgstr "Eŭropo/Oslo"
 
-#: ../calendar/zones.h:334
+#: ../src/calendar/zones.h:334
 msgid "Europe/Paris"
 msgstr "Eŭropo/Parizo"
 
-#: ../calendar/zones.h:335
+#: ../src/calendar/zones.h:335
 msgid "Europe/Prague"
 msgstr "Eŭropo/Prago"
 
-#: ../calendar/zones.h:336
+#: ../src/calendar/zones.h:336
 msgid "Europe/Riga"
 msgstr "Eŭropo/Rigo"
 
-#: ../calendar/zones.h:337
+#: ../src/calendar/zones.h:337
 msgid "Europe/Rome"
 msgstr "Eŭropo/Romo"
 
-#: ../calendar/zones.h:338
+#: ../src/calendar/zones.h:338
 msgid "Europe/Samara"
 msgstr "Eŭropo/Samara"
 
-#: ../calendar/zones.h:339
+#: ../src/calendar/zones.h:339
 msgid "Europe/San_Marino"
 msgstr "Eŭropo/San-Marino"
 
-#: ../calendar/zones.h:340
+#: ../src/calendar/zones.h:340
 msgid "Europe/Sarajevo"
 msgstr "Eŭropo/Sarajevo"
 
-#: ../calendar/zones.h:341
+#: ../src/calendar/zones.h:341
 msgid "Europe/Simferopol"
 msgstr "Eŭropo/Simferopolo"
 
-#: ../calendar/zones.h:342
+#: ../src/calendar/zones.h:342
 msgid "Europe/Skopje"
 msgstr "Eŭropo/Skopjo"
 
-#: ../calendar/zones.h:343
+#: ../src/calendar/zones.h:343
 msgid "Europe/Sofia"
 msgstr "Eŭropo/Sofio"
 
-#: ../calendar/zones.h:344
+#: ../src/calendar/zones.h:344
 msgid "Europe/Stockholm"
 msgstr "Eŭropo/Stokholmo"
 
-#: ../calendar/zones.h:345
+#: ../src/calendar/zones.h:345
 msgid "Europe/Tallinn"
 msgstr "Eŭropo/Talino"
 
-#: ../calendar/zones.h:346
+#: ../src/calendar/zones.h:346
 msgid "Europe/Tirane"
 msgstr "Eŭropo/Tirano"
 
-#: ../calendar/zones.h:347
+#: ../src/calendar/zones.h:347
 msgid "Europe/Uzhgorod"
 msgstr "Eŭropo/Uĵhorodo"
 
-#: ../calendar/zones.h:348
+#: ../src/calendar/zones.h:348
 msgid "Europe/Vaduz"
 msgstr "Eŭropo/Vaduzo"
 
-#: ../calendar/zones.h:349
+#: ../src/calendar/zones.h:349
 msgid "Europe/Vatican"
 msgstr "Eŭropo/Vatikano"
 
-#: ../calendar/zones.h:350
+#: ../src/calendar/zones.h:350
 msgid "Europe/Vienna"
 msgstr "Eŭropo/Vieno"
 
-#: ../calendar/zones.h:351
+#: ../src/calendar/zones.h:351
 msgid "Europe/Vilnius"
 msgstr "Eŭropo/Vilno"
 
-#: ../calendar/zones.h:352
+#: ../src/calendar/zones.h:352
 msgid "Europe/Warsaw"
 msgstr "Eŭropo/Varsovio"
 
-#: ../calendar/zones.h:353
+#: ../src/calendar/zones.h:353
 msgid "Europe/Zagreb"
 msgstr "Eŭropo/Zagrebo"
 
-#: ../calendar/zones.h:354
+#: ../src/calendar/zones.h:354
 msgid "Europe/Zaporozhye"
 msgstr "Eŭropo/Zaporiĵo"
 
-#: ../calendar/zones.h:355
+#: ../src/calendar/zones.h:355
 msgid "Europe/Zurich"
 msgstr "Eŭropo/Zuriko"
 
-#: ../calendar/zones.h:356
+#: ../src/calendar/zones.h:356
 msgid "Indian/Antananarivo"
 msgstr "Hinda_Oceano/Antananarivo"
 
-#: ../calendar/zones.h:357
+#: ../src/calendar/zones.h:357
 msgid "Indian/Chagos"
 msgstr "Hinda_Oceano/Ĉagosoj"
 
-#: ../calendar/zones.h:358
+#: ../src/calendar/zones.h:358
 msgid "Indian/Christmas"
 msgstr "Hinda_Oceano/Kristnaskinsulo"
 
-#: ../calendar/zones.h:359
+#: ../src/calendar/zones.h:359
 msgid "Indian/Cocos"
 msgstr "Hinda_Oceano/Kokosinsuloj"
 
-#: ../calendar/zones.h:360
+#: ../src/calendar/zones.h:360
 msgid "Indian/Comoro"
 msgstr "Hinda_Oceano/Komoroj"
 
-#: ../calendar/zones.h:361
+#: ../src/calendar/zones.h:361
 msgid "Indian/Kerguelen"
 msgstr "Hinda_Oceano/Kerguelen"
 
-#: ../calendar/zones.h:362
+#: ../src/calendar/zones.h:362
 msgid "Indian/Mahe"
 msgstr "Hinda_Oceano/Mahe"
 
-#: ../calendar/zones.h:363
+#: ../src/calendar/zones.h:363
 msgid "Indian/Maldives"
 msgstr "Hinda_Oceano/Maldivoj"
 
-#: ../calendar/zones.h:364
+#: ../src/calendar/zones.h:364
 msgid "Indian/Mauritius"
 msgstr "Hinda_Oceano/Maŭricio"
 
-#: ../calendar/zones.h:365
+#: ../src/calendar/zones.h:365
 msgid "Indian/Mayotte"
 msgstr "Hinda_Oceano/Majoto"
 
-#: ../calendar/zones.h:366
+#: ../src/calendar/zones.h:366
 msgid "Indian/Reunion"
 msgstr "Hinda_Oceano/Reunio"
 
-#: ../calendar/zones.h:367
+#: ../src/calendar/zones.h:367
 msgid "Pacific/Apia"
 msgstr "Pacifiko/Apio"
 
-#: ../calendar/zones.h:368
+#: ../src/calendar/zones.h:368
 msgid "Pacific/Auckland"
 msgstr "Pacifiko/Aŭklando"
 
-#: ../calendar/zones.h:369
+#: ../src/calendar/zones.h:369
 msgid "Pacific/Chatham"
 msgstr "Pacifiko/Chatham"
 
-#: ../calendar/zones.h:370
+#: ../src/calendar/zones.h:370
 msgid "Pacific/Easter"
 msgstr "Pacifiko/Paskinsulo"
 
-#: ../calendar/zones.h:371
+#: ../src/calendar/zones.h:371
 msgid "Pacific/Efate"
 msgstr "Pacifiko/Efate"
 
-#: ../calendar/zones.h:372
+#: ../src/calendar/zones.h:372
 msgid "Pacific/Enderbury"
 msgstr "Pacifiko/Enderbury"
 
-#: ../calendar/zones.h:373
+#: ../src/calendar/zones.h:373
 msgid "Pacific/Fakaofo"
 msgstr "Pacifiko/Fakaofo"
 
-#: ../calendar/zones.h:374
+#: ../src/calendar/zones.h:374
 msgid "Pacific/Fiji"
 msgstr "Pacifiko/Fiĝioj"
 
-#: ../calendar/zones.h:375
+#: ../src/calendar/zones.h:375
 msgid "Pacific/Funafuti"
 msgstr "Pacifiko/Funafutio"
 
-#: ../calendar/zones.h:376
+#: ../src/calendar/zones.h:376
 msgid "Pacific/Galapagos"
 msgstr "Pacifiko/Galapagoj"
 
-#: ../calendar/zones.h:377
+#: ../src/calendar/zones.h:377
 msgid "Pacific/Gambier"
 msgstr "Pacifiko/Gambier"
 
-#: ../calendar/zones.h:378
+#: ../src/calendar/zones.h:378
 msgid "Pacific/Guadalcanal"
 msgstr "Pacifiko/Guadalcanal"
 
-#: ../calendar/zones.h:379
+#: ../src/calendar/zones.h:379
 msgid "Pacific/Guam"
 msgstr "Pacifiko/Gvamo"
 
-#: ../calendar/zones.h:380
+#: ../src/calendar/zones.h:380
 msgid "Pacific/Honolulu"
 msgstr "Pacifiko/Honolulo"
 
-#: ../calendar/zones.h:381
+#: ../src/calendar/zones.h:381
 msgid "Pacific/Johnston"
 msgstr "Pacifiko/Johnston"
 
-#: ../calendar/zones.h:382
+#: ../src/calendar/zones.h:382
 msgid "Pacific/Kiritimati"
 msgstr "Pacifiko/Kiritimati"
 
-#: ../calendar/zones.h:383
+#: ../src/calendar/zones.h:383
 msgid "Pacific/Kosrae"
 msgstr "Pacifiko/Kosrae"
 
-#: ../calendar/zones.h:384
+#: ../src/calendar/zones.h:384
 msgid "Pacific/Kwajalein"
 msgstr "Pacifiko/Kwajalein"
 
-#: ../calendar/zones.h:385
+#: ../src/calendar/zones.h:385
 msgid "Pacific/Majuro"
 msgstr "Pacifiko/Majuro"
 
-#: ../calendar/zones.h:386
+#: ../src/calendar/zones.h:386
 msgid "Pacific/Marquesas"
 msgstr "Pacifiko/Markizinsuloj"
 
-#: ../calendar/zones.h:387
+#: ../src/calendar/zones.h:387
 msgid "Pacific/Midway"
 msgstr "Pacifiko/Midvejinsuloj"
 
-#: ../calendar/zones.h:388
+#: ../src/calendar/zones.h:388
 msgid "Pacific/Nauru"
 msgstr "Pacifiko/Nauro"
 
-#: ../calendar/zones.h:389
+#: ../src/calendar/zones.h:389
 msgid "Pacific/Niue"
 msgstr "Pacifiko/Niuo"
 
-#: ../calendar/zones.h:390
+#: ../src/calendar/zones.h:390
 msgid "Pacific/Norfolk"
 msgstr "Pacifiko/Norfolkinsulo"
 
-#: ../calendar/zones.h:391
+#: ../src/calendar/zones.h:391
 msgid "Pacific/Noumea"
 msgstr "Pacifiko/Noumeo"
 
-#: ../calendar/zones.h:392
+#: ../src/calendar/zones.h:392
 msgid "Pacific/Pago_Pago"
 msgstr "Pacifiko/Pagopago"
 
-#: ../calendar/zones.h:393
+#: ../src/calendar/zones.h:393
 msgid "Pacific/Palau"
 msgstr "Pacifiko/Palaŭo"
 
-#: ../calendar/zones.h:394
+#: ../src/calendar/zones.h:394
 msgid "Pacific/Pitcairn"
 msgstr "Pacifiko/Pitkarna_Insulo"
 
-#: ../calendar/zones.h:395
+#: ../src/calendar/zones.h:395
 msgid "Pacific/Ponape"
 msgstr "Pacifiko/Ponape"
 
-#: ../calendar/zones.h:396
+#: ../src/calendar/zones.h:396
 msgid "Pacific/Port_Moresby"
 msgstr "Pacifiko/Port-Moresbo"
 
-#: ../calendar/zones.h:397
+#: ../src/calendar/zones.h:397
 msgid "Pacific/Rarotonga"
 msgstr "Pacifiko/Rarotonga"
 
-#: ../calendar/zones.h:398
+#: ../src/calendar/zones.h:398
 msgid "Pacific/Saipan"
 msgstr "Pacifiko/Saipano"
 
-#: ../calendar/zones.h:399
+#: ../src/calendar/zones.h:399
 msgid "Pacific/Tahiti"
 msgstr "Pacifiko/Tahitio"
 
-#: ../calendar/zones.h:400
+#: ../src/calendar/zones.h:400
 msgid "Pacific/Tarawa"
 msgstr "Pacifiko/Tarawa"
 
-#: ../calendar/zones.h:401
+#: ../src/calendar/zones.h:401
 msgid "Pacific/Tongatapu"
 msgstr "Pacifiko/Tongatapu"
 
-#: ../calendar/zones.h:402
+#: ../src/calendar/zones.h:402
 msgid "Pacific/Truk"
 msgstr "Pacifiko/Truk"
 
-#: ../calendar/zones.h:403
+#: ../src/calendar/zones.h:403
 msgid "Pacific/Wake"
 msgstr "Pacifiko/Vejkinsulo"
 
-#: ../calendar/zones.h:404
+#: ../src/calendar/zones.h:404
 msgid "Pacific/Wallis"
 msgstr "Pacifiko/Wallis"
 
-#: ../calendar/zones.h:405
+#: ../src/calendar/zones.h:405
 msgid "Pacific/Yap"
 msgstr "Pacifiko/Yap"
 
-#: ../composer/e-composer-actions.c:63 ../mail/em-utils.c:131
-#: ../modules/mailto-handler/evolution-mailto-handler.c:148
-msgid "_Do not show this message again"
-msgstr "Ne _plu montri ĉi tiun mesaĝon"
-
-#: ../composer/e-composer-actions.c:265
+#: ../src/composer/e-composer-actions.c:225
 msgid "Save as..."
 msgstr "Konservi kiel..."
 
-#: ../composer/e-composer-actions.c:389
+#: ../src/composer/e-composer-actions.c:329
 msgid "Close the current file"
 msgstr "Fermi la aktualan dosieron"
 
-#: ../composer/e-composer-actions.c:394
+#: ../src/composer/e-composer-actions.c:334
 msgid "New _Message"
 msgstr "Nova _mesaĝo"
 
-#: ../composer/e-composer-actions.c:396
+#: ../src/composer/e-composer-actions.c:336
 msgid "Open New Message window"
 msgstr "Malfermi fenestron de nova mesaĝo"
 
-#: ../composer/e-composer-actions.c:401 ../shell/e-shell-window-actions.c:978
+#: ../src/composer/e-composer-actions.c:341 ../src/shell/e-shell.c:1302
+#: ../src/shell/e-shell-window-actions.c:887
 msgid "_Preferences"
 msgstr "_Agordoj"
 
-#: ../composer/e-composer-actions.c:403 ../shell/e-shell-window-actions.c:980
+#: ../src/composer/e-composer-actions.c:343
+#: ../src/shell/e-shell-window-actions.c:889
 msgid "Configure Evolution"
 msgstr "Agordi Evolucion"
 
-#: ../composer/e-composer-actions.c:410
+#: ../src/composer/e-composer-actions.c:350
 msgid "Save the current file"
 msgstr "Konservi la aktualan dosieron"
 
-#: ../composer/e-composer-actions.c:415
+#: ../src/composer/e-composer-actions.c:355
 msgid "Save _As..."
 msgstr "_Konservi kiel..."
 
-#: ../composer/e-composer-actions.c:417
+#: ../src/composer/e-composer-actions.c:357
 msgid "Save the current file with a different name"
 msgstr "Konservi la aktualan dosieron kun alia nomo"
 
-#: ../composer/e-composer-actions.c:424
+#: ../src/composer/e-composer-actions.c:364
 msgid "Character _Encoding"
 msgstr "Signara _kodoprezento"
 
-#: ../composer/e-composer-actions.c:448
+#: ../src/composer/e-composer-actions.c:388
 msgid "Print Pre_view"
 msgstr "Presi antaŭ_vidon"
 
-#: ../composer/e-composer-actions.c:455
+#: ../src/composer/e-composer-actions.c:395
 msgid "Save as _Draft"
 msgstr "Konservi kiel _malneto"
 
-#: ../composer/e-composer-actions.c:457
+#: ../src/composer/e-composer-actions.c:397
 msgid "Save as draft"
 msgstr "Konservi kiel malneto"
 
-#: ../composer/e-composer-actions.c:462
+#: ../src/composer/e-composer-actions.c:402
 msgid "S_end"
 msgstr "S_endi"
 
-#: ../composer/e-composer-actions.c:464
+#: ../src/composer/e-composer-actions.c:404
 msgid "Send this message"
 msgstr "Sendi tiun mesaĝon"
 
-#: ../composer/e-composer-actions.c:472
+#: ../src/composer/e-composer-actions.c:412
 msgid "PGP _Encrypt"
-msgstr "PGP-ĉifro"
+msgstr "PGP-ĉ_ifro"
 
-#: ../composer/e-composer-actions.c:474
+#: ../src/composer/e-composer-actions.c:414
 msgid "Encrypt this message with PGP"
 msgstr "Ĉifri tiun ĉi mesaĝon per PGP"
 
-#: ../composer/e-composer-actions.c:480
+#: ../src/composer/e-composer-actions.c:420
 msgid "PGP _Sign"
-msgstr "PGP-subskribo"
+msgstr "PGP-_subskribo"
 
-#: ../composer/e-composer-actions.c:482
+#: ../src/composer/e-composer-actions.c:422
 msgid "Sign this message with your PGP key"
 msgstr "Subskribi tiun ĉi mesaĝon pere de via PGP-ŝlosilo"
 
-#: ../composer/e-composer-actions.c:488
+#: ../src/composer/e-composer-actions.c:428
 msgid "_Picture Gallery"
 msgstr "_Bildogalerio"
 
-#: ../composer/e-composer-actions.c:490
+#: ../src/composer/e-composer-actions.c:430
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Vidigi kolekton de bildoj, kiujn vi povas treni al via mesaĝo"
 
-#: ../composer/e-composer-actions.c:496
+#: ../src/composer/e-composer-actions.c:436
 msgid "_Prioritize Message"
 msgstr "_Prioritatatigita mesaĝo"
 
-#: ../composer/e-composer-actions.c:498
+#: ../src/composer/e-composer-actions.c:438
 msgid "Set the message priority to high"
 msgstr "Agordi mesaĝan prioritaton kiel alta"
 
-#: ../composer/e-composer-actions.c:504
+#: ../src/composer/e-composer-actions.c:444
 msgid "Re_quest Read Receipt"
 msgstr "P_eti legokonfirmon"
 
-#: ../composer/e-composer-actions.c:506
+#: ../src/composer/e-composer-actions.c:446
 msgid "Get delivery notification when your message is read"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:512
+#: ../src/composer/e-composer-actions.c:452
 msgid "S/MIME En_crypt"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:514
+#: ../src/composer/e-composer-actions.c:454
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:520
+#: ../src/composer/e-composer-actions.c:460
 msgid "S/MIME Sig_n"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:522
+#: ../src/composer/e-composer-actions.c:462
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:576
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
-msgid "Unicode smileys"
-msgstr "Unikodaj ridetoj"
-
-#: ../composer/e-composer-actions.c:578
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
-msgid "Use Unicode characters for smileys."
-msgstr "Uzi Unikodajn karakterojn por ridetoj."
-
-#: ../composer/e-composer-actions.c:584
+#: ../src/composer/e-composer-actions.c:516
 msgid "_Bcc Field"
 msgstr "_Kaŝkopio kampo"
 
-#: ../composer/e-composer-actions.c:586
+#: ../src/composer/e-composer-actions.c:518
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Baskuligas ĉu montri la Kaŝkopio kampon"
 
-#: ../composer/e-composer-actions.c:592
+#: ../src/composer/e-composer-actions.c:524
 msgid "_Cc Field"
 msgstr "'_Kopio de mesaĝo' kampo"
 
-#: ../composer/e-composer-actions.c:594
+#: ../src/composer/e-composer-actions.c:526
 msgid "Toggles whether the CC field is displayed"
 msgstr "Baskuligas ĉu montri la 'Kopio de mesaĝo' kampon"
 
-#: ../composer/e-composer-actions.c:600
+#: ../src/composer/e-composer-actions.c:532
 msgid "_From Override Field"
 msgstr "'El _transpaso' kampo"
 
-#: ../composer/e-composer-actions.c:602
+#: ../src/composer/e-composer-actions.c:534
 msgid ""
 "Toggles whether the From override field to change name or email address is "
 "displayed"
 msgstr "Baskuligas ĉu montri la 'El transpaso' kampon"
 
-#: ../composer/e-composer-actions.c:608
+#: ../src/composer/e-composer-actions.c:540
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:610
+#: ../src/composer/e-composer-actions.c:542
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:671
+#: ../src/composer/e-composer-actions.c:597
+msgid "Attach"
+msgstr "Aldoni"
+
+#: ../src/composer/e-composer-actions.c:603
 msgid "Save Draft"
 msgstr "Konservi malneton"
 
-#: ../composer/e-composer-from-header.c:109
-#: ../e-util/e-mail-signature-script-dialog.c:415
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../mail/e-mail-config-identity-page.c:327
-#: ../mail/e-mail-config-summary-page.c:339
+#: ../src/composer/e-composer-from-header.c:108
+#: ../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
+#: ../src/mail/e-mail-config-identity-page.c:550
+#: ../src/mail/e-mail-config-summary-page.c:332
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:297
 msgid "_Name:"
 msgstr "_Nomo:"
 
-#: ../composer/e-composer-header-table.c:38
+#: ../src/composer/e-composer-header-table.c:36
 msgid "Enter the recipients of the message"
 msgstr "Enigu la poŝtricevulojn"
 
-#: ../composer/e-composer-header-table.c:40
+#: ../src/composer/e-composer-header-table.c:38
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Enigu la adresojn, kiuj ricevos kopion de mesaĝo"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../src/composer/e-composer-header-table.c:41
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:829
+#: ../src/composer/e-composer-header-table.c:840
 msgid "Fr_om:"
 msgstr "_De:"
 
-#: ../composer/e-composer-header-table.c:836
+#: ../src/composer/e-composer-header-table.c:847
 msgid "_Reply-To:"
 msgstr "_Respondi-al:"
 
-#: ../composer/e-composer-header-table.c:841
+#: ../src/composer/e-composer-header-table.c:852
 msgid "_To:"
 msgstr "_Al:"
 
-#: ../composer/e-composer-header-table.c:847
+#: ../src/composer/e-composer-header-table.c:858
 msgid "_Cc:"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:853
+#: ../src/composer/e-composer-header-table.c:864
 msgid "_Bcc:"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:858
+#: ../src/composer/e-composer-header-table.c:869
 msgid "_Post To:"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:862
+#: ../src/composer/e-composer-header-table.c:873
 msgid "S_ubject:"
 msgstr "_Temo:"
 
-#: ../composer/e-composer-header-table.c:870
-#: ../mail/e-mail-config-identity-page.c:505
+#: ../src/composer/e-composer-header-table.c:883
+#: ../src/mail/e-mail-config-identity-page.c:743
 msgid "Si_gnature:"
 msgstr "_Subskribo:"
 
-#: ../composer/e-composer-name-header.c:233
+#: ../src/composer/e-composer-name-header.c:237
 msgid "Click here for the address book"
 msgstr "Klaku ĉi tien por la adresaro"
 
-#: ../composer/e-composer-post-header.c:182
+#: ../src/composer/e-composer-post-header.c:180
 msgid "Click here to select folders to post to"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:871
+#: ../src/composer/e-msg-composer.c:854
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:880
+#: ../src/composer/e-msg-composer.c:863
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1594 ../composer/e-msg-composer.c:2282
+#: ../src/composer/e-msg-composer.c:1622 ../src/composer/e-msg-composer.c:2294
 msgid "Compose Message"
 msgstr "Krei mesaĝon"
 
-#: ../composer/e-msg-composer.c:4599
+#: ../src/composer/e-msg-composer.c:4657
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:1
-msgid "You cannot attach the file &quot;{0}&quot; to this message."
+#: ../src/composer/mail-composer.error.xml.h:1
+msgid "You cannot attach the file “{0}” to this message."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:2
-msgid "The file '{0}' is not a regular file and cannot be sent in a 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."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:3
+#: ../src/composer/mail-composer.error.xml.h:3
 msgid "Could not retrieve messages to attach from {0}."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:4
-msgid "Because &quot;{1}&quot;."
-msgstr "Ĉar &quot;{1}&quot;."
+#: ../src/composer/mail-composer.error.xml.h:4
+#: ../src/e-util/e-system.error.xml.h:5
+#| msgid "Because \"{1}\"."
+msgid "Because “{1}”."
+msgstr "Ĉar “{1}”."
 
-#: ../composer/mail-composer.error.xml.h:5
+#: ../src/composer/mail-composer.error.xml.h:5
 msgid "Do you want to recover unfinished messages?"
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:6
+#: ../src/composer/mail-composer.error.xml.h:6
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:7
+#: ../src/composer/mail-composer.error.xml.h:7
 msgid "_Do not Recover"
 msgstr "_Ne ripari"
 
-#: ../composer/mail-composer.error.xml.h:8
+#: ../src/composer/mail-composer.error.xml.h:8
 msgid "_Recover"
 msgstr "_Ripari"
 
-#: ../composer/mail-composer.error.xml.h:9
-msgid "Could not save to autosave file &quot;{0}&quot;."
-msgstr ""
-
-#: ../composer/mail-composer.error.xml.h:10
-msgid "Error saving to autosave because &quot;{1}&quot;."
+#: ../src/composer/mail-composer.error.xml.h:9
+msgid "Could not save to autosave file “{0}”."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:11
-msgid "Download in progress. Do you want to send the mail?"
+#: ../src/composer/mail-composer.error.xml.h:10
+msgid "Error saving to autosave because “{1}”."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:12
-msgid ""
-" There are few attachments getting downloaded. Sending the mail will cause "
-"the mail to be sent without those pending attachments "
-msgstr ""
-
-#: ../composer/mail-composer.error.xml.h:14
+#: ../src/composer/mail-composer.error.xml.h:11
+#, fuzzy
+#| msgid "Are you sure you want to delete these {0} memos?"
 msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
+"Are you sure you want to discard the message, titled “{0}”, you are "
 "composing?"
-msgstr ""
+msgstr "Ĉu vi certe volas forigi tiujn notojn “{0}”?"
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../src/composer/mail-composer.error.xml.h:12
 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 "
@@ -7604,3582 +11380,1453 @@ msgid ""
 msgstr ""
 
 #. Response codes were chosen somewhat arbitrarily.
-#: ../composer/mail-composer.error.xml.h:18
+#: ../src/composer/mail-composer.error.xml.h:15
 msgid "_Continue Editing"
 msgstr "_Daŭrigi redakton"
 
-#: ../composer/mail-composer.error.xml.h:19
+#: ../src/composer/mail-composer.error.xml.h:16
 msgid "_Save Draft"
 msgstr "_Konservi malneton"
 
-#: ../composer/mail-composer.error.xml.h:20
+#: ../src/composer/mail-composer.error.xml.h:17
 #, fuzzy
 #| msgid "Are you sure you want to delete these {0} memos?"
 msgid "Are you sure you want to discard the message you are composing?"
 msgstr "Ĉu vi certe volas forigi tiujn notojn?"
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../src/composer/mail-composer.error.xml.h:18
 msgid "Could not create message."
 msgstr "Ne eblis kreii mesaĝon."
 
-#: ../composer/mail-composer.error.xml.h:22
-msgid "Because &quot;{0}&quot;, you may need to select different mail options."
+#: ../src/composer/mail-composer.error.xml.h:19
+msgid ""
+"You may need to select different mail options.\n"
+"\n"
+"Detailed error: {0}"
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:23
-msgid "Could not read signature file &quot;{0}&quot;."
-msgstr ""
+#: ../src/composer/mail-composer.error.xml.h:22
+#, fuzzy
+#| msgid "Could not load signature."
+msgid "Could not read signature file “{0}”."
+msgstr "Ne eblis legi subskrib-dosieron “{0}”."
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../src/composer/mail-composer.error.xml.h:23
 msgid "All accounts have been removed."
 msgstr "Ĉiuj kontoj estas forigitaj."
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../src/composer/mail-composer.error.xml.h:24
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../src/composer/mail-composer.error.xml.h:25
 msgid "An error occurred while saving to your Outbox folder."
 msgstr "Eraro okazis dum konservado al via senditaĵujo."
 
-#: ../composer/mail-composer.error.xml.h:27
-msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
+#: ../src/composer/mail-composer.error.xml.h:26
+msgid "The reported error was “{0}”. The message has not been sent."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../src/composer/mail-composer.error.xml.h:27
 msgid "An error occurred while saving to your Drafts folder."
 msgstr "Eraro okazis dum konservado al via malnetdosierujo."
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../src/composer/mail-composer.error.xml.h:28
 msgid ""
-"The reported error was &quot;{0}&quot;. The message has most likely not been "
-"saved."
+"The reported error was “{0}”. The message has most likely not been saved."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../src/composer/mail-composer.error.xml.h:29
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Eraro okazis dum sendo. Kiel vi volas daŭrigi?"
 
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:163
-msgid "The reported error was &quot;{0}&quot;."
-msgstr ""
+#: ../src/composer/mail-composer.error.xml.h:30
+#: ../src/mail/mail.error.xml.h:177
+#| msgid "Because &quot;{1}&quot;."
+msgid "The reported error was “{0}”."
+msgstr "La raportata eraro estis “{0}”."
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../src/composer/mail-composer.error.xml.h:31
 msgid "_Save to Outbox"
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../src/composer/mail-composer.error.xml.h:32
 msgid "_Try Again"
 msgstr "_Provi denove"
 
-#: ../composer/mail-composer.error.xml.h:34
+#: ../src/composer/mail-composer.error.xml.h:33
 msgid "Your message was sent, but an error occurred during post-processing."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:35
+#: ../src/composer/mail-composer.error.xml.h:34
 msgid "Saving message to Outbox."
 msgstr "Konservi mesaĝon en senditujo."
 
-#: ../composer/mail-composer.error.xml.h:36
+#: ../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."
+"clicking the Send/Receive button in Evolution’s toolbar."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:37
+#: ../src/composer/mail-composer.error.xml.h:36
 #, fuzzy
 #| msgid "Are you sure you want to delete this memo?"
 msgid "Are you sure you want to send the message?"
 msgstr "Ĉu vi certe volas forigi tiun noton?"
 
-#: ../composer/mail-composer.error.xml.h:38
+#: ../src/composer/mail-composer.error.xml.h:37
 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."
 msgstr ""
 
-#: ../data/evolution-alarm-notify.desktop.in.in.h:1
-msgid "Evolution Alarm Notify"
-msgstr ""
-
-#: ../data/evolution-alarm-notify.desktop.in.in.h:2
-msgid "Calendar event notifications"
-msgstr ""
-
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1032
-#: ../modules/mailto-handler/evolution-mailto-handler.c:210
-#: ../shell/e-shell-window-private.c:242
-msgid "Evolution"
-msgstr "Evolucio"
-
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:81
-msgid "Groupware Suite"
-msgstr "Grupprogramaro"
-
-#: ../data/evolution.desktop.in.in.h:3
-msgid "Evolution Mail and Calendar"
-msgstr "Evolucio - Retpoŝto kaj Kalendaro"
-
-#: ../data/evolution.desktop.in.in.h:4
-msgid "Manage your email, contacts and schedule"
-msgstr "Administri viajn retpoŝton, kontaktojn kaj planojn"
-
-#: ../data/evolution.desktop.in.in.h:5
-msgid "email;calendar;contact;addressbook;task;"
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
-msgid "Enable address formatting"
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:2
-msgid ""
-"Whether addresses should be formatted according to standard in their "
-"destination country"
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:3
-msgid "Autocomplete length"
-msgstr "Aŭtomata longo"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:4
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:5
-msgid "Show autocompleted name with an address"
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:6
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:7
-msgid "URI for the folder last used in the select names dialog"
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:8
-msgid "URI for the folder last used in the select names dialog."
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:9
-msgid "Contact layout style"
-msgstr ""
-
-#: ../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."
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
-msgid "Contact preview pane position (horizontal)"
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
-msgid "Position of the contact preview pane when oriented horizontally."
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
-msgid "Contact preview pane position (vertical)"
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:14
-msgid "Position of the contact preview pane when oriented vertically."
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:15
-msgid "Show maps"
-msgstr "Montri mapojn"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:16
-msgid "Whether to show maps in preview pane"
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
-msgid "Primary address book"
-msgstr "Ĉefa adresaro"
-
-#: ../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"
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
-msgid "Show preview pane"
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:20
-msgid "Whether to show the preview pane."
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:21
-msgid "true"
-msgstr "vero"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:22
-msgid "Whether to show phone numbers in the editor"
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:23
-msgid "Whether to show SIP addresses in the editor"
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:24
-msgid "Whether to show IM addresses in the editor"
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:25
-msgid "Whether to show mailing Home addresses in the editor"
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:26
-msgid "Whether to show mailing addresses Work in the editor"
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:27
-msgid "Whether to show mailing addresses Other in the editor"
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:28
-msgid "Whether to show Web Addresses in the editor"
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:29
-msgid "Whether to show job information in the editor"
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:30
-msgid "Whether to show Miscellaneous information in the editor"
-msgstr ""
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:31
-msgid "Whether to show notes in the editor"
-msgstr "Ĉu montri notojn en la redaktilo"
-
-#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
-msgid "Convert mail messages to Unicode"
-msgstr "Konverti retmesaĝojn al Unikodo"
-
-#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:2
-msgid ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
-msgstr ""
-
-#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:3
-msgid "Full path command to run Bogofilter"
-msgstr ""
-
-#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:4
-msgid ""
-"Full path to a Bogofilter command. If not set, then a compile-time path is "
-"used, usually /usr/bin/bogofilter. The command should not contain any other "
-"arguments."
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
-msgid "Save directory for reminder audio"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:2
-msgid "Directory for saving reminder audio files"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:3
-msgid "Birthday and anniversary reminder value"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:4
-msgid "Number of units for determining a birthday or anniversary reminder"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:5
-msgid "Birthday and anniversary reminder units"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:6
-msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\""
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:7
-msgid "Compress weekends in month view"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:8
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:9
-msgid "Ask for confirmation when deleting items"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:10
-msgid "Whether to ask for confirmation when deleting an appointment or task"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
-msgid "Confirm expunge"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:12
-msgid "Whether to ask for confirmation when expunging appointments and tasks"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:13
-msgid "Month view vertical pane position"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:14
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:15
-msgid "Workday end hour"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:16
-msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:17
-msgid "Workday end minute"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:18
-msgid "Minute the workday ends on, 0 to 59."
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:19
-msgid "Workday start hour"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:20
-msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:21
-msgid "Workday start minute"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:22
-msgid "Minute the workday starts on, 0 to 59."
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
-msgid "The second timezone for a Day View"
-msgstr "La dua horzono de taga vido"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
-msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
-msgid "Recently used second time zones in a Day View"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
-msgid "List of recently used second time zones in a Day View"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
-msgid "Maximum number of recently used timezones to remember"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
-msgid ""
-"Maximum number of recently used timezones to remember in a 'day-second-"
-"zones' list"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
-msgid "Default reminder value"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
-msgid "Number of units for determining a default reminder"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
-msgid "Default reminder units"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
-msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
-msgid "Show categories field in the event/meeting/task editor"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
-msgid "Whether to show categories field in the event/meeting editor"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
-msgid "Show Role field in the event/task/meeting editor"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
-msgid "Whether to show role field in the event/task/meeting editor"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
-msgid "Show RSVP field in the event/task/meeting editor"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
-msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
-msgid "Show status field in the event/task/meeting editor"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
-msgid "Whether to show status field in the event/task/meeting editor"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
-msgid "Show timezone field in the event/meeting editor"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
-msgid "Whether to show timezone field in the event/meeting editor"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
-msgid "Show type field in the event/task/meeting editor"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
-msgid "Whether to show type field in the event/task/meeting editor"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
-msgid "Hide completed tasks"
-msgstr "Kaŝi plenumigitajn taskojn"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
-msgid "Whether to hide completed tasks in the tasks view"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
+#: ../src/composer/mail-composer.error.xml.h:39
 #, fuzzy
-msgid "Hide task units"
-msgstr "Kaŝi task-unuojn"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
-msgid "Hide task value"
-msgstr "Kaŝi task-valoron"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
-msgid "Number of units for determining when to hide tasks"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
-msgid "Horizontal pane position"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
-msgid ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
-msgid "Last reminder time"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
-msgid "Time the last reminder ran, in time_t"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
-msgid "Marcus Bains Line Color - Day View"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
-msgid "Color to draw the Marcus Bains line in the Day View"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
-msgid "Marcus Bains Line Color - Time bar"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
-#, fuzzy
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
-msgstr ""
-"Koloro por kolori la nunhoromontrilan linion en la tempa tabulbarilo "
-"(malplenigu la kampon elektos la aprioran koloron)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
-msgid "Marcus Bains Line"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
-#, fuzzy
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar"
-msgstr ""
-"Koloro por kolori la nunhoromontrilan linion en la tempa tabulbarilo "
-"(malplenigu la kampon elektos la aprioran koloron)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
-msgid "Memo preview pane position (horizontal)"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
-msgid "Position of the task preview pane when oriented horizontally"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
-msgid "Memo layout style"
-msgstr "Noto-stilo"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
-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"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
-msgid "Memo preview pane position (vertical)"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
-msgid "Position of the memo preview pane when oriented vertically"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
-msgid "Month view horizontal pane position"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
-msgid "Scroll Month View by a week, not by a month"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
-msgid "Whether to scroll a Month View by a week, not by a month"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
-msgid "Reminder programs"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
-msgid "Programs that are allowed to be run by reminders"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
-msgid "Show display reminders in notification tray"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
-msgid "Whether or not to use the notification tray for display reminders"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
-msgid "Preferred New button item"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
-msgid "Name of the preferred New toolbar button item"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
-msgid "Primary calendar"
-msgstr "Ĉefa kalendaro"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
-msgid ""
-"The UID of the selected (or \"primary\") calendar in the sidebar of the "
-"\"Calendar\" view"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
-#, fuzzy
-msgid "Primary memo list"
-msgstr "Ĉefa tasklisto"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
-msgid ""
-"The UID of the selected (or \"primary\") memo list in the sidebar of the "
-"\"Memos\" view"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
-msgid "Primary task list"
-msgstr "Ĉefa tasklisto"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
-msgid ""
-"The UID of the selected (or \"primary\") task list in the sidebar of the "
-"\"Tasks\" view"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
-msgid "Free/busy template URL"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
-#, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
-msgid "Recurrent Events in Italic"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
-msgid "Show days with recurrent events in italic font in bottom left calendar"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
-msgid "Search range for time-based searching in years"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
-msgid ""
-"How many years can the time-based search go forward or backward from "
-"currently selected day when searching for another occurrence; default is ten "
-"years"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
-msgid "Show appointment end times in week and month views"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
-msgid "Whether to display the end time of events in the week and month views"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
-msgid "Show the memo preview pane"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
-msgid "If \"true\", show the memo preview pane in the main window"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
-msgid "Show the task preview pane"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
-msgid "If \"true\", show the task preview pane in the main window"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
-msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
-msgid "Whether to show week numbers in various places in the Calendar"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
-msgid "Vertical position for the tag pane"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
-msgid "Highlight tasks due today"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
-msgid ""
-"Whether highlight tasks due today with a special color (task-due-today-color)"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
-msgid "Tasks due today color"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
-msgid ""
-"Background color of tasks that are due today, in \"#rrggbb\" format. Used "
-"together with task-due-today-highlight"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
-msgid "Task preview pane position (horizontal)"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
-msgid "Task layout style"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
-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"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
-msgid "Task preview pane position (vertical)"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
-msgid "Position of the task preview pane when oriented vertically"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
-#, fuzzy
-msgid "Highlight overdue tasks"
-msgstr "Malfruaj taskoj"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
-msgid ""
-"Whether highlight overdue tasks with a special color (task-overdue-color)"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
-#, fuzzy
-msgid "Overdue tasks color"
-msgstr "Koloro de malfruaj taskoj"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
-msgid ""
-"Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
-"together with task-overdue-highlight."
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
-msgid "Time divisions"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
-msgid "Intervals shown in Day and Work Week views, in minutes"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
-msgid "Timezone"
-msgstr "Horzono"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olson timezone database location like \"America/New York\""
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
-msgid "Twenty four hour time format"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
-msgid "Whether to show times in twenty four hour format instead of using am/pm"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
-msgid "Birthday and anniversary reminder"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
-msgid "Whether to set a reminder for birthdays and anniversaries"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
-msgid "Default appointment reminder"
-msgstr "Defaŭlta rendevuo-memorigilo"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
-msgid "Whether to set a default reminder for appointments"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
-msgid "Use system timezone"
-msgstr "Uzi la sisteman horzonon"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
-#, fuzzy
-msgid "Use the system timezone instead of the timezone selected in Evolution"
-msgstr ""
-"Uzi la sisteman horzonon anstataŭ la horzono kiu estas elektita en Evolucio"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
-msgid "First day of the week"
-msgstr "Unua tago de la semajno"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
-msgid "Monday is a work day"
-msgstr "Lundo estas labortago"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
-msgid "Tuesday is a work day"
-msgstr "Mardo estas labortago"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
-msgid "Wednesday is a work day"
-msgstr "Merkredo estas labortago"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
-msgid "Thursday is a work day"
-msgstr "Ĵaŭdo estas labortago"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
-msgid "Friday is a work day"
-msgstr "Vendredo estas labortablo"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
-msgid "Saturday is a work day"
-msgstr "Sabato estas labortago"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
-msgid "Sunday is a work day"
-msgstr "Dimanĉo estas labortablo"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
-msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
-msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"\"week-start-day-name\" instead."
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
-msgid "(Deprecated) Work days"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
-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.)"
-msgstr ""
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:1
-#, fuzzy
-#| msgid "Evolution Website"
-msgid "Previous Evolution version"
-msgstr "Retpaĝaro de Evolucio"
-
-#: ../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."
-msgstr ""
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:3
-msgid "List of disabled plugins"
-msgstr "Listo de elŝaltitaj kromprogramoj"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:4
-msgid "The list of disabled plugins in Evolution"
-msgstr "La listo de elŝaltitaj kromprogramoj de Evolucio"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:5
-msgid "The window's X coordinate"
-msgstr "La fenestra X-koordinato"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:6
-msgid "The window's Y coordinate"
-msgstr "La fenestra Y-koordinato"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:7
-msgid "The window's width in pixels"
-msgstr "La fenestra larĝo bildere"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:8
-msgid "The window's height in pixels"
-msgstr "La fenestra alto bildere"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:9
-msgid "Whether the window is maximized"
-msgstr "Ĉu la fenestro estas maksimumigita"
-
-#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:1
-msgid "Gnome Calendar's calendar import done"
-msgstr ""
-
-#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:2
-msgid "Whether calendar from Gnome Calendar has been imported or not"
-msgstr ""
-
-#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:3
-msgid "Gnome Calendar's tasks import done"
-msgstr ""
-
-#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:4
-msgid "Whether tasks from Gnome Calendar have been imported or not"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr ""
-"Ĉiufoje Evolucio startas, kontroli ĉu ĝi estas la defaŭlta poŝtilo aŭ ne."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:3
-msgid "Default charset in which to compose messages"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
-msgid "Default charset in which to compose messages."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
-msgid "Path where picture gallery should search for its content"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
-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"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
-#, fuzzy
-msgid "Spell check inline"
-msgstr "Literum-kontrolataj"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
-msgid "Draw spelling error indicators on words as you type."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
-msgid "Automatic link recognition"
-msgstr "Aŭtomata rekono de ligiloj"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
-msgid "Recognize links in text and replace them."
-msgstr "Rekoni ligilojn en teksto kaj anstataŭigi ilin."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
-msgid "Automatic emoticon recognition"
-msgstr "Aŭtomata miensimbola rekono"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
-msgid ""
-"Recognize emoticons in text and replace them with images or Unicode "
-"characters."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
-#, fuzzy
-msgid "Attribute message"
-msgstr "Aldonita mesaĝo"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
-msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
-msgid "Forward message"
-msgstr "Plusendi mesaĝon"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
-msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
-msgid "Original message"
-msgstr "Originala mesaĝo"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
-msgid ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
-msgid "Group Reply replies to list"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
-msgid ""
-"Instead of the normal \"Reply to All\" behaviour, this option will make the "
-"'Group Reply' toolbar button try to reply only to the mailing list through "
-"which you happened to receive the copy of the message to which you're "
-"replying."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
-msgid "Put the cursor at the bottom of replies"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
-#, fuzzy
-msgid ""
-"Users get all up in arms over where the cursor should go when replying to a "
-"message. This determines whether the cursor is placed at the top of the "
-"message or the bottom."
-msgstr ""
-"Tio ĉi difinas, ĉu en respondo la kursoro komence estu supre aŭ malsupre en "
-"la mesaĝo."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
-msgid "Always request read receipt"
-msgstr "Ĉiam peti kvitancon pri legado"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
-msgid "Whether a read receipt request gets added to every message by default."
-msgstr "Ĉu defaŭlte peti lego-konfirmon por ĉiu sendita mesaĝo?"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
-msgid "Send HTML mail by default"
-msgstr "Sendi HTML-poŝton defaŭlte"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
-msgid "Send HTML mail by default."
-msgstr "Sendi HTML-poŝton defaŭlte."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
-msgid "Spell checking languages"
-msgstr "Literum-kontrolataj lingvoj"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
-msgid "List of dictionary language codes used for spell checking."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
-msgid "Show \"Bcc\" field when sending a mail message"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
-msgid ""
-"Show the \"Bcc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
-msgid "Show \"Cc\" field when sending a mail message"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
-msgid ""
-"Show the \"Cc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
-msgid "Show \"From\" override field when sending a mail message"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
-msgid ""
-"Show the \"From\" override field when sending a mail message. This is "
-"controlled from the View menu when a mail account is chosen."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
-msgid "Show \"Reply To\" field when sending a mail message"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
-msgid ""
-"Show the \"Reply To\" field when sending a mail message. This is controlled "
-"from the View menu when a mail account is chosen."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
-msgid "Show \"From\" field when posting to a newsgroup"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
-msgid ""
-"Show the \"From\" field when posting to a newsgroup. This is controlled from "
-"the View menu when a news account is chosen."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
-msgid "Show \"Reply To\" field when posting to a newsgroup"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
-msgid ""
-"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
-"from the View menu when a news account is chosen."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
-msgid "Digitally sign replies when the original message is signed"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
-msgid ""
-"Automatically enable PGP or S/MIME signatures when replying to a message "
-"which is also PGP or S/MIME signed."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
-msgid "Encode filenames in an Outlook/GMail way"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
-msgid ""
-"Encode filenames in the mail headers same as Outlook or GMail do, to let "
-"them display correctly filenames with UTF-8 letters sent by Evolution, "
-"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
-"standard."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
-#, fuzzy
-#| msgid "Saving message to Outbox."
-msgid "Send messages through Outbox folder"
-msgstr "Konservi mesaĝon en senditujo"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
-msgid ""
-"Always save messages to Outbox folder when sending, to let a user choose "
-"when the messages should be sent."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
-msgid "Put personalized signatures at the top of replies"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
-#, fuzzy
-msgid ""
-"Users get all up in arms over where their signature should go when replying "
-"to a message. This determines whether the signature is placed at the top of "
-"the message or the bottom."
-msgstr ""
-"Tio ĉi difinas, ĉu en respondo la subskriba alineo aperu super aŭ sub la "
-"mesaĝo."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
-msgid "Do not add signature delimiter"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
-msgid ""
-"Set to TRUE in case you do not want to add signature delimiter before your "
-"signature when composing a mail."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
-msgid "Ignore list Reply-To:"
-msgstr ""
+#| msgid "Are you sure you want to delete these contacts?"
+msgid "Are you sure you want to change the composer format?"
+msgstr "Ĉu certe vi volas forigi tiujn ĉi kontaktulojn?"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+#: ../src/composer/mail-composer.error.xml.h:40
 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."
+"Switching to Plain Text format will cause the text to lose all the HTML "
+"formatting. Do you want to continue?"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
-msgid "List of localized 'Re'"
+#: ../src/composer/mail-composer.error.xml.h:41
+msgid "_Don’t lose formatting"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
-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'."
+#: ../src/composer/mail-composer.error.xml.h:42
+#| msgid "No Information"
+msgid "Lose _formatting"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+#: ../src/composer/mail-composer.error.xml.h:43
 #, fuzzy
-msgid "Enable developer mode"
-msgstr "Ĉiuj lokaj dosierujoj"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
-msgid ""
-"Enables some hidden actions and tools aimed for development and debugging."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
-msgid "Number of characters for wrapping"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
-msgid "Will autowrap lines after given number of characters."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
-msgid "Save file format for drag-and-drop operation"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
-msgid "Can be either 'mbox' or 'pdf'."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
-msgid "Show image animations"
-msgstr "Montri movbildojn"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
-msgid ""
-"Enable animated images in HTML mail. Many users find animated images "
-"annoying and prefer to see a static image instead."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
-msgid "Enable or disable type ahead search feature"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
-msgid ""
-"Enable the side bar search feature to allow interactive searching of folder "
-"names."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
-msgid "Enable or disable magic space bar"
-msgstr "Enŝalti aŭ elŝalti magian spacostangon"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
-msgid ""
-"Enable this to use Space bar key to scroll in message preview, message list "
-"and folders."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
-msgid "Enable to use a similar message list view settings for all folders"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
-msgid "Enable to use a similar message list view settings for all folders."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
-msgid "Mark citations in the message \"Preview\""
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
-msgid "Mark citations in the message \"Preview\"."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
-msgid "Citation highlight color"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
-msgid "Citation highlight color."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
-msgid "Enable/disable caret mode"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
-msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
-msgid "Default charset in which to display messages"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
-msgid "Default charset in which to display messages."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
-msgid "Automatically load images for HTML messages over HTTP"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
-msgid "Show Animations"
-msgstr "Vidigi movbildojn"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
-msgid "Show animated images as animations."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
-msgid "Show all message headers"
-msgstr "Montri ĉiujn kapliniojn"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
-msgid "Show all the headers when viewing a messages."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
-msgid "List of headers to show when viewing a message."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
-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 "
-"when viewing a message, but are still listed in Preferences."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
-msgid "Show photo of the sender"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
-msgid "Show the photo of the sender in the message reading pane."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
-msgid "Search gravatar.com for photo of the sender"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
-msgid "Allow searching also at gravatar.com for photo of the sender."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
-msgid "Mark as Seen after specified timeout"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
-msgid "Mark as Seen after specified timeout."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
-#| msgid "Timeout for marking message as seen"
-msgid "Timeout for marking messages as seen"
-msgstr "Tempolimo post kiu mesaĝoj estas markitaj kiel legita"
+#| msgid "An error occurred while saving to your Drafts folder."
+msgid "An error occurred while saving to your Templates folder."
+msgstr "Eraro okazis dum konservado al via malnetdosierujo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../src/composer/mail-composer.error.xml.h:44
 #, fuzzy
-#| msgid "Timeout for marking message as seen."
-msgid "Timeout in milliseconds for marking messages as seen."
-msgstr "Tempolimo, post kiu mesaĝo estas markita kiel legita."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
-msgid "Sender email-address column in the message list"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
-msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view"
-msgstr ""
+#| msgid "Are you sure you want to delete these {0} memos?"
+msgid "Are you sure you want to convert the message into a meeting?"
+msgstr "Ĉu vi certe volas forigi tiujn notojn?"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../src/composer/mail-composer.error.xml.h:45
 msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
-msgid "Show deleted messages in the message-list"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
-msgid "Show deleted messages (with a strike-through) in the message-list."
+"By converting the message into the meeting the composed message will be "
+"closed and the changes being done discarded."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../src/composer/mail-composer.error.xml.h:46
 #, fuzzy
-msgid "Enable Unmatched search folder"
-msgstr "Ĉiuj lokaj dosierujoj"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
-msgid ""
-"Enable Unmatched search folder within Search Folders. It does nothing if "
-"Search Folders are disabled."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
-msgid "Hides the per-folder preview and removes the selection"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
-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."
-msgstr ""
-"Tiu ĉi ŝlosilo estas legata nur unufoje kaj poste metita al \"ne\". Tio "
-"malmarkas la mesaĝon en la listo kaj forigas la antaŭrigardilon el la "
-"mesaĝujo."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
-msgid "Height of the message-list pane"
-msgstr "Alto de la mesaĝo-lista fenestro"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
-msgid "Height of the message-list pane."
-msgstr "Alto de la mesaĝo-lista fenestro."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
-msgid "Whether message headers are collapsed in the user interface"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
-msgid "Width of the message-list pane"
-msgstr "Larĝo de la mesaĝo-lista areo"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
-msgid "Width of the message-list pane."
-msgstr "Larĝo de la mesaĝo-lista areo."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
-msgid "Layout style"
-msgstr "Stilo de aranĝo"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
-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."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
-msgid "Variable width font"
-msgstr "Diverslarĝa tiparo"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
-msgid "The variable width font for mail display."
-msgstr "La varilarĝa tiparo por montrado de retpoŝtaĵoj."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
-msgid "Terminal font"
-msgstr "Terminala tiparo"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
-msgid "The terminal font for mail display."
-msgstr "La terminala litertiparo por montri poŝtaĵojn."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
-msgid "Use custom fonts"
-msgstr "Uzu personecigitajn riparojn"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
-msgid "Use custom fonts for displaying mail."
-msgstr "Uzu personecigitajn riparojn por montri poŝtaĵojn."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-msgstr ""
-"Tio ĉi difinas la nombron de adresoj montrataj en la normala mesaĝa vido, "
-"post kiuj aperas '...'."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
-msgid "Thread the message-list based on Subject"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
-msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
-msgid "Default value for thread expand state"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
-msgid "Whether sort threads based on latest message in that thread"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
-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."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
-msgid "Sort accounts alphabetically in a folder tree"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
-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 "
-"Computer and Search folders, otherwise accounts are sorted based on an order "
-"given by a user"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
-msgid "Log filter actions"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
-msgid "Log filter actions to the specified log file."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
-msgid "Logfile to log filter actions"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
-msgid "Logfile to log filter actions."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
-msgid "Flush Outbox after filtering"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
-msgid ""
-"Whether to flush Outbox after filtering is done. Outbox flush will happen "
-"only when there was used any 'Forward to' filter action and approximately "
-"one minute after the last action invocation."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
-msgid "Default forward style"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
-msgid "Default reply style"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
-msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
-msgid ""
-"Prompt the user when he or she tries to send a message with a key "
-"accelerator."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
-msgid "Prompt on empty subject"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
-msgid "Prompt when emptying the trash"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
-msgid "Prompt the user when he or she tries to empty the trash."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
-msgid "Prompt when user expunges"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
-msgid "Prompt the user when he or she tries to expunge a folder."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
-msgid "Prompt before sending to recipients not entered as mail addresses"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
-msgid ""
-"It disables/enables the repeated prompts to warn that you are trying to send "
-"a message to recipients not entered as mail addresses"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
-msgid "Prompt when user only fills Bcc"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
-msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
-msgid ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
-msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
-msgid ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
-msgid "Prompt while marking multiple messages"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
-msgid "Enable or disable the prompt whilst marking multiple messages."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
-msgid "Prompt when deleting messages in search folder"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
-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 "
-"the search results."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
-msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
-msgid ""
-"Possible values are: 'never' - do not allow copy with drag &amp; drop of "
-"folders in folder tree, 'always' - allow copy with drag &amp; drop of "
-"folders in folder tree without asking, or 'ask' - (or any other value) will "
-"ask user."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
-msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
-msgid ""
-"Possible values are: 'never' - do not allow move with drag &amp; drop of "
-"folders in folder tree, 'always' - allow move with drag &amp; drop of "
-"folders in folder tree without asking, or 'ask' - (or any other value) will "
-"ask user."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
-msgid "Prompt when replying privately to list messages"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
-msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"private reply to a message which arrived via a mailing list."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
-msgid "Prompt when mailing list hijacks private replies"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
-msgid ""
-"It disables/enables the repeated prompts to warn that you are trying sending "
-"a private reply to a message which arrived via a mailing list, but the list "
-"sets a Reply-To: header which redirects your reply back to the list"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
-msgid "Prompt when replying to many recipients"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
-msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"reply to many people."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
-msgid ""
-"Policy for automatically closing the message browser window when forwarding "
-"or replying to the displayed message."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
-msgid "Empty Trash folders on exit"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
-msgid "Empty all Trash folders when exiting Evolution."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
-msgid "Minimum days between emptying the trash on exit"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
-msgid "Minimum time between emptying the trash on exit, in days."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
-msgid "Last time Empty Trash was run"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
-msgid ""
-"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
-msgstr ""
-"La tempo de la lasta malplenigo de la rubujo, en tagoj ekde la 1-a de "
-"januaro 1970 (\"la epoko\")."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
-msgid "Level beyond which the message should be logged."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
-msgid ""
-"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
-"\"2\" for debug messages."
-msgstr ""
-"Tio ĉi povas havi unu el tri valoroj. \"0\" = eraro. \"1\" = averto. \"2\" = "
-"erarospura informo."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
-msgid "Show original \"Date\" header value."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
-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."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
-msgid "List of Labels and their associated colors"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
-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."
-msgstr ""
+#| msgid "Create a _Meeting"
+msgid "Convert to _Meeting"
+msgstr "Krei _kunsidon"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../src/composer/mail-composer.error.xml.h:47
 #, fuzzy
-msgid "Check incoming mail being junk"
-msgstr "Kontrolu alvenantajn poŝtaĵojn pri nedezirateco"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
-msgid "Run junk test on incoming mail."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
-msgid "Empty Junk folders on exit"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
-msgid "Empty all Junk folders when exiting Evolution."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
-msgid "Minimum days between emptying the junk on exit"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
-msgid "Minimum time between emptying the junk on exit, in days."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
-msgid "Last time Empty Junk was run"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
-msgid ""
-"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
-msgstr ""
-"La tempo de la lasta malplenigo de la mesaĝaĉujo, en tagoj ekde la 1-a de "
-"januaro 1970 (\"la epoko\")."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
-msgid "The default plugin for Junk hook"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
-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."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
-msgid "Determines whether to lookup in address book for sender email"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
-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."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
-msgid ""
-"Determines whether to look up addresses for junk filtering in local address "
-"book only"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
-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 "
-"mail sent by known contacts from junk filtering."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
-msgid "Determines whether to use custom headers to check for junk"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
-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 "
-"checking speed."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
-msgid "Custom headers to use while checking for junk."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
-msgid ""
-"Custom headers to use while checking for junk. The list elements are string "
-"in the format \"headername=value\"."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
-msgid "UID string of the default account."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
-msgid "Save directory"
-msgstr "Konservi dosierujon"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
-msgid "Directory for saving mail component files."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
-msgid "Composer load/attach directory"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
-msgid "Directory for loading/attaching files to composer."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
-msgid "Check for new messages on start"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
-msgid ""
-"Whether to check for new messages when Evolution is started. This includes "
-"also sending messages from Outbox."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
-msgid "Check for new messages in all active accounts"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
-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."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
-msgid "Server synchronization interval"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
-msgid ""
-"Controls how frequently local changes are synchronized with the remote mail "
-"server. The interval must be at least 30 seconds."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
-msgid "Allow expunge in virtual folders"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
-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."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
-msgid "An Archive folder for On This Computer folders."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
-msgid ""
-"An Archive folder to use for Messages|Archive... feature when in an On This "
-"Computer folder."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
-msgid "(Deprecated) Default forward style"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
-msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"\"forward-style-name\" instead."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
-msgid "(Deprecated) Default reply style"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
-msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"\"reply-style-name\" instead."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
-msgid "(Deprecated) List of custom headers and whether they are enabled."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
-msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"\"show-headers\" instead."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
-msgid "(Deprecated) Load images for HTML messages over HTTP"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
-msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"\"image-loading-policy\" instead."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
-msgid ""
-"(Deprecated) Asks whether to close the message window when the user forwards "
-"or replies to the message shown in the window"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
-msgid ""
-"This key was deprecated in version 3.10 and should no longer be used. Use "
-"\"browser-close-on-reply-policy\" instead."
-msgstr ""
-
-#. Translators: This is the a list of words for the attach reminder plugin to look
-#. for in a message body. Please use any number of words here in your language that might
-#. indicate that an attachment should have been attached to the message.
-#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:4
-msgid "['attachment','attaching','attached','enclosed']"
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:5
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body"
-msgstr ""
+#| msgid "Are you sure you want to delete this memo?"
+msgid "Are you sure you want to convert the event into a message?"
+msgstr "Ĉu vi certe volas forigi tiun noton?"
 
-#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:6
+#: ../src/composer/mail-composer.error.xml.h:48
 msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:1
-msgid "Address book source"
-msgstr "Adresaro-fonto"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:2
-msgid "Address book to use for storing automatically synced contacts."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
-msgid "Auto sync Pidgin contacts"
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
-msgid "Whether Pidgin contacts should be automatically synced."
+"By converting the event into the message the editing window will be closed "
+"and the changes being done discarded."
 msgstr ""
 
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
+#: ../src/composer/mail-composer.error.xml.h:49
 #, fuzzy
-msgid "Enable autocontacts"
-msgstr "Enŝalti aŭtomatajn kontaktojn"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
-msgid ""
-"Whether contacts should be automatically added to the user's address book."
-msgstr ""
+#| msgid "Important Messages"
+msgid "Convert to _Message"
+msgstr "Konverti al _mesaĝo"
 
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
+#: ../src/composer/mail-composer.error.xml.h:50
 #, fuzzy
-#| msgid "Address book source"
-msgid "Pidgin address book source"
-msgstr "Adresaro-fonto"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
-msgid ""
-"Address book to use for storing automatically synced contacts from Pidgin."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
-msgid "Pidgin check interval"
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
-msgid "Check interval for Pidgin syncing of contacts."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
-msgid "Pidgin last sync MD5"
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
-msgid "Pidgin last sync MD5."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
-msgid "Pidgin last sync time"
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:14
-msgid "Pidgin last sync time."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:1
-msgid "List of Custom Headers"
-msgstr ""
-
-#: ../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 \";\""
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
-msgid "Default External Editor"
-msgstr "Defaŭlta ekstera redaktilo"
-
-#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:2
-msgid "The default command that must be used as the editor."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
-msgid "Automatically launch when a new mail is edited"
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:4
-msgid "Automatically launch editor when key is pressed in the mail composer."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:1
-msgid "Insert Face picture by default"
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:2
-msgid ""
-"Whether insert Face picture to outgoing messages by default. The picture "
-"should be set before checking this, otherwise nothing happens."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:1
-msgid "Delete processed"
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:2
-msgid "Whether to delete processed iTip objects"
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
-msgid "Notify new messages for Inbox only."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:2
-msgid "Whether to notify new messages in Inbox folder only."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:3
-msgid "Enable D-Bus messages."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:4
-msgid "Generates a D-Bus message when new mail messages arrive."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:5
-msgid "Enable icon in notification area."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:6
-msgid "Show new mail icon in notification area when new messages arrive."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:7
-msgid "Popup message together with the icon."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:8
-msgid "Whether show message over the icon when new messages arrive."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
-msgid "Enable audible notifications when new messages arrive."
-msgstr ""
-
-#: ../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."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
-msgid "Whether to emit a beep."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
-msgid "Whether to emit a beep when new messages arrive."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
-msgid "Sound filename to be played."
-msgstr ""
+#| msgid "Are you sure you want to save the memo without a summary?"
+msgid "Are you sure you want to convert the memo into a message?"
+msgstr "Ĉu vi certe volas konservi tiun noton sen iu resumo?"
 
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
+#: ../src/composer/mail-composer.error.xml.h:51
 msgid ""
-"Sound file to be played when new messages arrive, if \"notify-sound-play-file"
-"\" is \"true\"."
+"By converting the memo into the message the editing window will be closed "
+"and the changes being done discarded."
 msgstr ""
 
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
+#: ../src/composer/mail-composer.error.xml.h:52
 #, fuzzy
-#| msgid "Beep or play sound file."
-msgid "Whether to play a sound file."
-msgstr "Pepi aŭ ludi sondosieron."
-
-#: ../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."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
-msgid "Use sound theme"
-msgstr "Uzi sontemon"
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:18
-msgid "Play themed sound when new messages arrive, if not in beep mode."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
-msgid "Mode to use when displaying mails"
-msgstr ""
-
-#: ../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, "
-"and \"only_plain\" forces Evolution to only show plain text"
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:3
-msgid "Whether to show suppressed HTML output"
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:1
-msgid "List of Destinations for publishing"
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:2
-msgid ""
-"The key specifies the list of destinations to where publish calendars. Each "
-"values specifies an XML with setup for publishing to one destination."
-msgstr ""
-
-#: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
-msgid ""
-"List of keyword/value pairs for the Templates plugin to substitute in a "
-"message body."
-msgstr ""
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
-msgid "Skip development warning dialog"
-msgstr ""
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
-msgstr ""
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:3
-msgid "Initial attachment view"
-msgstr ""
-
-#: ../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."
-msgstr ""
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:5
-msgid "Initial file chooser folder"
-msgstr ""
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:6
-msgid "Initial folder for GtkFileChooser dialogs."
-msgstr ""
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:308
-msgid "Start in offline mode"
-msgstr "Starti per nekonektita reĝimo"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
-msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr "Ĉu starti Evolucion per nekonektita reĝimo anstataŭ konektita reĝimo?"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
-msgid "Offline folder paths"
-msgstr ""
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage."
-msgstr ""
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
-msgid "Enable express mode"
-msgstr ""
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
-msgid "Flag that enables a much simplified user interface."
-msgstr ""
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
-msgid "Window buttons are visible"
-msgstr ""
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
-msgid "Whether the window buttons should be visible."
-msgstr ""
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
-msgid "Window button style"
-msgstr ""
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
-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."
-msgstr ""
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
-msgid "Toolbar is visible"
-msgstr "Ilobreto estas videbla"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
-msgid "Whether the toolbar should be visible."
-msgstr ""
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
-msgid "Sidebar is visible"
-msgstr "Flanka breto estas videbla"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
-msgid "Whether the sidebar should be visible."
-msgstr ""
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
-msgid "Statusbar is visible"
-msgstr "Statobreto estas videbla"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
-msgid "Whether the status bar should be visible."
-msgstr ""
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
-msgid "ID or alias of the component to be shown by default at start-up."
-msgstr ""
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
-msgid "Default sidebar width"
-msgstr ""
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
-msgid "The default width for the sidebar, in pixels."
-msgstr ""
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
-msgid "Use only local spam tests."
-msgstr ""
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:2
-msgid "Use only the local spam tests (no DNS)."
-msgstr ""
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
-msgid "Full path command to run spamassassin"
-msgstr ""
+#| msgid "Are you sure you want to save the task without a summary?"
+msgid "Are you sure you want to convert the task into a message?"
+msgstr "Ĉu vi certe volas konservi la taskon sen resumo?"
 
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
+#: ../src/composer/mail-composer.error.xml.h:53
 msgid ""
-"Full path to a spamassassin command. If not set, then a compile-time path is "
-"used, usually /usr/bin/spamassassin. The command should not contain any "
-"other arguments."
+"By converting the task into the message the editing window will be closed "
+"and the changes being done discarded."
 msgstr ""
 
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
-msgid "Full path command to run sa-learn"
+#: ../src/composer/mail-composer.error.xml.h:54
+msgid "Something has gone wrong when editing the message"
 msgstr ""
 
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
+#: ../src/composer/mail-composer.error.xml.h:55
 msgid ""
-"Full path to a sa-learn command. If not set, then a compile-time path is "
-"used, usually /usr/bin/sa-learn. The command should not contain any other "
-"arguments."
+"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, "
+"please file a bug report in the GNOME bugzilla."
 msgstr ""
 
-#: ../em-format/e-mail-formatter-attachment.c:405
-#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
-#: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
-#: ../mail/message-list.etspec.h:4
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "Aldonaĵo"
-msgstr[1] "Aldonaĵoj"
-
-#: ../em-format/e-mail-formatter-attachment.c:406
-#| msgctxt "iCalImp"
-#| msgid "has attachments"
+#: ../src/em-format/e-mail-formatter-attachment.c:334
 msgid "Display as attachment"
 msgstr "Montri kiel aldonaĵo"
 
-#: ../em-format/e-mail-formatter-audio.c:152
+#: ../src/em-format/e-mail-formatter-audio.c:151
 msgid "Audio Player"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-audio.c:153
+#: ../src/em-format/e-mail-formatter-audio.c:152
 msgid "Play the attachment in embedded audio player"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-headers.c:102
-#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:277
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:62
+#: ../src/em-format/e-mail-formatter-headers.c:107
+#: ../src/em-format/e-mail-part-headers.c:46
+#: ../src/mail/e-mail-tag-editor.c:203 ../src/mail/message-list.etspec.h:5
+#: ../src/modules/mail/em-mailer-prefs.c:60
 msgid "From"
 msgstr "De"
 
-#: ../em-format/e-mail-formatter-headers.c:128
+#: ../src/em-format/e-mail-formatter-headers.c:132
 msgid "(no subject)"
 msgstr "(sen temo)"
 
-#: ../em-format/e-mail-formatter-headers.c:329
+#. Translators: This message suggests to the receipients
+#. * that the sender of the mail is different from the one
+#. * listed in From field.
+#: ../src/em-format/e-mail-formatter-headers.c:339
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-image.c:170
+#: ../src/em-format/e-mail-formatter-image.c:178
 #, fuzzy
 #| msgid "Save Image"
 msgid "Regular Image"
 msgstr "Konservi bildon"
 
-#: ../em-format/e-mail-formatter-image.c:171
+#: ../src/em-format/e-mail-formatter-image.c:179
 #, fuzzy
 #| msgid "Display the next message"
 msgid "Display part as an image"
 msgstr "Montri la sekvan mesaĝon"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:254
-#| msgid "Custom _message"
+#: ../src/em-format/e-mail-formatter-message-rfc822.c:249
 msgid "RFC822 message"
 msgstr "RFC822-mesaĝo"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:255
+#: ../src/em-format/e-mail-formatter-message-rfc822.c:250
 msgid "Format part as an RFC822 message"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-print.c:53
-#: ../e-util/gal-view-instance-save-as-dialog.c:94
-#: ../mail/e-mail-label-tree-view.c:98
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1301
-#: ../modules/cal-config-google/e-google-chooser.c:1303
-#: ../modules/plugin-manager/evolution-plugin-manager.c:66
+#: ../src/em-format/e-mail-formatter-print.c:51
+#: ../src/e-util/e-webdav-browser.c:2352
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:92
+#: ../src/mail/e-mail-label-tree-view.c:96
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:64
 msgid "Name"
 msgstr "Nomo"
 
-#: ../em-format/e-mail-formatter-print.c:53
-#: ../e-util/e-attachment-tree-view.c:573 ../mail/message-list.etspec.h:10
+#: ../src/em-format/e-mail-formatter-print.c:51
+#: ../src/e-util/e-attachment-tree-view.c:193
+#: ../src/mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Grando"
 
-#: ../em-format/e-mail-formatter-quote-headers.c:174
-#: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:282
-#: ../mail/filtertypes.xml.in.h:16 ../mail/message-list.etspec.h:6
-#: ../mail/searchtypes.xml.in.h:17 ../mail/vfoldertypes.xml.in.h:17
-#: ../modules/mail/em-mailer-prefs.c:67
-#: ../smime/gui/certificate-manager.c:1630
+#: ../src/em-format/e-mail-formatter-quote-headers.c:178
+#: ../src/em-format/e-mail-part-headers.c:51
+#: ../src/mail/e-mail-tag-editor.c:208 ../src/mail/filtertypes.xml.in.h:16
+#: ../src/mail/message-list.etspec.h:6 ../src/mail/searchtypes.xml.in.h:17
+#: ../src/mail/vfoldertypes.xml.in.h:17
+#: ../src/modules/mail/em-mailer-prefs.c:65
+#: ../src/smime/gui/certificate-manager.c:1643
 msgid "Subject"
 msgstr "Temo"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:193
-#: ../em-format/e-mail-formatter-utils.c:343
-#: ../modules/mail/em-mailer-prefs.c:1166
+#: ../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:1500
 msgid "Mailer"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:94
-#: ../em-format/e-mail-formatter-text-enriched.c:102
+#: ../src/em-format/e-mail-formatter-quote-text-enriched.c:92
+#: ../src/em-format/e-mail-formatter-text-enriched.c:100
 msgid "Richtext"
 msgstr "Riĉa teksto"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:95
-#: ../em-format/e-mail-formatter-text-enriched.c:103
+#: ../src/em-format/e-mail-formatter-quote-text-enriched.c:93
+#: ../src/em-format/e-mail-formatter-text-enriched.c:101
 msgid "Display part as enriched text"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:95
-#: ../em-format/e-mail-formatter-text-html.c:360
+#: ../src/em-format/e-mail-formatter-quote-text-html.c:93
+#: ../src/em-format/e-mail-formatter-text-html.c:385
 msgid "HTML"
 msgstr "HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:96
-#: ../em-format/e-mail-formatter-text-html.c:361
+#: ../src/em-format/e-mail-formatter-quote-text-html.c:94
+#: ../src/em-format/e-mail-formatter-text-html.c:386
 msgid "Format part as HTML"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:123
-#: ../em-format/e-mail-formatter-text-plain.c:198
-#: ../e-util/e-html-editor-actions.c:1544
+#: ../src/em-format/e-mail-formatter-quote-text-plain.c:121
+#: ../src/em-format/e-mail-formatter-text-plain.c:196
+#: ../src/e-util/e-html-editor-actions.c:1314
 msgid "Plain Text"
 msgstr "Plata teksto"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:124
-#: ../em-format/e-mail-formatter-text-plain.c:199
+#: ../src/em-format/e-mail-formatter-quote-text-plain.c:122
+#: ../src/em-format/e-mail-formatter-text-plain.c:197
 msgid "Format part as plain text"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-secure-button.c:51
+#: ../src/em-format/e-mail-formatter-secure-button.c:45
 msgid "Unsigned"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-secure-button.c:51
+#: ../src/em-format/e-mail-formatter-secure-button.c:47
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 
-#: ../em-format/e-mail-formatter-secure-button.c:52
+#: ../src/em-format/e-mail-formatter-secure-button.c:49
 msgid "Valid signature"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-secure-button.c:52
+#: ../src/em-format/e-mail-formatter-secure-button.c:50
+msgid "Valid signature, but sender address and signer address do not match"
+msgstr ""
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:51
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr ""
 
-#: ../em-format/e-mail-formatter-secure-button.c:53
+#: ../src/em-format/e-mail-formatter-secure-button.c:53
 msgid "Invalid signature"
 msgstr "Nevalida subskribo"
 
-#: ../em-format/e-mail-formatter-secure-button.c:53
+#: ../src/em-format/e-mail-formatter-secure-button.c:55
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: ../em-format/e-mail-formatter-secure-button.c:54
+#: ../src/em-format/e-mail-formatter-secure-button.c:57
 msgid "Valid signature, but cannot verify sender"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-secure-button.c:54
+#: ../src/em-format/e-mail-formatter-secure-button.c:59
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
 
-#: ../em-format/e-mail-formatter-secure-button.c:55
-msgid "Signature exists, but need public key"
+#: ../src/em-format/e-mail-formatter-secure-button.c:61
+msgid "This message is signed, but the public key is not in your keyring"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-secure-button.c:55
+#: ../src/em-format/e-mail-formatter-secure-button.c:63
 msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
+"This message was digitally signed, but the corresponding public key is not "
+"present in your keyring. If you want to be able to verify the authenticity "
+"of messages from this person, you should obtain the public key through a "
+"trusted method and add it to your keyring. Until then, there is no guarantee "
+"that this message truly came from that person and that it arrived unaltered."
 msgstr ""
 
-#: ../em-format/e-mail-formatter-secure-button.c:62
+#: ../src/em-format/e-mail-formatter-secure-button.c:72
 msgid "Unencrypted"
 msgstr "Neĉifrite"
 
-#: ../em-format/e-mail-formatter-secure-button.c:62
+#: ../src/em-format/e-mail-formatter-secure-button.c:72
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: ../em-format/e-mail-formatter-secure-button.c:63
+#: ../src/em-format/e-mail-formatter-secure-button.c:73
 msgid "Encrypted, weak"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-secure-button.c:63
+#: ../src/em-format/e-mail-formatter-secure-button.c:73
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 
-#: ../em-format/e-mail-formatter-secure-button.c:64
+#: ../src/em-format/e-mail-formatter-secure-button.c:74
 msgid "Encrypted"
 msgstr "Ĉifrite"
 
-#: ../em-format/e-mail-formatter-secure-button.c:64
+#: ../src/em-format/e-mail-formatter-secure-button.c:74
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../src/em-format/e-mail-formatter-secure-button.c:75
 msgid "Encrypted, strong"
 msgstr "Ĉifrite, forte"
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../src/em-format/e-mail-formatter-secure-button.c:75
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 
-#: ../em-format/e-mail-formatter-secure-button.c:187
-#: ../shell/shell.error.xml.h:23 ../smime/gui/smime-ui.ui.h:22
-msgid "_View Certificate"
-msgstr "_Montri ateston"
-
-#: ../em-format/e-mail-formatter-secure-button.c:202
-msgid "This certificate is not viewable"
-msgstr ""
-
-#: ../em-format/e-mail-formatter-source.c:120
-msgid "Source"
-msgstr "Fonto"
-
-#: ../em-format/e-mail-formatter-source.c:121
+#: ../src/em-format/e-mail-formatter-source.c:119
 msgid "Display source of a MIME part"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-utils.c:203
-#: ../em-format/e-mail-formatter-utils.c:220
-#: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:65
+#: ../src/em-format/e-mail-formatter-utils.c:200
+#: ../src/em-format/e-mail-formatter-utils.c:217
+#: ../src/em-format/e-mail-part-headers.c:48
+#: ../src/mail/message-list.etspec.h:9 ../src/mail/searchtypes.xml.in.h:11
+#: ../src/mail/vfoldertypes.xml.in.h:11
+#: ../src/modules/mail/em-mailer-prefs.c:62
+msgid "To"
+msgstr "Al"
+
+#: ../src/em-format/e-mail-formatter-utils.c:201
+#: ../src/em-format/e-mail-formatter-utils.c:218
+#: ../src/em-format/e-mail-part-headers.c:49
+#: ../src/modules/mail/em-mailer-prefs.c:63
 msgid "Cc"
 msgstr "Km"
 
-#: ../em-format/e-mail-formatter-utils.c:204
-#: ../em-format/e-mail-formatter-utils.c:221
-#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:66
+#: ../src/em-format/e-mail-formatter-utils.c:202
+#: ../src/em-format/e-mail-formatter-utils.c:219
+#: ../src/em-format/e-mail-part-headers.c:50
+#: ../src/modules/mail/em-mailer-prefs.c:64
 msgid "Bcc"
 msgstr "Kkm"
 
-#: ../em-format/e-mail-formatter-utils.c:564
+#: ../src/em-format/e-mail-formatter-utils.c:582
 msgid "GPG signed"
 msgstr "Subskribita per GPG"
 
-#: ../em-format/e-mail-formatter-utils.c:570
-#, fuzzy
+#: ../src/em-format/e-mail-formatter-utils.c:588
 #| msgid "Unencrypted"
 msgid "GPG encrypted"
-msgstr "Neĉifrite"
+msgstr "Ĉifrite per GPG"
 
-#: ../em-format/e-mail-formatter-utils.c:576
+#: ../src/em-format/e-mail-formatter-utils.c:594
 msgid "S/MIME signed"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-utils.c:582
-#| msgid "Encrypted"
+#: ../src/em-format/e-mail-formatter-utils.c:600
 msgid "S/MIME encrypted"
 msgstr "S/MIME-ĉifrite"
 
-#: ../em-format/e-mail-formatter-utils.c:591
-#: ../mail/e-mail-config-security-page.c:736
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:194
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:144
+#: ../src/em-format/e-mail-formatter-utils.c:609
+#: ../src/mail/e-mail-config-security-page.c:716
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:272
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:215
 msgid "Security"
 msgstr "Sekureco"
 
-#: ../em-format/e-mail-parser-application-mbox.c:87
+#: ../src/em-format/e-mail-parser-application-mbox.c:85
 #, c-format
 msgid "Error parsing MBOX part: %s"
 msgstr ""
 
-#: ../em-format/e-mail-parser-application-smime.c:83
+#: ../src/em-format/e-mail-parser-application-smime.c:81
 #, c-format
-#| msgid "Could not create message."
 msgid "Could not parse S/MIME message: %s"
 msgstr "Ne eblis analizi S/MIME-mesaĝon: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:77
+#: ../src/em-format/e-mail-parser-inlinepgp-encrypted.c:75
 #, c-format
-#| msgid "Could not create message."
 msgid "Could not parse PGP message: %s"
 msgstr "Ne eblis analizi PGP-mesaĝon: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:80
-#: ../em-format/e-mail-parser-multipart-signed.c:135
+#: ../src/em-format/e-mail-parser-inlinepgp-signed.c:78
+#: ../src/em-format/e-mail-parser-multipart-signed.c:133
 #, c-format
-#| msgid "Error modifying contact"
 msgid "Error verifying signature: %s"
 msgstr "Eraro dum konfirmo de subskribo: %s"
 
-#: ../em-format/e-mail-parser-message-external.c:68
+#: ../src/em-format/e-mail-parser-message-external.c:66
 msgid "Malformed external-body part"
 msgstr ""
 
-#: ../em-format/e-mail-parser-message-external.c:101
+#: ../src/em-format/e-mail-parser-message-external.c:99
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: ../em-format/e-mail-parser-message-external.c:112
+#: ../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 ""
 
-#: ../em-format/e-mail-parser-message-external.c:114
+#: ../src/em-format/e-mail-parser-message-external.c:112
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: ../em-format/e-mail-parser-message-external.c:133
+#: ../src/em-format/e-mail-parser-message-external.c:131
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: ../em-format/e-mail-parser-message-external.c:151
+#: ../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 ""
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:66
-#: ../em-format/e-mail-parser-multipart-signed.c:83
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:64
+#: ../src/em-format/e-mail-parser-multipart-signed.c:81
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:82
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:79
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:101
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:98
 #, c-format
-#| msgid "Could not create message."
 msgid "Could not parse PGP/MIME message: %s"
 msgstr "Ne eblis analizi PGP/MIME-mesaĝon: %s"
 
-#: ../em-format/e-mail-parser-multipart-signed.c:121
+#: ../src/em-format/e-mail-parser-multipart-signed.c:119
 msgid "Unsupported signature format"
 msgstr ""
 
-#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:63
+#: ../src/em-format/e-mail-part-headers.c:47
+#: ../src/modules/mail/em-mailer-prefs.c:61
 msgid "Reply-To"
 msgstr "Respondo-al"
 
-#: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:549
-#: ../e-util/e-dateedit.c:572 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:68
+#: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:550
+#: ../src/e-util/e-dateedit.c:573 ../src/mail/message-list.etspec.h:7
+#: ../src/modules/mail/em-mailer-prefs.c:66
 msgid "Date"
 msgstr "Dato"
 
-#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:69
+#: ../src/em-format/e-mail-part-headers.c:53
+#: ../src/modules/mail/em-mailer-prefs.c:67
 msgid "Newsgroups"
 msgstr "Novaĵogrupoj"
 
-#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:70
-#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+#: ../src/em-format/e-mail-part-headers.c:54
+#: ../src/modules/mail/em-mailer-prefs.c:68
+#: ../src/plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "Vizaĝo"
 
-#: ../em-format/e-mail-part-utils.c:544
+#: ../src/em-format/e-mail-part-secure-button.c:92
+#, c-format
+#| msgid "Failed to open folder."
+msgid "Failed to import certificate: %s"
+msgstr "Malsukcesis enporti atestilon: %s"
+
+#: ../src/em-format/e-mail-part-secure-button.c:185
+#: ../src/shell/shell.error.xml.h:28 ../src/smime/gui/smime-ui.ui.h:16
+msgid "_View Certificate"
+msgstr "_Montri atestilon"
+
+#: ../src/em-format/e-mail-part-secure-button.c:198
+#| msgid "Your Certificates"
+msgid "_Import Certificate"
+msgstr "_Enporti atestilojn"
+
+#: ../src/em-format/e-mail-part-secure-button.c:207
+msgid "This certificate is not viewable"
+msgstr ""
+
+#: ../src/em-format/e-mail-part-utils.c:556
 #, c-format
 msgid "%s attachment"
 msgstr "%s aldonaĵo"
 
-#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
+#: ../src/e-util/ea-calendar-item.c:312 ../src/e-util/ea-calendar-item.c:321
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: ../e-util/ea-calendar-item.c:326
+#: ../src/e-util/ea-calendar-item.c:324
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Kalendaro: de %s al %s"
 
-#: ../e-util/ea-calendar-item.c:363
+#: ../src/e-util/ea-calendar-item.c:361
 msgid "evolution calendar item"
 msgstr "kalendar-elemento de Evolucio"
 
+#: ../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:836
+msgid "Mail Accounts"
+msgstr "Retpoŝtkontoj"
+
+#: ../src/e-util/e-accounts-window.c:516 ../src/e-util/e-accounts-window.c:653
+#: ../src/e-util/e-accounts-window.c:841
+#, fuzzy
+#| msgid "Address Book"
+msgid "Address Books"
+msgstr "Adresaro"
+
+#: ../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
+#, fuzzy
+#| msgid "Calendar"
+msgid "Calendars"
+msgstr "Kalendaro"
+
+#: ../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"
+msgid "Memo Lists"
+msgstr "Notolistoj"
+
+#: ../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
+#, fuzzy
+#| msgid "Task List"
+msgid "Task Lists"
+msgstr "Tasklisto"
+
+#: ../src/e-util/e-accounts-window.c:1326
+#: ../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
+msgid "Enabled"
+msgstr "Enŝaltite"
+
+#: ../src/e-util/e-accounts-window.c:1342
+#: ../src/mail/e-mail-account-tree-view.c:108
+msgid "Account Name"
+msgstr "Kontonomo"
+
+#. { "collection",     N_("Collection _Account"),      "evolution" },
+#: ../src/e-util/e-accounts-window.c:1410
+#| msgid "Mail Accounts"
+msgid "_Mail Account"
+msgstr "_Retpoŝtkonto"
+
+#: ../src/e-util/e-accounts-window.c:1411
+#, fuzzy
+#| msgctxt "New"
+#| msgid "Address _Book"
+msgid "Address _Book"
+msgstr "_Adresaro"
+
+#: ../src/e-util/e-accounts-window.c:1412
+#| msgid "_Calendar:"
+msgid "_Calendar"
+msgstr "_Kalendaro"
+
+#: ../src/e-util/e-accounts-window.c:1413
+#, fuzzy
+#| msgctxt "New"
+#| msgid "Memo Li_st"
+msgid "M_emo List"
+msgstr "Notoli_sto"
+
+#: ../src/e-util/e-accounts-window.c:1414
+#| msgid "Task List"
+msgid "_Task List"
+msgstr "_Tasklisto"
+
+#: ../src/e-util/e-accounts-window.c:1608
+#, fuzzy
+#| msgid "Evolution Account Assistant"
+msgid "Evolution Accounts"
+msgstr "Konto-asistanto de Evolucio"
+
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:258
+#: ../src/e-util/e-activity.c:256
 #, c-format
 msgid "%s (cancelled)"
 msgstr ""
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:261
+#: ../src/e-util/e-activity.c:259
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (plenumite)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:264
+#: ../src/e-util/e-activity.c:262
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (atendante)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:268
+#: ../src/e-util/e-activity.c:266
 #, c-format
 msgid "%s (cancelling)"
 msgstr ""
 
-#: ../e-util/e-activity.c:270
+#: ../src/e-util/e-activity.c:268
 #, c-format
 msgid "%s"
 msgstr "%s"
 
+#. Translators: This is a running activity whose
+#. *              percent complete is known.
 #. Translators: This is a running activity whose percent complete is known.
-#: ../e-util/e-activity.c:275
-#: ../modules/calendar/e-cal-base-shell-content.c:144
+#: ../src/e-util/e-activity.c:273
+#: ../src/modules/calendar/e-cal-base-shell-content.c:142
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% plenumite)"
 
-#: ../e-util/e-activity-proxy.c:352
-#: ../modules/mail/e-mail-shell-view-actions.c:1785
+#: ../src/e-util/e-activity-proxy.c:350
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1851
 msgid "Cancel"
 msgstr "Nuligi"
 
 #. Translators: Escape is a keyboard binding.
-#: ../e-util/e-alert-bar.c:118
+#: ../src/e-util/e-alert-bar.c:125
 #, fuzzy
 #| msgid "Close this message"
 msgid "Close this message (Escape)"
 msgstr "Fermi tiun mesaĝon (Eskapo)"
 
-#: ../e-util/e-alert-sink.c:246
+#: ../src/e-util/e-alert-sink.c:244
 msgid "Failed to create a thread: "
 msgstr "Malsukcesis krei fadenon: "
 
-#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:736
-msgid "Icon View"
-msgstr "Piktograma vido"
-
-#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:738
-msgid "List View"
-msgstr "Lista vido"
-
 #. To Translators: This text is set as a description of an attached
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../e-util/e-attachment.c:1197
+#: ../src/e-util/e-attachment.c:1138
 msgid "Attached message"
 msgstr "Aldonita mesaĝo"
 
-#: ../e-util/e-attachment.c:2104 ../e-util/e-attachment.c:3101
+#: ../src/e-util/e-attachment.c:2063 ../src/e-util/e-attachment.c:3116
 msgid "Operation was cancelled"
 msgstr ""
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment.c:2264 ../e-util/e-attachment.c:2963
-#: ../e-util/e-attachment.c:3334 ../e-util/e-attachment-store.c:691
+#: ../src/e-util/e-attachment.c:2247 ../src/e-util/e-attachment.c:2963
+#: ../src/e-util/e-attachment.c:3406 ../src/e-util/e-attachment-store.c:886
 msgid "attachment.dat"
 msgstr "aldonajxo.dat"
 
-#: ../e-util/e-attachment.c:2345 ../e-util/e-attachment.c:3394
+#: ../src/e-util/e-attachment.c:2325 ../src/e-util/e-attachment.c:3466
 msgid "A load operation is already in progress"
 msgstr ""
 
-#: ../e-util/e-attachment.c:2353 ../e-util/e-attachment.c:3402
+#: ../src/e-util/e-attachment.c:2333 ../src/e-util/e-attachment.c:3474
 msgid "A save operation is already in progress"
 msgstr ""
 
-#: ../e-util/e-attachment.c:2473
+#: ../src/e-util/e-attachment.c:2730
 #, c-format
-msgid "Could not load '%s'"
-msgstr "Ne eblis ŝargi na '%s'"
+#| msgid "Could not open %s:"
+msgid "Could not open “%s”"
+msgstr "Ne eblis malfemi “%s”"
 
-#: ../e-util/e-attachment.c:2476
-#, c-format
-msgid "Could not load the attachment"
-msgstr ""
-
-#: ../e-util/e-attachment.c:2761
-#, c-format
-msgid "Could not open '%s'"
-msgstr "Ne eblis malfermi na '%s'"
-
-#: ../e-util/e-attachment.c:2764
+#: ../src/e-util/e-attachment.c:2733
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Ne eblis malfermi aldonaĵon"
 
-#: ../e-util/e-attachment.c:3411
+#: ../src/e-util/e-attachment.c:3483
 msgid "Attachment contents not loaded"
 msgstr ""
 
-#: ../e-util/e-attachment.c:3502
+#: ../src/e-util/e-attachment.c:3574
 #, c-format
-msgid "Could not save '%s'"
-msgstr "Ne eblis konservi na '%s'"
+#| msgid "Could not save “%s”"
+msgid "Could not save “%s”"
+msgstr "Ne eblis konservi na “%s”"
 
-#: ../e-util/e-attachment.c:3505
+#: ../src/e-util/e-attachment.c:3577
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Ne eblis konservi la aldonaĵon"
 
-#: ../e-util/e-attachment-dialog.c:317
+#: ../src/e-util/e-attachment-dialog.c:315
 msgid "Attachment Properties"
 msgstr "Ecoj de aldonaĵoj"
 
-#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:273
+#: ../src/e-util/e-attachment-dialog.c:337
+#: ../src/e-util/e-import-assistant.c:276
 msgid "F_ilename:"
 msgstr "_Dosiernomo:"
 
-#: ../e-util/e-attachment-dialog.c:374
+#: ../src/e-util/e-attachment-dialog.c:354
+#: ../src/e-util/e-html-editor-image-dialog.c:508
+#: ../src/e-util/e-html-editor-link-dialog.c:241
+#: ../src/e-util/e-webdav-browser.c:2447
+msgid "_Description:"
+msgstr "_Priskribo:"
+
+#: ../src/e-util/e-attachment-dialog.c:372
 msgid "MIME Type:"
 msgstr "MIME-tipo:"
 
-#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:521
+#: ../src/e-util/e-attachment-dialog.c:380
+#: ../src/e-util/e-attachment-store.c:694
 msgid "_Suggest automatic display of attachment"
 msgstr ""
 
-#: ../e-util/e-attachment-handler-image.c:98
+#: ../src/e-util/e-attachment-handler-image.c:96
 msgid "Could not set as background"
 msgstr ""
 
-#: ../e-util/e-attachment-handler-image.c:148
+#: ../src/e-util/e-attachment-handler-image.c:146
 msgid "Set as _Background"
 msgstr "Uzi kiel _fono"
 
-#: ../e-util/e-attachment-icon-view.c:168
-#: ../e-util/e-attachment-tree-view.c:548
+#: ../src/e-util/e-attachment-icon-view.c:168
+#: ../src/e-util/e-attachment-tree-view.c:168
 msgid "Loading"
 msgstr "Ŝargante"
 
-#: ../e-util/e-attachment-icon-view.c:180
-#: ../e-util/e-attachment-tree-view.c:560
+#: ../src/e-util/e-attachment-icon-view.c:180
+#: ../src/e-util/e-attachment-tree-view.c:180
 msgid "Saving"
 msgstr "Konservante"
 
-#: ../e-util/e-attachment-paned.c:107
+#: ../src/e-util/e-attachment-paned.c:103
 msgid "Hide Attachment _Bar"
 msgstr "Kaŝi aldonaĵ_breton"
 
-#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:752
+#: ../src/e-util/e-attachment-paned.c:105
+#: ../src/e-util/e-attachment-paned.c:741
 msgid "Show Attachment _Bar"
 msgstr "Montri aldonaĵ_breton"
 
-#: ../e-util/e-attachment-store.c:486
+#: ../src/e-util/e-attachment-store.c:659
 msgid "Add Attachment"
 msgstr "Aldoni aldonaĵo"
 
-#: ../e-util/e-attachment-store.c:493 ../e-util/e-attachment-store.c:495
+#: ../src/e-util/e-attachment-store.c:666
+#: ../src/e-util/e-attachment-store.c:668
 msgid "A_ttach"
 msgstr "_Aldoni"
 
-#: ../e-util/e-attachment-store.c:533
+#: ../src/e-util/e-attachment-store.c:715
 msgid "Archive selected directories using this format:"
 msgstr ""
 
-#: ../e-util/e-attachment-store.c:626
+#: ../src/e-util/e-attachment-store.c:823
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Konservi aldonaĵon"
 msgstr[1] "Konservi aldonaĵojn"
 
-#: ../e-util/e-attachment-store.c:653
+#: ../src/e-util/e-attachment-store.c:850
 #, fuzzy
 #| msgid "Could not save the attachment"
 msgid "Do _not extract files from the attachment"
 msgstr "_Ne eblis konservi la aldonaĵon"
 
-#: ../e-util/e-attachment-store.c:658
+#: ../src/e-util/e-attachment-store.c:855
 msgid "Save extracted files _only"
 msgstr ""
 
-#: ../e-util/e-attachment-store.c:663
+#: ../src/e-util/e-attachment-store.c:860
 msgid "Save extracted files and the original _archive"
 msgstr ""
 
-#: ../e-util/e-attachment-view.c:377
+#: ../src/e-util/e-attachment-view.c:309
 msgid "Open With Other Application..."
 msgstr ""
 
-#: ../e-util/e-attachment-view.c:384
+#: ../src/e-util/e-attachment-view.c:316
 msgid "S_ave All"
 msgstr "_Konservi ĉiujn"
 
-#: ../e-util/e-attachment-view.c:391
+#: ../src/e-util/e-attachment-view.c:323
 msgid "Sa_ve As"
 msgstr "Konser_vi kiel"
 
-#: ../e-util/e-attachment-view.c:400
-#: ../plugins/save-calendar/save-calendar.c:349
-#: ../plugins/save-calendar/save-calendar.c:380
-#: ../plugins/save-calendar/save-calendar.c:411
+#: ../src/e-util/e-attachment-view.c:332
+#: ../src/plugins/save-calendar/save-calendar.c:351
+#: ../src/plugins/save-calendar/save-calendar.c:382
+#: ../src/plugins/save-calendar/save-calendar.c:413
 msgid "Save _As"
 msgstr "Konservi _kiel"
 
-#: ../e-util/e-attachment-view.c:410
+#: ../src/e-util/e-attachment-view.c:342
 msgid "A_dd Attachment..."
 msgstr "_Alsodni aldonaĵon..."
 
-#: ../e-util/e-attachment-view.c:417
-#: ../modules/addressbook/e-book-shell-view-actions.c:1071
-#: ../modules/calendar/e-cal-shell-view-actions.c:1240
-#: ../modules/calendar/e-memo-shell-view-actions.c:571
-#: ../modules/calendar/e-task-shell-view-actions.c:696
-#: ../modules/mail/e-mail-shell-view-actions.c:1586
-#: ../modules/mail/e-mail-shell-view-actions.c:1657
+#: ../src/e-util/e-attachment-view.c:349
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1101
+#: ../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
 msgid "_Properties"
 msgstr "_Ecoj"
 
-#: ../e-util/e-attachment-view.c:434
-msgid "_Hide"
-msgstr "_Kaŝi"
-
-#: ../e-util/e-attachment-view.c:441
-msgid "Hid_e All"
-msgstr "Kaŝ_i ĉiujn"
-
-#: ../e-util/e-attachment-view.c:448
-msgid "_View Inline"
-msgstr ""
-
-#: ../e-util/e-attachment-view.c:455
-msgid "Vie_w All Inline"
-msgstr ""
-
-#: ../e-util/e-attachment-view.c:785
-#, c-format
-msgid "Open With \"%s\""
-msgstr "Malfermi per \"%s\""
+#: ../src/e-util/e-attachment-view.c:778
+#, fuzzy, c-format
+#| msgid "Open With \"%s\""
+msgid "Open With “%s”"
+msgstr "Malfermi per “%s”"
 
-#: ../e-util/e-attachment-view.c:788
+#: ../src/e-util/e-attachment-view.c:781
 #, c-format
 msgid "Open this attachment in %s"
 msgstr ""
 
-#: ../e-util/e-book-source-config.c:97
+#: ../src/e-util/e-book-source-config.c:98
 #, fuzzy
 #| msgid "Mark as _default calendar"
 msgid "Mark as default address book"
 msgstr "Marki kiel defaŭlta kalendaro"
 
-#: ../e-util/e-book-source-config.c:102
+#: ../src/e-util/e-book-source-config.c:103
 #, fuzzy
 #| msgid "Delete the selected address book"
 msgid "Autocomplete with this address book"
 msgstr "Forigi la elektitan adresaron"
 
-#: ../e-util/e-book-source-config.c:276
+#: ../src/e-util/e-book-source-config.c:277
 #, fuzzy
 #| msgid "Cop_y task list contents locally for offline operation"
 msgid "Copy book content locally for offline operation"
 msgstr "Loke kopii tasklistan enhavon por nekonektitaj agoj"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../e-util/e-buffer-tagger.c:407
+#: ../src/e-util/e-buffer-tagger.c:410
 msgid "Ctrl-click to open a link"
 msgstr ""
 
-#: ../e-util/e-calendar.c:195
+#: ../src/e-util/e-calendar.c:267
 msgid "Previous month"
 msgstr "Antaŭa monato"
 
-#: ../e-util/e-calendar.c:220
+#: ../src/e-util/e-calendar.c:286
 msgid "Next month"
 msgstr "Sekva monato"
 
-#: ../e-util/e-calendar.c:246
+#: ../src/e-util/e-calendar.c:306
 msgid "Previous year"
 msgstr "Antaŭa jaro"
 
-#: ../e-util/e-calendar.c:271
+#: ../src/e-util/e-calendar.c:325
 msgid "Next year"
 msgstr "Sekva jaro"
 
-#: ../e-util/e-calendar.c:295
+#: ../src/e-util/e-calendar.c:349
 msgid "Month Calendar"
 msgstr "Monata kalendaro"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1323 ../e-util/e-calendar-item.c:2201
+#: ../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.
-#: ../e-util/e-calendar-item.c:1325
+#: ../src/e-util/e-calendar-item.c:1335
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1362
+#: ../src/e-util/e-calendar-item.c:1372
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "d- %b-%Y"
 
-#: ../e-util/e-cal-source-config.c:169
+#: ../src/e-util/e-cal-source-config.c:169
 #, fuzzy
 #| msgid "Mark as _default calendar"
 msgid "Mark as default calendar"
 msgstr "Marki kiel defaŭlta kalendaro"
 
-#: ../e-util/e-cal-source-config.c:172
+#: ../src/e-util/e-cal-source-config.c:172
 #, fuzzy
 #| msgid "Mark as _default task list"
 msgid "Mark as default task list"
 msgstr "Marki kiel defaŭlta tasklisto"
 
-#: ../e-util/e-cal-source-config.c:175
+#: ../src/e-util/e-cal-source-config.c:175
 #, fuzzy
 #| msgid "Mark as _default task list"
 msgid "Mark as default memo list"
 msgstr "Marki kiel defaŭlta tasklisto"
 
-#: ../e-util/e-cal-source-config.c:200
-#| msgid "Colo_r:"
+#: ../src/e-util/e-cal-source-config.c:200
 msgid "Color:"
 msgstr "Koloro:"
 
-#: ../e-util/e-cal-source-config.c:428
+#: ../src/e-util/e-cal-source-config.c:428
 #, fuzzy
 #| msgid "Cop_y calendar contents locally for offline operation"
 msgid "Copy calendar contents locally for offline operation"
 msgstr "Loke kopii kalendaran enhavon por nekonektitaj agoj"
 
-#: ../e-util/e-cal-source-config.c:432
+#: ../src/e-util/e-cal-source-config.c:432
 #, fuzzy
 #| msgid "Cop_y task list contents locally for offline operation"
 msgid "Copy task list contents locally for offline operation"
 msgstr "Loke kopii tasklistan enhavon por nekonektitaj agoj"
 
-#: ../e-util/e-cal-source-config.c:436
+#: ../src/e-util/e-cal-source-config.c:436
 #, fuzzy
 #| msgid "Cop_y memo list contents locally for offline operation"
 msgid "Copy memo list contents locally for offline operation"
 msgstr "Loke kopii notlistan enhavon por nekonektitaj agoj"
 
-#: ../e-util/e-categories-editor.c:223
+#: ../src/e-util/e-categories-editor.c:246
 msgid "Currently _used categories:"
 msgstr ""
 
-#: ../e-util/e-categories-editor.c:234
-#| msgid "Available Cate_gories"
+#: ../src/e-util/e-categories-editor.c:257
 msgid "_Available Categories:"
 msgstr "_Disponeblaj kategorioj:"
 
-#: ../e-util/e-categories-editor.c:274
+#: ../src/e-util/e-categories-editor.c:297
 msgctxt "category"
 msgid "_New"
 msgstr "_Nova"
 
-#: ../e-util/e-categories-editor.c:278
+#: ../src/e-util/e-categories-editor.c:301
 msgctxt "category"
 msgid "_Edit"
 msgstr "R_edakti"
 
-#: ../e-util/e-categories-editor.c:282
+#: ../src/e-util/e-categories-editor.c:305
 msgctxt "category"
 msgid "_Delete"
 msgstr "_Forigi"
 
-#: ../e-util/e-categories-selector.c:322
+#: ../src/e-util/e-categories-selector.c:323
 #, fuzzy
 #| msgid "Icon View"
 msgid "Icon"
 msgstr "Piktograma vido"
 
-#: ../e-util/e-category-completion.c:307
+#: ../src/e-util/e-category-completion.c:304
 #, c-format
-msgid "Create category \"%s\""
+msgid "Create category “%s”"
 msgstr ""
 
-#: ../e-util/e-category-editor.c:136
+#: ../src/e-util/e-category-editor.c:138
 #, fuzzy
 #| msgid "Category"
 msgid "Category Icon"
 msgstr "Kategorio"
 
-#: ../e-util/e-category-editor.c:140
+#: ../src/e-util/e-category-editor.c:142
 #, fuzzy
 #| msgid "_No image"
 msgid "_No Image"
 msgstr "_Neniu bildo"
 
-#: ../e-util/e-category-editor.c:173
+#: ../src/e-util/e-category-editor.c:175
 #, fuzzy
 #| msgid "Category"
 msgid "Category _Name"
 msgstr "Kategorio-_nomo"
 
-#: ../e-util/e-category-editor.c:185
+#: ../src/e-util/e-category-editor.c:188
 #, fuzzy
 #| msgid "Category"
 msgid "Category _Icon"
 msgstr "Kategorio-_piktogramo"
 
-#: ../e-util/e-category-editor.c:211
+#: ../src/e-util/e-category-editor.c:214
 #, fuzzy
 #| msgid "Calendar Properties"
 msgid "Category Properties"
 msgstr "Kalendar-ecoj"
 
-#: ../e-util/e-category-editor.c:272
+#: ../src/e-util/e-category-editor.c:275
 #, c-format
 msgid ""
-"There is already a category '%s' in the configuration. Please use another "
+"There is already a category “%s” in the configuration. Please use another "
 "name"
 msgstr ""
 
-#: ../e-util/e-cell-combo.c:185
+#: ../src/e-util/e-cell-combo.c:183
 msgid "popup list"
 msgstr ""
 
-#: ../e-util/e-cell-date.c:52 ../mail/message-list.c:2033
+#: ../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:2067
 msgid "?"
 msgstr "?"
 
-#: ../e-util/e-cell-date-edit.c:298
+#: ../src/e-util/e-cell-date-edit.c:320
 msgid "Now"
 msgstr "Nun"
 
-#. strftime format of a weekday and a date.
-#: ../e-util/e-cell-date-edit.c:306 ../e-util/e-datetime-format.c:208
-#: ../modules/calendar/e-cal-shell-view-actions.c:1740
-#: ../modules/itip-formatter/itip-view.c:223
-msgid "Today"
-msgstr "Hodiaŭ"
-
 #. Translators: "None" as a label of a button to unset date in a
 #. * date table cell.
-#: ../e-util/e-cell-date-edit.c:316
+#: ../src/e-util/e-cell-date-edit.c:338
 msgctxt "table-date"
 msgid "None"
 msgstr "Neniu"
 
-#: ../e-util/e-cell-date-edit.c:324 ../mail/e-mail-label-dialog.c:200
+#: ../src/e-util/e-cell-date-edit.c:346 ../src/mail/e-mail-label-dialog.c:198
 msgid "OK"
 msgstr "Bone"
 
-#: ../e-util/e-cell-date-edit.c:873
+#: ../src/e-util/e-cell-date-edit.c:901
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
 
-#: ../e-util/e-cell-percent.c:81
+#: ../src/e-util/e-cell-percent.c:79
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: ../e-util/e-charset.c:52
+#: ../src/e-util/e-charset.c:50
 msgid "Arabic"
 msgstr "Araba"
 
-#: ../e-util/e-charset.c:53
+#: ../src/e-util/e-charset.c:51
 msgid "Baltic"
 msgstr "Balta"
 
-#: ../e-util/e-charset.c:54
+#: ../src/e-util/e-charset.c:52
 msgid "Central European"
 msgstr "Mezeŭropa"
 
-#: ../e-util/e-charset.c:55
+#: ../src/e-util/e-charset.c:53
 msgid "Chinese"
 msgstr "Ĉina"
 
-#: ../e-util/e-charset.c:56
+#: ../src/e-util/e-charset.c:54
 msgid "Cyrillic"
 msgstr "Cirila"
 
-#: ../e-util/e-charset.c:57
+#: ../src/e-util/e-charset.c:55
 msgid "Greek"
 msgstr "Greka"
 
-#: ../e-util/e-charset.c:58
+#: ../src/e-util/e-charset.c:56
 msgid "Hebrew"
 msgstr "Hebrea"
 
-#: ../e-util/e-charset.c:59
+#: ../src/e-util/e-charset.c:57
 msgid "Japanese"
 msgstr "Japana"
 
-#: ../e-util/e-charset.c:60
+#: ../src/e-util/e-charset.c:58
 msgid "Korean"
 msgstr "Korea"
 
-#: ../e-util/e-charset.c:61
+#: ../src/e-util/e-charset.c:59
 msgid "Thai"
 msgstr "Taja"
 
-#: ../e-util/e-charset.c:62
+#: ../src/e-util/e-charset.c:60
 msgid "Turkish"
 msgstr "Turka"
 
-#: ../e-util/e-charset.c:63
+#: ../src/e-util/e-charset.c:61
 msgid "Unicode"
 msgstr "Unikodo"
 
-#: ../e-util/e-charset.c:64
+#: ../src/e-util/e-charset.c:62
 msgid "Western European"
 msgstr "Okcidenteŭropa"
 
-#: ../e-util/e-charset.c:65
+#: ../src/e-util/e-charset.c:63
 msgid "Western European, New"
 msgstr "Okcidenteŭropa nova"
 
 #. Translators: Character set "Chinese, Traditional"
-#: ../e-util/e-charset.c:84 ../e-util/e-charset.c:86 ../e-util/e-charset.c:88
+#: ../src/e-util/e-charset.c:82 ../src/e-util/e-charset.c:84
+#: ../src/e-util/e-charset.c:86
 msgid "Traditional"
 msgstr "Tradicia"
 
 #. Translators: Character set "Chinese, Simplified"
-#: ../e-util/e-charset.c:90 ../e-util/e-charset.c:92 ../e-util/e-charset.c:94
-#: ../e-util/e-charset.c:96
+#: ../src/e-util/e-charset.c:88 ../src/e-util/e-charset.c:90
+#: ../src/e-util/e-charset.c:92 ../src/e-util/e-charset.c:94
 msgid "Simplified"
 msgstr "Simpligite"
 
 #. Translators: Character set "Cyrillic, Ukrainian"
-#: ../e-util/e-charset.c:100
+#: ../src/e-util/e-charset.c:98
 msgid "Ukrainian"
 msgstr "Ukraina"
 
 #. Translators: Character set "Hebrew, Visual"
-#: ../e-util/e-charset.c:104
+#: ../src/e-util/e-charset.c:102
 msgid "Visual"
 msgstr ""
 
-#: ../e-util/e-charset-combo-box.c:99
+#: ../src/e-util/e-charset-combo-box.c:97
 msgid "Character Encoding"
 msgstr ""
 
-#: ../e-util/e-charset-combo-box.c:119
+#: ../src/e-util/e-charset-combo-box.c:117
 msgid "Enter the character set to use"
 msgstr ""
 
-#: ../e-util/e-charset-combo-box.c:365
+#: ../src/e-util/e-charset-combo-box.c:363
 msgid "Other..."
 msgstr "Alia..."
 
-#: ../e-util/e-client-cache.c:1285
+#: ../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 ""
 
-#: ../e-util/e-color-chooser-widget.c:124
+#: ../src/e-util/e-color-chooser-widget.c:122
 #, fuzzy
 #| msgid "Use custom fonts"
 msgid "Choose custom color"
 msgstr "Uzu personecigitajn riparojn"
 
-#: ../e-util/e-color-combo.c:81
+#: ../src/e-util/e-color-combo.c:79
 msgid "black"
 msgstr "nigra"
 
-#: ../e-util/e-color-combo.c:82
+#: ../src/e-util/e-color-combo.c:80
 msgid "light brown"
 msgstr "bruneta"
 
-#: ../e-util/e-color-combo.c:83
+#: ../src/e-util/e-color-combo.c:81
 msgid "brown gold"
 msgstr "brunaora"
 
-#: ../e-util/e-color-combo.c:84
+#: ../src/e-util/e-color-combo.c:82
 msgid "dark green #2"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:85
+#: ../src/e-util/e-color-combo.c:83
 msgid "navy"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:86
+#: ../src/e-util/e-color-combo.c:84
 msgid "dark blue"
 msgstr "nigrablua"
 
-#: ../e-util/e-color-combo.c:87
+#: ../src/e-util/e-color-combo.c:85
 msgid "purple #2"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:88
-#| msgid "Every day"
-#| msgid_plural "Every %d days"
+#: ../src/e-util/e-color-combo.c:86
 msgid "very dark gray"
 msgstr "malhelega grizo"
 
-#: ../e-util/e-color-combo.c:90
-#| msgid "Mark as _Unread"
+#: ../src/e-util/e-color-combo.c:88
 msgid "dark red"
 msgstr "malhela ruĝo"
 
-#: ../e-util/e-color-combo.c:91
+#: ../src/e-util/e-color-combo.c:89
 msgid "red-orange"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:92
+#: ../src/e-util/e-color-combo.c:90
 msgid "gold"
 msgstr "ora"
 
-#: ../e-util/e-color-combo.c:93
+#: ../src/e-util/e-color-combo.c:91
 msgid "dark green"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:94
+#: ../src/e-util/e-color-combo.c:92
 msgid "dull blue"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:95
+#: ../src/e-util/e-color-combo.c:93
 msgid "blue"
 msgstr "blua"
 
-#: ../e-util/e-color-combo.c:96
+#: ../src/e-util/e-color-combo.c:94
 msgid "dull purple"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:97
+#: ../src/e-util/e-color-combo.c:95
 msgid "dark grey"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:99
+#: ../src/e-util/e-color-combo.c:97
 #, fuzzy
 #| msgid "3rd"
 msgid "red"
 msgstr "3a"
 
-#: ../e-util/e-color-combo.c:100
+#: ../src/e-util/e-color-combo.c:98
 msgid "orange"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:101
+#: ../src/e-util/e-color-combo.c:99
 msgid "lime"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:102
+#: ../src/e-util/e-color-combo.c:100
 msgid "dull green"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:103
+#: ../src/e-util/e-color-combo.c:101
 msgid "dull blue #2"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:104
+#: ../src/e-util/e-color-combo.c:102
 msgid "sky blue #2"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:105
+#: ../src/e-util/e-color-combo.c:103
 msgid "purple"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:106
+#: ../src/e-util/e-color-combo.c:104
 msgid "gray"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:108
+#: ../src/e-util/e-color-combo.c:106
 #, fuzzy
 #| msgid "Image"
 msgid "magenta"
 msgstr "magenta"
 
-#: ../e-util/e-color-combo.c:109
+#: ../src/e-util/e-color-combo.c:107
 msgid "bright orange"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:110
+#: ../src/e-util/e-color-combo.c:108
 msgid "yellow"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:111
+#: ../src/e-util/e-color-combo.c:109
 msgid "green"
 msgstr "verda"
 
-#: ../e-util/e-color-combo.c:112
+#: ../src/e-util/e-color-combo.c:110
 msgid "cyan"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:113
+#: ../src/e-util/e-color-combo.c:111
 msgid "bright blue"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:114
+#: ../src/e-util/e-color-combo.c:112
 msgid "red purple"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:115
+#: ../src/e-util/e-color-combo.c:113
 msgid "light grey"
 msgstr "grizeta"
 
-#: ../e-util/e-color-combo.c:117
+#: ../src/e-util/e-color-combo.c:115
 msgid "pink"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:118
+#: ../src/e-util/e-color-combo.c:116
 msgid "light orange"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:119
+#: ../src/e-util/e-color-combo.c:117
 msgid "light yellow"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:120
+#: ../src/e-util/e-color-combo.c:118
 msgid "light green"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:121
+#: ../src/e-util/e-color-combo.c:119
 msgid "light cyan"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:122
+#: ../src/e-util/e-color-combo.c:120
 msgid "light blue"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:123
+#: ../src/e-util/e-color-combo.c:121
 msgid "light purple"
 msgstr ""
 
-#: ../e-util/e-color-combo.c:124
+#: ../src/e-util/e-color-combo.c:122
 msgid "white"
 msgstr "blanka"
 
-#: ../e-util/e-color-combo.c:639 ../mail/e-mail-account-tree-view.c:134
-#: ../mail/e-mail-config-security-page.c:426
-#: ../mail/e-mail-config-security-page.c:566 ../mail/e-mail-reader.c:3863
-#: ../mail/mail-config.ui.h:69
+#: ../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:4048 ../src/mail/mail-config.ui.h:76
 msgid "Default"
 msgstr "Defaŭlto"
 
-#: ../e-util/e-dateedit.c:523
+#: ../src/e-util/e-dateedit.c:524
 msgid "Date and Time"
 msgstr "Dato kaj horo"
 
-#: ../e-util/e-dateedit.c:548
+#: ../src/e-util/e-dateedit.c:549
 msgid "Text entry to input date"
 msgstr ""
 
-#: ../e-util/e-dateedit.c:571
+#: ../src/e-util/e-dateedit.c:572
 msgid "Click this button to show a calendar"
 msgstr ""
 
-#: ../e-util/e-dateedit.c:625
+#: ../src/e-util/e-dateedit.c:627
 msgid "Drop-down combination box to select time"
 msgstr ""
 
-#: ../e-util/e-dateedit.c:626
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
+#: ../src/e-util/e-dateedit.c:628
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Tempo"
 
-#: ../e-util/e-dateedit.c:700
+#: ../src/e-util/e-dateedit.c:702
 msgid "No_w"
 msgstr "_Nun"
 
-#: ../e-util/e-dateedit.c:707
+#: ../src/e-util/e-dateedit.c:709
 msgid "_Today"
 msgstr "_Hodiaŭ"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../e-util/e-dateedit.c:716
+#: ../src/e-util/e-dateedit.c:718
 msgid "_None"
 msgstr "_Neniu"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../e-util/e-dateedit.c:1838 ../e-util/e-dateedit.c:2086
+#: ../src/e-util/e-dateedit.c:1877 ../src/e-util/e-dateedit.c:2125
 msgctxt "date"
 msgid "None"
 msgstr "Neniu"
 
-#: ../e-util/e-dateedit.c:1978
+#: ../src/e-util/e-dateedit.c:2017
 msgid "Invalid Date Value"
 msgstr "Nevalida valoro de dato"
 
-#: ../e-util/e-dateedit.c:2023
+#: ../src/e-util/e-dateedit.c:2062
 msgid "Invalid Time Value"
 msgstr "Nevalida valoro de tempo"
 
-#. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:251
-msgid "Tomorrow"
-msgstr "Morgaŭ"
-
-#: ../e-util/e-datetime-format.c:221
+#: ../src/e-util/e-datetime-format.c:219
 msgid "Yesterday"
 msgstr "Hieraŭ"
 
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:229
+#: ../src/e-util/e-datetime-format.c:227
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "Sekva lun"
@@ -11187,7 +12834,7 @@ msgstr "Sekva lun"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:235
+#: ../src/e-util/e-datetime-format.c:233
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "Sekva mar"
@@ -11195,7 +12842,7 @@ msgstr "Sekva mar"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:241
+#: ../src/e-util/e-datetime-format.c:239
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "Sekva mer"
@@ -11203,7 +12850,7 @@ msgstr "Sekva mer"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:247
+#: ../src/e-util/e-datetime-format.c:245
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "Sekva ĵaŭ"
@@ -11211,7 +12858,7 @@ msgstr "Sekva ĵaŭ"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:253
+#: ../src/e-util/e-datetime-format.c:251
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "Sekva ven"
@@ -11219,7 +12866,7 @@ msgstr "Sekva ven"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:259
+#: ../src/e-util/e-datetime-format.c:257
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "Sekva sab"
@@ -11227,285 +12874,324 @@ msgstr "Sekva sab"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:265
+#: ../src/e-util/e-datetime-format.c:263
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Sekva dim"
 
-#: ../e-util/e-datetime-format.c:351 ../e-util/e-datetime-format.c:361
-#: ../e-util/e-datetime-format.c:370
+#: ../src/e-util/e-datetime-format.c:349 ../src/e-util/e-datetime-format.c:359
+#: ../src/e-util/e-datetime-format.c:368
 msgid "Use locale default"
 msgstr "Uzi lokan defaŭlton"
 
-#: ../e-util/e-datetime-format.c:575
+#: ../src/e-util/e-datetime-format.c:592
 msgid "Format:"
 msgstr "Formato:"
 
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ days ]"
+#: ../src/e-util/e-dialog-widgets.c:181
+#, fuzzy
+#| msgid "days"
+msgctxt "time-unit"
+msgid "days"
+msgstr "tagoj"
+
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ weeks ]"
+#: ../src/e-util/e-dialog-widgets.c:183
+#, fuzzy
+#| msgid "weeks"
+msgctxt "time-unit"
+msgid "weeks"
+msgstr "semajnoj"
+
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ months ]"
+#: ../src/e-util/e-dialog-widgets.c:185
+#, fuzzy
+#| msgid "months"
+msgctxt "time-unit"
+msgid "months"
+msgstr "monatoj"
+
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ years ]"
+#: ../src/e-util/e-dialog-widgets.c:187
+#, fuzzy
+#| msgid "years"
+msgctxt "time-unit"
+msgid "years"
+msgstr "jaroj"
+
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ days ]"
+#: ../src/e-util/e-dialog-widgets.c:245
+msgid "Do not synchronize locally mails older than"
+msgstr ""
+
 #. Translators: :-)
-#: ../e-util/e-emoticon-chooser.c:40
+#: ../src/e-util/e-emoticon-chooser.c:38
 msgid "_Smile"
 msgstr "_Rideto"
 
 #. Translators: :-(
-#: ../e-util/e-emoticon-chooser.c:42
+#: ../src/e-util/e-emoticon-chooser.c:40
 msgid "S_ad"
 msgstr "M_alĝoja"
 
 #. Translators: ;-)
-#: ../e-util/e-emoticon-chooser.c:44
+#: ../src/e-util/e-emoticon-chooser.c:42
 #, fuzzy
 #| msgid "_Window"
 msgid "_Wink"
 msgstr "_Fenestro"
 
 #. Translators: :-P
-#: ../e-util/e-emoticon-chooser.c:46
+#: ../src/e-util/e-emoticon-chooser.c:44
 msgid "Ton_gue"
 msgstr "Lan_go"
 
 #. Translators: :-))
-#: ../e-util/e-emoticon-chooser.c:48
+#: ../src/e-util/e-emoticon-chooser.c:46
 msgid "Laug_h"
 msgstr "R_ido"
 
 #. Translators: :-|
-#: ../e-util/e-emoticon-chooser.c:50
+#: ../src/e-util/e-emoticon-chooser.c:48
 msgid "_Plain"
 msgstr "_Plata"
 
 #. Translators: :-!
-#: ../e-util/e-emoticon-chooser.c:52
+#: ../src/e-util/e-emoticon-chooser.c:50
 msgid "Smi_rk"
 msgstr ""
 
 #. Translators: :"-)
-#: ../e-util/e-emoticon-chooser.c:54
+#: ../src/e-util/e-emoticon-chooser.c:52
 msgid "_Embarrassed"
 msgstr "_Honta"
 
 #. Translators: :-D
-#: ../e-util/e-emoticon-chooser.c:56
+#: ../src/e-util/e-emoticon-chooser.c:54
 msgid "_Big Smile"
 msgstr "Ride_go"
 
 #. Translators: :-/
-#: ../e-util/e-emoticon-chooser.c:58
+#: ../src/e-util/e-emoticon-chooser.c:56
 msgid "Uncer_tain"
 msgstr ""
 
 #. Translators: :-O
-#: ../e-util/e-emoticon-chooser.c:60
+#: ../src/e-util/e-emoticon-chooser.c:58
 msgid "S_urprise"
 msgstr "S_urprizo"
 
 #. Translators: :-S
-#: ../e-util/e-emoticon-chooser.c:62
+#: ../src/e-util/e-emoticon-chooser.c:60
 msgid "W_orried"
 msgstr ""
 
 #. Translators: :-*
-#: ../e-util/e-emoticon-chooser.c:64
+#: ../src/e-util/e-emoticon-chooser.c:62
 msgid "_Kiss"
 msgstr "_Kiso"
 
 #. Translators: X-(
-#: ../e-util/e-emoticon-chooser.c:66
+#: ../src/e-util/e-emoticon-chooser.c:64
 msgid "A_ngry"
 msgstr ""
 
 #. Translators: B-)
-#: ../e-util/e-emoticon-chooser.c:68
+#: ../src/e-util/e-emoticon-chooser.c:66
 msgid "_Cool"
 msgstr ""
 
 #. Translators: O:-)
-#: ../e-util/e-emoticon-chooser.c:70
+#: ../src/e-util/e-emoticon-chooser.c:68
 msgid "Ange_l"
 msgstr "Anĝe_lo"
 
 #. Translators: :'(
-#: ../e-util/e-emoticon-chooser.c:72
+#: ../src/e-util/e-emoticon-chooser.c:70
 msgid "Cr_ying"
 msgstr "Pl_oranta"
 
 #. Translators: :-Q
-#: ../e-util/e-emoticon-chooser.c:74
+#: ../src/e-util/e-emoticon-chooser.c:72
 msgid "S_ick"
 msgstr "M_alsana"
 
 #. Translators: |-)
-#: ../e-util/e-emoticon-chooser.c:76
+#: ../src/e-util/e-emoticon-chooser.c:74
 msgid "Tire_d"
 msgstr "Lac_a"
 
 #. Translators: >:-)
-#: ../e-util/e-emoticon-chooser.c:78
+#: ../src/e-util/e-emoticon-chooser.c:76
 msgid "De_vilish"
 msgstr ""
 
 #. Translators: :-(|)
-#: ../e-util/e-emoticon-chooser.c:80
+#: ../src/e-util/e-emoticon-chooser.c:78
 #, fuzzy
 #| msgid "_Mon"
 msgid "_Monkey"
 msgstr "_Lun"
 
-#: ../e-util/e-file-utils.c:120
+#: ../src/e-util/e-file-utils.c:121
 msgid "(Unknown Filename)"
 msgstr "(Nekonata dosiernomo)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:124
-#, c-format
-msgid "Writing \"%s\""
-msgstr "Skribante \"%s\""
+#: ../src/e-util/e-file-utils.c:125
+#, fuzzy, c-format
+#| msgid "Writing \"%s\""
+msgid "Writing “%s”"
+msgstr "Skribante “%s”"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:129
-#, c-format
-msgid "Writing \"%s\" to %s"
-msgstr "Skribante \"%s\" al %s"
+#: ../src/e-util/e-file-utils.c:130
+#, fuzzy, c-format
+#| msgid "Writing \"%s\" to %s"
+msgid "Writing “%s” to %s"
+msgstr "Skribante “%s” al %s"
 
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
-#: ../e-util/e-filter-datespec.c:66
+#: ../src/e-util/e-filter-datespec.c:64
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "antaŭ 1 sekundo"
 msgstr[1] "antaŭ %d sekundoj"
 
-#: ../e-util/e-filter-datespec.c:67
+#: ../src/e-util/e-filter-datespec.c:65
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 sekundo en la estonteco"
 msgstr[1] "%d sekundoj en la estonteco"
 
-#: ../e-util/e-filter-datespec.c:68
+#: ../src/e-util/e-filter-datespec.c:66
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "antaŭ 1 minuto"
 msgstr[1] "antaŭ %d minutoj"
 
-#: ../e-util/e-filter-datespec.c:69
+#: ../src/e-util/e-filter-datespec.c:67
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 minuto en la estonteco"
 msgstr[1] "%d minutoj en la estonteco"
 
-#: ../e-util/e-filter-datespec.c:70
+#: ../src/e-util/e-filter-datespec.c:68
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "antaŭ 1 horo"
 msgstr[1] "antaŭ %d horoj"
 
-#: ../e-util/e-filter-datespec.c:71
+#: ../src/e-util/e-filter-datespec.c:69
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 horo en la estonteco"
 msgstr[1] "%d horoj en la estonteco"
 
-#: ../e-util/e-filter-datespec.c:72
+#: ../src/e-util/e-filter-datespec.c:70
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "antaŭ 1 tago"
 msgstr[1] "antaŭ %d tagoj"
 
-#: ../e-util/e-filter-datespec.c:73
+#: ../src/e-util/e-filter-datespec.c:71
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "1 tago en la estonteco"
 msgstr[1] "%d tagoj en la estonteco"
 
-#: ../e-util/e-filter-datespec.c:74
+#: ../src/e-util/e-filter-datespec.c:72
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "antaŭ 1 semajno"
 msgstr[1] "antaŭ %d semajnoj"
 
-#: ../e-util/e-filter-datespec.c:75
+#: ../src/e-util/e-filter-datespec.c:73
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 semajno en la estonteco"
 msgstr[1] "%d semajnoj en la estonteco"
 
-#: ../e-util/e-filter-datespec.c:76
+#: ../src/e-util/e-filter-datespec.c:74
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "antaŭ 1 monato"
 msgstr[1] "antaŭ %d monatoj"
 
-#: ../e-util/e-filter-datespec.c:77
+#: ../src/e-util/e-filter-datespec.c:75
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 monato en la estonteco"
 msgstr[1] "%d monatoj en la estonteco"
 
-#: ../e-util/e-filter-datespec.c:78
+#: ../src/e-util/e-filter-datespec.c:76
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "antaŭ 1 jaro"
 msgstr[1] "antaŭ %d jaroj"
 
-#: ../e-util/e-filter-datespec.c:79
+#: ../src/e-util/e-filter-datespec.c:77
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 jaro en la estonteco"
 msgstr[1] "%d jaroj en la estonteco"
 
-#: ../e-util/e-filter-datespec.c:129
+#: ../src/e-util/e-filter-datespec.c:127
 msgid "<click here to select a date>"
 msgstr "<klaku ĉi tie por elekti daton>"
 
-#: ../e-util/e-filter-datespec.c:132 ../e-util/e-filter-datespec.c:143
-#: ../e-util/e-filter-datespec.c:154
+#: ../src/e-util/e-filter-datespec.c:130 ../src/e-util/e-filter-datespec.c:141
+#: ../src/e-util/e-filter-datespec.c:152
 msgid "now"
 msgstr "nun"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../e-util/e-filter-datespec.c:139
+#: ../src/e-util/e-filter-datespec.c:137
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../e-util/e-filter-datespec.c:288
+#: ../src/e-util/e-filter-datespec.c:286
 msgid "Select a time to compare against"
 msgstr ""
 
-#: ../e-util/e-filter-file.c:186
+#: ../src/e-util/e-filter-file.c:184
 msgid "Choose a File"
 msgstr "Elekti dosieron"
 
-#: ../e-util/e-filter-rule.c:751
+#: ../src/e-util/e-filter-rule.c:763
 msgid "R_ule name:"
 msgstr ""
 
-#: ../e-util/e-filter-rule.c:801
+#: ../src/e-util/e-filter-rule.c:813
 msgid "all the following conditions"
 msgstr ""
 
-#: ../e-util/e-filter-rule.c:802
+#: ../src/e-util/e-filter-rule.c:814
 msgid "any of the following conditions"
 msgstr ""
 
-#: ../e-util/e-filter-rule.c:808
+#: ../src/e-util/e-filter-rule.c:820
 msgid "_Find items which match:"
 msgstr ""
 
-#: ../e-util/e-filter-rule.c:831
+#: ../src/e-util/e-filter-rule.c:843
 msgid "Find items that meet the following conditions"
 msgstr ""
 
@@ -11513,1845 +13199,1863 @@ msgstr ""
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:846 ../e-util/e-html-editor-page-dialog.c:62
-#: ../e-util/e-mail-identity-combo-box.c:476
-#: ../e-util/e-mail-signature-combo-box.c:367 ../e-util/e-proxy-editor.c:560
-#: ../libemail-engine/camel-null-store.c:27
-#: ../mail/e-mail-config-summary-page.c:138
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
+#: ../src/e-util/e-filter-rule.c:858
+#: ../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-config-summary-page.c:141
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:629
 msgid "None"
 msgstr "Nenio"
 
-#: ../e-util/e-filter-rule.c:847
+#: ../src/e-util/e-filter-rule.c:859
 msgid "All related"
 msgstr ""
 
-#: ../e-util/e-filter-rule.c:848 ../e-util/e-send-options.ui.h:19
+#: ../src/e-util/e-filter-rule.c:860 ../src/e-util/e-send-options.ui.h:24
 msgid "Replies"
 msgstr "Respondoj"
 
-#: ../e-util/e-filter-rule.c:849
+#: ../src/e-util/e-filter-rule.c:861
 msgid "Replies and parents"
 msgstr ""
 
-#: ../e-util/e-filter-rule.c:850
+#: ../src/e-util/e-filter-rule.c:862
 msgid "No reply or parent"
 msgstr ""
 
-#: ../e-util/e-filter-rule.c:853
+#: ../src/e-util/e-filter-rule.c:865
 msgid "I_nclude threads:"
 msgstr ""
 
-#: ../e-util/e-filter-rule.c:930
+#: ../src/e-util/e-filter-rule.c:944
 msgid "A_dd Condition"
 msgstr ""
 
-#: ../e-util/e-filter-rule.c:1244 ../e-util/filter.ui.h:1
-#: ../mail/em-utils.c:229
+#: ../src/e-util/e-filter-rule.c:1258 ../src/e-util/filter.ui.h:1
+#: ../src/mail/em-filter-rule.c:615 ../src/mail/em-utils.c:166
 msgid "Incoming"
 msgstr "Alveninta"
 
-#: ../e-util/e-filter-rule.c:1244 ../mail/em-utils.c:230
+#: ../src/e-util/e-filter-rule.c:1258 ../src/mail/em-filter-rule.c:616
+#: ../src/mail/em-utils.c:167
 msgid "Outgoing"
 msgstr "Eliranta"
 
-#: ../e-util/e-html-editor-actions.c:58
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:80
 #| msgid "Failed to open folder."
 msgid "Failed to insert HTML file."
-msgstr "Malsukcesis malfermi dosierujon."
+msgstr "Malsukcesis enmeti HTML-dosieron."
 
-#: ../e-util/e-html-editor-actions.c:95
+#: ../src/e-util/e-html-editor-actions.c:118
 #, fuzzy
 #| msgid "Failed to open folder."
 msgid "Failed to insert text file."
 msgstr "Malsukcesis malfermi dosierujon."
 
-#: ../e-util/e-html-editor-actions.c:612
+#: ../src/e-util/e-html-editor-actions.c:319
 msgid "Insert HTML File"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:618
-#| msgid "HTML _Mode"
+#: ../src/e-util/e-html-editor-actions.c:325
 msgid "HTML file"
 msgstr "HTML-dosiero"
 
-#: ../e-util/e-html-editor-actions.c:645
+#: ../src/e-util/e-html-editor-actions.c:355
 msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "Enmeti bildon"
 
-#: ../e-util/e-html-editor-actions.c:706
+#: ../src/e-util/e-html-editor-actions.c:413
 #, fuzzy
 #| msgid "Increase the text size"
 msgid "Insert text file"
 msgstr "Pligrandigi la tekston"
 
-#: ../e-util/e-html-editor-actions.c:712
+#: ../src/e-util/e-html-editor-actions.c:419
 #, fuzzy
 #| msgid "Select a file"
 msgid "Text file"
 msgstr "Elekti dosieron"
 
-#: ../e-util/e-html-editor-actions.c:1096
+#: ../src/e-util/e-html-editor-actions.c:880
 #, fuzzy
 #| msgid "Copy selected tasks to the clipboard"
 msgid "Copy selected text to the clipboard"
 msgstr "Kopii elektitajn taskojn al la tondujo"
 
-#: ../e-util/e-html-editor-actions.c:1103
+#: ../src/e-util/e-html-editor-actions.c:887
 #, fuzzy
 #| msgid "Cut selected tasks to the clipboard"
 msgid "Cut selected text to the clipboard"
 msgstr "Eltondi elektitajn taskojn al la tondujo"
 
 #. Widgets are treating Ctrl + v shortcut themselves
-#: ../e-util/e-html-editor-actions.c:1110
+#: ../src/e-util/e-html-editor-actions.c:894
 #, fuzzy
 #| msgid "Paste tasks from the clipboard"
 msgid "Paste text from the clipboard"
 msgstr "Enmeti taskojn de la tondujo"
 
-#: ../e-util/e-html-editor-actions.c:1117
+#: ../src/e-util/e-html-editor-actions.c:901
 msgid "Redo the last undone action"
 msgstr "Refari la lastan malfaritan agon"
 
-#: ../e-util/e-html-editor-actions.c:1131
+#: ../src/e-util/e-html-editor-actions.c:915
 msgid "Undo the last action"
 msgstr "Malfari la lastan agon"
 
-#: ../e-util/e-html-editor-actions.c:1152
+#: ../src/e-util/e-html-editor-actions.c:936
 msgid "For_mat"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1159
+#: ../src/e-util/e-html-editor-actions.c:943
 #, fuzzy
 #| msgid "Tool_bar Style"
 msgid "_Paragraph Style"
 msgstr "Ilo_bret-stilo"
 
-#: ../e-util/e-html-editor-actions.c:1173
-#: ../e-util/e-html-editor-image-dialog.c:635
+#: ../src/e-util/e-html-editor-actions.c:957
+#: ../src/e-util/e-html-editor-image-dialog.c:585
 #, fuzzy
 #| msgctxt "New"
 #| msgid "_Appointment"
 msgid "_Alignment"
 msgstr "_Rendevuo"
 
-#: ../e-util/e-html-editor-actions.c:1180
+#: ../src/e-util/e-html-editor-actions.c:964
 #, fuzzy
 #| msgid "_Languages"
 msgid "Current _Languages"
 msgstr "_Lingvoj"
 
-#: ../e-util/e-html-editor-actions.c:1197
+#: ../src/e-util/e-html-editor-actions.c:981
 msgid "_Increase Indent"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1199
+#: ../src/e-util/e-html-editor-actions.c:983
 msgid "Increase Indent"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1204
+#: ../src/e-util/e-html-editor-actions.c:988
 msgid "_HTML File..."
 msgstr "_HTML-dosiero..."
 
-#: ../e-util/e-html-editor-actions.c:1211
+#: ../src/e-util/e-html-editor-actions.c:995
 msgid "Te_xt File..."
 msgstr "Te_ksto-dosiero..."
 
-#: ../e-util/e-html-editor-actions.c:1218
+#: ../src/e-util/e-html-editor-actions.c:1002
 msgid "Paste _Quotation"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1225
+#: ../src/e-util/e-html-editor-actions.c:1009
 msgid "_Find..."
 msgstr "_Serĉi..."
 
-#: ../e-util/e-html-editor-actions.c:1227
+#: ../src/e-util/e-html-editor-actions.c:1011
 msgid "Search for text"
 msgstr "Serĉi tekston"
 
-#: ../e-util/e-html-editor-actions.c:1232
+#: ../src/e-util/e-html-editor-actions.c:1016
 msgid "Find A_gain"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1239
+#: ../src/e-util/e-html-editor-actions.c:1023
 msgid "Re_place..."
 msgstr "An_stataŭigi..."
 
-#: ../e-util/e-html-editor-actions.c:1241
+#: ../src/e-util/e-html-editor-actions.c:1025
 msgid "Search for and replace text"
 msgstr "Serĉi kaj anstataŭigi tekston"
 
-#: ../e-util/e-html-editor-actions.c:1246
+#: ../src/e-util/e-html-editor-actions.c:1030
 #, fuzzy
 #| msgid "New _Meeting..."
 msgid "Check _Spelling..."
 msgstr "Nova _kunsido..."
 
-#: ../e-util/e-html-editor-actions.c:1253
+#: ../src/e-util/e-html-editor-actions.c:1037
 msgid "_Decrease Indent"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1255
+#: ../src/e-util/e-html-editor-actions.c:1039
 msgid "Decrease Indent"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1260
+#: ../src/e-util/e-html-editor-actions.c:1044
 msgid "_Wrap Lines"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1267
-msgid "Open Inspector"
-msgstr ""
-
 #. Center
-#: ../e-util/e-html-editor-actions.c:1277
-#: ../e-util/e-html-editor-paragraph-dialog.c:110
+#: ../src/e-util/e-html-editor-actions.c:1054
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:108
 msgid "_Center"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1279
-#| msgid "_Delete Appointment"
+#: ../src/e-util/e-html-editor-actions.c:1056
 msgid "Center Alignment"
 msgstr ""
 
 #. Left
-#: ../e-util/e-html-editor-actions.c:1284
-#: ../e-util/e-html-editor-paragraph-dialog.c:101
+#: ../src/e-util/e-html-editor-actions.c:1061
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:99
 msgid "_Left"
 msgstr "_Maldekstre"
 
-#: ../e-util/e-html-editor-actions.c:1286
+#: ../src/e-util/e-html-editor-actions.c:1063
 #, fuzzy
 #| msgid "New Appointment"
 msgid "Left Alignment"
 msgstr "Nova rendevuo"
 
 #. Right
-#: ../e-util/e-html-editor-actions.c:1291
-#: ../e-util/e-html-editor-paragraph-dialog.c:119
+#: ../src/e-util/e-html-editor-actions.c:1068
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:117
 msgid "_Right"
 msgstr "_Dekstre"
 
-#: ../e-util/e-html-editor-actions.c:1293
+#: ../src/e-util/e-html-editor-actions.c:1070
 #, fuzzy
 #| msgid "Edit Appointment"
 msgid "Right Alignment"
 msgstr "Redakti rendevuon"
 
-#: ../e-util/e-html-editor-actions.c:1301
-#: ../modules/text-highlight/languages.c:72
+#: ../src/e-util/e-html-editor-actions.c:1078
+#: ../src/modules/text-highlight/languages.c:70
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../e-util/e-html-editor-actions.c:1303
+#: ../src/e-util/e-html-editor-actions.c:1080
 msgid "HTML editing mode"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1308
+#: ../src/e-util/e-html-editor-actions.c:1085
 msgid "Plain _Text"
 msgstr "Plata _teksto"
 
-#: ../e-util/e-html-editor-actions.c:1310
+#: ../src/e-util/e-html-editor-actions.c:1087
 msgid "Plain text editing mode"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1318
+#: ../src/e-util/e-html-editor-actions.c:1095
 msgid "_Normal"
 msgstr "_Normala"
 
-#: ../e-util/e-html-editor-actions.c:1325
-msgid "Header _1"
+#: ../src/e-util/e-html-editor-actions.c:1102
+#, fuzzy
+#| msgid "Header _1"
+msgid "Heading _1"
 msgstr "Paĝokapo _1"
 
-#: ../e-util/e-html-editor-actions.c:1332
-msgid "Header _2"
+#: ../src/e-util/e-html-editor-actions.c:1109
+#, fuzzy
+#| msgid "Header _2"
+msgid "Heading _2"
 msgstr "Paĝokapo _2"
 
-#: ../e-util/e-html-editor-actions.c:1339
-msgid "Header _3"
+#: ../src/e-util/e-html-editor-actions.c:1116
+#, fuzzy
+#| msgid "Header _3"
+msgid "Heading _3"
 msgstr "Paĝokapo _3"
 
-#: ../e-util/e-html-editor-actions.c:1346
-msgid "Header _4"
+#: ../src/e-util/e-html-editor-actions.c:1123
+#, fuzzy
+#| msgid "Header _4"
+msgid "Heading _4"
 msgstr "Paĝokapo _4"
 
-#: ../e-util/e-html-editor-actions.c:1353
-msgid "Header _5"
+#: ../src/e-util/e-html-editor-actions.c:1130
+#, fuzzy
+#| msgid "Header _5"
+msgid "Heading _5"
 msgstr "Paĝokapo _5"
 
-#: ../e-util/e-html-editor-actions.c:1360
-msgid "Header _6"
+#: ../src/e-util/e-html-editor-actions.c:1137
+#, fuzzy
+#| msgid "Header _6"
+msgid "Heading _6"
 msgstr "Paĝokapo _6"
 
-#: ../e-util/e-html-editor-actions.c:1367
+#: ../src/e-util/e-html-editor-actions.c:1144
 msgid "_Preformatted"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1374
+#: ../src/e-util/e-html-editor-actions.c:1151
 msgid "A_ddress"
 msgstr "A_dreso"
 
-#: ../e-util/e-html-editor-actions.c:1381
-msgid "_Blockquote"
-msgstr ""
-
-#: ../e-util/e-html-editor-actions.c:1388
+#: ../src/e-util/e-html-editor-actions.c:1158
 #, fuzzy
 #| msgid "D_elete Memo List"
 msgid "_Bulleted List"
 msgstr "_Forigi la notoliston"
 
-#: ../e-util/e-html-editor-actions.c:1395
+#: ../src/e-util/e-html-editor-actions.c:1165
 msgid "_Roman Numeral List"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1402
+#: ../src/e-util/e-html-editor-actions.c:1172
 msgid "Numbered _List"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1409
+#: ../src/e-util/e-html-editor-actions.c:1179
 msgid "_Alphabetical List"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1425
-#: ../e-util/e-html-editor-actions.c:1463
+#: ../src/e-util/e-html-editor-actions.c:1195
+#: ../src/e-util/e-html-editor-actions.c:1233
 msgid "_Image..."
 msgstr "_Bildo..."
 
 #. Translators: This is an action tooltip
-#: ../e-util/e-html-editor-actions.c:1428
+#: ../src/e-util/e-html-editor-actions.c:1198
 msgid "Insert Image"
 msgstr "Enmeti bildon"
 
-#: ../e-util/e-html-editor-actions.c:1433
-#: ../e-util/e-html-editor-actions.c:1470
+#: ../src/e-util/e-html-editor-actions.c:1203
+#: ../src/e-util/e-html-editor-actions.c:1240
 msgid "_Link..."
 msgstr "_Ligilo..."
 
-#: ../e-util/e-html-editor-actions.c:1435
+#: ../src/e-util/e-html-editor-actions.c:1205
 msgid "Insert Link"
 msgstr "Enmeti ligilon"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1441
-#: ../e-util/e-html-editor-actions.c:1485
+#: ../src/e-util/e-html-editor-actions.c:1211
+#: ../src/e-util/e-html-editor-actions.c:1255
 msgid "_Rule..."
 msgstr "_Regulo..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1444
+#: ../src/e-util/e-html-editor-actions.c:1214
 msgid "Insert Rule"
 msgstr "Enmeti regulon"
 
-#: ../e-util/e-html-editor-actions.c:1449
-#: ../e-util/e-html-editor-actions.c:1492
+#: ../src/e-util/e-html-editor-actions.c:1219
+#: ../src/e-util/e-html-editor-actions.c:1262
 msgid "_Table..."
 msgstr "_Tabelo..."
 
-#: ../e-util/e-html-editor-actions.c:1451
+#: ../src/e-util/e-html-editor-actions.c:1221
 msgid "Insert Table"
 msgstr "Enmeti tabelon"
 
-#: ../e-util/e-html-editor-actions.c:1456
+#: ../src/e-util/e-html-editor-actions.c:1226
 msgid "_Cell..."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1477
+#: ../src/e-util/e-html-editor-actions.c:1247
 msgid "Pa_ge..."
 msgstr "P_aĝo..."
 
-#: ../e-util/e-html-editor-actions.c:1501
+#: ../src/e-util/e-html-editor-actions.c:1271
 msgid "Font _Size"
 msgstr "Tipara _grando"
 
-#: ../e-util/e-html-editor-actions.c:1508
+#: ../src/e-util/e-html-editor-actions.c:1278
 msgid "_Font Style"
 msgstr "_Tipara stilo"
 
-#: ../e-util/e-html-editor-actions.c:1515
+#: ../src/e-util/e-html-editor-actions.c:1285
 msgid "Paste As _Text"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1526
-#: ../e-util/e-html-editor-text-dialog.c:214
+#: ../src/e-util/e-html-editor-actions.c:1296
+#: ../src/e-util/e-html-editor-text-dialog.c:201
 msgid "_Bold"
 msgstr "_Grasa"
 
-#: ../e-util/e-html-editor-actions.c:1528
+#: ../src/e-util/e-html-editor-actions.c:1298
 msgid "Bold"
 msgstr "Grasa"
 
-#: ../e-util/e-html-editor-actions.c:1534
-#: ../e-util/e-html-editor-text-dialog.c:225
+#: ../src/e-util/e-html-editor-actions.c:1304
+#: ../src/e-util/e-html-editor-text-dialog.c:212
 msgid "_Italic"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1536
+#: ../src/e-util/e-html-editor-actions.c:1306
 msgid "Italic"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1542
+#: ../src/e-util/e-html-editor-actions.c:1312
 msgid "_Plain Text"
 msgstr "_Plata teksto"
 
-#: ../e-util/e-html-editor-actions.c:1550
-#: ../e-util/e-html-editor-text-dialog.c:246
+#: ../src/e-util/e-html-editor-actions.c:1320
+#: ../src/e-util/e-html-editor-text-dialog.c:233
 msgid "_Strikethrough"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1552
+#: ../src/e-util/e-html-editor-actions.c:1322
 msgid "Strikethrough"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1558
-#: ../e-util/e-html-editor-text-dialog.c:236
-#| msgid "Undefined"
+#: ../src/e-util/e-html-editor-actions.c:1328
+#: ../src/e-util/e-html-editor-text-dialog.c:223
 msgid "_Underline"
 msgstr "S_ubstreki"
 
-#: ../e-util/e-html-editor-actions.c:1560
+#: ../src/e-util/e-html-editor-actions.c:1330
 msgid "Underline"
 msgstr "Substreki"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1570
+#: ../src/e-util/e-html-editor-actions.c:1340
 msgid "-2"
 msgstr ""
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1578
-#| msgid "1"
+#: ../src/e-util/e-html-editor-actions.c:1348
 msgid "-1"
 msgstr "-1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1586
+#: ../src/e-util/e-html-editor-actions.c:1356
 msgid "+0"
 msgstr ""
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1594
-#| msgid "1"
+#: ../src/e-util/e-html-editor-actions.c:1364
 msgid "+1"
 msgstr "+1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1602
+#: ../src/e-util/e-html-editor-actions.c:1372
 msgid "+2"
 msgstr ""
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1610
+#: ../src/e-util/e-html-editor-actions.c:1380
 msgid "+3"
 msgstr ""
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1618
+#: ../src/e-util/e-html-editor-actions.c:1388
 msgid "+4"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1637
+#: ../src/e-util/e-html-editor-actions.c:1407
 #, fuzzy
 #| msgid "_Contents"
 msgid "Cell Contents"
 msgstr "Ĉelaj enhavoj"
 
-#: ../e-util/e-html-editor-actions.c:1644
+#: ../src/e-util/e-html-editor-actions.c:1414
 msgid "Column"
 msgstr "Kolumno"
 
-#: ../e-util/e-html-editor-actions.c:1651
+#: ../src/e-util/e-html-editor-actions.c:1421
 msgid "Row"
 msgstr "Vico"
 
-#: ../e-util/e-html-editor-actions.c:1658
-#: ../e-util/e-html-editor-actions.c:1743
+#: ../src/e-util/e-html-editor-actions.c:1428
 msgid "Table"
 msgstr "Tabelo"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../e-util/e-html-editor-actions.c:1668
+#: ../src/e-util/e-html-editor-actions.c:1438
 msgid "Table Delete"
 msgstr "Tabelo-forigo"
 
-#: ../e-util/e-html-editor-actions.c:1675 ../e-util/e-text.c:2127
-msgid "Input Methods"
-msgstr "Enigaj metodoj"
-
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../e-util/e-html-editor-actions.c:1683
+#: ../src/e-util/e-html-editor-actions.c:1446
 msgid "Table Insert"
 msgstr "Tabelo-enmeto"
 
-#: ../e-util/e-html-editor-actions.c:1690
+#: ../src/e-util/e-html-editor-actions.c:1453
 msgid "Properties"
 msgstr "Atributoj"
 
-#: ../e-util/e-html-editor-actions.c:1708
+#: ../src/e-util/e-html-editor-actions.c:1471
 msgid "Column After"
 msgstr "Kolumno poste"
 
-#: ../e-util/e-html-editor-actions.c:1715
+#: ../src/e-util/e-html-editor-actions.c:1478
 msgid "Column Before"
 msgstr "Kolumno antaŭe"
 
-#: ../e-util/e-html-editor-actions.c:1722
+#: ../src/e-util/e-html-editor-actions.c:1485
 msgid "Insert _Link"
 msgstr "Enmeti _ligilon"
 
-#: ../e-util/e-html-editor-actions.c:1729
+#: ../src/e-util/e-html-editor-actions.c:1492
 msgid "Row Above"
 msgstr "Vico supre"
 
-#: ../e-util/e-html-editor-actions.c:1736
+#: ../src/e-util/e-html-editor-actions.c:1499
 msgid "Row Below"
 msgstr "Vico malsupre"
 
-#: ../e-util/e-html-editor-actions.c:1750
+#: ../src/e-util/e-html-editor-actions.c:1506
 msgid "Cell..."
 msgstr "Ĉelo..."
 
-#: ../e-util/e-html-editor-actions.c:1757
+#: ../src/e-util/e-html-editor-actions.c:1513
 msgid "Image..."
 msgstr "Bildo..."
 
-#: ../e-util/e-html-editor-actions.c:1764
+#: ../src/e-util/e-html-editor-actions.c:1520
 msgid "Link..."
 msgstr "Ligilo..."
 
-#: ../e-util/e-html-editor-actions.c:1771
+#: ../src/e-util/e-html-editor-actions.c:1527
 msgid "Page..."
 msgstr "Paĝo..."
 
-#: ../e-util/e-html-editor-actions.c:1778
+#: ../src/e-util/e-html-editor-actions.c:1534
 msgid "Paragraph..."
 msgstr "Paragrafo..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1786
+#: ../src/e-util/e-html-editor-actions.c:1542
 msgid "Rule..."
 msgstr "Regulo..."
 
-#: ../e-util/e-html-editor-actions.c:1793
+#: ../src/e-util/e-html-editor-actions.c:1549
 msgid "Table..."
 msgstr "Tabelo..."
 
-#: ../e-util/e-html-editor-actions.c:1800
+#: ../src/e-util/e-html-editor-actions.c:1556
 msgid "Text..."
 msgstr "Teksto..."
 
-#: ../e-util/e-html-editor-actions.c:1807
+#: ../src/e-util/e-html-editor-actions.c:1563
 msgid "Remove Link"
 msgstr "Forigi ligilon"
 
-#: ../e-util/e-html-editor-actions.c:1824
+#: ../src/e-util/e-html-editor-actions.c:1580
 msgid "Add Word to Dictionary"
 msgstr "Aldoni vorton al vortaro"
 
-#: ../e-util/e-html-editor-actions.c:1831
+#: ../src/e-util/e-html-editor-actions.c:1587
 msgid "Ignore Misspelled Word"
 msgstr "Malatenti misliterumitan vorton"
 
-#: ../e-util/e-html-editor-actions.c:1838
+#: ../src/e-util/e-html-editor-actions.c:1594
 msgid "Add Word To"
 msgstr "Aldoni vorton al"
 
-#: ../e-util/e-html-editor-actions.c:1847
+#: ../src/e-util/e-html-editor-actions.c:1603
 msgid "More Suggestions"
 msgstr ""
 
 #. Translators: %s will be replaced with the actual dictionary
 #. * name, where a user can add a word to. This is part of an
 #. * "Add Word To" submenu.
-#: ../e-util/e-html-editor-actions.c:1955
+#: ../src/e-util/e-html-editor-actions.c:1727
 #, c-format
 msgid "%s Dictionary"
 msgstr "%s vortaro"
 
-#: ../e-util/e-html-editor-actions.c:2042
+#: ../src/e-util/e-html-editor-actions.c:1806
 msgid "_Emoticon"
 msgstr "_Miensimbolo"
 
-#: ../e-util/e-html-editor-actions.c:2043
+#: ../src/e-util/e-html-editor-actions.c:1807
 msgid "Insert Emoticon"
 msgstr "Enmeti miensimbolon"
 
-#: ../e-util/e-html-editor-actions.c:2111
+#: ../src/e-util/e-html-editor-actions.c:1875
 msgid "Re_place"
 msgstr "An_stataŭigi"
 
-#: ../e-util/e-html-editor-actions.c:2114
+#: ../src/e-util/e-html-editor-actions.c:1878
 msgid "_Image"
 msgstr "_Bildo"
 
-#: ../e-util/e-html-editor-actions.c:2117
+#: ../src/e-util/e-html-editor-actions.c:1881
 msgid "_Link"
 msgstr "_Ligilo"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:2121
+#: ../src/e-util/e-html-editor-actions.c:1885
 msgid "_Rule"
 msgstr "_Regulo"
 
-#: ../e-util/e-html-editor-actions.c:2124
-#: ../e-util/e-html-editor-cell-dialog.c:732
+#: ../src/e-util/e-html-editor-actions.c:1888
+#: ../src/e-util/e-html-editor-cell-dialog.c:448
 msgid "_Table"
 msgstr "_Tabelo"
 
-#: ../e-util/e-html-editor.c:672
+#: ../src/e-util/e-html-editor.c:727
 msgid "Paragraph Style"
 msgstr "Paragrafa stilo"
 
-#: ../e-util/e-html-editor.c:686
+#: ../src/e-util/e-html-editor.c:741
 msgid "Editing Mode"
 msgstr "Redakta reĝimo"
 
-#: ../e-util/e-html-editor.c:698
+#: ../src/e-util/e-html-editor.c:753
 msgid "Font Color"
 msgstr "Tiparokoloro"
 
-#: ../e-util/e-html-editor.c:716
+#: ../src/e-util/e-html-editor.c:763
 msgid "Font Size"
 msgstr "Tipara grando"
 
-#: ../e-util/e-html-editor-cell-dialog.c:692
+#: ../src/e-util/e-html-editor-cell-dialog.c:408
 msgid "<b>Scope</b>"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:706
+#: ../src/e-util/e-html-editor-cell-dialog.c:422
 msgid "C_ell"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:719
+#: ../src/e-util/e-html-editor-cell-dialog.c:435
 msgid "_Row"
 msgstr "_Vico"
 
-#: ../e-util/e-html-editor-cell-dialog.c:745
+#: ../src/e-util/e-html-editor-cell-dialog.c:461
 msgid "Col_umn"
 msgstr "Kol_umno"
 
-#: ../e-util/e-html-editor-cell-dialog.c:755
+#: ../src/e-util/e-html-editor-cell-dialog.c:471
 msgid "<b>Alignment &amp; Behavior</b>"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:768
-#: ../e-util/e-html-editor-hrule-dialog.c:407
-#: ../e-util/e-html-editor-table-dialog.c:894
+#: ../src/e-util/e-html-editor-cell-dialog.c:484
+#: ../src/e-util/e-html-editor-hrule-dialog.c:328
+#: ../src/e-util/e-html-editor-table-dialog.c:649
 msgid "Left"
 msgstr "Maldekstre"
 
-#: ../e-util/e-html-editor-cell-dialog.c:769
-#: ../e-util/e-html-editor-hrule-dialog.c:409
-#: ../e-util/e-html-editor-table-dialog.c:895
+#: ../src/e-util/e-html-editor-cell-dialog.c:485
+#: ../src/e-util/e-html-editor-hrule-dialog.c:330
+#: ../src/e-util/e-html-editor-table-dialog.c:650
 msgid "Center"
 msgstr "Centre"
 
-#: ../e-util/e-html-editor-cell-dialog.c:770
-#: ../e-util/e-html-editor-hrule-dialog.c:411
-#: ../e-util/e-html-editor-table-dialog.c:896
+#: ../src/e-util/e-html-editor-cell-dialog.c:486
+#: ../src/e-util/e-html-editor-hrule-dialog.c:332
+#: ../src/e-util/e-html-editor-table-dialog.c:651
 msgid "Right"
 msgstr "Dekstre"
 
-#: ../e-util/e-html-editor-cell-dialog.c:778
+#: ../src/e-util/e-html-editor-cell-dialog.c:494
 msgid "_Horizontal:"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:786
-#: ../e-util/e-html-editor-image-dialog.c:625
+#: ../src/e-util/e-html-editor-cell-dialog.c:502
+#: ../src/e-util/e-html-editor-image-dialog.c:575
 #, fuzzy
 #| msgid "To"
 msgid "Top"
 msgstr "Al"
 
-#: ../e-util/e-html-editor-cell-dialog.c:787
-#: ../e-util/e-html-editor-image-dialog.c:626
-#| msgid "_Middle:"
+#: ../src/e-util/e-html-editor-cell-dialog.c:503
+#: ../src/e-util/e-html-editor-image-dialog.c:576
 msgid "Middle"
 msgstr "Meze"
 
-#: ../e-util/e-html-editor-cell-dialog.c:788
-#: ../e-util/e-html-editor-image-dialog.c:627
+#: ../src/e-util/e-html-editor-cell-dialog.c:504
+#: ../src/e-util/e-html-editor-image-dialog.c:577
 msgid "Bottom"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:796
+#: ../src/e-util/e-html-editor-cell-dialog.c:512
 msgid "_Vertical:"
 msgstr "_Vertikala:"
 
 #. Wrap Text
-#: ../e-util/e-html-editor-cell-dialog.c:802
+#: ../src/e-util/e-html-editor-cell-dialog.c:518
 msgid "_Wrap Text"
 msgstr ""
 
 #. Header Style
-#: ../e-util/e-html-editor-cell-dialog.c:810
+#: ../src/e-util/e-html-editor-cell-dialog.c:526
 msgid "_Header Style"
 msgstr "Paĝokapa s_tilo"
 
-#: ../e-util/e-html-editor-cell-dialog.c:824
-#: ../e-util/e-html-editor-image-dialog.c:565
-#: ../e-util/e-html-editor-table-dialog.c:806
+#: ../src/e-util/e-html-editor-cell-dialog.c:540
+#: ../src/e-util/e-html-editor-image-dialog.c:515
+#: ../src/e-util/e-html-editor-table-dialog.c:561
 msgid "<b>Layout</b>"
 msgstr "<b>Aranĝo</b>"
 
 #. Width
-#: ../e-util/e-html-editor-cell-dialog.c:835
+#: ../src/e-util/e-html-editor-cell-dialog.c:551
 msgid "_Width"
 msgstr "_Larĝo"
 
-#: ../e-util/e-html-editor-cell-dialog.c:874
+#: ../src/e-util/e-html-editor-cell-dialog.c:591
 msgid "Row S_pan:"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:888
+#: ../src/e-util/e-html-editor-cell-dialog.c:605
 msgid "Co_lumn Span:"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:895
-#: ../e-util/e-html-editor-table-dialog.c:910
+#: ../src/e-util/e-html-editor-cell-dialog.c:612
+#: ../src/e-util/e-html-editor-table-dialog.c:665
 msgid "<b>Background</b>"
 msgstr "<b>Fono</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:908
-#: ../e-util/e-html-editor-table-dialog.c:923
+#: ../src/e-util/e-html-editor-cell-dialog.c:625
+#: ../src/e-util/e-html-editor-table-dialog.c:678
 msgid "Transparent"
 msgstr "Travidebla"
 
-#: ../e-util/e-html-editor-cell-dialog.c:916
+#: ../src/e-util/e-html-editor-cell-dialog.c:633
 msgid "C_olor:"
 msgstr "K_oloro:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:924
-#: ../e-util/e-html-editor-image-dialog.c:527
-#: ../e-util/e-html-editor-table-dialog.c:939
+#: ../src/e-util/e-html-editor-cell-dialog.c:641
+#: ../src/e-util/e-html-editor-image-dialog.c:477
+#: ../src/e-util/e-html-editor-table-dialog.c:694
 #, fuzzy
 msgid "Choose Background Image"
 msgstr "Elekti fonbildon"
 
-#: ../e-util/e-html-editor-cell-dialog.c:929
-#: ../e-util/e-html-editor-image-dialog.c:533
-#: ../e-util/e-html-editor-table-dialog.c:944
+#: ../src/e-util/e-html-editor-cell-dialog.c:646
+#: ../src/e-util/e-html-editor-image-dialog.c:483
+#: ../src/e-util/e-html-editor-table-dialog.c:699
 msgid "Images"
 msgstr "Bildoj"
 
-#: ../e-util/e-html-editor-cell-dialog.c:942
+#: ../src/e-util/e-html-editor-cell-dialog.c:659
 msgid "_Image:"
 msgstr "_Bildo:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:949
-#: ../e-util/e-html-editor-page-dialog.c:602
-#: ../e-util/e-html-editor-table-dialog.c:964
+#: ../src/e-util/e-html-editor-cell-dialog.c:666
+#: ../src/e-util/e-html-editor-page-dialog.c:495
+#: ../src/e-util/e-html-editor-table-dialog.c:719
 #, fuzzy
 #| msgid "_No image"
 msgid "_Remove image"
 msgstr "_Neniu bildo"
 
-#: ../e-util/e-html-editor-cell-dialog.c:969
+#: ../src/e-util/e-html-editor-cell-dialog.c:686
 msgid "Cell Properties"
 msgstr "Ĉelo-atributoj"
 
-#: ../e-util/e-html-editor-find-dialog.c:105
-#: ../e-util/e-html-editor-replace-dialog.c:90
-#: ../e-util/e-html-editor-replace-dialog.c:108
+#: ../src/e-util/e-html-editor-find-dialog.c:92
+#: ../src/e-util/e-html-editor-replace-dialog.c:68
 msgid "No match found"
 msgstr ""
 
-#: ../e-util/e-html-editor-find-dialog.c:160
-#: ../e-util/e-html-editor-replace-dialog.c:247
-#| msgid "Search _base:"
+#: ../src/e-util/e-html-editor-find-dialog.c:215
+#: ../src/e-util/e-html-editor-replace-dialog.c:295
 msgid "Search _backwards"
 msgstr "Serĉi _malantaŭen"
 
-#: ../e-util/e-html-editor-find-dialog.c:167
+#: ../src/e-util/e-html-editor-find-dialog.c:222
 msgid "Case _Sensitive"
 msgstr ""
 
-#: ../e-util/e-html-editor-find-dialog.c:174
+#: ../src/e-util/e-html-editor-find-dialog.c:229
 #, fuzzy
 #| msgid "_Search"
 msgid "_Wrap Search"
 msgstr "_Serĉi"
 
-#: ../e-util/e-html-editor-find-dialog.c:213
+#: ../src/e-util/e-html-editor-find-dialog.c:268
 msgid "Find"
 msgstr "Serĉi"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:342
+#: ../src/e-util/e-html-editor-hrule-dialog.c:263
 msgid "<b>Size</b>"
 msgstr "<b>Grando</b>"
 
 #. Width
-#: ../e-util/e-html-editor-hrule-dialog.c:362
-#: ../e-util/e-html-editor-image-dialog.c:583
-#: ../e-util/e-html-editor-table-dialog.c:817
+#: ../src/e-util/e-html-editor-hrule-dialog.c:283
+#: ../src/e-util/e-html-editor-image-dialog.c:533
+#: ../src/e-util/e-html-editor-table-dialog.c:572
 msgid "_Width:"
 msgstr "_Larĝo:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:387
+#: ../src/e-util/e-html-editor-hrule-dialog.c:308
 msgid "_Size:"
 msgstr "_Grando:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:394
+#: ../src/e-util/e-html-editor-hrule-dialog.c:315
 msgid "<b>Style</b>"
 msgstr "<b>Stilo</b>"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:419
-#: ../e-util/e-html-editor-table-dialog.c:903
+#: ../src/e-util/e-html-editor-hrule-dialog.c:340
+#: ../src/e-util/e-html-editor-table-dialog.c:658
 #, fuzzy
 #| msgid "_Arguments:"
 msgid "_Alignment:"
 msgstr "_Argumentoj:"
 
 #. Shaded
-#: ../e-util/e-html-editor-hrule-dialog.c:425
+#: ../src/e-util/e-html-editor-hrule-dialog.c:346
 msgid "S_haded"
 msgstr ""
 
-#: ../e-util/e-html-editor-hrule-dialog.c:442
+#: ../src/e-util/e-html-editor-hrule-dialog.c:363
 #, fuzzy
 #| msgid "Calendar Properties"
 msgid "Rule properties"
 msgstr "Kalendar-ecoj"
 
-#: ../e-util/e-html-editor-image-dialog.c:515
-#: ../e-util/e-html-editor-paragraph-dialog.c:66
-#: ../e-util/e-html-editor-table-dialog.c:760
+#: ../src/e-util/e-html-editor-image-dialog.c:465
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:64
+#: ../src/e-util/e-html-editor-table-dialog.c:515
 msgid "<b>General</b>"
 msgstr "<b>Ĝenerala</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:544
+#: ../src/e-util/e-html-editor-image-dialog.c:494
 msgid "_Source:"
 msgstr "_Fonto:"
 
-#: ../e-util/e-html-editor-image-dialog.c:607
+#: ../src/e-util/e-html-editor-image-dialog.c:557
 msgid "_Height:"
 msgstr "_Alto:"
 
-#: ../e-util/e-html-editor-image-dialog.c:648
+#: ../src/e-util/e-html-editor-image-dialog.c:598
 msgid "_X-Padding:"
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:664
+#: ../src/e-util/e-html-editor-image-dialog.c:614
 msgid "_Y-Padding:"
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:680
-#: ../e-util/e-html-editor-table-dialog.c:884
+#: ../src/e-util/e-html-editor-image-dialog.c:630
+#: ../src/e-util/e-html-editor-table-dialog.c:639
 msgid "_Border:"
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:690
+#: ../src/e-util/e-html-editor-image-dialog.c:640
 msgid "<b>Link</b>"
 msgstr "<b>Ligilo</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:708
-#: ../e-util/e-html-editor-link-dialog.c:352
+#: ../src/e-util/e-html-editor-image-dialog.c:658
+#: ../src/e-util/e-html-editor-link-dialog.c:219
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../e-util/e-html-editor-image-dialog.c:713
-#: ../e-util/e-html-editor-link-dialog.c:357
+#: ../src/e-util/e-html-editor-image-dialog.c:663
+#: ../src/e-util/e-html-editor-link-dialog.c:224
 msgid "_Test URL..."
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:730
+#: ../src/e-util/e-html-editor-image-dialog.c:680
 msgid "Image Properties"
 msgstr "Bildo-atributoj"
 
-#: ../e-util/e-html-editor-link-dialog.c:381
+#: ../src/e-util/e-html-editor-link-dialog.c:248
 msgid "_Remove Link"
 msgstr "_Forigi ligilon"
 
-#: ../e-util/e-html-editor-link-dialog.c:406
+#: ../src/e-util/e-html-editor-link-dialog.c:273
 msgid "Link Properties"
 msgstr "Ligilo-atributoj"
 
-#: ../e-util/e-html-editor-page-dialog.c:71
+#: ../src/e-util/e-html-editor-page-dialog.c:68
 msgid "Perforated Paper"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:80
+#: ../src/e-util/e-html-editor-page-dialog.c:77
 msgid "Blue Ink"
 msgstr "Blua inko"
 
-#: ../e-util/e-html-editor-page-dialog.c:89
+#: ../src/e-util/e-html-editor-page-dialog.c:86
 msgid "Paper"
 msgstr "Papero"
 
-#: ../e-util/e-html-editor-page-dialog.c:98
+#: ../src/e-util/e-html-editor-page-dialog.c:95
 msgid "Ribbon"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:107
+#: ../src/e-util/e-html-editor-page-dialog.c:104
 msgid "Midnight"
 msgstr "Meznokto"
 
-#: ../e-util/e-html-editor-page-dialog.c:125 ../mail/filtertypes.xml.in.h:36
-#: ../mail/searchtypes.xml.in.h:39 ../mail/vfoldertypes.xml.in.h:39
+#: ../src/e-util/e-html-editor-page-dialog.c:122
+#: ../src/mail/filtertypes.xml.in.h:38 ../src/mail/searchtypes.xml.in.h:41
+#: ../src/mail/vfoldertypes.xml.in.h:41
 msgid "Draft"
 msgstr "Malneto"
 
-#: ../e-util/e-html-editor-page-dialog.c:134
+#: ../src/e-util/e-html-editor-page-dialog.c:131
 msgid "Graph Paper"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:501
+#: ../src/e-util/e-html-editor-page-dialog.c:379
 msgid "<b>Colors</b>"
 msgstr "<b>Koloroj</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:520
+#: ../src/e-util/e-html-editor-page-dialog.c:398
 msgid "_Text:"
 msgstr "_Teksto:"
 
-#: ../e-util/e-html-editor-page-dialog.c:535
+#: ../src/e-util/e-html-editor-page-dialog.c:413
 msgid "_Link:"
 msgstr "_Ligilo:"
 
-#: ../e-util/e-html-editor-page-dialog.c:550
+#: ../src/e-util/e-html-editor-page-dialog.c:428
+#, fuzzy
+#| msgid "_Link:"
+msgid "_Visited Link:"
+msgstr "_Ligilo:"
+
+#: ../src/e-util/e-html-editor-page-dialog.c:443
 msgid "_Background:"
 msgstr "_Fono:"
 
-#: ../e-util/e-html-editor-page-dialog.c:558
+#: ../src/e-util/e-html-editor-page-dialog.c:451
 msgid "<b>Background Image</b>"
 msgstr "<b>Fona bildo</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:580
+#: ../src/e-util/e-html-editor-page-dialog.c:473
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
 msgid "_Template:"
 msgstr "Ŝ_ablono:"
 
-#: ../e-util/e-html-editor-page-dialog.c:588
-#: ../e-util/e-import-assistant.c:283
+#: ../src/e-util/e-html-editor-page-dialog.c:481
+#: ../src/e-util/e-import-assistant.c:286
 msgid "Select a file"
 msgstr "Elekti dosieron"
 
-#: ../e-util/e-html-editor-page-dialog.c:595
+#: ../src/e-util/e-html-editor-page-dialog.c:488
 msgid "_Custom:"
 msgstr "_Propra:"
 
-#: ../e-util/e-html-editor-page-dialog.c:622
+#: ../src/e-util/e-html-editor-page-dialog.c:515
 #, fuzzy
 #| msgid "_Properties"
 msgid "Page Properties"
 msgstr "Paĝo-atributoj"
 
-#: ../e-util/e-html-editor-paragraph-dialog.c:83
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:81
 msgid "_Style:"
 msgstr "_Stilo:"
 
-#: ../e-util/e-html-editor-paragraph-dialog.c:90
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:88
 msgid "<b>Alignment</b>"
 msgstr "<b>Ĝisrandigo</b>"
 
-#: ../e-util/e-html-editor-paragraph-dialog.c:155
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:153
 msgid "Paragraph Properties"
 msgstr "Paragrafo-atributoj"
 
-#: ../e-util/e-html-editor-replace-dialog.c:163
-#, c-format
-msgid "%d occurence replaced"
-msgid_plural "%d occurences replaced"
-msgstr[0] ""
-msgstr[1] ""
+#: ../src/e-util/e-html-editor-replace-dialog.c:90
+#, fuzzy, c-format
+#| msgid "occurrences"
+msgid "%d occurrence replaced"
+msgid_plural "%d occurrences replaced"
+msgstr[0] "okazoj"
+msgstr[1] "okazoj"
 
-#: ../e-util/e-html-editor-replace-dialog.c:227
+#: ../src/e-util/e-html-editor-replace-dialog.c:278
 msgid "R_eplace:"
 msgstr ""
 
-#: ../e-util/e-html-editor-replace-dialog.c:239
+#: ../src/e-util/e-html-editor-replace-dialog.c:287
 msgid "_With:"
 msgstr "_Larĝo:"
 
-#: ../e-util/e-html-editor-replace-dialog.c:251
+#: ../src/e-util/e-html-editor-replace-dialog.c:299
 msgid "_Case sensitive"
 msgstr ""
 
-#: ../e-util/e-html-editor-replace-dialog.c:255
+#: ../src/e-util/e-html-editor-replace-dialog.c:303
 #, fuzzy
 #| msgid "_Search"
 msgid "Wra_p search"
 msgstr "_Serĉi"
 
-#: ../e-util/e-html-editor-replace-dialog.c:265
+#: ../src/e-util/e-html-editor-replace-dialog.c:313
 msgid "_Skip"
 msgstr "_Preterpasi"
 
-#: ../e-util/e-html-editor-replace-dialog.c:273
-#: ../e-util/e-system.error.xml.h:3
+#: ../src/e-util/e-html-editor-replace-dialog.c:321
+#: ../src/e-util/e-system.error.xml.h:3
 msgid "_Replace"
 msgstr "_Anstataŭigi"
 
-#: ../e-util/e-html-editor-replace-dialog.c:281
+#: ../src/e-util/e-html-editor-replace-dialog.c:329
 msgid "Replace _All"
 msgstr "Anstataŭigi ĉ_ion"
 
-#: ../e-util/e-html-editor-replace-dialog.c:301
+#: ../src/e-util/e-html-editor-replace-dialog.c:349
 msgctxt "dialog-title"
 msgid "Replace"
 msgstr "Anstataŭigi"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:87
+#: ../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 ""
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:505
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:388
 msgid "<b>Suggestions</b>"
 msgstr ""
 
 #. Replace
-#: ../e-util/e-html-editor-spell-check-dialog.c:540
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:423
 msgid "Replace"
 msgstr "Anstataŭigi"
 
 #. Replace All
-#: ../e-util/e-html-editor-spell-check-dialog.c:549
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:432
 msgid "Replace All"
 msgstr "Anstataŭigi ĉion"
 
 #. Ignore
-#: ../e-util/e-html-editor-spell-check-dialog.c:558
-#: ../mail/mail.error.xml.h:109
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:441
+#: ../src/mail/mail.error.xml.h:116
 msgid "Ignore"
 msgstr "Ignori"
 
 #. Skip
-#: ../e-util/e-html-editor-spell-check-dialog.c:567
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:450
 msgid "Skip"
 msgstr "Transsalti"
 
 #. Back
-#: ../e-util/e-html-editor-spell-check-dialog.c:576
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:459
 #, fuzzy
 #| msgid "Go Back"
 msgid "Back"
 msgstr "Reen"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:585
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:468
 msgid "<b>Dictionary</b>"
 msgstr "<b>Vortaro</b>"
 
 #. Add Word button
-#: ../e-util/e-html-editor-spell-check-dialog.c:605
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:488
 msgid "Add word"
 msgstr "Aldoni vorton"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:622
-#: ../mail/mail-config.ui.h:37
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:505
+#: ../src/mail/mail-config.ui.h:40
 msgid "Spell Checking"
 msgstr "Literumkontrolo"
 
-#: ../e-util/e-html-editor-table-dialog.c:782
+#: ../src/e-util/e-html-editor-table-dialog.c:537
 msgid "_Rows:"
 msgstr "_Vicoj:"
 
-#: ../e-util/e-html-editor-table-dialog.c:799
+#: ../src/e-util/e-html-editor-table-dialog.c:554
 msgid "C_olumns:"
 msgstr "K_olumnoj:"
 
-#: ../e-util/e-html-editor-table-dialog.c:850
+#: ../src/e-util/e-html-editor-table-dialog.c:605
 msgid "_Spacing:"
 msgstr ""
 
-#: ../e-util/e-html-editor-table-dialog.c:867
-#| msgid "Loading"
+#: ../src/e-util/e-html-editor-table-dialog.c:622
 msgid "_Padding:"
 msgstr ""
 
-#: ../e-util/e-html-editor-table-dialog.c:931
-#: ../e-util/e-html-editor-text-dialog.c:261
+#: ../src/e-util/e-html-editor-table-dialog.c:686
+#: ../src/e-util/e-html-editor-text-dialog.c:248
+#: ../src/e-util/e-webdav-browser.c:2418
 msgid "_Color:"
 msgstr "_Koloro:"
 
-#: ../e-util/e-html-editor-table-dialog.c:957
+#: ../src/e-util/e-html-editor-table-dialog.c:712
 msgid "Image:"
 msgstr "Bildo:"
 
-#: ../e-util/e-html-editor-table-dialog.c:984
+#: ../src/e-util/e-html-editor-table-dialog.c:739
 msgid "Table Properties"
 msgstr "Tabelo-atributoj"
 
-#: ../e-util/e-html-editor-text-dialog.c:281
+#: ../src/e-util/e-html-editor-text-dialog.c:268
 msgid "Si_ze:"
 msgstr "Gr_ando:"
 
-#: ../e-util/e-html-editor-text-dialog.c:296
+#: ../src/e-util/e-html-editor-text-dialog.c:283
 msgid "Text Properties"
 msgstr "Teksto-atributoj"
 
-#: ../e-util/e-html-editor-view.c:5030
-#, fuzzy
-#| msgid "Calendar Properties"
-msgid "Changed property"
-msgstr "Kalendar-ecoj"
-
-#: ../e-util/e-html-editor-view.c:5031
-msgid "Whether editor changed"
-msgstr ""
-
-#: ../e-util/e-html-editor-view.c:8937
-msgid ""
-"Turning HTML mode off will cause the text to lose all formatting. Do you "
-"want to continue?"
-msgstr ""
-
-#: ../e-util/e-html-editor-view.c:8941
-msgid "_Don't lose formatting"
-msgstr ""
-
-#: ../e-util/e-html-editor-view.c:8942
-#| msgid "Task information"
-msgid "_Lose formatting"
-msgstr ""
-
-#: ../e-util/e-import-assistant.c:256
+#: ../src/e-util/e-import-assistant.c:259
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr ""
 
-#: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
+#: ../src/e-util/e-import-assistant.c:300
+#: ../src/e-util/e-import-assistant.c:475
 msgid "File _type:"
 msgstr "Dosier-_tipo:"
 
-#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:917
+#: ../src/e-util/e-import-assistant.c:343
+#: ../src/e-util/e-import-assistant.c:923
 msgid "Choose the destination for this import"
 msgstr ""
 
-#: ../e-util/e-import-assistant.c:365
+#: ../src/e-util/e-import-assistant.c:368
 msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: ../e-util/e-import-assistant.c:373
+#: ../src/e-util/e-import-assistant.c:376
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: ../e-util/e-import-assistant.c:381
+#: ../src/e-util/e-import-assistant.c:384
 msgid "Import a _single file"
 msgstr ""
 
-#: ../e-util/e-import-assistant.c:403
-#: ../modules/startup-wizard/e-mail-config-import-page.c:200
+#: ../src/e-util/e-import-assistant.c:406
+#: ../src/modules/startup-wizard/e-mail-config-import-page.c:209
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: ../e-util/e-import-assistant.c:533
+#: ../src/e-util/e-import-assistant.c:536
 msgid ""
 "Evolution checked for settings to import from the following applications: "
-"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
-"like to try again, please click the \"Back\" button."
+"Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
+"would like to try again, please click the “Back” button."
 msgstr ""
 
-#: ../e-util/e-import-assistant.c:559
-#: ../modules/startup-wizard/e-mail-config-import-page.c:229
+#: ../src/e-util/e-import-assistant.c:562
+#: ../src/modules/startup-wizard/e-mail-config-import-page.c:238
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
 #. Install a custom "Cancel Import" button.
-#: ../e-util/e-import-assistant.c:775
+#: ../src/e-util/e-import-assistant.c:781
 msgid "_Cancel Import"
 msgstr "_Nuligi enporton"
 
-#: ../e-util/e-import-assistant.c:916
+#: ../src/e-util/e-import-assistant.c:922
 msgid "Preview data to be imported"
 msgstr ""
 
-#: ../e-util/e-import-assistant.c:922 ../e-util/e-import-assistant.c:935
-#: ../e-util/e-import-assistant.c:1288 ../e-util/e-import-assistant.c:1364
-#: ../e-util/e-import-assistant.c:1373
+#: ../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
 msgid "Import Data"
 msgstr "Enporti datumojn"
 
-#: ../e-util/e-import-assistant.c:930
+#: ../src/e-util/e-import-assistant.c:936
 msgid "Select what type of file you want to import from the list."
 msgstr ""
 
-#: ../e-util/e-import-assistant.c:1278 ../e-util/e-import-assistant.c:1313
+#: ../src/e-util/e-import-assistant.c:1284
+#: ../src/e-util/e-import-assistant.c:1319
 msgid "Evolution Import Assistant"
 msgstr "Enport-asistanto de Evolucio"
 
-#: ../e-util/e-import-assistant.c:1295 ../e-util/e-import-assistant.c:1351
+#: ../src/e-util/e-import-assistant.c:1301
+#: ../src/e-util/e-import-assistant.c:1357
 msgid "Import Location"
 msgstr "Enporti lokon"
 
-#: ../e-util/e-import-assistant.c:1306
+#: ../src/e-util/e-import-assistant.c:1312
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
 "external files into Evolution."
 msgstr ""
 
-#: ../e-util/e-import-assistant.c:1323
+#: ../src/e-util/e-import-assistant.c:1329
 msgid "Importer Type"
 msgstr ""
 
-#: ../e-util/e-import-assistant.c:1333
+#: ../src/e-util/e-import-assistant.c:1339
 msgid "Select Information to Import"
 msgstr ""
 
-#: ../e-util/e-import-assistant.c:1342
+#: ../src/e-util/e-import-assistant.c:1348
 msgid "Select a File"
 msgstr "Elekti dosieron"
 
-#: ../e-util/e-import-assistant.c:1359
-msgid "Click \"Apply\" to begin importing the file into Evolution."
-msgstr "Alkaku \"Apliki\" por komenci la enporton de la dosiero en Evolucion."
+#: ../src/e-util/e-import-assistant.c:1365
+#, fuzzy
+#| msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgid "Click “Apply” to begin importing the file into Evolution."
+msgstr "Alkaku “Apliki” por komenci la enporton de la dosiero en Evolucion."
 
-#: ../e-util/e-mail-signature-combo-box.c:376
+#: ../src/e-util/e-mail-signature-combo-box.c:431
 msgid "Autogenerated"
 msgstr ""
 
-#: ../e-util/e-mail-signature-editor.c:297
+#: ../src/e-util/e-mail-signature-editor.c:311 ../src/mail/e-mail-notes.c:933
 msgid "Close"
 msgstr "Fermi"
 
-#: ../e-util/e-mail-signature-editor.c:302
+#: ../src/e-util/e-mail-signature-editor.c:316 ../src/mail/e-mail-notes.c:938
 msgid "_Save and Close"
 msgstr "_Konservi kaj fermi"
 
-#: ../e-util/e-mail-signature-editor.c:529
+#: ../src/e-util/e-mail-signature-editor.c:558
 msgid "Edit Signature"
 msgstr "Redakti subskribon"
 
-#: ../e-util/e-mail-signature-editor.c:562
+#: ../src/e-util/e-mail-signature-editor.c:591
 msgid "_Signature Name:"
 msgstr "_Subsribonomo:"
 
-#: ../e-util/e-mail-signature-editor.c:598
+#: ../src/e-util/e-mail-signature-editor.c:627
 msgid "Unnamed"
 msgstr "Sennome"
 
-#: ../e-util/e-mail-signature-manager.c:337
+#: ../src/e-util/e-mail-signature-manager.c:338
 msgid "Add _Script"
 msgstr ""
 
-#: ../e-util/e-mail-signature-manager.c:426
+#: ../src/e-util/e-mail-signature-manager.c:444
 msgid "Add Signature Script"
 msgstr ""
 
-#: ../e-util/e-mail-signature-manager.c:497
+#: ../src/e-util/e-mail-signature-manager.c:538
 msgid "Edit Signature Script"
 msgstr ""
 
-#: ../e-util/e-mail-signature-script-dialog.c:393
+#: ../src/e-util/e-mail-signature-script-dialog.c:394
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only."
 msgstr ""
 
-#: ../e-util/e-mail-signature-script-dialog.c:444
+#: ../src/e-util/e-mail-signature-script-dialog.c:445
 msgid "S_cript:"
 msgstr ""
 
-#: ../e-util/e-mail-signature-script-dialog.c:475
+#: ../src/e-util/e-mail-signature-script-dialog.c:476
 msgid "Script file must be executable."
 msgstr ""
 
-#: ../e-util/e-map.c:885
+#: ../src/e-util/e-map.c:886
 msgid "World Map"
 msgstr "Mondmapo"
 
-#: ../e-util/e-map.c:888
+#: ../src/e-util/e-map.c:889
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
 msgstr ""
 
-#: ../e-util/e-misc-utils.c:248
+#: ../src/e-util/e-misc-utils.c:253
 msgid "Could not open the link."
 msgstr "Ne eblis malfermi la ligilon."
 
-#: ../e-util/e-misc-utils.c:330
+#: ../src/e-util/e-misc-utils.c:336
 msgid "Could not display help for Evolution."
 msgstr "Ne eblis montri helpon pri Evolucio."
 
-#: ../e-util/e-misc-utils.c:2383
+#: ../src/e-util/e-misc-utils.c:2501
 #, c-format
-#| msgid "Opening calendar at %s"
-msgid "Opening calendar '%s'"
-msgstr "Malfermante kalendaron '%s'"
+#| msgid "Opening calendar “%s”"
+msgid "Opening calendar “%s”"
+msgstr "Malfermante kalendaron “%s”"
 
-#: ../e-util/e-misc-utils.c:2386
+#: ../src/e-util/e-misc-utils.c:2504
 #, c-format
-#| msgid "Opening memos at %s"
-msgid "Opening memo list '%s'"
-msgstr "Malfermante notliston '%s'"
+#| msgid "Opening memo list “%s”"
+msgid "Opening memo list “%s”"
+msgstr "Malfermante notliston “%s”"
 
-#: ../e-util/e-misc-utils.c:2389
+#: ../src/e-util/e-misc-utils.c:2507
 #, c-format
-#| msgid "Opening tasks at %s"
-msgid "Opening task list '%s'"
-msgstr "Malfermante taskliston '%s'"
+#| msgid "Opening task list “%s”"
+msgid "Opening task list “%s”"
+msgstr "Malfermante taskliston “%s”"
 
-#: ../e-util/e-misc-utils.c:2392
+#: ../src/e-util/e-misc-utils.c:2510
 #, c-format
-#| msgid "Opening tasks at %s"
-msgid "Opening address book '%s'"
-msgstr "Malfermante adresaron '%s'"
+#| msgid "Opening address book “%s”"
+msgid "Opening address book “%s”"
+msgstr "Malfermante adresaron “%s”"
+
+#: ../src/e-util/e-misc-utils.c:3290
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:146
+msgid "_Do not show this message again"
+msgstr "Ne _plu montri ĉi tiun mesaĝon"
 
-#: ../e-util/e-name-selector-dialog.c:277
+#: ../src/e-util/e-name-selector-dialog.c:274
 msgid "Show Contacts"
 msgstr "Montri kontaktojn"
 
-#: ../e-util/e-name-selector-dialog.c:309
-#| msgid "Address Book"
+#: ../src/e-util/e-name-selector-dialog.c:306
 msgid "Address B_ook:"
 msgstr "Adresar_o:"
 
-#: ../e-util/e-name-selector-dialog.c:316
-#| msgid "Category"
+#: ../src/e-util/e-name-selector-dialog.c:313
 msgid "Cat_egory:"
 msgstr "Kat_egorio:"
 
-#: ../e-util/e-name-selector-dialog.c:340
+#: ../src/e-util/e-name-selector-dialog.c:337
 msgid "_Search:"
 msgstr "_Serĉi:"
 
-#: ../e-util/e-name-selector-dialog.c:366
-#: ../e-util/e-name-selector-dialog.c:1274
-#: ../modules/addressbook/e-book-shell-view-actions.c:1157
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
-#: ../modules/calendar/e-memo-shell-view-actions.c:709
-#: ../modules/calendar/e-task-shell-view-actions.c:881
+#: ../src/e-util/e-name-selector-dialog.c:363
+#: ../src/e-util/e-name-selector-dialog.c:1330
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1187
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1675
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:758
+#: ../src/modules/calendar/e-task-shell-view-actions.c:931
 msgid "Any Category"
 msgstr "Iu kategorio"
 
-#: ../e-util/e-name-selector-dialog.c:368
+#: ../src/e-util/e-name-selector-dialog.c:365
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:338
 msgid "Co_ntacts"
 msgstr "Ko_ntaktoj"
 
-#: ../e-util/e-name-selector-dialog.c:445
+#: ../src/e-util/e-name-selector-dialog.c:442
 msgid "Search"
 msgstr "Serĉi"
 
-#: ../e-util/e-name-selector-dialog.c:448
-#: ../mail/importers/pine-importer.c:427
+#: ../src/e-util/e-name-selector-dialog.c:445
+#: ../src/mail/importers/pine-importer.c:430
 msgid "Address Book"
 msgstr "Adresaro"
 
-#: ../e-util/e-name-selector-dialog.c:451
-#: ../modules/addressbook/e-book-shell-backend.c:303
-#: ../modules/addressbook/e-book-shell-view.c:373
-msgid "Contacts"
-msgstr "Kontaktoj"
-
-#: ../e-util/e-name-selector-dialog.c:576
+#: ../src/e-util/e-name-selector-dialog.c:573
 #, fuzzy
 #| msgid "Select Address Book"
 msgid "Select Contacts from Address Book"
 msgstr "Elekti adresaron"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../e-util/e-name-selector-entry.c:3183
+#: ../src/e-util/e-name-selector-entry.c:3222
 #, fuzzy, c-format
 #| msgid "E_xpand All"
 msgid "E_xpand %s Inline"
 msgstr "_Etendi %s"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3199
+#: ../src/e-util/e-name-selector-entry.c:3238
 #, c-format
 msgid "Cop_y %s"
 msgstr "Kopi_i %s"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3210
+#: ../src/e-util/e-name-selector-entry.c:3249
 #, c-format
 msgid "C_ut %s"
 msgstr "Elt_ondi %s"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3228
+#: ../src/e-util/e-name-selector-entry.c:3267
 #, c-format
-#| msgid "_Edit"
 msgid "_Edit %s"
 msgstr "R_edakti na %s"
 
-#: ../e-util/e-name-selector-list.c:583
+#: ../src/e-util/e-name-selector-list.c:585
 #, c-format
-#| msgid "_Delete"
 msgid "_Delete %s"
 msgstr "_Forigi na %s"
 
-#: ../e-util/e-online-button.c:32
+#: ../src/e-util/e-online-button.c:30
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr ""
 "Evolucio nun estas konektite.  Alklaku tiun butonon por labori nekonektite."
 
-#: ../e-util/e-online-button.c:35
+#: ../src/e-util/e-online-button.c:33
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr ""
 "Evolucio nun estas nekonektite.  Alklaku tiun butonon por labori konektite."
 
-#: ../e-util/e-online-button.c:38
+#: ../src/e-util/e-online-button.c:36
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolucio nun estas nekonektite ĉar la reto ne disponeblas."
 
-#: ../e-util/e-passwords.c:127
+#: ../src/e-util/e-passwords.c:125
 msgid "Keyring key is unusable: no user or host name"
 msgstr ""
 
-#: ../e-util/e-passwords.c:447
+#: ../src/e-util/e-passwords.c:445
 msgid "You have the Caps Lock key on."
 msgstr ""
 
-#: ../e-util/e-passwords.c:578
+#: ../src/e-util/e-passwords.c:576
 msgid "_Remember this passphrase"
 msgstr "_Memori tiun ĉi pasfrazon"
 
-#: ../e-util/e-passwords.c:579
+#: ../src/e-util/e-passwords.c:577
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr ""
 
-#: ../e-util/e-passwords.c:584
+#: ../src/e-util/e-passwords.c:582
 msgid "_Remember this password"
 msgstr "_Memori tiun ĉi pasvorton"
 
-#: ../e-util/e-passwords.c:585
+#: ../src/e-util/e-passwords.c:583
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
-#: ../e-util/e-preferences-window.c:318
+#: ../src/e-util/e-preferences-window.c:329
 msgid "Evolution Preferences"
 msgstr "Evolucio-agordoj"
 
-#: ../e-util/e-print.c:160
+#: ../src/e-util/e-print.c:164
 msgid "An error occurred while printing"
 msgstr "Eraro okazis dum presado"
 
-#: ../e-util/e-print.c:167
+#: ../src/e-util/e-print.c:171
 msgid "The printing system reported the following details about the error:"
 msgstr "La pres-sistemo raportis la jenajn detalojn pri la eraro:"
 
-#: ../e-util/e-print.c:173
+#: ../src/e-util/e-print.c:177
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "La pres-sistemo ne raportis iun pluan detalon pri la eraro."
 
-#: ../e-util/e-proxy-editor.c:325
+#: ../src/e-util/e-proxy-editor.c:326
 #, fuzzy
 #| msgid "_Login method:"
 msgid "_Method:"
 msgstr "_Ensalutmetodo:"
 
-#: ../e-util/e-proxy-editor.c:347
+#: ../src/e-util/e-proxy-editor.c:348
 msgid "Defer to Desktop Settings"
 msgstr ""
 
-#: ../e-util/e-proxy-editor.c:351
+#: ../src/e-util/e-proxy-editor.c:352
 msgid "_Open Desktop Settings"
 msgstr ""
 
-#: ../e-util/e-proxy-editor.c:377
+#: ../src/e-util/e-proxy-editor.c:378
 #, fuzzy
 #| msgid "January"
 msgid "Manual"
 msgstr "Januaro"
 
-#: ../e-util/e-proxy-editor.c:396
-#| msgid "Use HTTP proxy"
+#: ../src/e-util/e-proxy-editor.c:397
 msgid "_HTTP Proxy:"
 msgstr "_HTTP-prokurilo:"
 
-#: ../e-util/e-proxy-editor.c:427
-#| msgid "Use HTTP proxy"
+#: ../src/e-util/e-proxy-editor.c:428
 msgid "H_TTPS Proxy:"
 msgstr "H_TTPS-prokurilo:"
 
-#: ../e-util/e-proxy-editor.c:458
+#: ../src/e-util/e-proxy-editor.c:459
 msgid "_Socks Proxy:"
 msgstr ""
 
-#: ../e-util/e-proxy-editor.c:489
+#: ../src/e-util/e-proxy-editor.c:490
 #, fuzzy
 #| msgid "Ignore"
 msgid "_Ignore Hosts:"
 msgstr "_Ignori:"
 
-#: ../e-util/e-proxy-editor.c:515
+#: ../src/e-util/e-proxy-editor.c:516
 #, fuzzy
 #| msgid "Autocompletion"
 msgid "Automatic"
 msgstr "Aŭtomata kompletigo"
 
-#: ../e-util/e-proxy-editor.c:534
-#| msgid "Configuration"
+#: ../src/e-util/e-proxy-editor.c:535
 msgid "Configuration _URL:"
 msgstr ""
 
-#: ../e-util/e-proxy-editor.c:563
+#: ../src/e-util/e-proxy-editor.c:561
+#, fuzzy
+#| msgid "Proxy"
+msgid "No proxy"
+msgstr "Prokurilo"
+
+#: ../src/e-util/e-proxy-editor.c:564
 msgid "Use a direct connection, no proxying required."
 msgstr ""
 
-#: ../e-util/e-proxy-preferences.c:213
+#: ../src/e-util/e-proxy-preferences.c:214
 msgid "Switch to Basic Proxy Preferences"
 msgstr ""
 
-#: ../e-util/e-proxy-preferences.c:215
+#: ../src/e-util/e-proxy-preferences.c:216
 msgid "Switch to Advanced Proxy Preferences"
 msgstr ""
 
-#: ../e-util/e-proxy-preferences.c:526
+#: ../src/e-util/e-proxy-preferences.c:527
 msgid "Apply custom proxy settings to these accounts:"
 msgstr ""
 
-#: ../e-util/e-proxy-preferences.c:561
+#: ../src/e-util/e-proxy-preferences.c:562
 msgid ""
 "<b>Advanced Proxy Preferences</b> lets you define alternate network proxies "
 "and apply them to specific accounts"
 msgstr ""
 
-#: ../e-util/e-proxy-selector.c:85
-#| msgid "Custom Alarm:"
+#: ../src/e-util/e-proxy-selector.c:86
 msgid "Custom Proxy"
 msgstr "Propra prokurilo"
 
-#: ../e-util/e-proxy-selector.c:487
+#: ../src/e-util/e-proxy-selector.c:488
 #, fuzzy
 #| msgid "Create a new appointment"
 msgid "Create a new proxy profile"
 msgstr "Kreii novan rendevuon"
 
-#: ../e-util/e-proxy-selector.c:492
+#: ../src/e-util/e-proxy-selector.c:493
 #, fuzzy
 #| msgid "Delete the selected memo list"
 msgid "Delete the selected proxy profile"
 msgstr "Forigi la elektitan notoliston"
 
-#: ../e-util/e-rule-editor.c:184
+#: ../src/e-util/e-rule-editor.c:190
 msgid "Add Rule"
 msgstr "Aldoni regulon"
 
-#: ../e-util/e-rule-editor.c:286
+#: ../src/e-util/e-rule-editor.c:301
 msgid "Edit Rule"
 msgstr "Redakti regulon"
 
-#: ../e-util/e-search-bar.c:83
+#: ../src/e-util/e-search-bar.c:82
 #, c-format
 msgid "Matches: %u"
 msgstr ""
 
-#: ../e-util/e-search-bar.c:567
+#: ../src/e-util/e-search-bar.c:609
 msgid "Close the find bar"
 msgstr ""
 
-#: ../e-util/e-search-bar.c:575
+#: ../src/e-util/e-search-bar.c:617
 msgid "Fin_d:"
 msgstr "_Serĉi:"
 
-#: ../e-util/e-search-bar.c:587
+#: ../src/e-util/e-search-bar.c:629
 msgid "Clear the search"
 msgstr ""
 
-#: ../e-util/e-search-bar.c:611
+#: ../src/e-util/e-search-bar.c:653
 msgid "_Previous"
 msgstr "_Antaŭa"
 
-#: ../e-util/e-search-bar.c:614
+#: ../src/e-util/e-search-bar.c:656
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../e-util/e-search-bar.c:623
+#: ../src/e-util/e-search-bar.c:665
 msgid "_Next"
 msgstr "_Sekva"
 
-#: ../e-util/e-search-bar.c:626
+#: ../src/e-util/e-search-bar.c:668
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../e-util/e-search-bar.c:635
+#: ../src/e-util/e-search-bar.c:677
 msgid "Mat_ch case"
 msgstr ""
 
-#: ../e-util/e-search-bar.c:663
+#: ../src/e-util/e-search-bar.c:705
 msgid "Reached bottom of page, continued from top"
 msgstr ""
 
-#: ../e-util/e-search-bar.c:685
+#: ../src/e-util/e-search-bar.c:727
 msgid "Reached top of page, continued from bottom"
 msgstr ""
 
-#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:327
-#: ../mail/importers/kmail-importer.c:253
-#: ../mail/importers/pine-importer.c:420
-#: ../modules/mail/e-mail-shell-view.c:1163
-#: ../smime/gui/certificate-manager.c:1669
-msgid "Mail"
-msgstr "Retpoŝto"
-
-#: ../e-util/e-send-options.c:570
+#: ../src/e-util/e-send-options.c:568
 msgid "When de_leted:"
 msgstr ""
 
-#: ../e-util/e-send-options.ui.h:3
+#: ../src/e-util/e-send-options.ui.h:3
 msgid "Standard"
 msgstr "Standarde"
 
-#: ../e-util/e-send-options.ui.h:6
+#: ../src/e-util/e-send-options.ui.h:6
 msgid "Proprietary"
 msgstr "Mallibere"
 
-#: ../e-util/e-send-options.ui.h:8
+#: ../src/e-util/e-send-options.ui.h:8
 msgid "Secret"
 msgstr "Sekrete"
 
-#: ../e-util/e-send-options.ui.h:9
+#: ../src/e-util/e-send-options.ui.h:9
 msgid "Top Secret"
 msgstr "Sekretege"
 
-#: ../e-util/e-send-options.ui.h:10
+#: ../src/e-util/e-send-options.ui.h:10
 msgid "For Your Eyes Only"
 msgstr "Nur por viaj okuloj"
 
 #. Translators: Used in send options dialog
-#: ../e-util/e-send-options.ui.h:12
+#: ../src/e-util/e-send-options.ui.h:12
 msgctxt "send-options"
 msgid "None"
 msgstr "Neniu"
 
-#: ../e-util/e-send-options.ui.h:13
+#: ../src/e-util/e-send-options.ui.h:13
 msgid "Mail Receipt"
 msgstr ""
 
-#: ../e-util/e-send-options.ui.h:15
+#: ../src/e-util/e-send-options.ui.h:14
+msgid "Send Options"
+msgstr "Send-agordoj"
+
+#: ../src/e-util/e-send-options.ui.h:18
 msgid "R_eply requested"
 msgstr ""
 
-#: ../e-util/e-send-options.ui.h:16
+#. Translators: This is part of
+#: ../src/e-util/e-send-options.ui.h:20
 msgctxt "ESendOptionsWithin"
 msgid "Wi_thin"
 msgstr "_Dum"
 
-#: ../e-util/e-send-options.ui.h:17
+#. Translators: This is part of
+#: ../src/e-util/e-send-options.ui.h:22
 msgctxt "ESendOptionsWithin"
 msgid "days"
 msgstr "tagoj"
 
-#: ../e-util/e-send-options.ui.h:18
+#: ../src/e-util/e-send-options.ui.h:23
 msgid "_When convenient"
 msgstr ""
 
-#: ../e-util/e-send-options.ui.h:20
+#. To translators: This means Delay the message delivery for some time
+#: ../src/e-util/e-send-options.ui.h:26
 msgid "_Delay message delivery"
 msgstr ""
 
-#: ../e-util/e-send-options.ui.h:21
+#. Translators: This is part of
+#: ../src/e-util/e-send-options.ui.h:28
 msgctxt "ESendOptionsAfter"
 msgid "_After"
 msgstr "_Post"
 
-#: ../e-util/e-send-options.ui.h:22
+#. Translators: This is part of
+#: ../src/e-util/e-send-options.ui.h:30
 msgctxt "ESendOptionsAfter"
 msgid "days"
 msgstr "tagoj"
 
-#: ../e-util/e-send-options.ui.h:23
+#: ../src/e-util/e-send-options.ui.h:31
 msgid "_Set expiration date"
 msgstr ""
 
-#: ../e-util/e-send-options.ui.h:24
+#. Translators: This is part of
+#: ../src/e-util/e-send-options.ui.h:33
 msgctxt "ESendOptions"
 msgid "_Until"
 msgstr "Ĝ_is"
 
-#: ../e-util/e-send-options.ui.h:25
+#: ../src/e-util/e-send-options.ui.h:34
 msgid "Delivery Options"
 msgstr ""
 
-#: ../e-util/e-send-options.ui.h:26
+#: ../src/e-util/e-send-options.ui.h:35
 msgid "_Priority:"
 msgstr "_Prioritato:"
 
-#: ../e-util/e-send-options.ui.h:27
+#: ../src/e-util/e-send-options.ui.h:36
 msgid "_Classification:"
 msgstr ""
 
-#: ../e-util/e-send-options.ui.h:28
+#: ../src/e-util/e-send-options.ui.h:37
 msgid "Gene_ral Options"
 msgstr "Ĝene_ralaj agordoj"
 
-#: ../e-util/e-send-options.ui.h:29
+#: ../src/e-util/e-send-options.ui.h:38
 msgid "Creat_e a sent item to track information"
 msgstr ""
 
-#: ../e-util/e-send-options.ui.h:30
+#: ../src/e-util/e-send-options.ui.h:39
 msgid "_Delivered"
 msgstr ""
 
-#: ../e-util/e-send-options.ui.h:31
+#: ../src/e-util/e-send-options.ui.h:40
 msgid "Deli_vered and opened"
 msgstr ""
 
-#: ../e-util/e-send-options.ui.h:32
+#: ../src/e-util/e-send-options.ui.h:41
 msgid "_All information"
 msgstr "Ĉi_uj informoj"
 
-#: ../e-util/e-send-options.ui.h:33
+#: ../src/e-util/e-send-options.ui.h:42
 msgid "A_uto-delete sent item"
 msgstr ""
 
-#: ../e-util/e-send-options.ui.h:34
+#: ../src/e-util/e-send-options.ui.h:43
 msgid "Status Tracking"
 msgstr ""
 
-#: ../e-util/e-send-options.ui.h:35
+#: ../src/e-util/e-send-options.ui.h:44
 msgid "_When opened:"
 msgstr ""
 
-#: ../e-util/e-send-options.ui.h:36
+#: ../src/e-util/e-send-options.ui.h:45
 msgid "When decli_ned:"
 msgstr ""
 
-#: ../e-util/e-send-options.ui.h:37
+#: ../src/e-util/e-send-options.ui.h:46
 msgid "When co_mpleted:"
 msgstr ""
 
-#: ../e-util/e-send-options.ui.h:38
+#: ../src/e-util/e-send-options.ui.h:47
 msgid "When acce_pted:"
 msgstr ""
 
-#: ../e-util/e-send-options.ui.h:39
+#: ../src/e-util/e-send-options.ui.h:48
 msgid "Return Notification"
 msgstr ""
 
-#: ../e-util/e-send-options.ui.h:40
+#: ../src/e-util/e-send-options.ui.h:49
 msgid "Sta_tus Tracking"
 msgstr ""
 
-#: ../e-util/e-source-config.c:690 ../e-util/e-source-config.c:694
+#: ../src/e-util/e-source-config.c:691 ../src/e-util/e-source-config.c:695
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../e-util/e-source-config.c:702 ../e-util/e-source-config.c:706
+#: ../src/e-util/e-source-config.c:703 ../src/e-util/e-source-config.c:707
 msgid "Name:"
 msgstr "Nomo:"
 
+#: ../src/e-util/e-source-config.c:814 ../src/e-util/e-webdav-browser.c:1748
+#, fuzzy
+#| msgid "The file cannot be read"
+msgid "Name cannot be empty"
+msgstr "La dosiero ne estas legebla"
+
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../e-util/e-source-config.c:1311
+#: ../src/e-util/e-source-config.c:1314
 #, fuzzy
 #| msgid "Refresh the folder"
 msgid "Refresh every"
 msgstr "Aktualigi la dosierujon"
 
-#: ../e-util/e-source-config.c:1341 ../e-util/e-source-config.c:1411
-#| msgid "Use _secure connection"
+#: ../src/e-util/e-source-config.c:1344 ../src/e-util/e-source-config.c:1414
 msgid "Use a secure connection"
 msgstr "Uzi sekuran konekton"
 
-#: ../e-util/e-source-config.c:1437
-msgid "Unset _trust for SSL certificate"
+#: ../src/e-util/e-source-config.c:1440
+msgid "Unset _trust for SSL/TLS certificate"
 msgstr ""
 
-#: ../e-util/e-source-config.c:1473
+#: ../src/e-util/e-source-config.c:1476
 msgid "User"
 msgstr "Uzanto"
 
-#: ../e-util/e-source-selector-dialog.c:229
-#| msgid "_Destination folder:"
+#: ../src/e-util/e-source-selector.c:3212
+#| msgid "Show %s"
+msgid "Show"
+msgstr "Montri"
+
+#: ../src/e-util/e-source-selector.c:3219
+#, fuzzy
+#| msgid "Group Reply"
+msgid "Group name"
+msgstr "Gruprespondo"
+
+#: ../src/e-util/e-source-selector.c:3374 ../src/mail/e-mail-display.c:794
+msgid "_Hide"
+msgstr "_Kaŝi"
+
+#: ../src/e-util/e-source-selector.c:3374
+#: ../src/e-util/e-source-selector.c:3473
+#| msgid "Show %s"
+msgid "_Show"
+msgstr "_Montri"
+
+#: ../src/e-util/e-source-selector.c:3426
+#, fuzzy
+#| msgid "Manager"
+msgid "Manage Groups"
+msgstr "Estro"
+
+#: ../src/e-util/e-source-selector.c:3438
+#| msgid "A_vailable Fields:"
+msgid "Available Groups:"
+msgstr "Disponeblaj grupoj:"
+
+#: ../src/e-util/e-source-selector-dialog.c:234
 msgid "_Destination"
 msgstr "_Celdosierujo"
 
-#: ../e-util/e-source-selector-dialog.c:342
-#| msgid "Select destination file"
+#: ../src/e-util/e-source-selector-dialog.c:362
 msgid "Select destination"
 msgstr "Elekti celdosieron"
 
 #. Translators: %s is the language ISO code.
-#: ../e-util/e-spell-dictionary.c:266
+#: ../src/e-util/e-spell-dictionary.c:264
 #, c-format
-#| msgid "Unknown"
 msgctxt "language"
 msgid "Unknown (%s)"
 msgstr "Nekonate (%s)"
 
 #. Translators: The first %s is the language name, and the
 #. * second is the country name. Example: "French (France)"
-#: ../e-util/e-spell-dictionary.c:281 ../e-util/e-spell-dictionary.c:286
+#: ../src/e-util/e-spell-dictionary.c:279
+#: ../src/e-util/e-spell-dictionary.c:284
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:408
-#| msgid "(no subject)"
+#: ../src/e-util/e-spell-entry.c:479
 msgid "(no suggestions)"
 msgstr "(neniuj proponoj)"
 
-#: ../e-util/e-spell-entry.c:432
+#: ../src/e-util/e-spell-entry.c:503
 msgid "More..."
 msgstr "Pli..."
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:517
+#: ../src/e-util/e-spell-entry.c:588
 #, c-format
-msgid "Add \"%s\" to Dictionary"
-msgstr ""
+#| msgid "Add Word to Dictionary"
+msgid "Add “%s” to Dictionary"
+msgstr "Aldoni “%s” al vortaro"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:566
-#| msgid "Ignore"
+#: ../src/e-util/e-spell-entry.c:637
 msgid "Ignore All"
 msgstr "Ignori ĉiujn"
 
-#: ../e-util/e-spell-entry.c:598
+#: ../src/e-util/e-spell-entry.c:669
 msgid "Spelling Suggestions"
 msgstr ""
 
-#: ../e-util/e-system.error.xml.h:1
-msgid "A file named \"{0}\" already exists. Do you want to replace it?"
+#: ../src/e-util/e-system.error.xml.h:1
+msgid "A file named “{0}” already exists. Do you want to replace it?"
 msgstr ""
 
-#: ../e-util/e-system.error.xml.h:2
+#: ../src/e-util/e-system.error.xml.h:2
 msgid ""
-"The file already exists in \"{0}\". Replacing it will overwrite its contents."
+"The file already exists in “{0}”. Replacing it will overwrite its contents."
 msgstr ""
 
-#: ../e-util/e-system.error.xml.h:4
-msgid "Cannot save file \"{0}\"."
-msgstr "Ne eblis konservi dosieron \"{0}\"."
-
-#: ../e-util/e-system.error.xml.h:5
-msgid "Because \"{1}\"."
-msgstr "Ĉar \"{1}\"."
+#: ../src/e-util/e-system.error.xml.h:4
+#| msgid "Cannot save file \"{0}\"."
+msgid "Cannot save file “{0}”."
+msgstr "Ne eblis konservi dosieron “{0}”."
 
-#: ../e-util/e-system.error.xml.h:6
-msgid "Cannot open file \"{0}\"."
-msgstr "Ne eblis malfermi dosieron \"{0}\"."
+#: ../src/e-util/e-system.error.xml.h:6
+#| msgid "Cannot open file \"{0}\"."
+msgid "Cannot open file “{0}”."
+msgstr "Ne eblis malfermi dosieron “{0}”."
 
-#: ../e-util/e-system.error.xml.h:7
-msgid "Failed to remove data source &quot;{0}&quot;."
-msgstr ""
+#: ../src/e-util/e-system.error.xml.h:7
+#| msgid "Failed to delete contact"
+msgid "Failed to remove data source “{0}”."
+msgstr "Malsukcesis forigi datum-risurcon “{0}”."
 
-#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:61
-#, fuzzy
+#: ../src/e-util/e-system.error.xml.h:8 ../src/mail/mail.error.xml.h:64
 #| msgid "Because &quot;{1}&quot;."
-msgid "The reported error was &quot;{1}&quot;."
-msgstr "Ĉar &quot;{1}&quot;."
+msgid "The reported error was “{1}”."
+msgstr "La raportata eraro estis “{1}”."
 
-#: ../e-util/e-system.error.xml.h:9
-msgid "Failed to update data source &quot;{0}&quot;."
-msgstr ""
+#: ../src/e-util/e-system.error.xml.h:9
+#, fuzzy
+#| msgid "Failed to delete contact"
+msgid "Failed to update data source “{0}”."
+msgstr "Malsukcesis forigi risurcon “{0}”."
 
-#: ../e-util/e-system.error.xml.h:10
+#: ../src/e-util/e-system.error.xml.h:10
 #, fuzzy
 #| msgid "Failed to delete contact"
-msgid "Failed to delete resource &quot;{0}&quot;."
-msgstr "Malsukcesis forigi risurcon &quot;{0}&quot;."
+msgid "Failed to delete resource “{0}”."
+msgstr "Malsukcesis forigi risurcon “{0}”."
 
-#: ../e-util/e-system.error.xml.h:11
+#: ../src/e-util/e-system.error.xml.h:11
 #, fuzzy
 #| msgid "The Evolution address book has quit unexpectedly."
-msgid ""
-"The address book backend servicing &quot;{0}&quot; has quit unexpectedly."
-msgstr "La adresaro &quot;{0}&quot; ĉesigitis neatendite."
+msgid "The address book backend servicing “{0}” has quit unexpectedly."
+msgstr "La adresaro “{0}” ĉesigitis neatendite."
 
-#: ../e-util/e-system.error.xml.h:12
+#: ../src/e-util/e-system.error.xml.h:12
 #, fuzzy
 #| msgid ""
 #| "Your contacts for {0} will not be available until Evolution is restarted."
@@ -13359,881 +15063,1143 @@ msgid ""
 "Some of your contacts may not be available until Evolution is restarted."
 msgstr "Via kontaktoj estos disponeblaj nur post restartigo de Evolucio."
 
-#: ../e-util/e-system.error.xml.h:13
+#: ../src/e-util/e-system.error.xml.h:13
 #, fuzzy
 #| msgid "The Evolution calendar has quit unexpectedly."
-msgid "The calendar backend servicing &quot;{0}&quot; has quit unexpectedly."
-msgstr "La Evolucio-kalendaro &quot;{0}&quot; ĉesigitis neatendite."
+msgid "The calendar backend servicing “{0}” has quit unexpectedly."
+msgstr "La Evolucio-kalendaro “{0}” ĉesigitis neatendite."
 
-#: ../e-util/e-system.error.xml.h:14
+#: ../src/e-util/e-system.error.xml.h:14
 #, fuzzy
 #| msgid "Your memos will not be available until Evolution is restarted."
 msgid ""
 "Some of your appointments may not be available until Evolution is restarted."
 msgstr "Viaj notoj ne disponeblas ĝis restarto de Evolucio."
 
-#: ../e-util/e-system.error.xml.h:15
+#: ../src/e-util/e-system.error.xml.h:15
 #, fuzzy
 #| msgid "The Evolution calendar has quit unexpectedly."
-msgid "The memo list backend servicing &quot;{0}&quot; has quit unexpectedly."
-msgstr "La Evolucio-kalendaro &quot;{0}&quot; ĉesigitis neatendite."
+msgid "The memo list backend servicing “{0}” has quit unexpectedly."
+msgstr "La Evolucio-kalendaro “{0}” ĉesigitis neatendite."
 
-#: ../e-util/e-system.error.xml.h:16
+#: ../src/e-util/e-system.error.xml.h:16
 #, fuzzy
 #| msgid "Your memos will not be available until Evolution is restarted."
 msgid "Some of your memos may not be available until Evolution is restarted."
 msgstr "Viaj notoj ne disponeblas ĝis restarto de Evolucio."
 
-#: ../e-util/e-system.error.xml.h:17
+#: ../src/e-util/e-system.error.xml.h:17
 #, fuzzy
 #| msgid "The Evolution calendar has quit unexpectedly."
-msgid "The task list backend servicing &quot;{0}&quot; has quit unexpectedly."
-msgstr "La Evolucio-kalendaro &quot;{0}&quot; ĉesigitis neatendite."
+msgid "The task list backend servicing “{0}” has quit unexpectedly."
+msgstr "La Evolucio-kalendaro “{0}” ĉesigitis neatendite."
 
-#: ../e-util/e-system.error.xml.h:18
+#: ../src/e-util/e-system.error.xml.h:18
 #, fuzzy
 #| msgid "Your tasks will not be available until Evolution is restarted."
 msgid "Some of your tasks may not be available until Evolution is restarted."
 msgstr "Viaj taskoj ne estas disponeblaj ĝis restarto de Evolucio."
 
-#: ../e-util/e-system.error.xml.h:19
-msgid ""
-"The address book backend servicing &quot;{0}&quot; encountered an error."
-msgstr ""
+#: ../src/e-util/e-system.error.xml.h:19
+#, fuzzy
+#| msgid "The Evolution address book has quit unexpectedly."
+msgid "The address book backend servicing “{0}” encountered an error."
+msgstr "La adresaro “{0}” ĉesigitis neatendite."
+
+#: ../src/e-util/e-system.error.xml.h:20
+#, fuzzy
+#| msgid "The Evolution calendar has quit unexpectedly."
+msgid "The calendar backend servicing “{0}” encountered an error."
+msgstr "La Evolucio-kalendaro “{0}” ĉesigitis neatendite."
 
-#: ../e-util/e-system.error.xml.h:20
-msgid "The calendar backend servicing &quot;{0}&quot; encountered an error."
+#: ../src/e-util/e-system.error.xml.h:21
+#, fuzzy
+#| msgid "The Evolution calendar has quit unexpectedly."
+msgid "The memo list backend servicing “{0}” encountered an error."
+msgstr "La Evolucio-kalendaro “{0}” ĉesigitis neatendite."
+
+#: ../src/e-util/e-system.error.xml.h:22
+#, fuzzy
+#| msgid "The Evolution calendar has quit unexpectedly."
+msgid "The task list backend servicing “{0}” encountered an error."
+msgstr "La Evolucio-kalendaro “{0}” ĉesigitis neatendite."
+
+#: ../src/e-util/e-system.error.xml.h:23
+msgid "Something has gone wrong"
 msgstr ""
 
-#: ../e-util/e-system.error.xml.h:21
-msgid "The memo list backend servicing &quot;{0}&quot; encountered an error."
+#: ../src/e-util/e-system.error.xml.h:24
+msgid ""
+"A WebKitWebProcess crashed when displaying the content. You can try again by "
+"reopening the window. If the issue persists, please file a bug report in the "
+"GNOME bugzilla."
 msgstr ""
 
-#: ../e-util/e-system.error.xml.h:22
-msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
+#: ../src/e-util/e-system.error.xml.h:25
+#, fuzzy
+#| msgid "Are you sure you want to delete the memo “{0}”?"
+msgid "Are you sure you want to delete remote collection “{0}”?"
+msgstr "Ĉu vi certe volas forigi tiun noton “{0}”?"
+
+#: ../src/e-util/e-system.error.xml.h:26
+#, fuzzy
+#| 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?"
 msgstr ""
+"La kalendaro “{0}” estos daŭre forigita el la servilo. Ĉu vi vere volas "
+"daŭrigi?"
 
-#: ../e-util/e-table-click-to-add.c:684
-#: ../e-util/gal-a11y-e-table-click-to-add.c:61
-#: ../e-util/gal-a11y-e-table-click-to-add.c:142
+#: ../src/e-util/e-table-click-to-add.c:687
+#: ../src/e-util/gal-a11y-e-table-click-to-add.c:59
+#: ../src/e-util/gal-a11y-e-table-click-to-add.c:140
 msgid "click to add"
 msgstr "klaku por aldoni"
 
-#: ../e-util/e-table-column-selector.c:264
+#: ../src/e-util/e-table-column-selector.c:264
 #, fuzzy
 #| msgid "Move selected contacts to another address book"
 msgid "Move selected column names to top"
 msgstr "Movi elektitajn kontaktojn al alia adresaro"
 
-#: ../e-util/e-table-column-selector.c:269
+#: ../src/e-util/e-table-column-selector.c:269
 #, fuzzy
 #| msgid "Move selected contacts to another address book"
 msgid "Move selected column names up one row"
 msgstr "Movi elektitajn kontaktojn al alia adresaro"
 
-#: ../e-util/e-table-column-selector.c:274
+#: ../src/e-util/e-table-column-selector.c:274
 #, fuzzy
 #| msgid "Move selected contacts to another address book"
 msgid "Move selected column names down one row"
 msgstr "Movi elektitajn kontaktojn al alia adresaro"
 
-#: ../e-util/e-table-column-selector.c:279
+#: ../src/e-util/e-table-column-selector.c:279
 #, fuzzy
 #| msgid "Move selected contacts to another address book"
 msgid "Move selected column names to bottom"
 msgstr "Movi elektitajn kontaktojn al alia adresaro"
 
-#: ../e-util/e-table-column-selector.c:284
+#: ../src/e-util/e-table-column-selector.c:284
 #, fuzzy
 #| msgid "Select all visible memos"
 msgid "Select all column names"
 msgstr "Elekti ĉiujn videblajn notojn"
 
-#: ../e-util/e-table-config.c:388 ../e-util/e-table-config.c:434
+#: ../src/e-util/e-table-config.c:388 ../src/e-util/e-table-config.c:434
 msgid "(Ascending)"
 msgstr ""
 
-#: ../e-util/e-table-config.c:388 ../e-util/e-table-config.c:434
+#: ../src/e-util/e-table-config.c:388 ../src/e-util/e-table-config.c:434
 msgid "(Descending)"
 msgstr ""
 
-#: ../e-util/e-table-config.c:395
+#: ../src/e-util/e-table-config.c:395
 msgid "Not sorted"
 msgstr "Ne ordigite"
 
-#: ../e-util/e-table-config.c:440
+#: ../src/e-util/e-table-config.c:440
 msgid "No grouping"
 msgstr "Ne grupite"
 
-#: ../e-util/e-table-config.c:545
+#: ../src/e-util/e-table-config.c:545
 msgid "Show Fields"
 msgstr "Montri kampojn"
 
-#: ../e-util/e-table-config.c:559
+#: ../src/e-util/e-table-config.c:559
 msgid "Choose the order of information to appear in the message list."
 msgstr ""
 
-#: ../e-util/e-table-config.ui.h:2
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:367
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:367
-#| msgid "_Append"
-msgid "_Apply"
-msgstr "_Apliki"
-
-#: ../e-util/e-table-config.ui.h:4
-msgid "_Sort..."
-msgstr "_Ordigi..."
-
-#: ../e-util/e-table-config.ui.h:5
-msgid "_Group By..."
-msgstr ""
-
-#: ../e-util/e-table-config.ui.h:6
-msgid "_Fields Shown..."
-msgstr ""
-
-#: ../e-util/e-table-config.ui.h:9
+#: ../src/e-util/e-table-config.ui.h:2
 msgid "Clear _All"
 msgstr "Vakigi ĉi_on"
 
-#: ../e-util/e-table-config.ui.h:10
+#: ../src/e-util/e-table-config.ui.h:5
 msgid "_Show field in View"
 msgstr ""
 
-#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1755
+#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1779
 msgid "Ascending"
 msgstr "Kreskante"
 
-#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1755
+#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1779
 msgid "Descending"
 msgstr "Malkreskante"
 
-#: ../e-util/e-table-config.ui.h:13
+#: ../src/e-util/e-table-config.ui.h:8
 msgid "Group Items By"
 msgstr ""
 
-#: ../e-util/e-table-config.ui.h:14
+#: ../src/e-util/e-table-config.ui.h:9
 msgid "Show _field in View"
 msgstr ""
 
-#: ../e-util/e-table-config.ui.h:15
+#: ../src/e-util/e-table-config.ui.h:10
 msgid "Then By"
 msgstr "Tiam laŭ"
 
-#: ../e-util/e-table-config.ui.h:16
+#: ../src/e-util/e-table-config.ui.h:11
 msgid "Show field i_n View"
 msgstr ""
 
-#: ../e-util/e-table-config.ui.h:17
+#: ../src/e-util/e-table-config.ui.h:12
 msgid "Show field in _View"
 msgstr ""
 
-#: ../e-util/e-table-config.ui.h:18
+#: ../src/e-util/e-table-config.ui.h:13
 msgid "Sort"
 msgstr "Ordigi"
 
-#: ../e-util/e-table-config.ui.h:19
+#: ../src/e-util/e-table-config.ui.h:14
 msgid "Clear All"
 msgstr "Vakigi ĉion"
 
-#: ../e-util/e-table-config.ui.h:20
+#: ../src/e-util/e-table-config.ui.h:15
 msgid "Sort Items By"
 msgstr ""
 
-#: ../e-util/e-table-field-chooser.c:166
+#: ../src/e-util/e-table-config.ui.h:16
+msgid "_Apply"
+msgstr "_Apliki"
+
+#: ../src/e-util/e-table-config.ui.h:17
+msgid "_Sort..."
+msgstr "_Ordigi..."
+
+#: ../src/e-util/e-table-config.ui.h:18
+msgid "_Group By..."
+msgstr ""
+
+#: ../src/e-util/e-table-config.ui.h:19
+msgid "_Fields Shown..."
+msgstr ""
+
+#: ../src/e-util/e-table-field-chooser.c:164
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
 msgstr ""
 
-#: ../e-util/e-table-field-chooser-dialog.c:226
+#: ../src/e-util/e-table-field-chooser-dialog.c:224
 msgid "Add a Column"
 msgstr "Aldoni kolumnon"
 
-#: ../e-util/e-table-group-container.c:368
+#. Translators: This text is used as a special row when an ETable
+#. * has turned on grouping on a column, which has set a title.
+#. * The first %s is replaced with a column title.
+#. * The second %s is replaced with an actual  group value.
+#. * Finally the %d is replaced with count of items in this group.
+#. * Example: "Family name: Smith (13 items)"
+#.
+#: ../src/e-util/e-table-group-container.c:366
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../e-util/e-table-group-container.c:382
+#. Translators: This text is used as a special row when an ETable
+#. * has turned on grouping on a column, which doesn't have set a title.
+#. * The %s is replaced with an actual group value.
+#. * The %d is replaced with count of items in this group.
+#. * Example: "Smith (13 items)"
+#.
+#: ../src/e-util/e-table-group-container.c:380
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../e-util/e-table-header-item.c:1578
+#: ../src/e-util/e-table-header-item.c:1606
 msgid "Customize Current View"
 msgstr ""
 
-#: ../e-util/e-table-header-item.c:1601
+#: ../src/e-util/e-table-header-item.c:1629
 msgid "Sort _Ascending"
 msgstr ""
 
-#: ../e-util/e-table-header-item.c:1604
+#: ../src/e-util/e-table-header-item.c:1632
 msgid "Sort _Descending"
 msgstr ""
 
-#: ../e-util/e-table-header-item.c:1607
-msgid "_Unsort"
-msgstr "_Neordigite"
+#: ../src/e-util/e-table-header-item.c:1635
+msgid "_Reset sort"
+msgstr ""
 
-#: ../e-util/e-table-header-item.c:1610
+#: ../src/e-util/e-table-header-item.c:1638
 msgid "Group By This _Field"
 msgstr ""
 
-#: ../e-util/e-table-header-item.c:1613
+#: ../src/e-util/e-table-header-item.c:1641
 msgid "Group By _Box"
 msgstr ""
 
-#: ../e-util/e-table-header-item.c:1617
+#: ../src/e-util/e-table-header-item.c:1645
 msgid "Remove This _Column"
 msgstr ""
 
-#: ../e-util/e-table-header-item.c:1620
+#: ../src/e-util/e-table-header-item.c:1648
 msgid "Add a C_olumn..."
 msgstr ""
 
-#: ../e-util/e-table-header-item.c:1624
+#: ../src/e-util/e-table-header-item.c:1652
 msgid "A_lignment"
 msgstr ""
 
-#: ../e-util/e-table-header-item.c:1627
+#: ../src/e-util/e-table-header-item.c:1655
 msgid "B_est Fit"
 msgstr ""
 
-#: ../e-util/e-table-header-item.c:1630
+#: ../src/e-util/e-table-header-item.c:1658
 msgid "Format Column_s..."
 msgstr ""
 
-#: ../e-util/e-table-header-item.c:1634
+#: ../src/e-util/e-table-header-item.c:1662
 msgid "Custo_mize Current View..."
 msgstr ""
 
-#: ../e-util/e-table-header-item.c:1705
+#: ../src/e-util/e-table-header-item.c:1729
 msgid "_Sort By"
 msgstr "_Ordigi laŭ"
 
 #. Custom
-#: ../e-util/e-table-header-item.c:1728
+#: ../src/e-util/e-table-header-item.c:1752
 msgid "_Custom"
 msgstr "_Propre"
 
-#: ../e-util/e-text.c:2114
+#: ../src/e-util/e-text.c:2111
 msgid "Select All"
 msgstr "Elekti ĉiujn"
 
+#: ../src/e-util/e-text.c:2124
+msgid "Input Methods"
+msgstr "Enigaj metodoj"
+
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../e-util/e-timezone-dialog.c:206 ../e-util/e-timezone-dialog.c:428
-#: ../e-util/e-timezone-dialog.c:432 ../e-util/e-timezone-dialog.c:436
-#: ../e-util/e-timezone-dialog.c:804
+#: ../src/e-util/e-timezone-dialog.c:268 ../src/e-util/e-timezone-dialog.c:508
+#: ../src/e-util/e-timezone-dialog.c:512 ../src/e-util/e-timezone-dialog.c:516
+#: ../src/e-util/e-timezone-dialog.c:899
 msgid "UTC"
 msgstr "UTC"
 
-#: ../e-util/e-timezone-dialog.ui.h:1
+#: ../src/e-util/e-timezone-dialog.ui.h:1
 msgid "Select a Time Zone"
 msgstr "Elekti horzonon"
 
-#: ../e-util/e-timezone-dialog.ui.h:4
+#: ../src/e-util/e-timezone-dialog.ui.h:4
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
 
-#: ../e-util/e-timezone-dialog.ui.h:6
+#: ../src/e-util/e-timezone-dialog.ui.h:6
 msgid "Time Zones"
 msgstr "Horzonoj"
 
-#: ../e-util/e-timezone-dialog.ui.h:7
+#: ../src/e-util/e-timezone-dialog.ui.h:7
 msgid "_Selection"
 msgstr "_Elekto"
 
-#: ../e-util/e-timezone-dialog.ui.h:8
+#: ../src/e-util/e-timezone-dialog.ui.h:8
 msgid "Timezone drop-down combination box"
 msgstr ""
 
-#: ../e-util/e-url-entry.c:108
-#| msgid "Click to open %s"
+#: ../src/e-util/e-url-entry.c:106
 msgid "Click here to open the URL"
 msgstr "Klaki ĉi tien por malfermi la adreson"
 
-#: ../e-util/e-url-entry.c:110
+#: ../src/e-util/e-url-entry.c:108
 #, fuzzy
 #| msgid "Enter Passphrase"
 msgid "Enter a URL here"
 msgstr "Enigi pasfrazon"
 
-#: ../e-util/evolution-source-viewer.c:637
+#: ../src/e-util/evolution-source-viewer.c:638
 #, fuzzy
 #| msgid "Evolution Pine importer"
 msgid "Evolution Source Viewer"
 msgstr "Evolucio-Pine-enportilo"
 
 #. Translators: The name that is displayed in the user interface
-#: ../e-util/evolution-source-viewer.c:667
-#| msgid "Display"
+#: ../src/e-util/evolution-source-viewer.c:668
 msgid "Display Name"
 msgstr "Montri nomon"
 
-#: ../e-util/evolution-source-viewer.c:676
+#: ../src/e-util/evolution-source-viewer.c:677
 msgid "Flags"
 msgstr "Flagoj"
 
-#: ../e-util/evolution-source-viewer.c:728
-#: ../mail/e-mail-config-identity-page.c:722
+#: ../src/e-util/evolution-source-viewer.c:729
+#: ../src/mail/e-mail-config-identity-page.c:1230
 msgid "Identity"
 msgstr "Identeco"
 
-#: ../e-util/e-web-view.c:295
+#: ../src/e-util/e-webdav-browser.c:447
+#, fuzzy
+#| msgid "Address Book"
+msgid "Address book"
+msgstr "Adresaro"
+
+#: ../src/e-util/e-webdav-browser.c:458
+msgid "Events"
+msgstr "Eventoj"
+
+#: ../src/e-util/e-webdav-browser.c:473
+#, fuzzy
+#| msgid "_Selection"
+msgid "Collection"
+msgstr "_Elekto"
+
+#: ../src/e-util/e-webdav-browser.c:514
+#| msgid "Loading"
+msgid "Loading…"
+msgstr "Ŝargante…"
+
+#: ../src/e-util/e-webdav-browser.c:1383
+msgid "Searching collection children…"
+msgstr ""
+
+#: ../src/e-util/e-webdav-browser.c:1385
+msgid "Failed to search for collection children"
+msgstr ""
+
+#: ../src/e-util/e-webdav-browser.c:1419
+msgid "Searching for user home, please wait…"
+msgstr ""
+
+#: ../src/e-util/e-webdav-browser.c:1421
+#, fuzzy
+#| msgid "Unable to perform search."
+msgid "Failed to search for user home"
+msgstr "Ne ebliĝas efektivigi serĉon"
+
+#: ../src/e-util/e-webdav-browser.c:1763
+msgid "At least one component type should be set"
+msgstr ""
+
+#: ../src/e-util/e-webdav-browser.c:1781
+#, fuzzy
+#| msgid "Failed to delete contact"
+msgid "Failed to get selected collection HREF"
+msgstr "Forigo de kontakto malsukcesis"
+
+#: ../src/e-util/e-webdav-browser.c:1812
+#| msgid "_Save Changes"
+msgid "Saving changes…"
+msgstr "Konservi ŝanĝojn…"
+
+#: ../src/e-util/e-webdav-browser.c:1813
+#| msgid "Unable to save image."
+msgid "Failed to save changes"
+msgstr "Malsukcesis konservi ŝanĝojn"
+
+#: ../src/e-util/e-webdav-browser.c:1815
+#| msgid "Creating a memo"
+msgid "Creating new book…"
+msgstr "Kreante novan libron…"
+
+#: ../src/e-util/e-webdav-browser.c:1816
+#| msgid "Failed to create a thread: "
+msgid "Failed to create new book"
+msgstr "Malsukcesis krei novan libron"
+
+#: ../src/e-util/e-webdav-browser.c:1818
+#, fuzzy
+#| msgid "Create a new calendar"
+msgid "Creating new calendar…"
+msgstr "Krei novan kalendaron…"
+
+#: ../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 "Malsukcesis krei novan kalendaron"
+
+#: ../src/e-util/e-webdav-browser.c:1821
+#, fuzzy
+#| msgid "Create a new contact"
+msgid "Creating new collection…"
+msgstr "Krei novan kontakton…"
+
+#: ../src/e-util/e-webdav-browser.c:1822
+#, fuzzy
+#| msgid "Failed to create a thread: "
+msgid "Failed to create new collection"
+msgstr "Malsukcesis krei novan fadenon"
+
+#: ../src/e-util/e-webdav-browser.c:1961
+msgid "It is not allowed to create book under another book or calendar"
+msgstr ""
+
+#. 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 ""
+
+#: ../src/e-util/e-webdav-browser.c:2189
+#, fuzzy
+#| msgid "Deleting a memo"
+#| msgid_plural "Deleting %d memos"
+msgid "Deleting book…"
+msgstr "Forigante libron…"
+
+#: ../src/e-util/e-webdav-browser.c:2190
+#, fuzzy
+#| msgid "Failed to delete contact"
+msgid "Failed to delete book"
+msgstr "Forigo de kontakto malsukcesis"
+
+#: ../src/e-util/e-webdav-browser.c:2193
+#| msgid "Opening calendar"
+msgid "Deleting calendar…"
+msgstr "Forigante kalendaron…"
+
+#: ../src/e-util/e-webdav-browser.c:2194
+#, fuzzy
+#| msgid "Failed to delete contact"
+msgid "Failed to delete calendar"
+msgstr "Forigo de kontakto malsukcesis"
+
+#: ../src/e-util/e-webdav-browser.c:2197
+#, fuzzy
+#| msgid "Delete the selection"
+msgid "Deleting collection…"
+msgstr "Forigi la elektitaĵon…"
+
+#: ../src/e-util/e-webdav-browser.c:2198
+#, fuzzy
+#| msgid "Failed to delete contact"
+msgid "Failed to delete collection"
+msgstr "Forigo de kontakto malsukcesis"
+
+#: ../src/e-util/e-webdav-browser.c:2429
+msgid "For Components:"
+msgstr ""
+
+#: ../src/e-util/e-webdav-browser.c:2435
+#| msgid "Events"
+msgid "_Events"
+msgstr "_Eventoj"
+
+#: ../src/e-util/e-webdav-browser.c:2625
+#| msgid "WebDAV"
+msgid "WebDAV server:"
+msgstr "WebDAV-servilo:"
+
+#: ../src/e-util/e-webdav-browser.c:2660
+#, fuzzy
+#| msgid "Create a _Task"
+msgid "Create _Book"
+msgstr "Krei _taskon"
+
+#: ../src/e-util/e-webdav-browser.c:2667
+#| msgid "Weather Calendars"
+msgid "Create _Calendar"
+msgstr "Krei _kalendaron"
+
+#: ../src/e-util/e-webdav-browser.c:2674
+#, fuzzy
+#| msgid "Create Folder"
+msgid "Create Collectio_n"
+msgstr "Krei kolekto_n"
+
+#. widget = gtk_button_new_with_mnemonic (_("_Permissions"));
+#. 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:1948
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1652
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1723
+msgid "_Refresh"
+msgstr "_Aktualigi"
+
+#: ../src/e-util/e-web-view.c:346
 msgid "_Copy Link Location"
 msgstr ""
 
-#: ../e-util/e-web-view.c:297
+#: ../src/e-util/e-web-view.c:348
 msgid "Copy the link to the clipboard"
 msgstr ""
 
-#: ../e-util/e-web-view.c:305
+#: ../src/e-util/e-web-view.c:356
 msgid "_Open Link in Browser"
 msgstr "_Malfermi ligilon per foliumilo"
 
-#: ../e-util/e-web-view.c:307
+#: ../src/e-util/e-web-view.c:358
 msgid "Open the link in a web browser"
 msgstr "Malfermi la ligilon per foliumilo"
 
-#: ../e-util/e-web-view.c:315
+#: ../src/e-util/e-web-view.c:366
 msgid "_Copy Email Address"
 msgstr "_Kopii la retpoŝtadreson"
 
-#: ../e-util/e-web-view.c:332
+#: ../src/e-util/e-web-view.c:373
+#, fuzzy
+#| msgid "Copy _Email Address"
+msgid "Copy _Raw Email Address"
+msgstr "Kopiu _Retpoŝtadreson"
+
+#: ../src/e-util/e-web-view.c:375
+#, fuzzy
+#| msgid "Copy the email address to the clipboard"
+msgid "Copy the raw email address to the clipboard"
+msgstr "Kopii la retpoŝtadreson en la tondujon"
+
+#: ../src/e-util/e-web-view.c:390
 msgid "_Copy Image"
 msgstr "_Kopii bildon"
 
-#: ../e-util/e-web-view.c:334
+#: ../src/e-util/e-web-view.c:392
 msgid "Copy the image to the clipboard"
 msgstr "Kopii la bildon en la tondujon"
 
-#: ../e-util/e-web-view.c:339
+#: ../src/e-util/e-web-view.c:397
 msgid "Save _Image..."
 msgstr "Konservi b_ildon..."
 
-#: ../e-util/e-web-view.c:341
+#: ../src/e-util/e-web-view.c:399
 msgid "Save the image to a file"
 msgstr "Konservi la bildon al dosiero"
 
-#: ../e-util/e-web-view.c:361 ../e-util/e-web-view.c:1377
+#: ../src/e-util/e-web-view.c:419 ../src/e-util/e-web-view.c:1999
 msgid "Select all text and images"
 msgstr "Elekti ĉiujn tekston kaj bildojn"
 
-#: ../e-util/e-web-view.c:1041
+#: ../src/e-util/e-web-view.c:1354
 #, c-format
 msgid "Click to call %s"
 msgstr ""
 
-#: ../e-util/e-web-view.c:1043
+#: ../src/e-util/e-web-view.c:1356
 msgid "Click to hide/unhide addresses"
 msgstr ""
 
-#: ../e-util/e-web-view.c:1054
+#: ../src/e-util/e-web-view.c:1367
 #, c-format
 msgid "Go to the section %s of the message"
 msgstr ""
 
-#: ../e-util/e-web-view.c:1056
+#: ../src/e-util/e-web-view.c:1369
 msgid "Go to the beginning of the message"
 msgstr ""
 
-#: ../e-util/e-web-view.c:1060
+#: ../src/e-util/e-web-view.c:1373
 #, c-format
 msgid "Click to open %s"
 msgstr "Klaki por malfermi %s"
 
-#: ../e-util/e-web-view.c:2984
+#: ../src/e-util/e-web-view.c:3892
 #, fuzzy
 #| msgid "Copy the image to the clipboard"
 msgid "Copying image to clipboard"
 msgstr "Kopii la bildon en la tondujon"
 
-#: ../e-util/e-web-view.c:3172
+#: ../src/e-util/e-web-view.c:4080
 msgid "Save Image"
 msgstr "Konservi bildon"
 
-#: ../e-util/e-web-view.c:3208
+#: ../src/e-util/e-web-view.c:4121
+#, c-format
+#| msgid "Saving image to “%s”"
+msgid "Saving image to “%s”"
+msgstr "Konservante bildon al “%s”"
+
+#: ../src/e-util/e-web-view.c:4216
 #, c-format
-msgid "Saving image to '%s'"
-msgstr "Konservante bildon al '%s'"
+msgid "Cannot get URI “%s”, do not know how to download it."
+msgstr ""
 
-#: ../e-util/e-widget-undo.c:430
-msgid "Undo 'Insert text'"
-msgstr "Malfari 'Enmeti tekston'"
+#: ../src/e-util/e-widget-undo.c:428
+#| msgid "Undo 'Insert text'"
+msgid "Undo “Insert text”"
+msgstr "Malfari “Enmeti tekston”"
 
-#: ../e-util/e-widget-undo.c:432
-msgid "Redo 'Insert text'"
-msgstr "Refari 'Enmeti tekston'"
+#: ../src/e-util/e-widget-undo.c:430
+#| msgid "Redo 'Insert text'"
+msgid "Redo “Insert text”"
+msgstr "Refari “Enmeti tekston”"
 
-#: ../e-util/e-widget-undo.c:446
-msgid "Undo 'Delete text'"
-msgstr "Malfari 'Forigi tekston'"
+#: ../src/e-util/e-widget-undo.c:444
+#| msgid "Undo 'Delete text'"
+msgid "Undo “Delete text”"
+msgstr "Malfari “Forigi tekston”"
 
-#: ../e-util/e-widget-undo.c:448
-msgid "Redo 'Delete text'"
-msgstr "Refari 'Forigi tekston'"
+#: ../src/e-util/e-widget-undo.c:446
+#| msgid "Redo 'Delete text'"
+msgid "Redo “Delete text”"
+msgstr "Refari “Forigi tekston”"
 
-#: ../e-util/filter.error.xml.h:1
+#: ../src/e-util/filter.error.xml.h:1
 msgid "Missing date."
 msgstr "Mankanta dato."
 
-#: ../e-util/filter.error.xml.h:2
+#: ../src/e-util/filter.error.xml.h:2
 msgid "You must choose a date."
 msgstr "Vi devas elekti daton."
 
-#: ../e-util/filter.error.xml.h:3
+#: ../src/e-util/filter.error.xml.h:3
 #, fuzzy
 #| msgid "Missing file name."
 msgid "Missing filename."
 msgstr "Mankanta dosiernomo."
 
-#: ../e-util/filter.error.xml.h:4
+#: ../src/e-util/filter.error.xml.h:4
 #, fuzzy
 #| msgid "You must specify a file name."
 msgid "You must specify a filename."
 msgstr "Vi davas specifi dosiernomon."
 
-#: ../e-util/filter.error.xml.h:5
-msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+#: ../src/e-util/filter.error.xml.h:5
+msgid "File “{0}” does not exist or is not a regular file."
 msgstr ""
 
-#: ../e-util/filter.error.xml.h:6
-msgid "Bad regular expression &quot;{0}&quot;."
+#: ../src/e-util/filter.error.xml.h:6
+msgid "Bad regular expression “{0}”."
 msgstr ""
 
-#: ../e-util/filter.error.xml.h:7
-msgid "Could not compile regular expression &quot;{1}&quot;."
+#: ../src/e-util/filter.error.xml.h:7
+msgid "Could not compile regular expression “{1}”."
 msgstr ""
 
-#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
+#: ../src/e-util/filter.error.xml.h:8 ../src/mail/mail.error.xml.h:107
 msgid "Missing name."
 msgstr "Mankanta nomo."
 
-#: ../e-util/filter.error.xml.h:9
+#: ../src/e-util/filter.error.xml.h:9
 msgid "You must name this filter."
 msgstr "Vi devas nomi tiun filtrilon."
 
-#: ../e-util/filter.error.xml.h:10
-msgid "Name &quot;{0}&quot; already used."
+#: ../src/e-util/filter.error.xml.h:10
+msgid "Name “{0}” already used."
 msgstr ""
 
-#: ../e-util/filter.error.xml.h:11
+#: ../src/e-util/filter.error.xml.h:11
 msgid "Please choose another name."
 msgstr "Bonvolu elekti alian nomon."
 
-#: ../e-util/filter.error.xml.h:12
+#: ../src/e-util/filter.error.xml.h:12
 #, fuzzy
 #| msgid "Missing date."
 msgid "Missing condition."
 msgstr "Mankanta dato."
 
-#: ../e-util/filter.error.xml.h:13
+#: ../src/e-util/filter.error.xml.h:13
 msgid "Filter should have at least one condition."
 msgstr ""
 
-#: ../e-util/filter.error.xml.h:14
-#| msgid "Missing date."
+#: ../src/e-util/filter.error.xml.h:14
 msgid "Missing value."
 msgstr "Mankanta valoro."
 
-#: ../e-util/filter.error.xml.h:15
+#: ../src/e-util/filter.error.xml.h:15
 msgid "One or more values cannot be empty."
 msgstr ""
 
-#: ../e-util/filter.ui.h:2
+#: ../src/e-util/filter.error.xml.h:16
+#| msgid "Are you sure you want to remove this location?"
+msgid "Are you sure you want to remove rule “{0}”?"
+msgstr "Ĉu vi certe volas forigi la regulon “{0}”?"
+
+#: ../src/e-util/filter.error.xml.h:17
+msgid "_Keep"
+msgstr ""
+
+#: ../src/e-util/filter.ui.h:2
 msgid "the current time"
 msgstr "la aktuala tempo"
 
-#: ../e-util/filter.ui.h:3
+#: ../src/e-util/filter.ui.h:3
 msgid "the time you specify"
 msgstr ""
 
-#: ../e-util/filter.ui.h:4
+#: ../src/e-util/filter.ui.h:4
 msgid "a time relative to the current time"
 msgstr ""
 
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:86
+#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:93
 msgid "seconds"
 msgstr "sekundoj"
 
-#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../src/e-util/filter.ui.h:9
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:7
 msgid "weeks"
 msgstr "semajnoj"
 
-#: ../e-util/filter.ui.h:10
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../src/e-util/filter.ui.h:10
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:8
 msgid "months"
 msgstr "monatoj"
 
-#: ../e-util/filter.ui.h:11
+#: ../src/e-util/filter.ui.h:11
 msgid "years"
 msgstr "jaroj"
 
-#: ../e-util/filter.ui.h:12
+#: ../src/e-util/filter.ui.h:12
 msgid "ago"
 msgstr "antaŭe"
 
-#: ../e-util/filter.ui.h:13
+#: ../src/e-util/filter.ui.h:13
 msgid "in the future"
 msgstr "en la estonteco"
 
-#: ../e-util/filter.ui.h:14
-msgid "Show filters for mail:"
-msgstr ""
-
-#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
-msgid "_Filter Rules"
-msgstr "_Filtril-reguloj"
-
-#: ../e-util/filter.ui.h:23
+#: ../src/e-util/filter.ui.h:14
 msgid "Compare against"
 msgstr "Kompari kun"
 
-#: ../e-util/filter.ui.h:24
+#: ../src/e-util/filter.ui.h:15
 msgid ""
-"The message's date will be compared against\n"
+"The message’s date will be compared against\n"
 "the current time when filtering occurs."
 msgstr ""
 
-#: ../e-util/filter.ui.h:26
+#: ../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."
 msgstr ""
 
-#: ../e-util/filter.ui.h:28
+#: ../src/e-util/filter.ui.h:19
 msgid ""
-"The message's date will be compared against\n"
+"The message’s date will be compared against\n"
 "a time relative to when filtering occurs."
 msgstr ""
 
-#: ../e-util/gal-a11y-e-cell.c:122
+#: ../src/e-util/filter.ui.h:21
+msgid "Show filters for mail:"
+msgstr ""
+
+#: ../src/e-util/filter.ui.h:22 ../src/mail/em-filter-editor.c:163
+msgid "_Filter Rules"
+msgstr "_Filtril-reguloj"
+
+#: ../src/e-util/gal-a11y-e-cell.c:128
 msgid "Table Cell"
 msgstr "Tabela ĉelo"
 
 #. Translators: description of a "popup" action
-#: ../e-util/gal-a11y-e-cell-popup.c:127
+#: ../src/e-util/gal-a11y-e-cell-popup.c:125
 msgid "popup a child"
 msgstr "ŝpruci idon"
 
 #. Translators: description of an "edit" action
-#: ../e-util/gal-a11y-e-cell-text.c:617
+#: ../src/e-util/gal-a11y-e-cell-text.c:631
 msgid "begin editing this cell"
 msgstr ""
 
 #. Translators: description of a "toggle" action
-#: ../e-util/gal-a11y-e-cell-toggle.c:185
+#: ../src/e-util/gal-a11y-e-cell-toggle.c:183
 msgid "toggle the cell"
 msgstr "baskuligi la ĉelon"
 
 #. Translators: description of an "expand" action
-#: ../e-util/gal-a11y-e-cell-tree.c:213
+#: ../src/e-util/gal-a11y-e-cell-tree.c:213
 msgid "expands the row in the ETree containing this cell"
 msgstr ""
 
 #. Translators: description of a "collapse" action
-#: ../e-util/gal-a11y-e-cell-tree.c:221
+#: ../src/e-util/gal-a11y-e-cell-tree.c:221
 msgid "collapses the row in the ETree containing this cell"
 msgstr "maletendas la vicon en la ETree enhavanta ĉi tiun ĉelon"
 
-#: ../e-util/gal-a11y-e-table-click-to-add.c:71
+#: ../src/e-util/gal-a11y-e-table-click-to-add.c:69
 msgid "click"
 msgstr "klaki"
 
-#: ../e-util/gal-a11y-e-table-column-header.c:162
+#: ../src/e-util/gal-a11y-e-table-column-header.c:160
 msgid "sort"
 msgstr "ordigi"
 
-#: ../e-util/gal-view-instance-save-as-dialog.c:295
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:293
 msgid "Save Current View"
 msgstr "Konservi aktualan vidon"
 
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
+#: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:1
 msgid "_Create new view"
 msgstr "_Krei novan vidon"
 
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
+#: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:3
 msgid "_Replace existing view"
 msgstr "_Anstataŭigi ekzistantan vidon"
 
-#: ../e-util/widgets.error.xml.h:1
+#: ../src/e-util/widgets.error.xml.h:1 ../src/mail/mail.error.xml.h:203
 msgid "Do you wish to save your changes?"
 msgstr ""
 
-#: ../e-util/widgets.error.xml.h:2
+#: ../src/e-util/widgets.error.xml.h:2
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
 
-#: ../e-util/widgets.error.xml.h:3
+#: ../src/e-util/widgets.error.xml.h:3 ../src/mail/mail.error.xml.h:205
 msgid "_Discard changes"
 msgstr "_Ignori ŝanĝojn"
 
-#: ../e-util/widgets.error.xml.h:4
+#: ../src/e-util/widgets.error.xml.h:4
 msgid "Blank Signature"
 msgstr ""
 
-#: ../e-util/widgets.error.xml.h:5
+#: ../src/e-util/widgets.error.xml.h:5
 msgid "Please provide an unique name to identify this signature."
 msgstr ""
 
-#: ../e-util/widgets.error.xml.h:6
-#| msgid "Copy the image to the clipboard"
+#: ../src/e-util/widgets.error.xml.h:6
 msgid "Unable to copy image to clipboard."
 msgstr "Ne eblas kopii bildon tondujen."
 
-#: ../e-util/widgets.error.xml.h:7
-#| msgid "Unable to save {0}."
+#: ../src/e-util/widgets.error.xml.h:7
 msgid "Unable to save image."
 msgstr "Ne eblas konservi bildon."
 
-#: ../e-util/widgets.error.xml.h:8
-#| msgid "Could not load '%s'"
+#: ../src/e-util/widgets.error.xml.h:8
 msgid "Could not load signature."
 msgstr "Ne eblis ŝargi subskribon."
 
-#: ../e-util/widgets.error.xml.h:9
-#| msgid "Could not save '%s'"
+#: ../src/e-util/widgets.error.xml.h:9
 msgid "Could not save signature."
 msgstr "Ne eblis konservi subskribon."
 
-#: ../evolution.appdata.xml.in.h:1
-msgid ""
-"Evolution is a personal information management application that provides "
-"integrated mail, calendaring and address book functionality."
+#: ../src/libemail-engine/camel-sasl-oauth2-google.c:27
+msgid "OAuth2 Google"
 msgstr ""
 
-#: ../evolution.appdata.xml.in.h:2
+#: ../src/libemail-engine/camel-sasl-oauth2-google.c:28
 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."
+"This option will use an OAuth 2.0 access token to connect to the Google "
+"server"
 msgstr ""
 
-#: ../libemail-engine/camel-sasl-xoauth2.c:26
+#: ../src/libemail-engine/camel-sasl-xoauth2.c:27
 msgid "OAuth2"
 msgstr ""
 
-#: ../libemail-engine/camel-sasl-xoauth2.c:27
+#: ../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 ""
 
-#: ../libemail-engine/e-mail-folder-utils.c:113
+#: ../src/libemail-engine/e-mail-folder-utils.c:106
 #, c-format
-msgid "Saving message to folder '%s'"
-msgstr ""
+#| msgid "Saving message to Outbox."
+msgid "Saving message to folder “%s”"
+msgstr "Konservi mesaĝon en mesaĝujon “%s”"
 
-#: ../libemail-engine/e-mail-folder-utils.c:571
+#: ../src/libemail-engine/e-mail-folder-utils.c:565
 msgid "Forwarded messages"
 msgstr ""
 
-#: ../libemail-engine/e-mail-folder-utils.c:681
-#: ../libemail-engine/e-mail-folder-utils.c:932
+#: ../src/libemail-engine/e-mail-folder-utils.c:675
+#: ../src/libemail-engine/e-mail-folder-utils.c:937
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libemail-engine/e-mail-folder-utils.c:775
+#: ../src/libemail-engine/e-mail-folder-utils.c:777
 msgid "Scanning messages for duplicates"
 msgstr "Kontroli mesaĝojn pri duobligitoj"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1145
+#: ../src/libemail-engine/e-mail-folder-utils.c:1150
 #, c-format
-msgid "Removing folder '%s'"
-msgstr ""
+#| msgid "Moving folder %s"
+msgid "Removing folder “%s”"
+msgstr "Forigante mesaĝujon “%s”"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1325
+#: ../src/libemail-engine/e-mail-folder-utils.c:1331
 #, c-format
-msgid "File \"%s\" has been removed."
-msgstr "Dosiero \"%s\" estas forigita."
+#| msgid "File \"%s\" has been removed."
+msgid "File “%s” has been removed."
+msgstr "Dosiero “%s” estas forigita."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1329
+#: ../src/libemail-engine/e-mail-folder-utils.c:1335
 msgid "File has been removed."
 msgstr "Dosiero estas forigita."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1388
+#: ../src/libemail-engine/e-mail-folder-utils.c:1411
 msgid "Removing attachments"
 msgstr "Forigante aldonaĵon"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1552
+#: ../src/libemail-engine/e-mail-folder-utils.c:1583
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Konservi %d mesaĝon"
 msgstr[1] "Konservi %d mesaĝojn"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1930
+#: ../src/libemail-engine/e-mail-folder-utils.c:1961
 #, c-format
-msgid "Invalid folder URI '%s'"
-msgstr "Nevalida dosierujo-adreso '%s'"
+#| msgid "Invalid folder URI “%s”"
+msgid "Invalid folder URI “%s”"
+msgstr "Nevalida dosierujo-adreso “%s”"
 
 #. Some local folders
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-properties.c:410
-#: ../mail/em-folder-tree-model.c:1174 ../mail/importers/kmail-libs.c:141
-#: ../modules/mail/e-mail-shell-view-private.c:1074
-#: ../modules/mail/e-mail-shell-view-private.c:1085
+#: ../src/libemail-engine/e-mail-session.c:125
+#: ../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:1020
+#: ../src/modules/mail/e-mail-shell-view-private.c:1031
 msgid "Inbox"
 msgstr "Enirkesto"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1167
-#: ../mail/importers/kmail-libs.c:147
-#: ../modules/mail/e-mail-shell-view-private.c:1072
+#: ../src/libemail-engine/e-mail-session.c:126
+#: ../src/mail/em-folder-tree-model.c:1230
+#: ../src/mail/importers/kmail-libs.c:145
+#: ../src/modules/mail/e-mail-shell-view-private.c:1018
 msgid "Drafts"
 msgstr "Malnetaĵoj"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1178
-#: ../mail/importers/kmail-libs.c:143
-#: ../modules/mail/e-mail-shell-view-private.c:1076
+#: ../src/libemail-engine/e-mail-session.c:127
+#: ../src/mail/em-folder-tree-model.c:1241
+#: ../src/mail/importers/kmail-libs.c:141
+#: ../src/modules/mail/e-mail-shell-view-private.c:1022
 msgid "Outbox"
 msgstr "Elirkesto"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1182
-#: ../mail/importers/kmail-libs.c:145
-#: ../modules/mail/e-mail-shell-view-private.c:1078
+#: ../src/libemail-engine/e-mail-session.c:128
+#: ../src/mail/em-folder-tree-model.c:1245
+#: ../src/mail/importers/kmail-libs.c:143
+#: ../src/modules/mail/e-mail-shell-view-private.c:1024
 msgid "Sent"
 msgstr "Sendite"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1170
-#: ../mail/importers/kmail-libs.c:149
-#: ../modules/mail/e-mail-shell-view-private.c:1080
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1176 ../plugins/templates/templates.c:1478
-#: ../plugins/templates/templates.c:1488
+#: ../src/libemail-engine/e-mail-session.c:129
+#: ../src/mail/em-folder-tree-model.c:1233
+#: ../src/mail/importers/kmail-libs.c:147
+#: ../src/modules/mail/e-mail-shell-view-private.c:1026
+#: ../src/plugins/templates/e-templates-store.c:2212
+#: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
 msgstr "Ŝablonoj"
 
-#: ../libemail-engine/e-mail-session.c:1261
+#: ../src/libemail-engine/e-mail-session.c:1332
 #, c-format
 msgid "User cancelled operation"
 msgstr ""
 
-#: ../libemail-engine/e-mail-session.c:1318
+#: ../src/libemail-engine/e-mail-session.c:1389
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr ""
 
-#: ../libemail-engine/e-mail-session.c:1331
+#: ../src/libemail-engine/e-mail-session.c:1402
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr ""
 
-#: ../libemail-engine/e-mail-session.c:2360
+#: ../src/libemail-engine/e-mail-session.c:2444
 #, c-format
-#| msgid "Creating folder '%s'"
-msgid "Waiting for '%s'"
-msgstr "Atendante por '%s'"
+#| msgid "Waiting for “%s”"
+msgid "Waiting for “%s”"
+msgstr "Atendante por “%s”"
 
-#: ../libemail-engine/e-mail-session-utils.c:539
+#: ../src/libemail-engine/e-mail-session-utils.c:526
 #, fuzzy
 #| msgid "No location information available."
 msgid "No mail transport service available"
 msgstr "Neniu lokinformo disponeblas"
 
-#: ../libemail-engine/e-mail-session-utils.c:629
-#: ../libemail-engine/mail-ops.c:718
+#: ../src/libemail-engine/e-mail-session-utils.c:616
+#: ../src/libemail-engine/mail-ops.c:706
 #, c-format
-#| msgid "Composing Messages"
-msgid "Posting message to '%s'"
-msgstr "Afiŝante mesaĝon al '%s'"
+#| msgid "Posting message to “%s”"
+msgid "Posting message to “%s”"
+msgstr "Afiŝante mesaĝon al “%s”"
 
-#: ../libemail-engine/e-mail-session-utils.c:666
-#: ../libemail-engine/mail-ops.c:754
+#: ../src/libemail-engine/e-mail-session-utils.c:653
+#: ../src/libemail-engine/mail-ops.c:742
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: ../libemail-engine/e-mail-session-utils.c:696
-#: ../libemail-engine/e-mail-session-utils.c:731
-#: ../libemail-engine/mail-ops.c:778 ../libemail-engine/mail-ops.c:813
+#: ../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
 #, c-format
-#| msgid "_Send Message to List"
-msgid "Storing sent message to '%s'"
-msgstr "Konservi senditan mesaĝon al '%s'"
+#| msgid "Storing sent message to “%s”"
+msgid "Storing sent message to “%s”"
+msgstr "Konservi senditan mesaĝon al “%s”"
 
-#: ../libemail-engine/e-mail-session-utils.c:720
-#: ../libemail-engine/mail-ops.c:802
+#: ../src/libemail-engine/e-mail-session-utils.c:710
+#: ../src/libemail-engine/mail-ops.c:794
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
+"Appending to local “Sent” folder instead."
 msgstr ""
 
-#: ../libemail-engine/e-mail-session-utils.c:750
-#: ../libemail-engine/mail-ops.c:830
-#, c-format
-msgid "Failed to append to local 'Sent' folder: %s"
-msgstr ""
+#: ../src/libemail-engine/e-mail-session-utils.c:740
+#: ../src/libemail-engine/mail-ops.c:822
+#, fuzzy, c-format
+#| msgid "Failed to open client “%s”: %s"
+msgid "Failed to append to local “Sent” folder: %s"
+msgstr "Ne eblis malfermi la klienton: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:952
-#: ../libemail-engine/mail-ops.c:978 ../libemail-engine/mail-ops.c:1080
+#: ../src/libemail-engine/e-mail-session-utils.c:928
+#: ../src/libemail-engine/mail-ops.c:983 ../src/libemail-engine/mail-ops.c:1085
 msgid "Sending message"
 msgstr "Sendante mesaĝon"
 
-#: ../libemail-engine/e-mail-store-utils.c:189
+#: ../src/libemail-engine/e-mail-store-utils.c:188
 #, c-format
-msgid "Disconnecting from '%s'"
+msgid "Disconnecting from “%s”"
 msgstr ""
 
-#: ../libemail-engine/e-mail-store-utils.c:265
+#: ../src/libemail-engine/e-mail-store-utils.c:264
 #, c-format
-msgid "Reconnecting to '%s'"
+msgid "Reconnecting to “%s”"
 msgstr ""
 
-#: ../libemail-engine/e-mail-store-utils.c:350
+#: ../src/libemail-engine/e-mail-store-utils.c:349
 #, c-format
-msgid "Preparing account '%s' for offline"
+msgid "Preparing account “%s” for offline"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:90
+#: ../src/libemail-engine/mail-ops.c:88
 msgid "Filtering Selected Messages"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:148
+#: ../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"
+"set in one or more filters is invalid. Please check your filters in "
+"Edit→Message Filters.\n"
 "Original error was: %s"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:229
+#: ../src/libemail-engine/mail-ops.c:226
 #, fuzzy, c-format
 #| msgid "Mail from %s"
-msgid "Fetching mail from '%s'"
-msgstr "Poŝtaĵo de '%s'"
+msgid "Fetching mail from “%s”"
+msgstr "Poŝtaĵo de “%s”"
 
-#: ../libemail-engine/mail-ops.c:748
+#: ../src/libemail-engine/mail-ops.c:736
 #, 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"
+"in one or more filters is invalid. Please check your filters in Edit→Message "
+"Filters.\n"
 "Original error was: %s"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:989
+#: ../src/libemail-engine/mail-ops.c:994
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:1041
+#. 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
 #, fuzzy, c-format
 #| msgid "Calendar Message"
 msgid "Failed to send a message"
@@ -14241,77 +16207,97 @@ msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "Kalendar-mesaĝo"
 msgstr[1] "Kalendar-mesaĝo"
 
-#: ../libemail-engine/mail-ops.c:1047
-msgid "Canceled."
+#: ../src/libemail-engine/mail-ops.c:1052
+#| msgid "Cancelled"
+msgid "Cancelled."
 msgstr "Nuligite."
 
-#: ../libemail-engine/mail-ops.c:1049
+#: ../src/libemail-engine/mail-ops.c:1054
 msgid "Complete."
 msgstr "Plenumite."
 
-#: ../libemail-engine/mail-ops.c:1163
+#: ../src/libemail-engine/mail-ops.c:1169
 #, c-format
-msgid "Moving messages to '%s'"
-msgstr "Movante mesaĝojn al '%s'"
+#| msgid "Moving messages to “%s”"
+msgid "Moving messages to “%s”"
+msgstr "Movante mesaĝojn al “%s”"
 
-#: ../libemail-engine/mail-ops.c:1164
+#: ../src/libemail-engine/mail-ops.c:1170
 #, c-format
-msgid "Copying messages to '%s'"
-msgstr "Kopiante mesaĝojn al '%s'"
+#| msgid "Copying messages to “%s”"
+msgid "Copying messages to “%s”"
+msgstr "Kopiante mesaĝojn al “%s”"
 
-#: ../libemail-engine/mail-ops.c:1283
+#: ../src/libemail-engine/mail-ops.c:1289
 #, c-format
-msgid "Storing folder '%s'"
-msgstr "Konserva dosierujo '%s'"
+#| msgid "Storing folder “%s”"
+msgid "Storing folder “%s”"
+msgstr "Konserva dosierujo “%s”"
 
-#: ../libemail-engine/mail-ops.c:1411
+#: ../src/libemail-engine/mail-ops.c:1417
 #, c-format
-msgid "Expunging and storing account '%s'"
+msgid "Expunging and storing account “%s”"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:1412
+#: ../src/libemail-engine/mail-ops.c:1418
 #, c-format
-msgid "Storing account '%s'"
-msgstr "Konserva konto '%s'"
+#| msgid "Storing account “%s”"
+msgid "Storing account “%s”"
+msgstr "Konserva konto “%s”"
 
-#: ../libemail-engine/mail-ops.c:1487
+#: ../src/libemail-engine/mail-ops.c:1493
 #, c-format
-msgid "Emptying trash in '%s'"
-msgstr ""
+#| msgid "Opening tasks at %s"
+msgid "Emptying trash in “%s”"
+msgstr "Malplenigante rubujon en “%s”"
 
-#: ../libemail-engine/mail-ops.c:1579
+#: ../src/libemail-engine/mail-ops.c:1585
 #, fuzzy, c-format
-#| msgid "Creating folder '%s'"
-msgid "Processing folder changes in '%s'"
-msgstr "Kreante dosierujon '%s'"
+#| msgid "Creating folder “%s”"
+msgid "Processing folder changes in “%s”"
+msgstr "Kreante dosierujon “%s”"
 
-#: ../libemail-engine/mail-tools.c:70
+#: ../src/libemail-engine/mail-tools.c:68
 #, c-format
-msgid "Could not create spool directory '%s': %s"
+msgid "Could not create spool directory “%s”: %s"
 msgstr ""
 
-#: ../libemail-engine/mail-tools.c:110
+#: ../src/libemail-engine/mail-tools.c:108
 #, c-format
-msgid "Trying to movemail a non-mbox source '%s'"
+msgid "Trying to movemail a non-mbox source “%s”"
 msgstr ""
 
-#: ../libemail-engine/mail-tools.c:236
+#. 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
 #, c-format
-msgid "Forwarded message - %s"
+msgid "[Fwd: %s]"
 msgstr ""
 
-#: ../libemail-engine/mail-tools.c:238
+#. 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)"
+msgid "No Subject"
+msgstr "Neniu temo"
+
+#: ../src/libemail-engine/mail-tools.c:271
+#, c-format
+#| msgid "Forward message"
+msgid "Forwarded message — %s"
+msgstr "Plusendi mesaĝon — %s"
+
+#: ../src/libemail-engine/mail-tools.c:273
 msgid "Forwarded message"
 msgstr ""
 
-#: ../libemail-engine/mail-vfolder.c:151
+#: ../src/libemail-engine/mail-vfolder.c:149
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr ""
 
-#: ../libemail-engine/mail-vfolder.c:304
+#: ../src/libemail-engine/mail-vfolder.c:302
 #, c-format
-msgid "Updating Search Folders for '%s' - %s"
+msgid "Updating Search Folders for “%s : %s”"
 msgstr ""
 
 #. Translators: The first %s is name of the affected
@@ -14319,545 +16305,740 @@ msgstr ""
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../libemail-engine/mail-vfolder.c:668
+#: ../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\"."
+"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\"."
+"“%s”."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/e-mail-account-manager.c:117 ../mail/e-mail-account-manager.c:204
-#| msgid "All Accounts"
+#: ../src/mail/e-mail-account-manager.c:118
+#: ../src/mail/e-mail-account-manager.c:205
 msgid "Open _Online Accounts"
 msgstr "Malfermi _retajn kontoj"
 
-#: ../mail/e-mail-account-manager.c:143 ../mail/e-mail-account-manager.c:230
+#: ../src/mail/e-mail-account-manager.c:144
+#: ../src/mail/e-mail-account-manager.c:231
 msgid "This account was created through the Online Accounts service."
 msgstr ""
 
-#: ../mail/e-mail-account-manager.c:689
+#: ../src/mail/e-mail-account-manager.c:690
 msgid "_Reset Order"
 msgstr ""
 
-#: ../mail/e-mail-account-manager.c:702
+#: ../src/mail/e-mail-account-manager.c:703
 msgid "You can drag and drop account names to reorder them."
 msgstr ""
 
-#: ../mail/e-mail-account-manager.c:745
+#: ../src/mail/e-mail-account-manager.c:746
 msgid "De_fault"
 msgstr "De_faŭlto"
 
-#: ../mail/e-mail-account-tree-view.c:83
-#: ../modules/mail/em-composer-prefs.c:1263
-#: ../modules/plugin-manager/evolution-plugin-manager.c:358
-#: ../plugins/publish-calendar/publish-calendar.c:896
-msgid "Enabled"
-msgstr "Enŝaltite"
+#: ../src/mail/e-mail-autoconfig.c:634
+#, c-format
+msgid "Host: %s:%d"
+msgstr ""
 
-#: ../mail/e-mail-account-tree-view.c:107
-msgid "Account Name"
-msgstr "Kontonomo"
+#: ../src/mail/e-mail-autoconfig.c:638
+#, c-format
+#| msgid "Users:"
+msgid "User: %s"
+msgstr "Uzanto: %s"
+
+#: ../src/mail/e-mail-autoconfig.c:642
+#, c-format
+#| msgid "Security:"
+msgid "Security method: %s"
+msgstr "Sekureco-metodo: %s"
+
+#: ../src/mail/e-mail-autoconfig.c:643
+#: ../src/mail/e-mail-config-summary-page.c:144
+msgid "TLS"
+msgstr "TLS"
+
+#: ../src/mail/e-mail-autoconfig.c:644
+#: ../src/mail/e-mail-config-summary-page.c:147
+msgid "STARTTLS"
+msgstr ""
+
+#: ../src/mail/e-mail-autoconfig.c:648
+#, fuzzy, c-format
+#| msgid "Authentication"
+msgid "Authentication mechanism: %s"
+msgstr "Aŭtentokontrolo: %s"
 
-#: ../mail/e-mail-autoconfig.c:619
+#: ../src/mail/e-mail-autoconfig.c:783
 #, fuzzy
 #| msgid "Using email address"
 msgid "No email address provided"
 msgstr "Uzas retpoŝtadreson"
 
-#: ../mail/e-mail-autoconfig.c:628
+#: ../src/mail/e-mail-autoconfig.c:792
 #, fuzzy
 #| msgid "Using email address"
 msgid "Missing domain in email address"
 msgstr "Uzas retpoŝtadreson"
 
-#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:903
-#: ../shell/e-shell-window-actions.c:910 ../shell/e-shell-window-actions.c:917
+#: ../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
+#, fuzzy
+#| msgid "On LDAP Servers"
+msgid "IMAP server"
+msgstr "En LDAP-serviloj"
+
+#: ../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
+#, fuzzy
+#| msgid "On LDAP Servers"
+msgid "POP3 server"
+msgstr "En LDAP-serviloj"
+
+#: ../src/mail/e-mail-autoconfig.c:1111
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:82
+#| msgid "Server"
+msgid "SMTP server"
+msgstr "SMTP-servilo"
+
+#: ../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 "Fermi ĉi tiun fenestron"
 
-#: ../mail/e-mail-browser.c:285
+#: ../src/mail/e-mail-browser.c:288
 msgid "(No Subject)"
 msgstr "(Neniu temo)"
 
 #. GtkAssistant's back button label.
-#: ../mail/e-mail-config-assistant.c:46
-#| msgid "Go Back"
+#: ../src/mail/e-mail-config-assistant.c:48
 msgid "Go _Back"
 msgstr "Iri _reen"
 
 #. GtkAssistant sinks the floating button reference.
-#: ../mail/e-mail-config-assistant.c:115
+#: ../src/mail/e-mail-config-assistant.c:123
 msgid "_Skip Lookup"
 msgstr ""
 
-#: ../mail/e-mail-config-assistant.c:660
+#: ../src/mail/e-mail-config-assistant.c:718
 msgid "Evolution Account Assistant"
 msgstr "Konto-asistanto de Evolucio"
 
-#: ../mail/e-mail-config-assistant.c:952
-#| msgid "Task Details"
+#: ../src/mail/e-mail-config-assistant.c:1025
 msgid "_Revise Details"
 msgstr ""
 
-#: ../mail/e-mail-config-auth-check.c:351
+#: ../src/mail/e-mail-config-auth-check.c:178
+#, fuzzy
+#| msgid "%s authentication failed"
+msgid "Querying authentication types..."
+msgstr "Demandante aŭtentokontrol-tipojn..."
+
+#: ../src/mail/e-mail-config-auth-check.c:341
 msgid "Check for Supported Types"
 msgstr ""
 
-#: ../mail/e-mail-config-confirm-page.c:155
+#: ../src/mail/e-mail-config-composing-page.c:116
+#, fuzzy
+#| msgid "Use locale default"
+msgctxt "ReplyForward"
+msgid "Use global setting"
+msgstr "Uzi lokan defaŭlton"
+
+#: ../src/mail/e-mail-config-composing-page.c:118
+#: ../src/mail/mail-config.ui.h:27
+#, fuzzy
+#| msgid "Attachment"
+#| msgid_plural "Attachments"
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "Aldonaĵo"
+
+#: ../src/mail/e-mail-config-composing-page.c:120
+#: ../src/mail/mail-config.ui.h:28
+msgctxt "ReplyForward"
+msgid "Inline (Outlook style)"
+msgstr ""
+
+#: ../src/mail/e-mail-config-composing-page.c:122
+#: ../src/mail/mail-config.ui.h:29
+msgctxt "ReplyForward"
+msgid "Quoted"
+msgstr "Citita"
+
+#: ../src/mail/e-mail-config-composing-page.c:124
+#: ../src/mail/mail-config.ui.h:30
+msgctxt "ReplyForward"
+msgid "Do Not Quote"
+msgstr "Ne citi"
+
+#: ../src/mail/e-mail-config-composing-page.c:397
+#: ../src/mail/e-mail-config-composing-page.c:606
+msgid "Composing Messages"
+msgstr "Kreado de mesaĝoj"
+
+#: ../src/mail/e-mail-config-composing-page.c:406
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr ""
+
+#: ../src/mail/e-mail-config-composing-page.c:431
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Ĉiam _sendu kaŝitan kopion (bcc) al:"
+
+#: ../src/mail/e-mail-config-composing-page.c:462
+#| msgid "Reply to All"
+msgid "Re_ply style:"
+msgstr "Responda stilo:"
+
+#: ../src/mail/e-mail-config-composing-page.c:488
+#: ../src/mail/mail-config.ui.h:20
+msgid "Start _typing at the bottom"
+msgstr ""
+
+#: ../src/mail/e-mail-config-composing-page.c:495
+#: ../src/mail/mail-config.ui.h:21
+msgid "_Keep signature above the original message"
+msgstr ""
+
+#: ../src/mail/e-mail-config-composing-page.c:512
+msgid "Message Receipts"
+msgstr ""
+
+#: ../src/mail/e-mail-config-composing-page.c:521
+msgid "S_end message receipts:"
+msgstr ""
+
+#: ../src/mail/e-mail-config-composing-page.c:546
+msgid "Never"
+msgstr "Neniam"
+
+#: ../src/mail/e-mail-config-composing-page.c:552
+msgid "Always"
+msgstr "Ĉiam"
+
+#: ../src/mail/e-mail-config-composing-page.c:558
+msgid "Ask for each message"
+msgstr ""
+
+#: ../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."
+"Click “Apply” to save your settings."
 msgstr ""
 
-#: ../mail/e-mail-config-confirm-page.c:167
+#: ../src/mail/e-mail-config-confirm-page.c:166
 msgid "Done"
 msgstr "Farite"
 
-#: ../mail/e-mail-config-defaults-page.c:549
+#: ../src/mail/e-mail-config-defaults-page.c:314
+msgid "Checking server settings..."
+msgstr ""
+
+#: ../src/mail/e-mail-config-defaults-page.c:663
 msgid "Special Folders"
 msgstr "Specialaj dosierujoj"
 
-#: ../mail/e-mail-config-defaults-page.c:558
+#: ../src/mail/e-mail-config-defaults-page.c:672
 #, fuzzy
 #| msgid "Drafts _Folder:"
 msgid "Draft Messages _Folder:"
 msgstr "Malnet_dosierujo:"
 
-#: ../mail/e-mail-config-defaults-page.c:568
+#: ../src/mail/e-mail-config-defaults-page.c:682
 msgid "Choose a folder for saving draft messages."
 msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:582
+#: ../src/mail/e-mail-config-defaults-page.c:698
 msgid "Sent _Messages Folder:"
 msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:592
+#: ../src/mail/e-mail-config-defaults-page.c:726
 msgid "Choose a folder for saving sent messages."
 msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:611
+#: ../src/mail/e-mail-config-defaults-page.c:752
 msgid "S_ave replies in the folder of the message being replied to"
 msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:628
-#| msgid "Search Folders"
+#: ../src/mail/e-mail-config-defaults-page.c:775
 msgid "Archi_ve Folder:"
 msgstr "Arki_vo-dosierujo:"
 
-#: ../mail/e-mail-config-defaults-page.c:638
-#: ../modules/mail/em-mailer-prefs.c:1079
+#: ../src/mail/e-mail-config-defaults-page.c:785
+#: ../src/modules/mail/em-mailer-prefs.c:1413
 msgid "Choose a folder to archive messages to."
 msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:652
+#: ../src/mail/e-mail-config-defaults-page.c:799
+#, fuzzy
+#| msgid "_Template:"
+msgid "_Templates Folder:"
+msgstr "Ŝ_ablono:"
+
+#: ../src/mail/e-mail-config-defaults-page.c:809
+#, fuzzy
+#| msgid "Could not create message."
+msgid "Choose a folder to use for template messages."
+msgstr "Ne eblis kreii mesaĝon."
+
+#: ../src/mail/e-mail-config-defaults-page.c:831
 #, fuzzy
 #| msgid "_Restore Default"
 msgid "_Restore Defaults"
 msgstr "_Restaŭri defaŭlton"
 
-#: ../mail/e-mail-config-defaults-page.c:666
+#: ../src/mail/e-mail-config-defaults-page.c:848
+#, fuzzy
+#| msgid "Local Folders"
+msgid "_Lookup Folders"
+msgstr "Lokaj dosierujoj"
+
+#: ../src/mail/e-mail-config-defaults-page.c:866
 msgid "Use a Real Folder for _Trash:"
 msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:667
+#: ../src/mail/e-mail-config-defaults-page.c:867
 #, fuzzy
 #| msgid "Could not create message."
 msgid "Choose a folder for deleted messages."
 msgstr "Ne eblis kreii mesaĝon."
 
-#: ../mail/e-mail-config-defaults-page.c:676
+#: ../src/mail/e-mail-config-defaults-page.c:876
 msgid "Use a Real Folder for _Junk:"
 msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:677
+#: ../src/mail/e-mail-config-defaults-page.c:877
 msgid "Choose a folder for junk messages."
 msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:694
-msgid "Composing Messages"
-msgstr "Kreado de mesaĝoj"
-
-#: ../mail/e-mail-config-defaults-page.c:703
-msgid "Alway_s carbon-copy (cc) to:"
-msgstr ""
-
-#: ../mail/e-mail-config-defaults-page.c:728
-msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "Ĉiam _sendu kaŝitan kopion (bcc) al:"
-
-#: ../mail/e-mail-config-defaults-page.c:763
-msgid "Message Receipts"
-msgstr ""
-
-#: ../mail/e-mail-config-defaults-page.c:772
-msgid "S_end message receipts:"
-msgstr ""
-
-#: ../mail/e-mail-config-defaults-page.c:797
-msgid "Never"
-msgstr "Neniam"
-
-#: ../mail/e-mail-config-defaults-page.c:803
-msgid "Always"
-msgstr "Ĉiam"
-
-#: ../mail/e-mail-config-defaults-page.c:809
-msgid "Ask for each message"
-msgstr ""
-
-#: ../mail/e-mail-config-defaults-page.c:880
+#: ../src/mail/e-mail-config-defaults-page.c:981
 msgid "Defaults"
 msgstr "Defaŭltoj"
 
-#: ../mail/e-mail-config-identity-page.c:282
+#: ../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."
+"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."
 msgstr ""
 
-#: ../mail/e-mail-config-identity-page.c:310
-#: ../mail/e-mail-config-summary-page.c:322
+#: ../src/mail/e-mail-config-identity-page.c:541
+#: ../src/mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
 msgstr "Kontoinformoj"
 
-#: ../mail/e-mail-config-identity-page.c:319
-#: ../mail/e-mail-config-summary-page.c:331
+#: ../src/mail/e-mail-config-identity-page.c:579
+#: ../src/mail/e-mail-config-summary-page.c:353
 msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example, \"Work\" or \"Personal\"."
+"The above name will be used to identify this account.\n"
+"Use for example, “Work” or “Personal”."
 msgstr ""
 
-#: ../mail/e-mail-config-identity-page.c:364
+#: ../src/mail/e-mail-config-identity-page.c:596
 msgid "Required Information"
 msgstr "Nepra informo"
 
-#: ../mail/e-mail-config-identity-page.c:373
+#: ../src/mail/e-mail-config-identity-page.c:605
 msgid "Full Nam_e:"
 msgstr "Tuta _nomo:"
 
-#: ../mail/e-mail-config-identity-page.c:400
+#: ../src/mail/e-mail-config-identity-page.c:634
 msgid "Email _Address:"
 msgstr "Retpoŝt_adreso:"
 
-#: ../mail/e-mail-config-identity-page.c:447
-#: ../plugins/publish-calendar/publish-calendar.ui.h:26
+#: ../src/mail/e-mail-config-identity-page.c:683
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Nedeviga informo"
 
-#: ../mail/e-mail-config-identity-page.c:456
+#: ../src/mail/e-mail-config-identity-page.c:692
 msgid "Re_ply-To:"
 msgstr ""
 
-#: ../mail/e-mail-config-identity-page.c:483
+#: ../src/mail/e-mail-config-identity-page.c:721
 msgid "Or_ganization:"
 msgstr "Or_ganizo:"
 
-#: ../mail/e-mail-config-identity-page.c:538
+#: ../src/mail/e-mail-config-identity-page.c:776
 msgid "Add Ne_w Signature..."
 msgstr "Aldoni no_van subskribon..."
 
-#: ../mail/e-mail-config-identity-page.c:556
+#: ../src/mail/e-mail-config-identity-page.c:790
+msgid "A_liases:"
+msgstr ""
+
+#: ../src/mail/e-mail-config-identity-page.c:862
+msgid "Edi_t"
+msgstr ""
+
+#: ../src/mail/e-mail-config-identity-page.c:885
 msgid "_Look up mail server details based on the entered e-mail address"
 msgstr ""
 
-#: ../mail/e-mail-config-lookup-page.c:70
+#. This is only a warning, not a blocker
+#. complete = complete && correct;
+#: ../src/mail/e-mail-config-identity-page.c:934
+msgid "Full Name should not be empty"
+msgstr ""
+
+#: ../src/mail/e-mail-config-identity-page.c:941
+#, fuzzy
+#| msgid "Email Address"
+msgid "Email Address cannot be empty"
+msgstr "Retpoŝtadreso"
+
+#: ../src/mail/e-mail-config-identity-page.c:946
+#, fuzzy
+#| msgid "File is not a valid .desktop file"
+msgid "Email Address is not a valid email"
+msgstr "Dosiero ne estas valida .desktop-dosiero"
+
+#: ../src/mail/e-mail-config-identity-page.c:958
+#, fuzzy
+#| msgid "File is not a valid .desktop file"
+msgid "Reply To is not a valid email"
+msgstr "Dosiero ne estas valida .desktop-dosiero"
+
+#: ../src/mail/e-mail-config-identity-page.c:969
+#: ../src/mail/e-mail-config-summary-page.c:638
+#, fuzzy
+#| msgid "Account management"
+msgid "Account Name cannot be empty"
+msgstr "Konto-administrado"
+
+#: ../src/mail/e-mail-config-lookup-page.c:65
 #, fuzzy
 #| msgid "Loading accounts..."
 msgid "Looking up account details..."
 msgstr "Ŝargante kontojn..."
 
-#: ../mail/e-mail-config-provider-page.c:484
+#: ../src/mail/e-mail-config-provider-page.c:537
 msgid "Checking for New Mail"
 msgstr ""
 
-#: ../mail/e-mail-config-provider-page.c:500
+#: ../src/mail/e-mail-config-provider-page.c:553
 msgid "Check for _new messages every"
 msgstr ""
 
-#: ../mail/e-mail-config-provider-page.c:698
+#: ../src/mail/e-mail-config-provider-page.c:763
 msgid "Receiving Options"
 msgstr ""
 
-#: ../mail/e-mail-config-receiving-page.c:49
+#: ../src/mail/e-mail-config-receiving-page.c:50
 msgid "Receiving Email"
 msgstr "Retpoŝto estas ricevata"
 
 #. Translators: This string is to describe a PGP key in a combo box in mail account's preferences.
-#. The first '%s' is a key ID, the second '%s' is a display name of the key.
-#: ../mail/e-mail-config-security-page.c:251
+#. The first “%s” is a key ID, the second “%s” is a display name of the key.
+#: ../src/mail/e-mail-config-security-page.c:231
 #, c-format
 msgctxt "PGPKeyDescription"
-msgid "%s - %s"
-msgstr "%s - %s"
-
-#: ../mail/e-mail-config-security-page.c:340
-#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:29
-#: ../modules/addressbook/autocompletion-config.c:114
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
-#: ../modules/itip-formatter/plugin/config-ui.c:90
-#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+msgid "%s — %s"
+msgstr ""
+
+#: ../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: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
 msgid "General"
 msgstr "Ĝenerale"
 
-#: ../mail/e-mail-config-security-page.c:349
+#: ../src/mail/e-mail-config-security-page.c:327
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: ../mail/e-mail-config-security-page.c:371
+#: ../src/mail/e-mail-config-security-page.c:349
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr ""
 
-#: ../mail/e-mail-config-security-page.c:380
+#: ../src/mail/e-mail-config-security-page.c:358
 msgid "OpenPGP _Key ID:"
 msgstr ""
 
-#: ../mail/e-mail-config-security-page.c:413
+#: ../src/mail/e-mail-config-security-page.c:391
 msgid "Si_gning algorithm:"
 msgstr ""
 
-#: ../mail/e-mail-config-security-page.c:429
-#: ../mail/e-mail-config-security-page.c:569 ../mail/mail-config.ui.h:70
+#: ../src/mail/e-mail-config-security-page.c:407
+#: ../src/mail/e-mail-config-security-page.c:571
+#: ../src/mail/mail-config.ui.h:77
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/e-mail-config-security-page.c:432
-#: ../mail/e-mail-config-security-page.c:572 ../mail/mail-config.ui.h:71
+#: ../src/mail/e-mail-config-security-page.c:410
+#: ../src/mail/e-mail-config-security-page.c:574
+#: ../src/mail/mail-config.ui.h:78
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/e-mail-config-security-page.c:435
-#: ../mail/e-mail-config-security-page.c:575 ../mail/mail-config.ui.h:72
+#: ../src/mail/e-mail-config-security-page.c:413
+#: ../src/mail/e-mail-config-security-page.c:577
+#: ../src/mail/mail-config.ui.h:79
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/e-mail-config-security-page.c:438
-#: ../mail/e-mail-config-security-page.c:578 ../mail/mail-config.ui.h:73
+#: ../src/mail/e-mail-config-security-page.c:416
+#: ../src/mail/e-mail-config-security-page.c:580
+#: ../src/mail/mail-config.ui.h:80
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/e-mail-config-security-page.c:454
+#: ../src/mail/e-mail-config-security-page.c:432
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr ""
 
-#: ../mail/e-mail-config-security-page.c:466
+#: ../src/mail/e-mail-config-security-page.c:444
+msgid "Always enc_rypt outgoing messages when using this account"
+msgstr ""
+
+#: ../src/mail/e-mail-config-security-page.c:456
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr ""
 
-#: ../mail/e-mail-config-security-page.c:478
+#: ../src/mail/e-mail-config-security-page.c:468
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: ../mail/e-mail-config-security-page.c:502
+#: ../src/mail/e-mail-config-security-page.c:480
+msgid "Prefer _inline sign/encrypt for plain text messages"
+msgstr ""
+
+#: ../src/mail/e-mail-config-security-page.c:504
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: ../mail/e-mail-config-security-page.c:511
+#: ../src/mail/e-mail-config-security-page.c:513
 msgid "Sig_ning certificate:"
 msgstr ""
 
-#: ../mail/e-mail-config-security-page.c:535
-#: ../mail/e-mail-config-security-page.c:641
+#: ../src/mail/e-mail-config-security-page.c:537
+#: ../src/mail/e-mail-config-security-page.c:635
 msgid "Select"
 msgstr "Elekti"
 
-#: ../mail/e-mail-config-security-page.c:544
-#: ../mail/e-mail-config-security-page.c:650 ../mail/mail-dialogs.ui.h:5
-#: ../shell/e-shell-window-actions.c:1006
+#: ../src/mail/e-mail-config-security-page.c:546
+#: ../src/mail/e-mail-config-security-page.c:644
+#: ../src/mail/mail-dialogs.ui.h:16 ../src/shell/e-shell-window-actions.c:915
 msgid "_Clear"
 msgstr "_Vakigi"
 
-#: ../mail/e-mail-config-security-page.c:553
+#: ../src/mail/e-mail-config-security-page.c:555
 msgid "Signing _algorithm:"
 msgstr ""
 
-#: ../mail/e-mail-config-security-page.c:594
+#: ../src/mail/e-mail-config-security-page.c:596
 msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: ../mail/e-mail-config-security-page.c:617
+#: ../src/mail/e-mail-config-security-page.c:611
 #, fuzzy
 #| msgid "Encryption:"
 msgid "Encryption certificate:"
 msgstr "Ĉifrado:"
 
-#: ../mail/e-mail-config-security-page.c:659
+#: ../src/mail/e-mail-config-security-page.c:653
 msgid "Always encrypt outgoing messages when using this account"
 msgstr ""
 
-#: ../mail/e-mail-config-security-page.c:679
+#: ../src/mail/e-mail-config-security-page.c:665
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr ""
 
-#: ../mail/e-mail-config-sending-page.c:49
+#: ../src/mail/e-mail-config-sending-page.c:50
 msgid "Sending Email"
 msgstr "Retpoŝto estas sendata"
 
-#: ../mail/e-mail-config-service-page.c:638
+#: ../src/mail/e-mail-config-service-page.c:499
 msgid "Server _Type:"
 msgstr ""
 
-#: ../mail/e-mail-config-summary-page.c:141
-msgid "SSL"
-msgstr "SSL"
-
-#: ../mail/e-mail-config-summary-page.c:144
-msgid "TLS"
-msgstr "TLS"
-
-#: ../mail/e-mail-config-summary-page.c:305
+#: ../src/mail/e-mail-config-summary-page.c:306
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr ""
 
-#: ../mail/e-mail-config-summary-page.c:370
-#| msgid "Personal Details:"
+#: ../src/mail/e-mail-config-summary-page.c:370
 msgid "Personal Details"
 msgstr "Persondetaloj"
 
-#: ../mail/e-mail-config-summary-page.c:379
-#| msgid "Full Nam_e:"
+#: ../src/mail/e-mail-config-summary-page.c:379
 msgid "Full Name:"
 msgstr "Tuta nomo:"
 
-#: ../mail/e-mail-config-summary-page.c:393
-#| msgid "Email _Address:"
+#: ../src/mail/e-mail-config-summary-page.c:393
 msgid "Email Address:"
 msgstr "Retpoŝtadreso:"
 
-#: ../mail/e-mail-config-summary-page.c:407
+#: ../src/mail/e-mail-config-summary-page.c:407
 msgid "Receiving"
 msgstr "Ricevante"
 
-#: ../mail/e-mail-config-summary-page.c:419
+#: ../src/mail/e-mail-config-summary-page.c:419
 msgid "Sending"
 msgstr "Sendante"
 
-#: ../mail/e-mail-config-summary-page.c:431
+#: ../src/mail/e-mail-config-summary-page.c:431
 #, fuzzy
 #| msgid "Server type:"
 msgid "Server Type:"
 msgstr "Serviltipo:"
 
-#: ../mail/e-mail-config-summary-page.c:452
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:602
-#| msgid "_Server:"
+#: ../src/mail/e-mail-config-summary-page.c:452
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:606
 msgid "Server:"
 msgstr "Servilo:"
 
-#: ../mail/e-mail-config-summary-page.c:473
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
+#: ../src/mail/e-mail-config-summary-page.c:473
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:704
 msgid "Username:"
 msgstr "Uzantonomo:"
 
-#: ../mail/e-mail-config-summary-page.c:494
+#: ../src/mail/e-mail-config-summary-page.c:494
 msgid "Security:"
 msgstr "Sekureco:"
 
-#: ../mail/e-mail-config-summary-page.c:785
+#: ../src/mail/e-mail-config-summary-page.c:651
+msgid "Cannot have both receiving and sending parts set to None"
+msgstr ""
+
+#: ../src/mail/e-mail-config-summary-page.c:807
 msgid "Account Summary"
 msgstr "Konta resumo"
 
-#: ../mail/e-mail-config-welcome-page.c:156
+#: ../src/mail/e-mail-config-welcome-page.c:161
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Next\" to begin."
+"Click “Next” to begin."
 msgstr ""
 
-#: ../mail/e-mail-config-welcome-page.c:166
-#: ../modules/startup-wizard/e-startup-assistant.c:151
+#: ../src/mail/e-mail-config-welcome-page.c:171
+#: ../src/modules/startup-wizard/e-startup-assistant.c:154
 msgid "Welcome"
 msgstr "Bonvenon"
 
-#: ../mail/e-mail-config-window.c:325
+#: ../src/mail/e-mail-config-window.c:329
 msgid "Account Editor"
 msgstr "Kontoredaktilo"
 
-#: ../mail/e-mail-display.c:97
+#: ../src/mail/e-mail-display.c:126
 msgid "_Add to Address Book..."
 msgstr "_Aldoni al adresaro..."
 
-#: ../mail/e-mail-display.c:104
+#: ../src/mail/e-mail-display.c:133
 msgid "_To This Address"
 msgstr "_Al tiu adreso"
 
-#: ../mail/e-mail-display.c:111
+#: ../src/mail/e-mail-display.c:140
 msgid "_From This Address"
 msgstr "_De tiu adreso"
 
-#: ../mail/e-mail-display.c:118
+#: ../src/mail/e-mail-display.c:147
 msgid "Send _Reply To..."
 msgstr "Sendi _respondon al..."
 
-#: ../mail/e-mail-display.c:120
+#: ../src/mail/e-mail-display.c:149
 msgid "Send a reply message to this address"
 msgstr "Sendi respond-mesaĝon al tiu ĉi adreso"
 
-#: ../mail/e-mail-display.c:127
+#: ../src/mail/e-mail-display.c:156
 msgid "Create Search _Folder"
 msgstr "Kreii serĉ_dosierujon"
 
-#: ../mail/e-mail-folder-create-dialog.c:327
+#: ../src/mail/e-mail-display.c:801
+msgid "Hid_e All"
+msgstr "Kaŝ_i ĉiujn"
+
+#: ../src/mail/e-mail-display.c:808
+msgid "_View Inline"
+msgstr ""
+
+#: ../src/mail/e-mail-display.c:815
+msgid "Vie_w All Inline"
+msgstr ""
+
+#: ../src/mail/e-mail-display.c:822
+msgid "_Zoom to 100%"
+msgstr ""
+
+#: ../src/mail/e-mail-display.c:824
+#, fuzzy
+#| msgid "Save the image to a file"
+msgid "Zoom the image to its natural size"
+msgstr "Konservi la bildon al dosiero"
+
+#: ../src/mail/e-mail-display.c:829
+#, fuzzy
+#| msgid "Close this window"
+msgid "_Zoom to window"
+msgstr "Fermi ĉi tiun fenestron"
+
+#: ../src/mail/e-mail-display.c:831
+msgid "Zoom large images to not be wider than the window width"
+msgstr ""
+
+#: ../src/mail/e-mail-folder-create-dialog.c:328
 msgid "Create Folder"
 msgstr "Krei dosierujon"
 
-#: ../mail/e-mail-folder-create-dialog.c:331
+#: ../src/mail/e-mail-folder-create-dialog.c:332
 msgid "Specify where to create the folder:"
 msgstr ""
 
-#: ../mail/e-mail-folder-create-dialog.c:334
+#: ../src/mail/e-mail-folder-create-dialog.c:335
 msgid "C_reate"
 msgstr "K_rei"
 
-#: ../mail/e-mail-folder-create-dialog.c:351
+#: ../src/mail/e-mail-folder-create-dialog.c:352
 msgid "Folder _name:"
 msgstr "Dosieruj_nomo:"
 
 #. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
 #. The translated value should not contain spaces.
-#: ../mail/e-mail-free-form-exp.c:236
+#: ../src/mail/e-mail-free-form-exp.c:231
 #, fuzzy
 #| msgid "Answered"
 msgctxt "ffe"
 msgid "Answered"
 msgstr "Respondite"
 
-#: ../mail/e-mail-free-form-exp.c:237
-#| msgid "Deleted"
+#: ../src/mail/e-mail-free-form-exp.c:232
 msgctxt "ffe"
 msgid "Deleted"
 msgstr "Forigite"
 
-#: ../mail/e-mail-free-form-exp.c:238
+#: ../src/mail/e-mail-free-form-exp.c:233
 #, fuzzy
 #| msgid "Draft"
 msgctxt "ffe"
 msgid "Draft"
 msgstr "Malneto"
 
-#: ../mail/e-mail-free-form-exp.c:239
+#: ../src/mail/e-mail-free-form-exp.c:234
 msgctxt "ffe"
 msgid "Flagged"
 msgstr "Flagita"
 
-#: ../mail/e-mail-free-form-exp.c:240
+#: ../src/mail/e-mail-free-form-exp.c:235
 #, fuzzy
 #| msgid "Seen"
 msgctxt "ffe"
 msgid "Seen"
 msgstr "Vidite"
 
-#: ../mail/e-mail-free-form-exp.c:241
+#: ../src/mail/e-mail-free-form-exp.c:236
 #, fuzzy
 #| msgid "Attachment"
 #| msgid_plural "Attachments"
@@ -14865,789 +17046,911 @@ msgctxt "ffe"
 msgid "Attachment"
 msgstr "Aldonaĵo"
 
-#: ../mail/e-mail-free-form-exp.c:489
+#: ../src/mail/e-mail-free-form-exp.c:484
 msgctxt "ffe"
 msgid "no"
 msgstr "ne"
 
-#: ../mail/e-mail-free-form-exp.c:490
+#: ../src/mail/e-mail-free-form-exp.c:485
 msgctxt "ffe"
 msgid "false"
 msgstr ""
 
-#: ../mail/e-mail-junk-options.c:295
+#: ../src/mail/e-mail-junk-options.c:296
 msgid "Junk filtering software:"
 msgstr ""
 
-#: ../mail/e-mail-label-dialog.c:224
+#: ../src/mail/e-mail-label-dialog.c:222
 msgid "_Label name:"
 msgstr "_Marknomo:"
 
-#: ../mail/e-mail-label-list-store.c:57
+#: ../src/mail/e-mail-label-list-store.c:55
 msgid "I_mportant"
 msgstr "_Grave"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:58
+#: ../src/mail/e-mail-label-list-store.c:56
 msgid "_Work"
 msgstr "_Labore"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:59
+#: ../src/mail/e-mail-label-list-store.c:57
 msgid "_Personal"
 msgstr "_Persone"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:60
+#: ../src/mail/e-mail-label-list-store.c:58
 msgid "_To Do"
 msgstr "_Ende"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:61
+#: ../src/mail/e-mail-label-list-store.c:59
 msgid "_Later"
 msgstr "_Poste"
 
-#: ../mail/e-mail-label-manager.c:171
-#: ../modules/mail/e-mail-shell-view-actions.c:1084
+#: ../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
 msgid "Add Label"
 msgstr "Aldoni etikedon"
 
-#: ../mail/e-mail-label-manager.c:222
+#: ../src/mail/e-mail-label-manager.c:220
+#: ../src/mail/em-folder-properties.c:869
 msgid "Edit Label"
 msgstr "Redakti etikedon"
 
-#: ../mail/e-mail-label-manager.c:354
+#: ../src/mail/e-mail-label-manager.c:352
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
 msgstr ""
 
-#: ../mail/e-mail-label-tree-view.c:88
+#: ../src/mail/e-mail-label-tree-view.c:86
 msgid "Color"
 msgstr "Koloro"
 
-#: ../mail/e-mail-print-config-headers.c:165
+#: ../src/mail/e-mail-notes.c:319 ../src/mail/e-mail-notes.c:719
+#, fuzzy
+#| msgid "Messages"
+msgid "Message Note"
+msgstr "Mesaĝoj"
+
+#: ../src/mail/e-mail-notes.c:639
+#, fuzzy
+#| msgid "Mark all messages in the folder as read"
+msgid "Cannot find message in its folder summary"
+msgstr "Marki ĉiujn mesaĝojn en la dosierujo kiel legite"
+
+#: ../src/mail/e-mail-notes.c:842
+msgid "Storing changes..."
+msgstr ""
+
+#: ../src/mail/e-mail-notes.c:968
+#, fuzzy
+#| msgid "_Edit Message"
+msgid "Edit Message Note"
+msgstr "_Redakti mesaĝon"
+
+#: ../src/mail/e-mail-notes.c:1122
+#, fuzzy
+#| msgid "Sending message"
+msgid "Retrieving message..."
+msgstr "Sendante mesaĝon..."
+
+#: ../src/mail/e-mail-print-config-headers.c:166
 #, fuzzy
 #| msgid "Move the selected folder into another folder"
 msgid "Move selected headers to top"
 msgstr "Movi la elektitan dosierujon al alia dosierujo"
 
-#: ../mail/e-mail-print-config-headers.c:170
+#: ../src/mail/e-mail-print-config-headers.c:171
 #, fuzzy
 #| msgid "Move the selected folder into another folder"
 msgid "Move selected headers up one row"
 msgstr "Movi la elektitan dosierujon al alia dosierujo"
 
-#: ../mail/e-mail-print-config-headers.c:175
+#: ../src/mail/e-mail-print-config-headers.c:176
 #, fuzzy
 #| msgid "Move the selected folder into another folder"
 msgid "Move selected headers down one row"
 msgstr "Movi la elektitan dosierujon al alia dosierujo"
 
-#: ../mail/e-mail-print-config-headers.c:180
+#: ../src/mail/e-mail-print-config-headers.c:181
 #, fuzzy
 #| msgid "Move the selected folder into another folder"
 msgid "Move selected headers to bottom"
 msgstr "Movi la elektitan dosierujon al alia dosierujo"
 
-#: ../mail/e-mail-print-config-headers.c:185
+#: ../src/mail/e-mail-print-config-headers.c:186
 #, fuzzy
 #| msgid "Select all text"
 msgid "Select all headers"
 msgstr "Elekti tutan tekston"
 
-#: ../mail/e-mail-print-config-headers.c:204
+#: ../src/mail/e-mail-print-config-headers.c:205
 msgid "Header Name"
 msgstr "Paĝokapa nomo"
 
-#: ../mail/e-mail-print-config-headers.c:213
+#: ../src/mail/e-mail-print-config-headers.c:214
 msgid "Header Value"
 msgstr "Paĝokapa valoro"
 
-#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:114
+#: ../src/mail/e-mail-printer.c:100 ../src/mail/mail-config.ui.h:128
 msgid "Headers"
 msgstr "Kaplinioj"
 
-#: ../mail/e-mail-printer.c:166
+#: ../src/mail/e-mail-printer.c:142
 #, c-format
 msgid "Page %d of %d"
 msgstr "Paĝo %d de %d"
 
-#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:63
+#: ../src/mail/e-mail-reader.c:350 ../src/mail/filtertypes.xml.in.h:65
 msgid "Move to Folder"
 msgstr "Movi al dosierujo"
 
-#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:64
+#: ../src/mail/e-mail-reader.c:350 ../src/mail/filtertypes.xml.in.h:66
 msgid "Copy to Folder"
 msgstr "Kopii la dosierujon"
 
-#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
+#: ../src/mail/e-mail-reader.c:354 ../src/mail/em-folder-utils.c:501
+#: ../src/mail/mail.error.xml.h:152
 msgid "_Move"
 msgstr "_Movi"
 
-#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
+#: ../src/mail/e-mail-reader.c:354 ../src/mail/em-folder-utils.c:501
 msgid "C_opy"
 msgstr "K_opii"
 
-#: ../mail/e-mail-reader.c:1268 ../mail/e-mail-reader.c:1480
-#: ../mail/e-mail-reader.c:1520
+#: ../src/mail/e-mail-reader.c:480
+#, fuzzy
+#| msgid "Deleting an event"
+#| msgid_plural "Deleting %d events"
+msgid "Deleting message note..."
+msgstr "Forigante eventon..."
+
+#: ../src/mail/e-mail-reader.c:1306 ../src/mail/e-mail-reader.c:1518
+#: ../src/mail/e-mail-reader.c:1558
 msgid "_Do not ask me again."
 msgstr "_Ne demandu min denove."
 
-#: ../mail/e-mail-reader.c:1526
+#: ../src/mail/e-mail-reader.c:1564
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1728
+#: ../src/mail/e-mail-reader.c:1767
 #, fuzzy
 #| msgid "Detailed error message:"
 msgid "Failed to retrieve message:"
 msgstr "Detala erar-mesaĝo:"
 
-#: ../mail/e-mail-reader.c:1773 ../mail/e-mail-reader.c:3014
-#, c-format
-msgid "Retrieving message '%s'"
-msgstr ""
+#: ../src/mail/e-mail-reader.c:1812 ../src/mail/e-mail-reader.c:3171
+#, fuzzy, c-format
+#| msgid "Sending message"
+msgid "Retrieving message “%s”"
+msgstr "Sendante mesaĝon “%s”"
 
-#: ../mail/e-mail-reader.c:1961
+#: ../src/mail/e-mail-reader.c:2000
 msgid "A_dd Sender to Address Book"
 msgstr "Al_doni sendinton al adresaro"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../src/mail/e-mail-reader.c:2002
 msgid "Add sender to address book"
 msgstr "Aldoni sendinton al adresaro"
 
-#: ../mail/e-mail-reader.c:1968
+#: ../src/mail/e-mail-reader.c:2007
 msgid "_Archive..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1970
+#: ../src/mail/e-mail-reader.c:2009
 msgid "Move selected messages to the Archive folder for the account"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1975
+#: ../src/mail/e-mail-reader.c:2014
 msgid "Check for _Junk"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1977
+#: ../src/mail/e-mail-reader.c:2016
 msgid "Filter the selected messages for junk status"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1982
+#: ../src/mail/e-mail-reader.c:2021
 msgid "_Copy to Folder..."
 msgstr "_Kopii al dosierujo..."
 
-#: ../mail/e-mail-reader.c:1984
+#: ../src/mail/e-mail-reader.c:2023
 msgid "Copy selected messages to another folder"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1989
+#: ../src/mail/e-mail-reader.c:2028
 msgid "_Delete Message"
 msgstr "_Forigi mesaĝojn"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../src/mail/e-mail-reader.c:2030
 msgid "Mark the selected messages for deletion"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1996
+#: ../src/mail/e-mail-reader.c:2035
+#, fuzzy
+#| msgid "_Add Attachment..."
+msgid "_Add note..."
+msgstr "_Aldoni aldonaĵon..."
+
+#: ../src/mail/e-mail-reader.c:2037
+#, fuzzy
+#| msgid "Create a new memo from the selected message"
+msgid "Add a note for the selected message"
+msgstr "Krei novan noton de la elektita mesaĝo"
+
+#: ../src/mail/e-mail-reader.c:2042
+#, fuzzy
+#| msgid "Delete Memo"
+msgid "Delete no_te"
+msgstr "Forigi noton"
+
+#: ../src/mail/e-mail-reader.c:2044
+#, fuzzy
+#| msgid "Create a new event from the selected message"
+msgid "Delete the note for the selected message"
+msgstr "Krei novan eventon de la elektita mesaĝo"
+
+#: ../src/mail/e-mail-reader.c:2049
+msgid "_Edit note..."
+msgstr ""
+
+#: ../src/mail/e-mail-reader.c:2051
+#, fuzzy
+#| msgid "Create a new memo from the selected message"
+msgid "Edit a note for the selected message"
+msgstr "Krei novan noton de la elektita mesaĝo"
+
+#: ../src/mail/e-mail-reader.c:2056
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1998
+#: ../src/mail/e-mail-reader.c:2058
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2003
+#: ../src/mail/e-mail-reader.c:2063
 msgid "Create a Filter Rule for _Recipients..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2005
+#: ../src/mail/e-mail-reader.c:2065
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2010
+#: ../src/mail/e-mail-reader.c:2070
 msgid "Create a Filter Rule for Se_nder..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2012
+#: ../src/mail/e-mail-reader.c:2072
 msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2017
+#: ../src/mail/e-mail-reader.c:2077
 msgid "Create a Filter Rule for _Subject..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2019
+#: ../src/mail/e-mail-reader.c:2079
 msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2024
+#: ../src/mail/e-mail-reader.c:2084
 msgid "A_pply Filters"
 msgstr "A_pliki filtrilojn"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../src/mail/e-mail-reader.c:2086
 msgid "Apply filter rules to the selected messages"
 msgstr "Apliki filtril-regulojn al la elektitaj mesaĝoj"
 
-#: ../mail/e-mail-reader.c:2031
+#: ../src/mail/e-mail-reader.c:2091
 msgid "_Find in Message..."
 msgstr "_Trovi en mesaĝo..."
 
-#: ../mail/e-mail-reader.c:2033
+#: ../src/mail/e-mail-reader.c:2093
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2038
+#: ../src/mail/e-mail-reader.c:2098
 msgid "_Clear Flag"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2040
+#: ../src/mail/e-mail-reader.c:2100
 msgid "Remove the follow-up flag from the selected messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2045
+#: ../src/mail/e-mail-reader.c:2105
 msgid "_Flag Completed"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2047
+#: ../src/mail/e-mail-reader.c:2107
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2052
+#: ../src/mail/e-mail-reader.c:2112
 msgid "Follow _Up..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2054
+#: ../src/mail/e-mail-reader.c:2114
 msgid "Flag the selected messages for follow-up"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2059
+#: ../src/mail/e-mail-reader.c:2119
+#: ../src/modules/mail/e-mail-attachment-handler.c:430
 msgid "_Attached"
 msgstr "_Aldonite"
 
-#: ../mail/e-mail-reader.c:2061 ../mail/e-mail-reader.c:2068
+#: ../src/mail/e-mail-reader.c:2121 ../src/mail/e-mail-reader.c:2128
+#: ../src/modules/mail/e-mail-attachment-handler.c:432
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2066
+#: ../src/mail/e-mail-reader.c:2126
 msgid "Forward As _Attached"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2073
+#: ../src/mail/e-mail-reader.c:2133
+#: ../src/modules/mail/e-mail-attachment-handler.c:437
 msgid "_Inline"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2075 ../mail/e-mail-reader.c:2082
+#: ../src/mail/e-mail-reader.c:2135 ../src/mail/e-mail-reader.c:2142
+#: ../src/modules/mail/e-mail-attachment-handler.c:439
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2080
+#: ../src/mail/e-mail-reader.c:2140
 msgid "Forward As _Inline"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2087
+#: ../src/mail/e-mail-reader.c:2147
+#: ../src/modules/mail/e-mail-attachment-handler.c:444
 msgid "_Quoted"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2089 ../mail/e-mail-reader.c:2096
+#: ../src/mail/e-mail-reader.c:2149 ../src/mail/e-mail-reader.c:2156
+#: ../src/modules/mail/e-mail-attachment-handler.c:446
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2094
+#: ../src/mail/e-mail-reader.c:2154
 msgid "Forward As _Quoted"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2101
+#: ../src/mail/e-mail-reader.c:2161
 msgid "_Load Images"
 msgstr "Ŝ_argi bildojn"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../src/mail/e-mail-reader.c:2163
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2108 ../mail/e-mail-reader.c:2486
+#: ../src/mail/e-mail-reader.c:2168 ../src/mail/e-mail-reader.c:2558
 msgid "_Ignore Subthread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2110
+#: ../src/mail/e-mail-reader.c:2170
 msgid "Mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2115 ../mail/e-mail-reader.c:2490
+#: ../src/mail/e-mail-reader.c:2175 ../src/mail/e-mail-reader.c:2562
 #, fuzzy
 #| msgid "Next _Thread"
 msgid "_Ignore Thread"
 msgstr "Sekva _fadeno"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../src/mail/e-mail-reader.c:2177
 msgid "Mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2122
+#: ../src/mail/e-mail-reader.c:2182
 msgid "_Important"
 msgstr "_Grave"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../src/mail/e-mail-reader.c:2184
 msgid "Mark the selected messages as important"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2129
+#: ../src/mail/e-mail-reader.c:2189
 msgid "_Junk"
 msgstr "_Rubaĵo"
 
-#: ../mail/e-mail-reader.c:2131
+#: ../src/mail/e-mail-reader.c:2191
 msgid "Mark the selected messages as junk"
 msgstr "Marki la elektitajn mesaĝojn kiel rubaĵo"
 
-#: ../mail/e-mail-reader.c:2136
+#: ../src/mail/e-mail-reader.c:2196
 msgid "_Not Junk"
 msgstr "_Ne rubaĵo"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../src/mail/e-mail-reader.c:2198
 msgid "Mark the selected messages as not being junk"
 msgstr "Marki la elektitajn mesaĝojn kiel ne-rubaĵo"
 
-#: ../mail/e-mail-reader.c:2143
+#: ../src/mail/e-mail-reader.c:2203
 msgid "_Read"
 msgstr "_Legi"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../src/mail/e-mail-reader.c:2205
 msgid "Mark the selected messages as having been read"
 msgstr "Marki la elektitajn mesaĝojn kiel legite"
 
-#: ../mail/e-mail-reader.c:2150 ../mail/e-mail-reader.c:2510
+#: ../src/mail/e-mail-reader.c:2210 ../src/mail/e-mail-reader.c:2582
 msgid "Do not _Ignore Subthread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2152
+#: ../src/mail/e-mail-reader.c:2212
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2157 ../mail/e-mail-reader.c:2514
+#: ../src/mail/e-mail-reader.c:2217 ../src/mail/e-mail-reader.c:2586
 msgid "Do not _Ignore Thread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2159
+#: ../src/mail/e-mail-reader.c:2219
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2164
+#: ../src/mail/e-mail-reader.c:2224
 msgid "Uni_mportant"
 msgstr "_Malgrave"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../src/mail/e-mail-reader.c:2226
 msgid "Mark the selected messages as unimportant"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2171
+#: ../src/mail/e-mail-reader.c:2231
 msgid "_Unread"
 msgstr "_Nelegite"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../src/mail/e-mail-reader.c:2233
 msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2178
+#: ../src/mail/e-mail-reader.c:2238
+#: ../src/modules/mail/e-mail-attachment-handler.c:416
 msgid "_Edit as New Message..."
 msgstr "_Redakti kiel nova mesaĝo..."
 
-#: ../mail/e-mail-reader.c:2180
+#: ../src/mail/e-mail-reader.c:2240
+#: ../src/modules/mail/e-mail-attachment-handler.c:418
 msgid "Open the selected messages in the composer for editing"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2185
+#: ../src/mail/e-mail-reader.c:2245
 msgid "Compose _New Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2187
+#: ../src/mail/e-mail-reader.c:2247
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2192
+#: ../src/mail/e-mail-reader.c:2252
 msgid "_Open in New Window"
 msgstr "_Malfermi en nova fenestro"
 
-#: ../mail/e-mail-reader.c:2194
+#: ../src/mail/e-mail-reader.c:2254
 msgid "Open the selected messages in a new window"
 msgstr "Malfermi la elektitajn mesaĝojn en nova fenestro"
 
-#: ../mail/e-mail-reader.c:2199
+#: ../src/mail/e-mail-reader.c:2259
 msgid "_Move to Folder..."
 msgstr "_Movi al dosierujo..."
 
-#: ../mail/e-mail-reader.c:2201
+#: ../src/mail/e-mail-reader.c:2261
 msgid "Move selected messages to another folder"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2206
+#: ../src/mail/e-mail-reader.c:2266
 msgid "_Next Message"
 msgstr "_Sekva mesaĝo"
 
-#: ../mail/e-mail-reader.c:2208
+#: ../src/mail/e-mail-reader.c:2268
 msgid "Display the next message"
 msgstr "Montri la sekvan mesaĝon"
 
-#: ../mail/e-mail-reader.c:2213
+#: ../src/mail/e-mail-reader.c:2273
 msgid "Next _Important Message"
 msgstr "Sekva _grava mesaĝo"
 
-#: ../mail/e-mail-reader.c:2215
+#: ../src/mail/e-mail-reader.c:2275
 msgid "Display the next important message"
 msgstr "Montri la sekvan gravan mesaĝon"
 
-#: ../mail/e-mail-reader.c:2220
+#: ../src/mail/e-mail-reader.c:2280
 msgid "Next _Thread"
 msgstr "Sekva _fadeno"
 
-#: ../mail/e-mail-reader.c:2222
+#: ../src/mail/e-mail-reader.c:2282
 msgid "Display the next thread"
 msgstr "Montri la sekvan fadenon"
 
-#: ../mail/e-mail-reader.c:2227
+#: ../src/mail/e-mail-reader.c:2287
 msgid "Next _Unread Message"
 msgstr "Sekva _nelegita mesaĝo"
 
-#: ../mail/e-mail-reader.c:2229
+#: ../src/mail/e-mail-reader.c:2289
 msgid "Display the next unread message"
 msgstr "Montri la sekvan nelegitan mesaĝon"
 
-#: ../mail/e-mail-reader.c:2234
+#: ../src/mail/e-mail-reader.c:2294
 msgid "_Previous Message"
 msgstr "_Antaŭa mesaĝo"
 
-#: ../mail/e-mail-reader.c:2236
+#: ../src/mail/e-mail-reader.c:2296
 msgid "Display the previous message"
 msgstr "Montri la antaŭan mesaĝon"
 
-#: ../mail/e-mail-reader.c:2241
+#: ../src/mail/e-mail-reader.c:2301
 msgid "Pr_evious Important Message"
 msgstr "_Antaŭa grava mesaĝo"
 
-#: ../mail/e-mail-reader.c:2243
+#: ../src/mail/e-mail-reader.c:2303
 msgid "Display the previous important message"
 msgstr "Montri la antaŭan gravan mesaĝon"
 
-#: ../mail/e-mail-reader.c:2248
+#: ../src/mail/e-mail-reader.c:2308
 msgid "Previous T_hread"
 msgstr "_Antaŭa fadeno"
 
-#: ../mail/e-mail-reader.c:2250
+#: ../src/mail/e-mail-reader.c:2310
 msgid "Display the previous thread"
 msgstr "Montri la antaŭan fadenon"
 
-#: ../mail/e-mail-reader.c:2255
+#: ../src/mail/e-mail-reader.c:2315
 msgid "P_revious Unread Message"
 msgstr "A_ntaŭa nelegita mesaĝo"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../src/mail/e-mail-reader.c:2317
 msgid "Display the previous unread message"
 msgstr "Montri la antaŭan nelegitan mesaĝon"
 
-#: ../mail/e-mail-reader.c:2264
+#: ../src/mail/e-mail-reader.c:2324
 msgid "Print this message"
 msgstr "Presi tiun mesaĝon"
 
-#: ../mail/e-mail-reader.c:2271
+#: ../src/mail/e-mail-reader.c:2331
 msgid "Preview the message to be printed"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2276
+#: ../src/mail/e-mail-reader.c:2336
+#: ../src/modules/mail/e-mail-attachment-handler.c:451
 msgid "Re_direct"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2278
+#: ../src/mail/e-mail-reader.c:2338
+#: ../src/modules/mail/e-mail-attachment-handler.c:453
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2283
+#: ../src/mail/e-mail-reader.c:2343
 msgid "Remo_ve Attachments"
 msgstr "_Forigi aldonaĵon"
 
-#: ../mail/e-mail-reader.c:2285
+#: ../src/mail/e-mail-reader.c:2345
 msgid "Remove attachments"
 msgstr "Forigi aldonaĵojn"
 
-#: ../mail/e-mail-reader.c:2290
+#: ../src/mail/e-mail-reader.c:2350
 msgid "Remove Du_plicate Messages"
 msgstr "Forigi duo_bligitajn mesaĝojn"
 
-#: ../mail/e-mail-reader.c:2292
+#: ../src/mail/e-mail-reader.c:2352
 msgid "Checks selected messages for duplicates"
 msgstr "Kontroli elektitajn mesaĝojn pri duobligitoj"
 
-#: ../mail/e-mail-reader.c:2297 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1387
-#: ../modules/mail/e-mail-attachment-handler.c:213
+#: ../src/mail/e-mail-reader.c:2357 ../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
 msgid "Reply to _All"
 msgstr "Respondi al ĉi_uj"
 
-#: ../mail/e-mail-reader.c:2299
+#: ../src/mail/e-mail-reader.c:2359
+#: ../src/modules/mail/e-mail-attachment-handler.c:397
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2304 ../mail/mail.error.xml.h:25
+#: ../src/mail/e-mail-reader.c:2364 ../src/mail/mail.error.xml.h:26
+#: ../src/modules/mail/e-mail-attachment-handler.c:402
 msgid "Reply to _List"
 msgstr "Respondi al la _listo"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../src/mail/e-mail-reader.c:2366
+#: ../src/modules/mail/e-mail-attachment-handler.c:404
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2311
-#: ../modules/mail/e-mail-attachment-handler.c:220
+#: ../src/mail/e-mail-reader.c:2371
+#: ../src/modules/mail/e-mail-attachment-handler.c:409
 msgid "_Reply to Sender"
 msgstr "_Respondi al sendinto"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../src/mail/e-mail-reader.c:2373
+#: ../src/modules/mail/e-mail-attachment-handler.c:411
 msgid "Compose a reply to the sender of the selected message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2318
+#: ../src/mail/e-mail-reader.c:2378
 msgid "_Save as mbox..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2320
+#: ../src/mail/e-mail-reader.c:2380
 msgid "Save selected messages as an mbox file"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2325
+#: ../src/mail/e-mail-reader.c:2385
 msgid "_Message Source"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2327
+#: ../src/mail/e-mail-reader.c:2387
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2339
+#: ../src/mail/e-mail-reader.c:2399
 msgid "_Undelete Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2341
+#: ../src/mail/e-mail-reader.c:2401
 msgid "Undelete the selected messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2346
+#: ../src/mail/e-mail-reader.c:2406
 msgid "_Normal Size"
 msgstr "_Normala grando"
 
-#: ../mail/e-mail-reader.c:2348
+#: ../src/mail/e-mail-reader.c:2408
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2353
+#: ../src/mail/e-mail-reader.c:2413
 msgid "_Zoom In"
 msgstr "E_nzomi"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../src/mail/e-mail-reader.c:2415
 msgid "Increase the text size"
 msgstr "Pligrandigi la tekston"
 
-#: ../mail/e-mail-reader.c:2362
+#: ../src/mail/e-mail-reader.c:2422
 msgid "Decrease the text size"
 msgstr "Plimalgrandigi la tekston"
 
-#: ../mail/e-mail-reader.c:2369
+#: ../src/mail/e-mail-reader.c:2429
 msgid "Cre_ate"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2376
+#: ../src/mail/e-mail-reader.c:2436
 msgid "Ch_aracter Encoding"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2383
+#: ../src/mail/e-mail-reader.c:2443
+#: ../src/modules/mail/e-mail-attachment-handler.c:423
 msgid "F_orward As"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2390
+#: ../src/mail/e-mail-reader.c:2450
 msgid "_Group Reply"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2397
+#: ../src/mail/e-mail-reader.c:2457
 msgid "_Go To"
 msgstr "_Iri al"
 
-#: ../mail/e-mail-reader.c:2404
+#: ../src/mail/e-mail-reader.c:2464
 msgid "Mar_k As"
 msgstr "Mar_ki kiel"
 
-#: ../mail/e-mail-reader.c:2411
+#: ../src/mail/e-mail-reader.c:2471
 msgid "_Message"
 msgstr "_Mesaĝo"
 
-#: ../mail/e-mail-reader.c:2418
+#: ../src/mail/e-mail-reader.c:2478
 msgid "_Zoom"
 msgstr "_Zomo"
 
-#: ../mail/e-mail-reader.c:2428
-#| msgid "Create Search _Folder"
+#: ../src/mail/e-mail-reader.c:2488
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Kreii serĉdosierujon de dissendo_listo..."
 
-#: ../mail/e-mail-reader.c:2430
+#: ../src/mail/e-mail-reader.c:2490
 msgid "Create a search folder for this mailing list"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2435
+#: ../src/mail/e-mail-reader.c:2495
 #, fuzzy
 #| msgid "Create Search _Folder"
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Kreii serĉ_dosierujon..."
 
-#: ../mail/e-mail-reader.c:2437
+#: ../src/mail/e-mail-reader.c:2497
 msgid "Create a search folder for these recipients"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2442
+#: ../src/mail/e-mail-reader.c:2502
 #, fuzzy
 #| msgid "Create Search _Folder"
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Kreii serĉ_dosierujon..."
 
-#: ../mail/e-mail-reader.c:2444
+#: ../src/mail/e-mail-reader.c:2504
 msgid "Create a search folder for this sender"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2449
+#: ../src/mail/e-mail-reader.c:2509
 #, fuzzy
 #| msgid "Create Search _Folder"
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Kreii serĉ_dosierujon..."
 
-#: ../mail/e-mail-reader.c:2451
+#: ../src/mail/e-mail-reader.c:2511
 msgid "Create a search folder for this subject"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2478
+#: ../src/mail/e-mail-reader.c:2550
 msgid "Mark for Follo_w Up..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2494
+#: ../src/mail/e-mail-reader.c:2566
 msgid "Mark as _Important"
 msgstr "Marki kiel _grava"
 
-#: ../mail/e-mail-reader.c:2498
+#: ../src/mail/e-mail-reader.c:2570
 msgid "Mark as _Junk"
 msgstr "Marki kiel _rubaĵo"
 
-#: ../mail/e-mail-reader.c:2502
+#: ../src/mail/e-mail-reader.c:2574
 msgid "Mark as _Not Junk"
 msgstr "Marki kiel _nerubaĵo"
 
-#: ../mail/e-mail-reader.c:2506
+#: ../src/mail/e-mail-reader.c:2578
 msgid "Mar_k as Read"
 msgstr "Marki kiel _legite"
 
-#: ../mail/e-mail-reader.c:2518
+#: ../src/mail/e-mail-reader.c:2590
 msgid "Mark as Uni_mportant"
 msgstr "Marki kiel n_egrava"
 
-#: ../mail/e-mail-reader.c:2522
+#: ../src/mail/e-mail-reader.c:2594
 msgid "Mark as _Unread"
 msgstr "Marki kiel neleg_ite"
 
-#: ../mail/e-mail-reader.c:2566
+#: ../src/mail/e-mail-reader.c:2638
 msgid "_Caret Mode"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2568
+#: ../src/mail/e-mail-reader.c:2640
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2574
+#: ../src/mail/e-mail-reader.c:2646
 msgid "All Message _Headers"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2576
+#: ../src/mail/e-mail-reader.c:2648
 msgid "Show messages with all email headers"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:3020
+#: ../src/mail/e-mail-reader.c:3177
 #, fuzzy
 #| msgid "Sending message"
 msgid "Retrieving message"
 msgstr "Sendante mesaĝon"
 
-#: ../mail/e-mail-reader.c:4033
-#: ../modules/mail/e-mail-attachment-handler.c:206
+#: ../src/mail/e-mail-reader.c:4236
+#: ../src/modules/mail/e-mail-attachment-handler.c:388
 msgid "_Forward"
 msgstr "_Plusendi"
 
-#: ../mail/e-mail-reader.c:4034
+#: ../src/mail/e-mail-reader.c:4237
+#: ../src/modules/mail/e-mail-attachment-handler.c:390
 msgid "Forward the selected message to someone"
 msgstr "Plusendi la elektitan mesaĝon al iu"
 
-#: ../mail/e-mail-reader.c:4053
+#. For Translators: "Group Reply" will reply either to a mailing list
+#. * (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:4256
 msgid "Group Reply"
 msgstr "Gruprespondo"
 
-#: ../mail/e-mail-reader.c:4054
+#: ../src/mail/e-mail-reader.c:4257
 msgid "Reply to the mailing list, or to all recipients"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:4120 ../mail/filtertypes.xml.in.h:65
+#: ../src/mail/e-mail-reader.c:4323 ../src/mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Forigi"
 
-#: ../mail/e-mail-reader.c:4132
-#: ../modules/calendar/e-cal-shell-view-actions.c:1212
+#: ../src/mail/e-mail-reader.c:4335
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1281
 msgid "Next"
 msgstr "Sekva"
 
-#: ../mail/e-mail-reader.c:4136
-#: ../modules/calendar/e-cal-shell-view-actions.c:1205
+#: ../src/mail/e-mail-reader.c:4339
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1274
 msgid "Previous"
 msgstr "Antaŭa"
 
-#: ../mail/e-mail-reader.c:4145 ../mail/mail-dialogs.ui.h:16
+#: ../src/mail/e-mail-reader.c:4348 ../src/mail/mail-dialogs.ui.h:9
 msgid "Reply"
 msgstr "Respondi"
 
-#: ../mail/e-mail-reader-utils.c:146
+#: ../src/mail/e-mail-reader.c:5398
+#, c-format
+msgid "Allow remote content for anyone from %s"
+msgstr ""
+
+#: ../src/mail/e-mail-reader.c:5400
+#, c-format
+msgid "Allow remote content for %s"
+msgstr ""
+
+#: ../src/mail/e-mail-reader.c:5417
+#, c-format
+msgid "Allow remote content from %s"
+msgstr ""
+
+#: ../src/mail/e-mail-reader.c:5434
+#, fuzzy
+#| msgid "_Do not show this message again"
+msgid "Do not show this message again"
+msgstr "Ne _plu montri ĉi tiun mesaĝon"
+
+#: ../src/mail/e-mail-reader.c:5486
+#, fuzzy
+#| msgid "Header content"
+msgid "Load remote content"
+msgstr "Paĝokapa enhavo"
+
+#: ../src/mail/e-mail-reader-utils.c:144
 msgid "Do not warn me again"
 msgstr "Ne averti min denove"
 
-#: ../mail/e-mail-reader-utils.c:556
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1805
-#: ../modules/cal-config-google/e-google-chooser.c:1842
-#: ../plugins/face/face.c:170 ../shell/e-shell.c:867 ../shell/e-shell.c:888
-#: ../smime/gui/certificate-manager.c:346
-msgid "Unknown error"
-msgstr "Nekonata eraro"
+#: ../src/mail/e-mail-reader-utils.c:633
+#, c-format
+msgid "Deleting messages in Junk folder “%s”…"
+msgstr ""
+
+#: ../src/mail/e-mail-reader-utils.c:728
+#, fuzzy, c-format
+#| msgid "Refresh the folder list"
+msgid "Refreshing folder “%s”"
+msgstr "Aktualigi la dosierujoliston “%s”"
 
-#: ../mail/e-mail-reader-utils.c:1045
+#: ../src/mail/e-mail-reader-utils.c:1335
 msgid "Marking thread to be ignored"
 msgstr ""
 
-#: ../mail/e-mail-reader-utils.c:1049
+#: ../src/mail/e-mail-reader-utils.c:1339
 msgid "Unmarking thread from being ignored"
 msgstr ""
 
-#: ../mail/e-mail-reader-utils.c:1053
+#: ../src/mail/e-mail-reader-utils.c:1343
 msgid "Marking subthread to be ignored"
 msgstr ""
 
-#: ../mail/e-mail-reader-utils.c:1057
+#: ../src/mail/e-mail-reader-utils.c:1347
 msgid "Unmarking subthread from being ignored"
 msgstr ""
 
-#: ../mail/e-mail-reader-utils.c:1292
+#: ../src/mail/e-mail-reader-utils.c:1599
 msgid "Printing"
 msgstr "Presi"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1527
+#: ../src/mail/e-mail-reader-utils.c:1836
 #, c-format
 msgid ""
-"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
+"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 "
+"Folder “%s” contains %u duplicate messages. Are you sure you want to delete "
 "them?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/e-mail-reader-utils.c:2357
+#: ../src/mail/e-mail-reader-utils.c:2854
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Konservi mesaĝon"
@@ -15658,267 +17961,431 @@ msgstr[1] "Konservi mesaĝojn"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:2378
+#: ../src/mail/e-mail-reader-utils.c:2875
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Mesaĝo"
 msgstr[1] "Mesaĝoj"
 
-#: ../mail/e-mail-reader-utils.c:2751
-#| msgid "Saving %d message"
-#| msgid_plural "Saving %d messages"
+#: ../src/mail/e-mail-reader-utils.c:3271
 msgid "Parsing message"
 msgstr "Analizante mesaĝon"
 
-#: ../mail/e-mail-request.c:199
-#| msgid "Message has no attachments"
+#: ../src/mail/e-mail-request.c:270
 msgid "The message has no text content."
 msgstr "La mesaĝo ne havas tekstan enhavon."
 
-#: ../mail/e-mail-tag-editor.c:237
+#: ../src/mail/e-mail-tag-editor.c:163
 msgid "Flag to Follow Up"
 msgstr ""
 
-#: ../mail/e-mail-ui-session.c:801
+#: ../src/mail/e-mail-ui-session.c:821
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s aŭtentokontrolo malsukcesis"
 
-#: ../mail/e-mail-ui-session.c:851
+#: ../src/mail/e-mail-ui-session.c:871
+#, c-format
+msgid "No data source found for UID “%s”"
+msgstr ""
+
+#. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
+#: ../src/mail/em-composer-utils.c:388
+#, fuzzy, c-format
+#| msgid "Are you sure you want to delete these {0} memos?"
+msgid "Are you sure you want to send a message with %d To and CC recipients?"
+msgid_plural ""
+"Are you sure you want to send a message with %d To and CC recipients?"
+msgstr[0] "Ĉu vi certe volas forigi tiujn notojn?"
+msgstr[1] "Ĉu vi certe volas forigi tiujn notojn?"
+
+#. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
+#: ../src/mail/em-composer-utils.c:394
 #, c-format
-msgid "No data source found for UID '%s'"
+msgid ""
+"You are trying to send a message to %d recipients in To and CC fields. This "
+"would result in all recipients seeing the email addresses of each other. In "
+"some cases this behaviour is undesired, especially if they do not know each "
+"other or if privacy is a concern. Consider adding recipients to the BCC "
+"field instead."
+msgid_plural ""
+"You are trying to send a message to %d recipients in To and CC fields. This "
+"would result in all recipients seeing the email addresses of each other. In "
+"some cases this behaviour is undesired, especially if they do not know each "
+"other or if privacy is a concern. Consider adding recipients to the BCC "
+"field instead."
+msgstr[0] ""
+msgstr[1] ""
+
+#. This message is never removed from the camel operation, otherwise the GtkInfoBar
+#. hides itself and the user sees no feedback.
+#: ../src/mail/em-composer-utils.c:800
+msgid "Waiting for attachments to load..."
 msgstr ""
 
 #. Note to translators: this is the attribution string used
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1534
+#: ../src/mail/em-composer-utils.c:1845
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:1540
+#: ../src/mail/em-composer-utils.c:1851
 msgid "-------- Forwarded Message --------"
 msgstr "-------- plusendita mesaĝo --------"
 
-#: ../mail/em-composer-utils.c:1545
+#: ../src/mail/em-composer-utils.c:1856
 msgid "-----Original Message-----"
 msgstr "-----Originala mesaĝo-----"
 
-#: ../mail/em-composer-utils.c:2747
+#. 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
+#, c-format
+#| msgid "URL: %s"
+msgid "Re: %s"
+msgstr "Re: %s"
+
+#: ../src/mail/em-composer-utils.c:3103
 msgid "an unknown sender"
 msgstr "nekonata sendinto"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3185
+#: ../src/mail/em-composer-utils.c:3581
 msgid "Posting destination"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:3190
+#: ../src/mail/em-composer-utils.c:3586
 msgid "Choose folders to post the message to."
 msgstr ""
 
-#: ../mail/em-filter-editor-folder-element.c:153
+#: ../src/mail/em-filter-editor-folder-element.c:154
 msgid "Select Folder"
 msgstr "Elekti dosierujon"
 
+#: ../src/mail/em-filter-rule.c:610
+#, fuzzy
+#| msgid "File _type:"
+msgid "Rul_e type:"
+msgstr "Dosier-_tipo:"
+
 #. and now for the action area
-#: ../mail/em-filter-rule.c:587
+#: ../src/mail/em-filter-rule.c:632
 msgid "Then"
 msgstr "Tiam"
 
-#: ../mail/em-filter-rule.c:652
+#: ../src/mail/em-filter-rule.c:697
 msgid "Add Ac_tion"
 msgstr "Aldoni _agon"
 
-#: ../mail/em-folder-properties.c:177
+#: ../src/mail/em-folder-properties.c:240
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Nelegitaj mesaĝoj:"
 msgstr[1] "Nelegitaj mesaĝoj:"
 
-#: ../mail/em-folder-properties.c:188
+#: ../src/mail/em-folder-properties.c:251
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/em-folder-properties.c:209
+#: ../src/mail/em-folder-properties.c:272
 #, c-format
 msgid "Quota usage (%s):"
 msgstr ""
 
-#: ../mail/em-folder-properties.c:211
+#: ../src/mail/em-folder-properties.c:274
 #, c-format
 msgid "Quota usage"
 msgstr ""
 
 #. Translators: Label of a combo with a list of configured accounts where a user can
 #. choose which account to use as the sender when composing a message in this folder
-#: ../mail/em-folder-properties.c:286
+#: ../src/mail/em-folder-properties.c:398
 msgid "_Send Account Override:"
 msgstr ""
 
-#: ../mail/em-folder-properties.c:415
+#: ../src/mail/em-folder-properties.c:605
+msgid "_Archive this folder using these settings:"
+msgstr ""
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../src/mail/em-folder-properties.c:614
+msgctxt "autoarchive"
+msgid "_Cleanup messages older than"
+msgstr ""
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../src/mail/em-folder-properties.c:630
+#, fuzzy
+#| msgid "days"
+msgctxt "autoarchive"
+msgid "days"
+msgstr "tagoj"
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../src/mail/em-folder-properties.c:632
+#, fuzzy
+#| msgid "weeks"
+msgctxt "autoarchive"
+msgid "weeks"
+msgstr "semajnoj"
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../src/mail/em-folder-properties.c:634
+#, fuzzy
+#| msgid "months"
+msgctxt "autoarchive"
+msgid "months"
+msgstr "monatoj"
+
+#: ../src/mail/em-folder-properties.c:640
+#, fuzzy
+#| msgid "Saving message to Outbox."
+msgid "Move old messages to the default archive _folder"
+msgstr "Konservi mesaĝon en senditujo"
+
+#: ../src/mail/em-folder-properties.c:651
+#| msgid "Moving messages to “%s”"
+msgid "_Move old messages to:"
+msgstr "_Movi malnovajn mesaĝojn al:"
+
+#: ../src/mail/em-folder-properties.c:655
+#, fuzzy
+#| msgid "Archi_ve Folder:"
+msgid "AutoArchive folder"
+msgstr "Arkivo-dosierujo"
+
+#: ../src/mail/em-folder-properties.c:655
+#, fuzzy
+#| msgid "Select folder to import into"
+msgid "Select folder to use for AutoArchive"
+msgstr "Elektu mesaĝujon, en kiun enporti"
+
+#: ../src/mail/em-folder-properties.c:661
+#, fuzzy
+#| msgid "_Delete Message"
+msgid "_Delete old messages"
+msgstr "_Forigi mesaĝojn"
+
+#: ../src/mail/em-folder-properties.c:1018
+#, fuzzy
+#| msgid "Server"
+msgid "Server Tag"
+msgstr "Servilo"
+
+#: ../src/mail/em-folder-properties.c:1022 ../src/mail/filtertypes.xml.in.h:29
+#: ../src/mail/searchtypes.xml.in.h:31 ../src/mail/vfoldertypes.xml.in.h:31
+msgid "Label"
+msgstr "Etikedo"
+
+#: ../src/mail/em-folder-properties.c:1073
+msgid "AutoArchive"
+msgstr ""
+
+#: ../src/mail/em-folder-properties.c:1076 ../src/mail/mail-config.ui.h:121
+#: ../src/mail/message-list.etspec.h:19
+msgid "Labels"
+msgstr "Etikedoj"
+
+#: ../src/mail/em-folder-properties.c:1155
 msgid "Folder Properties"
 msgstr ""
 
-#: ../mail/em-folder-selection-button.c:76
+#: ../src/mail/em-folder-properties.c:1394
+#, fuzzy
+#| msgid "Calendar Properties"
+msgid "Gathering folder properties"
+msgstr "Kalendar-ecoj"
+
+#: ../src/mail/em-folder-selection-button.c:77
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: ../mail/em-folder-selector.c:398
+#: ../src/mail/em-folder-selector.c:399
 #, fuzzy
 #| msgid "Create folder"
 msgid "Create a new folder"
 msgstr "Krei dosierujon"
 
-#: ../mail/em-folder-tree.c:682
-msgid "Folder names cannot contain '/'"
-msgstr "Nomoj de dosierujoj ne povas enhavi '/'"
-
-#: ../mail/em-folder-tree.c:819
+#: ../src/mail/em-folder-tree.c:683
+#, fuzzy
+#| msgid "Folder names cannot contain '/'"
+msgid "Folder names cannot contain “/”"
+msgstr "Nomoj de dosierujoj ne povas enhavi “/”"
+
+#. Translators: This is the string used for displaying the
+#. * folder names in folder trees. The first "%s" will be
+#. * replaced by the folder's name and "%u" will be replaced
+#. * with the number of unread messages in the folder. The
+#. * second %s will be replaced with a "+" letter for collapsed
+#. * folders with unread messages in some subfolder too,
+#. * or with an empty string for other cases.
+#. *
+#. * Most languages should translate this as "%s (%u%s)". The
+#. * languages that use localized digits (like Persian) may
+#. * need to replace "%u" with "%Iu". Right-to-left languages
+#. * (like Arabic and Hebrew) may need to add bidirectional
+#. * formatting codes to take care of the cases the folder
+#. * name appears in either direction.
+#. *
+#. * Do not translate the "folder-display|" part. Remove it
+#. * from your translation.
+#.
+#: ../src/mail/em-folder-tree.c:877
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1668
+#: ../src/mail/em-folder-tree.c:1742
 msgid "Mail Folder Tree"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2216 ../mail/em-folder-utils.c:82
+#: ../src/mail/em-folder-tree.c:2290 ../src/mail/em-folder-utils.c:83
 #, c-format
 msgid "Moving folder %s"
 msgstr "Movi dosierujon %s"
 
-#: ../mail/em-folder-tree.c:2219 ../mail/em-folder-utils.c:84
+#: ../src/mail/em-folder-tree.c:2293 ../src/mail/em-folder-utils.c:85
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopii dosierujon %s"
 
-#: ../mail/em-folder-tree.c:2226 ../mail/message-list.c:2477
+#: ../src/mail/em-folder-tree.c:2300 ../src/mail/message-list.c:2509
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2230 ../mail/message-list.c:2479
+#: ../src/mail/em-folder-tree.c:2304 ../src/mail/message-list.c:2511
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2249
+#: ../src/mail/em-folder-tree.c:2323
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:430 ../mail/em-folder-tree-model.c:432
+#: ../src/mail/em-folder-tree-model.c:445
+#: ../src/mail/em-folder-tree-model.c:447
 msgid "UNMATCHED"
 msgstr ""
 
-#: ../mail/em-folder-tree-model.c:1258 ../mail/em-folder-tree-model.c:1634
+#: ../src/mail/em-folder-tree-model.c:1326
+#: ../src/mail/em-folder-tree-model.c:1702
 msgid "Loading..."
 msgstr "Ŝargante..."
 
-#: ../mail/em-folder-utils.c:488
+#: ../src/mail/em-folder-utils.c:502
 msgid "Move Folder To"
 msgstr "Movi dosierujon al"
 
-#: ../mail/em-folder-utils.c:488
+#: ../src/mail/em-folder-utils.c:502
 msgid "Copy Folder To"
 msgstr "Kopii dosierujon al"
 
-#: ../mail/em-subscription-editor.c:855
+#: ../src/mail/em-subscription-editor.c:813
 msgid "_Subscribe"
 msgstr "_Aboni"
 
-#: ../mail/em-subscription-editor.c:864
+#: ../src/mail/em-subscription-editor.c:822
 msgid "Su_bscribe To Shown"
 msgstr "_Aboni montratajn"
 
-#: ../mail/em-subscription-editor.c:872
+#: ../src/mail/em-subscription-editor.c:830
 msgid "Subscribe To _All"
 msgstr "_Aboni ĉiujn"
 
-#: ../mail/em-subscription-editor.c:969 ../mail/em-subscription-editor.c:1867
-#: ../modules/mail/e-mail-shell-view-actions.c:1692
+#: ../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:1751
 msgid "_Unsubscribe"
 msgstr "_Malaboni"
 
-#: ../mail/em-subscription-editor.c:978
+#: ../src/mail/em-subscription-editor.c:944
 msgid "Unsu_bscribe From Hidden"
 msgstr "_Malaboni kaŝitajn"
 
-#: ../mail/em-subscription-editor.c:986
+#: ../src/mail/em-subscription-editor.c:952
 msgid "Unsubscribe From _All"
 msgstr "_Malaboni ĉiujn"
 
-#: ../mail/em-subscription-editor.c:1704
+#: ../src/mail/em-subscription-editor.c:1311
+#: ../src/modules/mail/e-mail-shell-view-private.c:997
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d nelegite, "
+msgstr[1] "%d nelegite, "
+
+#: ../src/mail/em-subscription-editor.c:1315
+#: ../src/modules/mail/e-mail-shell-view-private.c:1007
+#, fuzzy, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d totala"
+msgstr[1] "%d totalaj"
+
+#: ../src/mail/em-subscription-editor.c:1727
 msgid "Folder Subscriptions"
 msgstr ""
 
-#: ../mail/em-subscription-editor.c:1743
+#: ../src/mail/em-subscription-editor.c:1762
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../mail/em-subscription-editor.c:1756
+#: ../src/mail/em-subscription-editor.c:1775
 msgid "Clear Search"
 msgstr "Vakigi serĉon"
 
-#: ../mail/em-subscription-editor.c:1773
+#: ../src/mail/em-subscription-editor.c:1792
 msgid "Sho_w items that contain:"
 msgstr "_Montri erojn kiuj entenas:"
 
-#: ../mail/em-subscription-editor.c:1820
+#: ../src/mail/em-subscription-editor.c:1839
 msgid "Subscribe to the selected folder"
 msgstr "Aboni la elektitan dosierujon"
 
-#: ../mail/em-subscription-editor.c:1821
+#: ../src/mail/em-subscription-editor.c:1840
 msgid "Su_bscribe"
 msgstr "_Aboni"
 
-#: ../mail/em-subscription-editor.c:1866
-#: ../modules/mail/e-mail-shell-view-actions.c:1694
+#: ../src/mail/em-subscription-editor.c:1885
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Unsubscribe from the selected folder"
 msgstr "Malaboni de la elektita dosierujo"
 
-#: ../mail/em-subscription-editor.c:1906
+#: ../src/mail/em-subscription-editor.c:1925
 msgid "Collapse all folders"
 msgstr "Maletendi ĉiujn dosierujon"
 
-#: ../mail/em-subscription-editor.c:1907
+#: ../src/mail/em-subscription-editor.c:1926
 msgid "C_ollapse All"
 msgstr "_Maletendi ĉiujn"
 
-#: ../mail/em-subscription-editor.c:1917
+#: ../src/mail/em-subscription-editor.c:1936
 msgid "Expand all folders"
 msgstr "Maletendi ĉiujn dosierujon"
 
-#: ../mail/em-subscription-editor.c:1918
+#: ../src/mail/em-subscription-editor.c:1937
 msgid "E_xpand All"
 msgstr "_Etendi ĉiujn"
 
-#: ../mail/em-subscription-editor.c:1928
+#: ../src/mail/em-subscription-editor.c:1947
 msgid "Refresh the folder list"
 msgstr "Aktualigi la dosierujoliston"
 
-#: ../mail/em-subscription-editor.c:1929
-#: ../modules/mail/e-mail-shell-view-actions.c:1593
-#: ../modules/mail/e-mail-shell-view-actions.c:1664
-#| msgctxt "Meeting"
-#| msgid "Refresh"
-msgid "_Refresh"
-msgstr "_Aktualigi"
-
-#: ../mail/em-subscription-editor.c:1940
+#: ../src/mail/em-subscription-editor.c:1959
 msgid "Stop the current operation"
 msgstr "Haltigi la aktualan agon"
 
-#: ../mail/em-subscription-editor.c:1941
-#: ../modules/addressbook/e-book-shell-view-actions.c:979
+#: ../src/mail/em-subscription-editor.c:1960
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1005
 msgid "_Stop"
 msgstr ""
 
@@ -15926,491 +18393,505 @@ msgstr ""
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:75
+#: ../src/mail/em-utils.c:77
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/em-utils.c:241
+#: ../src/mail/em-utils.c:178
 msgid "Message Filters"
 msgstr "Mesaĝfiltriloj"
 
-#: ../mail/em-utils.c:983
+#: ../src/mail/em-utils.c:950
 #, c-format
 msgid "Messages from %s"
 msgstr "Mesaĝoj de %s"
 
-#: ../mail/em-vfolder-editor.c:104
+#: ../src/mail/em-utils.c:1764
+#, fuzzy
+#| msgid "_Delete Message"
+msgid "Deleting old messages"
+msgstr "_Forigi mesaĝojn"
+
+#: ../src/mail/em-vfolder-editor.c:102
 msgid "Search _Folders"
 msgstr "Serĉ_dosierujoj"
 
-#: ../mail/em-vfolder-editor-rule.c:392
+#: ../src/mail/em-vfolder-editor-rule.c:393
 msgid "Add Folder"
 msgstr "Aldoni dosierujon"
 
-#: ../mail/em-vfolder-editor-rule.c:521
+#: ../src/mail/em-vfolder-editor-rule.c:522
 msgid "Search Folder Sources"
 msgstr ""
 
-#: ../mail/em-vfolder-editor-rule.c:553
+#: ../src/mail/em-vfolder-editor-rule.c:554
 msgid "Automatically update on any _source folder change"
 msgstr ""
 
-#: ../mail/em-vfolder-editor-rule.c:565
+#: ../src/mail/em-vfolder-editor-rule.c:566
 msgid "All local folders"
 msgstr "Ĉiuj lokaj dosierujoj"
 
-#: ../mail/em-vfolder-editor-rule.c:566
+#: ../src/mail/em-vfolder-editor-rule.c:567
 msgid "All active remote folders"
 msgstr ""
 
-#: ../mail/em-vfolder-editor-rule.c:567
+#: ../src/mail/em-vfolder-editor-rule.c:568
 msgid "All local and active remote folders"
 msgstr ""
 
-#: ../mail/em-vfolder-editor-rule.c:568
+#: ../src/mail/em-vfolder-editor-rule.c:569
 msgid "Specific folders"
 msgstr ""
 
-#: ../mail/em-vfolder-editor-rule.c:606
+#: ../src/mail/em-vfolder-editor-rule.c:607
 msgid "include subfolders"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:1 ../mail/message-list.etspec.h:15
-#: ../mail/searchtypes.xml.in.h:1 ../mail/vfoldertypes.xml.in.h:1
+#: ../src/mail/filtertypes.xml.in.h:1 ../src/mail/message-list.etspec.h:15
+#: ../src/mail/searchtypes.xml.in.h:1 ../src/mail/vfoldertypes.xml.in.h:1
 msgid "Sender"
 msgstr "Sendinto"
 
-#: ../mail/filtertypes.xml.in.h:6 ../mail/searchtypes.xml.in.h:6
-#: ../mail/vfoldertypes.xml.in.h:6
+#: ../src/mail/filtertypes.xml.in.h:6 ../src/mail/searchtypes.xml.in.h:6
+#: ../src/mail/vfoldertypes.xml.in.h:6
 msgid "starts with"
 msgstr "komencas per"
 
-#: ../mail/filtertypes.xml.in.h:7 ../mail/searchtypes.xml.in.h:7
-#: ../mail/vfoldertypes.xml.in.h:7
+#: ../src/mail/filtertypes.xml.in.h:7 ../src/mail/searchtypes.xml.in.h:7
+#: ../src/mail/vfoldertypes.xml.in.h:7
 msgid "does not start with"
 msgstr "ne komencas per"
 
-#: ../mail/filtertypes.xml.in.h:8 ../mail/searchtypes.xml.in.h:8
-#: ../mail/vfoldertypes.xml.in.h:8
+#: ../src/mail/filtertypes.xml.in.h:8 ../src/mail/searchtypes.xml.in.h:8
+#: ../src/mail/vfoldertypes.xml.in.h:8
 msgid "ends with"
 msgstr "finas per"
 
-#: ../mail/filtertypes.xml.in.h:9 ../mail/searchtypes.xml.in.h:9
-#: ../mail/vfoldertypes.xml.in.h:9
+#: ../src/mail/filtertypes.xml.in.h:9 ../src/mail/searchtypes.xml.in.h:9
+#: ../src/mail/vfoldertypes.xml.in.h:9
 msgid "does not end with"
 msgstr "ne finas per"
 
-#: ../mail/filtertypes.xml.in.h:10 ../mail/searchtypes.xml.in.h:12
-#: ../mail/vfoldertypes.xml.in.h:12
+#: ../src/mail/filtertypes.xml.in.h:10 ../src/mail/searchtypes.xml.in.h:12
+#: ../src/mail/vfoldertypes.xml.in.h:12
 msgid "sounds like"
 msgstr "sonas kiel"
 
-#: ../mail/filtertypes.xml.in.h:11 ../mail/searchtypes.xml.in.h:13
-#: ../mail/vfoldertypes.xml.in.h:13
+#: ../src/mail/filtertypes.xml.in.h:11 ../src/mail/searchtypes.xml.in.h:13
+#: ../src/mail/vfoldertypes.xml.in.h:13
 msgid "does not sound like"
 msgstr "ne sonas kiel"
 
-#: ../mail/filtertypes.xml.in.h:12 ../mail/message-list.etspec.h:16
-#: ../mail/searchtypes.xml.in.h:10 ../mail/vfoldertypes.xml.in.h:10
+#: ../src/mail/filtertypes.xml.in.h:12 ../src/mail/message-list.etspec.h:16
+#: ../src/mail/searchtypes.xml.in.h:10 ../src/mail/vfoldertypes.xml.in.h:10
 msgid "Recipients"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:13 ../mail/searchtypes.xml.in.h:14
-#: ../mail/vfoldertypes.xml.in.h:14
+#: ../src/mail/filtertypes.xml.in.h:13 ../src/mail/searchtypes.xml.in.h:14
+#: ../src/mail/vfoldertypes.xml.in.h:14
 msgid "CC"
 msgstr "Km"
 
-#: ../mail/filtertypes.xml.in.h:14 ../mail/searchtypes.xml.in.h:15
-#: ../mail/vfoldertypes.xml.in.h:15
+#: ../src/mail/filtertypes.xml.in.h:14 ../src/mail/searchtypes.xml.in.h:15
+#: ../src/mail/vfoldertypes.xml.in.h:15
 msgid "BCC"
 msgstr "Kkm"
 
-#: ../mail/filtertypes.xml.in.h:15 ../mail/searchtypes.xml.in.h:16
-#: ../mail/vfoldertypes.xml.in.h:16
+#: ../src/mail/filtertypes.xml.in.h:15 ../src/mail/searchtypes.xml.in.h:16
+#: ../src/mail/vfoldertypes.xml.in.h:16
 msgid "Sender or Recipients"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:17 ../mail/searchtypes.xml.in.h:18
-#: ../mail/vfoldertypes.xml.in.h:18
-#| msgid "Password:"
+#: ../src/mail/filtertypes.xml.in.h:17 ../src/mail/searchtypes.xml.in.h:18
+#: ../src/mail/vfoldertypes.xml.in.h:18
 msgid "has words"
 msgstr "havas vortojn"
 
-#: ../mail/filtertypes.xml.in.h:18 ../mail/searchtypes.xml.in.h:19
-#: ../mail/vfoldertypes.xml.in.h:19
+#: ../src/mail/filtertypes.xml.in.h:18 ../src/mail/searchtypes.xml.in.h:19
+#: ../src/mail/vfoldertypes.xml.in.h:19
 #, fuzzy
 #| msgid "does not end with"
 msgid "does not have words"
 msgstr "ne finas per"
 
-#: ../mail/filtertypes.xml.in.h:19 ../mail/searchtypes.xml.in.h:20
-#: ../mail/vfoldertypes.xml.in.h:20
+#: ../src/mail/filtertypes.xml.in.h:19 ../src/mail/searchtypes.xml.in.h:20
+#: ../src/mail/vfoldertypes.xml.in.h:20
 msgid "Specific header"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:20 ../mail/searchtypes.xml.in.h:21
-#: ../mail/vfoldertypes.xml.in.h:21
+#: ../src/mail/filtertypes.xml.in.h:20 ../src/mail/searchtypes.xml.in.h:21
+#: ../src/mail/vfoldertypes.xml.in.h:21
 msgid "exists"
 msgstr "ekzistas"
 
-#: ../mail/filtertypes.xml.in.h:21 ../mail/searchtypes.xml.in.h:22
-#: ../mail/vfoldertypes.xml.in.h:22
+#: ../src/mail/filtertypes.xml.in.h:21 ../src/mail/searchtypes.xml.in.h:22
+#: ../src/mail/vfoldertypes.xml.in.h:22
 msgid "does not exist"
 msgstr "ne ekzistas"
 
-#: ../mail/filtertypes.xml.in.h:22 ../mail/searchtypes.xml.in.h:24
-#: ../mail/vfoldertypes.xml.in.h:24
+#: ../src/mail/filtertypes.xml.in.h:22 ../src/mail/searchtypes.xml.in.h:24
+#: ../src/mail/vfoldertypes.xml.in.h:24
 msgid "Message Body"
 msgstr "Mesaĝokorpo"
 
-#: ../mail/filtertypes.xml.in.h:23 ../mail/searchtypes.xml.in.h:25
-#: ../mail/vfoldertypes.xml.in.h:25
+#: ../src/mail/filtertypes.xml.in.h:23 ../src/mail/searchtypes.xml.in.h:25
+#: ../src/mail/vfoldertypes.xml.in.h:25
 msgid "Expression"
 msgstr "Esprimo"
 
-#: ../mail/filtertypes.xml.in.h:24 ../mail/searchtypes.xml.in.h:26
-#: ../mail/vfoldertypes.xml.in.h:26
+#: ../src/mail/filtertypes.xml.in.h:24 ../src/mail/searchtypes.xml.in.h:26
+#: ../src/mail/vfoldertypes.xml.in.h:26
 #, fuzzy
 #| msgid "Expression"
 msgid "Free Form Expression"
 msgstr "Esprimo"
 
-#: ../mail/filtertypes.xml.in.h:25 ../mail/searchtypes.xml.in.h:27
-#: ../mail/vfoldertypes.xml.in.h:27
+#: ../src/mail/filtertypes.xml.in.h:25 ../src/mail/searchtypes.xml.in.h:27
+#: ../src/mail/vfoldertypes.xml.in.h:27
 msgid "Date sent"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:26 ../mail/searchtypes.xml.in.h:28
-#: ../mail/vfoldertypes.xml.in.h:28
+#: ../src/mail/filtertypes.xml.in.h:26 ../src/mail/searchtypes.xml.in.h:28
+#: ../src/mail/vfoldertypes.xml.in.h:28
 msgid "is before"
 msgstr "estas antaŭ"
 
-#: ../mail/filtertypes.xml.in.h:27 ../mail/searchtypes.xml.in.h:29
-#: ../mail/vfoldertypes.xml.in.h:29
+#: ../src/mail/filtertypes.xml.in.h:27 ../src/mail/searchtypes.xml.in.h:29
+#: ../src/mail/vfoldertypes.xml.in.h:29
 msgid "is after"
 msgstr "estas post"
 
-#: ../mail/filtertypes.xml.in.h:28 ../mail/searchtypes.xml.in.h:30
-#: ../mail/vfoldertypes.xml.in.h:30
+#: ../src/mail/filtertypes.xml.in.h:28 ../src/mail/searchtypes.xml.in.h:30
+#: ../src/mail/vfoldertypes.xml.in.h:30
 msgid "Date received"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:29 ../mail/searchtypes.xml.in.h:31
-#: ../mail/vfoldertypes.xml.in.h:31
-msgid "Label"
-msgstr "Etikedo"
-
-#: ../mail/filtertypes.xml.in.h:30 ../mail/message-list.etspec.h:3
-#: ../mail/searchtypes.xml.in.h:32 ../mail/vfoldertypes.xml.in.h:32
+#: ../src/mail/filtertypes.xml.in.h:30 ../src/mail/message-list.etspec.h:3
+#: ../src/mail/searchtypes.xml.in.h:32 ../src/mail/vfoldertypes.xml.in.h:32
 msgid "Score"
 msgstr "Poentoj"
 
-#: ../mail/filtertypes.xml.in.h:33 ../mail/searchtypes.xml.in.h:35
-#: ../mail/vfoldertypes.xml.in.h:35
+#: ../src/mail/filtertypes.xml.in.h:33 ../src/mail/searchtypes.xml.in.h:35
+#: ../src/mail/vfoldertypes.xml.in.h:35
 msgid "Size (kB)"
 msgstr "Grando (kB)"
 
-#: ../mail/filtertypes.xml.in.h:35 ../mail/searchtypes.xml.in.h:37
-#: ../mail/vfoldertypes.xml.in.h:37
+#: ../src/mail/filtertypes.xml.in.h:34 ../src/mail/searchtypes.xml.in.h:36
+#: ../src/mail/vfoldertypes.xml.in.h:36
+#, fuzzy
+#| msgid "is greater than"
+msgid "is greater than or equal to"
+msgstr "pli granda ol"
+
+#: ../src/mail/filtertypes.xml.in.h:35 ../src/mail/searchtypes.xml.in.h:37
+#: ../src/mail/vfoldertypes.xml.in.h:37
+#, fuzzy
+#| msgid "is less than"
+msgid "is less than or equal to"
+msgstr "pli malgranda ol"
+
+#: ../src/mail/filtertypes.xml.in.h:37 ../src/mail/searchtypes.xml.in.h:39
+#: ../src/mail/vfoldertypes.xml.in.h:39
 msgid "Replied to"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:40
-#: ../mail/vfoldertypes.xml.in.h:40
+#: ../src/mail/filtertypes.xml.in.h:39 ../src/mail/searchtypes.xml.in.h:42
+#: ../src/mail/vfoldertypes.xml.in.h:42
 msgid "Important"
 msgstr "Grave"
 
 #. Past tense, as in "has been read".
-#: ../mail/filtertypes.xml.in.h:38 ../mail/mail-dialogs.ui.h:15
-#: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
+#: ../src/mail/filtertypes.xml.in.h:40 ../src/mail/mail-dialogs.ui.h:8
+#: ../src/mail/searchtypes.xml.in.h:43 ../src/mail/vfoldertypes.xml.in.h:43
 msgid "Read"
 msgstr "Legite"
 
-#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:121
-#: ../mail/vfoldertypes.xml.in.h:42
+#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:135
+#: ../src/mail/vfoldertypes.xml.in.h:44
 msgid "Junk"
 msgstr "Rubaĵo"
 
-#: ../mail/filtertypes.xml.in.h:40 ../mail/searchtypes.xml.in.h:42
-#: ../mail/vfoldertypes.xml.in.h:43
+#: ../src/mail/filtertypes.xml.in.h:42 ../src/mail/searchtypes.xml.in.h:44
+#: ../src/mail/vfoldertypes.xml.in.h:45
 msgid "Follow Up"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:41 ../mail/searchtypes.xml.in.h:43
-#: ../mail/vfoldertypes.xml.in.h:44
+#: ../src/mail/filtertypes.xml.in.h:43 ../src/mail/searchtypes.xml.in.h:45
+#: ../src/mail/vfoldertypes.xml.in.h:46
 msgid "is Flagged"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
-#: ../mail/vfoldertypes.xml.in.h:45
+#: ../src/mail/filtertypes.xml.in.h:44 ../src/mail/searchtypes.xml.in.h:46
+#: ../src/mail/vfoldertypes.xml.in.h:47
 msgid "is not Flagged"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
-#: ../mail/vfoldertypes.xml.in.h:46
-msgid "Completed On"
-msgstr ""
-
-#: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
-#: ../mail/vfoldertypes.xml.in.h:47
-msgid "is set"
-msgstr ""
+#: ../src/mail/filtertypes.xml.in.h:45 ../src/mail/searchtypes.xml.in.h:47
+#: ../src/mail/vfoldertypes.xml.in.h:48
+#| msgid "% Completed"
+msgid "is Completed"
+msgstr "estas plenumite"
 
-#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
-#: ../mail/vfoldertypes.xml.in.h:48
-msgid "is not set"
-msgstr ""
+#: ../src/mail/filtertypes.xml.in.h:46 ../src/mail/searchtypes.xml.in.h:48
+#: ../src/mail/vfoldertypes.xml.in.h:49
+#| msgid "% Completed"
+msgid "is not Completed"
+msgstr "ne estas plenumite"
 
-#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
-#: ../mail/vfoldertypes.xml.in.h:52
+#: ../src/mail/filtertypes.xml.in.h:51 ../src/mail/searchtypes.xml.in.h:53
+#: ../src/mail/vfoldertypes.xml.in.h:54
 msgid "Mailing list"
 msgstr "Dissendolisto"
 
-#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
-#: ../mail/vfoldertypes.xml.in.h:53
+#: ../src/mail/filtertypes.xml.in.h:52 ../src/mail/searchtypes.xml.in.h:54
+#: ../src/mail/vfoldertypes.xml.in.h:55
 msgid "Regex Match"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:51 ../mail/searchtypes.xml.in.h:53
-#: ../mail/vfoldertypes.xml.in.h:54
+#: ../src/mail/filtertypes.xml.in.h:53 ../src/mail/searchtypes.xml.in.h:55
+#: ../src/mail/vfoldertypes.xml.in.h:56
 msgid "Message Header"
 msgstr "Mesaĝokapo"
 
-#: ../mail/filtertypes.xml.in.h:52
+#: ../src/mail/filtertypes.xml.in.h:54
 msgid "Source Account"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:53
+#: ../src/mail/filtertypes.xml.in.h:55
 msgid "Pipe to Program"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:54
+#: ../src/mail/filtertypes.xml.in.h:56
 msgid "returns"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:55
+#: ../src/mail/filtertypes.xml.in.h:57
 msgid "does not return"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:56
+#: ../src/mail/filtertypes.xml.in.h:58
 msgid "returns greater than"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:57
+#: ../src/mail/filtertypes.xml.in.h:59
 msgid "returns less than"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:58
+#: ../src/mail/filtertypes.xml.in.h:60
 msgid "Junk Test"
 msgstr "Rubaĵtesto"
 
-#: ../mail/filtertypes.xml.in.h:59
+#: ../src/mail/filtertypes.xml.in.h:61
 msgid "Message is Junk"
 msgstr "Mesaĝo estas rubaĵo"
 
-#: ../mail/filtertypes.xml.in.h:60
+#: ../src/mail/filtertypes.xml.in.h:62
 msgid "Message is not Junk"
 msgstr "Mesaĝo ne estas rubaĵo"
 
-#: ../mail/filtertypes.xml.in.h:61 ../mail/vfoldertypes.xml.in.h:55
+#: ../src/mail/filtertypes.xml.in.h:63 ../src/mail/vfoldertypes.xml.in.h:57
 msgid "Message Location"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:62 ../mail/searchtypes.xml.in.h:54
-#: ../mail/vfoldertypes.xml.in.h:56
+#: ../src/mail/filtertypes.xml.in.h:64 ../src/mail/searchtypes.xml.in.h:56
+#: ../src/mail/vfoldertypes.xml.in.h:58
 msgid "Match All"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:66
+#: ../src/mail/filtertypes.xml.in.h:68
 msgid "Stop Processing"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:67
+#: ../src/mail/filtertypes.xml.in.h:69
 msgid "Set Label"
 msgstr "Agordi etikedojn"
 
-#: ../mail/filtertypes.xml.in.h:68
+#: ../src/mail/filtertypes.xml.in.h:70
 msgid "Assign Color"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:69
+#: ../src/mail/filtertypes.xml.in.h:71
 #, fuzzy
 #| msgid "Color"
 msgid "Unset Color"
 msgstr "Koloro"
 
-#: ../mail/filtertypes.xml.in.h:70
+#: ../src/mail/filtertypes.xml.in.h:72
 msgid "Assign Score"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:71
+#: ../src/mail/filtertypes.xml.in.h:73
 msgid "Adjust Score"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:72
+#: ../src/mail/filtertypes.xml.in.h:74
 msgid "Set Status"
 msgstr "Agordi staton"
 
-#: ../mail/filtertypes.xml.in.h:73 ../mail/searchtypes.xml.in.h:38
-#: ../mail/vfoldertypes.xml.in.h:38
+#: ../src/mail/filtertypes.xml.in.h:75 ../src/mail/searchtypes.xml.in.h:40
+#: ../src/mail/vfoldertypes.xml.in.h:40
 msgid "Deleted"
 msgstr "Forigite"
 
-#: ../mail/filtertypes.xml.in.h:74
+#: ../src/mail/filtertypes.xml.in.h:76
 msgid "Unset Status"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:75
+#: ../src/mail/filtertypes.xml.in.h:77
 msgid "Beep"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:76
+#: ../src/mail/filtertypes.xml.in.h:78
 msgid "Play Sound"
 msgstr "Ludi sonon"
 
-#: ../mail/filtertypes.xml.in.h:77
+#: ../src/mail/filtertypes.xml.in.h:79
 msgid "Run Program"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:78
+#: ../src/mail/filtertypes.xml.in.h:80
 msgid "Forward to"
 msgstr ""
 
-#: ../mail/importers/elm-importer.c:173
+#: ../src/mail/importers/elm-importer.c:174
 msgid "Importing Elm data"
 msgstr ""
 
-#: ../mail/importers/elm-importer.c:374
+#: ../src/mail/importers/elm-importer.c:377
 msgid "Evolution Elm importer"
 msgstr "Evolucio-Elm-enportilo"
 
-#: ../mail/importers/elm-importer.c:375
+#: ../src/mail/importers/elm-importer.c:378
 msgid "Import mail from Elm."
 msgstr "Enporti poŝtaĵojn de Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:134
-#: ../mail/importers/kmail-importer.c:210
-#: ../plugins/dbx-import/dbx-importer.c:246
+#: ../src/mail/importers/evolution-mbox-importer.c:135
+#: ../src/mail/importers/kmail-importer.c:208
+#: ../src/plugins/dbx-import/dbx-importer.c:242
 msgid "_Destination folder:"
 msgstr "_Celdosierujo:"
 
-#: ../mail/importers/evolution-mbox-importer.c:140
-#: ../mail/importers/kmail-importer.c:216
-#: ../plugins/dbx-import/dbx-importer.c:252
-#: ../plugins/pst-import/pst-importer.c:541
+#: ../src/mail/importers/evolution-mbox-importer.c:141
+#: ../src/mail/importers/kmail-importer.c:214
+#: ../src/plugins/dbx-import/dbx-importer.c:248
+#: ../src/plugins/pst-import/pst-importer.c:537
 msgid "Select folder"
 msgstr "Elekti dosierujon"
 
-#: ../mail/importers/evolution-mbox-importer.c:141
-#: ../mail/importers/kmail-importer.c:217
-#: ../plugins/dbx-import/dbx-importer.c:253
-#: ../plugins/pst-import/pst-importer.c:542
+#: ../src/mail/importers/evolution-mbox-importer.c:142
+#: ../src/mail/importers/kmail-importer.c:215
+#: ../src/plugins/dbx-import/dbx-importer.c:249
+#: ../src/plugins/pst-import/pst-importer.c:538
 msgid "Select folder to import into"
 msgstr "Elektu mesaĝujon, en kiun enporti"
 
-#: ../mail/importers/evolution-mbox-importer.c:509
+#. Translators: Column header for a message subject
+#: ../src/mail/importers/evolution-mbox-importer.c:510
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Temo"
 
-#: ../mail/importers/evolution-mbox-importer.c:514
+#. Translators: Column header for a message From address
+#: ../src/mail/importers/evolution-mbox-importer.c:515
 msgctxt "mboxImp"
 msgid "From"
 msgstr "De"
 
-#: ../mail/importers/evolution-mbox-importer.c:568
-#: ../shell/e-shell-utils.c:171
+#: ../src/mail/importers/evolution-mbox-importer.c:569
+#: ../src/shell/e-shell-utils.c:176
 msgid "Berkeley Mailbox (mbox)"
 msgstr ""
 
-#: ../mail/importers/evolution-mbox-importer.c:569
+#: ../src/mail/importers/evolution-mbox-importer.c:570
 msgid "Importer Berkeley Mailbox format folders"
 msgstr ""
 
-#: ../mail/importers/kmail-importer.c:263
+#: ../src/mail/importers/kmail-importer.c:261
 #, c-format
-#| msgid "Address"
 msgid "%d Address"
 msgid_plural "%d Addresses"
 msgstr[0] "%d adreso"
 msgstr[1] "%d adresoj"
 
-#: ../mail/importers/kmail-importer.c:354
+#: ../src/mail/importers/kmail-importer.c:352
 #, fuzzy
 #| msgid "Evolution Elm importer"
 msgid "Evolution KMail importer"
 msgstr "Evolucio-Elm-enportilo"
 
-#: ../mail/importers/kmail-importer.c:355
+#: ../src/mail/importers/kmail-importer.c:353
 #, fuzzy
 #| msgid "Import mail from Elm."
 msgid "Import mail and contacts from KMail."
 msgstr "Enporti poŝtaĵojn kaj kontaktojn de KMail."
 
-#: ../mail/importers/kmail-libs.c:152
-#: ../modules/mail/e-mail-shell-view-private.c:1082
+#: ../src/mail/importers/kmail-libs.c:150
+#: ../src/modules/mail/e-mail-shell-view-private.c:1028
 msgid "Trash"
 msgstr "Rubujo"
 
-#: ../mail/importers/mail-importer.c:55
+#: ../src/mail/importers/mail-importer.c:55
 msgid "Importing mailbox"
 msgstr ""
 
-#: ../mail/importers/mail-importer.c:61
+#: ../src/mail/importers/mail-importer.c:61
 #, fuzzy
 #| msgid "Import mail from Elm."
 msgid "Importing mail and contacts from KMail"
 msgstr "Enportu poŝtaĵojn de Elm"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:187 ../mail/importers/mail-importer.c:314
-#: ../plugins/dbx-import/dbx-importer.c:609
-#: ../plugins/pst-import/pst-importer.c:760
+#: ../src/mail/importers/mail-importer.c:187
+#: ../src/mail/importers/mail-importer.c:312
+#: ../src/plugins/dbx-import/dbx-importer.c:605
+#: ../src/plugins/pst-import/pst-importer.c:756
 #, c-format
-msgid "Importing '%s'"
-msgstr "Enportado de '%s'"
+#| msgid "Importing “%s”"
+msgid "Importing “%s”"
+msgstr "Enportado de “%s”"
 
-#: ../mail/importers/mail-importer.c:570
+#: ../src/mail/importers/mail-importer.c:556
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../mail/importers/pine-importer.c:247
+#: ../src/mail/importers/pine-importer.c:248
 msgid "Importing Pine data"
 msgstr ""
 
-#: ../mail/importers/pine-importer.c:475
+#: ../src/mail/importers/pine-importer.c:478
 msgid "Evolution Pine importer"
 msgstr "Evolucio-Pine-enportilo"
 
-#: ../mail/importers/pine-importer.c:476
+#: ../src/mail/importers/pine-importer.c:479
 msgid "Import mail from Pine."
 msgstr ""
 
-#: ../mail/mail-autofilter.c:63
+#: ../src/mail/mail-autofilter.c:64
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: ../mail/mail-autofilter.c:219 ../mail/mail-autofilter.c:262
+#: ../src/mail/mail-autofilter.c:220 ../src/mail/mail-autofilter.c:267
 #, c-format
 msgid "Mail from %s"
 msgstr "Poŝtaĵo de %s"
 
-#: ../mail/mail-autofilter.c:245
+#: ../src/mail/mail-autofilter.c:250
 #, c-format
 msgid "Subject is %s"
 msgstr "Temo estas %s"
 
-#: ../mail/mail-autofilter.c:286
+#: ../src/mail/mail-autofilter.c:290
 #, c-format
 msgid "%s mailing list"
 msgstr "%s dissendolisto"
 
-#: ../mail/mail-autofilter.c:396
+#: ../src/mail/mail-autofilter.c:400
 msgid "Add Filter Rule"
 msgstr "Aldoni filtran regulon"
 
@@ -16419,240 +18900,218 @@ msgstr "Aldoni filtran regulon"
 #. * 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.
-#: ../mail/mail-autofilter.c:505
+#: ../src/mail/mail-autofilter.c:509
 #, c-format
 msgid ""
-"The filter rule \"%s\" has been modified to account for the deleted folder\n"
-"\"%s\"."
+"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\"."
+"“%s”."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/mail-config.ui.h:1
+#: ../src/mail/mail-config.ui.h:1
 msgid "Set custom junk header"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:4
+#: ../src/mail/mail-config.ui.h:4
 msgid ""
 "All new emails with header that matches given content will be automatically "
 "filtered as junk"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:5
+#: ../src/mail/mail-config.ui.h:5
 msgid "Header name"
 msgstr "Paĝokapa nomo"
 
-#: ../mail/mail-config.ui.h:6
+#: ../src/mail/mail-config.ui.h:6
 msgid "Header content"
 msgstr "Paĝokapa enhavo"
 
-#: ../mail/mail-config.ui.h:7
+#: ../src/mail/mail-config.ui.h:7
 msgid "Default Behavior"
 msgstr "Defaŭlta konduto"
 
-#: ../mail/mail-config.ui.h:8
+#: ../src/mail/mail-config.ui.h:8
 msgid "For_mat messages in HTML"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:9
+#: ../src/mail/mail-config.ui.h:10
 msgid "Automatically insert _emoticons"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:10
-msgid "Use Unicode characters for smile_ys"
-msgstr ""
+#: ../src/mail/mail-config.ui.h:11
+#, fuzzy
+#| msgid "Use Unicode characters for smileys."
+msgid "Use Un_icode characters for emoticons"
+msgstr "Uzi Un_ikodajn karakterojn por ridetoj"
 
-#: ../mail/mail-config.ui.h:11
+#: ../src/mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "Ĉiam petu kvitancon pri _legado"
 
-#: ../mail/mail-config.ui.h:12
+#: ../src/mail/mail-config.ui.h:13
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:13
+#: ../src/mail/mail-config.ui.h:14
 #, fuzzy
 #| msgid "Saving message to Outbox."
 msgid "Send messages through Outbo_x folder"
 msgstr "Konservi mesaĝon en _senditujo"
 
-#: ../mail/mail-config.ui.h:14
+#: ../src/mail/mail-config.ui.h:15
 msgid "Number of characters for word w_rapping:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:15
+#: ../src/mail/mail-config.ui.h:16
 #, fuzzy
 #| msgid "C_haracter set:"
 msgid "Ch_aracter encoding:"
 msgstr "_Signaro:"
 
-#: ../mail/mail-config.ui.h:16
+#: ../src/mail/mail-config.ui.h:17
 msgid "Replies and Forwards"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:17
+#: ../src/mail/mail-config.ui.h:18
 msgid "_Reply style:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:18
+#: ../src/mail/mail-config.ui.h:19
 msgid "_Forward style:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:19
-msgid "Start _typing at the bottom on replying"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:20
-msgid "_Keep signature above the original message on replying"
+#: ../src/mail/mail-config.ui.h:22
+msgid "Include si_gnature in new messages only"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:21
+#: ../src/mail/mail-config.ui.h:23
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:22
+#: ../src/mail/mail-config.ui.h:24
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:23
+#: ../src/mail/mail-config.ui.h:25
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:24
-#, fuzzy
-#| msgid "Attachment"
-#| msgid_plural "Attachments"
-msgctxt "ReplyForward"
-msgid "Attachment"
-msgstr "Aldonaĵo"
-
-#: ../mail/mail-config.ui.h:25
-msgctxt "ReplyForward"
-msgid "Inline (Outlook style)"
+#: ../src/mail/mail-config.ui.h:26
+msgid "_Wrap quoted text in replies"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:26
-msgctxt "ReplyForward"
-msgid "Quoted"
-msgstr "Citita"
-
-#: ../mail/mail-config.ui.h:27
-#| msgid "Do _Not Delete"
-msgctxt "ReplyForward"
-msgid "Do Not Quote"
-msgstr "Ne citi"
-
-#: ../mail/mail-config.ui.h:28
+#: ../src/mail/mail-config.ui.h:31
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:30
+#: ../src/mail/mail-config.ui.h:33
 msgid "Sig_natures"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:31
+#: ../src/mail/mail-config.ui.h:34
 msgid "Signatures"
 msgstr "Subskriboj"
 
-#: ../mail/mail-config.ui.h:32
+#: ../src/mail/mail-config.ui.h:35
 msgid "_Languages"
 msgstr "_Lingvoj"
 
-#: ../mail/mail-config.ui.h:33
+#: ../src/mail/mail-config.ui.h:36
 msgid "Languages Table"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:34
+#: ../src/mail/mail-config.ui.h:37
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: ../mail/mail-config.ui.h:36
+#: ../src/mail/mail-config.ui.h:39
 msgid "Check spelling while I _type"
 msgstr "Kontrolu la ortografion dum _tajpado"
 
-#: ../mail/mail-config.ui.h:38
+#: ../src/mail/mail-config.ui.h:41
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
 msgstr ""
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:40
+#: ../src/mail/mail-config.ui.h:43
 msgid "Sending a message with an _empty subject line"
 msgstr ""
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:42
+#: ../src/mail/mail-config.ui.h:45
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr ""
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:44
+#: ../src/mail/mail-config.ui.h:47
+msgid "Sending a message to many _To and CC recipients"
+msgstr ""
+
+#. This is in the context of: Ask for confirmation before...
+#: ../src/mail/mail-config.ui.h:49
 msgid "Sending a _private reply to a mailing list message"
 msgstr ""
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:46
+#: ../src/mail/mail-config.ui.h:51
 msgid "Sending a reply to a large _number of recipients"
 msgstr ""
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:48
+#: ../src/mail/mail-config.ui.h:53
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr ""
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:50
+#: ../src/mail/mail-config.ui.h:55
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:52
+#: ../src/mail/mail-config.ui.h:57
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:53
+#. Translators:
+#: ../src/mail/mail-config.ui.h:59
+msgid "Before composer _format changes from HTML to Plain Text"
+msgstr ""
+
+#: ../src/mail/mail-config.ui.h:60
 msgid "Confirmations"
 msgstr "Konfirmoj"
 
 #. Translators: Label of a frame with a list of folders for which to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:57
+#: ../src/mail/mail-config.ui.h:64
 #, fuzzy
 #| msgid "Search Folders"
 msgid "Use for Folders"
 msgstr "Serĉdosierujoj"
 
-#: ../mail/mail-config.ui.h:58
-msgid "A_dd"
-msgstr "_Aldoni"
-
-#: ../mail/mail-config.ui.h:60
-#, fuzzy
-#| msgid "_Remove"
-msgid "Re_move"
-msgstr "Fo_rigi"
-
 #. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:62
+#: ../src/mail/mail-config.ui.h:69
 msgid "Use for Recipients"
 msgstr ""
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../mail/mail-config.ui.h:64 ../modules/mail/em-composer-prefs.c:863
+#: ../src/mail/mail-config.ui.h:71 ../src/modules/mail/em-composer-prefs.c:875
 msgid "Account"
 msgstr "Konto"
 
-#: ../mail/mail-config.ui.h:65
+#: ../src/mail/mail-config.ui.h:72
 msgid "Send account overrides"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:66
+#: ../src/mail/mail-config.ui.h:73
 msgid ""
 "Assign which account should be used as a send account for respective folders "
 "or recipients, an override for usual send account detection. List of "
@@ -16660,341 +19119,372 @@ msgid ""
 "parts are compared separately."
 msgstr ""
 
-#: ../mail/mail-config.ui.h:67
+#: ../src/mail/mail-config.ui.h:74
 msgid "_Folder override has precedence over Recipient override"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:68
+#: ../src/mail/mail-config.ui.h:75
 #, fuzzy
 #| msgid "Current Account"
 msgid "Send Account"
 msgstr "Aktualo konto"
 
-#: ../mail/mail-config.ui.h:74 ../smime/gui/smime-ui.ui.h:1
+#: ../src/mail/mail-config.ui.h:81 ../src/smime/gui/smime-ui.ui.h:27
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:75 ../smime/gui/smime-ui.ui.h:2
+#: ../src/mail/mail-config.ui.h:82 ../src/smime/gui/smime-ui.ui.h:28
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:76
+#: ../src/mail/mail-config.ui.h:83
 msgid "Start up"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:77
+#: ../src/mail/mail-config.ui.h:84
 msgid "Check for new _messages on start"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:78
+#: ../src/mail/mail-config.ui.h:85
 msgid "Check for new messa_ges in all active accounts"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:79
+#: ../src/mail/mail-config.ui.h:86
 msgid "Message Display"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:80
+#: ../src/mail/mail-config.ui.h:87
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:81
+#: ../src/mail/mail-config.ui.h:88
 msgid "S_tandard Font:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:82
+#: ../src/mail/mail-config.ui.h:89
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:83
+#: ../src/mail/mail-config.ui.h:90
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:84
+#: ../src/mail/mail-config.ui.h:91
 msgid "Fix_ed Width Font:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:85
+#: ../src/mail/mail-config.ui.h:92
 #, fuzzy
 #| msgid "Mark Me_ssages as Read"
 msgid "_Mark messages as read after"
 msgstr "Marki me_saĝojn kiel legite"
 
-#: ../mail/mail-config.ui.h:87
+#: ../src/mail/mail-config.ui.h:94
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:88
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../src/mail/mail-config.ui.h:95
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Pick a color"
 msgstr "Elekti koloron"
 
-#: ../mail/mail-config.ui.h:89
+#: ../src/mail/mail-config.ui.h:96
 msgid "color"
 msgstr "koloro"
 
-#: ../mail/mail-config.ui.h:90
+#: ../src/mail/mail-config.ui.h:97
 msgid "Default character e_ncoding:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:91
+#: ../src/mail/mail-config.ui.h:98
 msgid "Apply the same _view settings to all folders"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:92
+#: ../src/mail/mail-config.ui.h:99
 msgid "F_all back to threading messages by subject"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:93
+#: ../src/mail/mail-config.ui.h:100
 msgid "Delete Mail"
 msgstr "Forigi mesaĝon"
 
-#: ../mail/mail-config.ui.h:94
+#: ../src/mail/mail-config.ui.h:101
 #, fuzzy
 #| msgid "Empty _Trash"
 msgid "Empty _trash folders"
 msgstr "Malplenigi _rubujon"
 
-#: ../mail/mail-config.ui.h:95
+#: ../src/mail/mail-config.ui.h:102
 msgid "Confirm _when expunging a folder"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:96
+#: ../src/mail/mail-config.ui.h:103
+msgid "Confirm when emptying a _Junk folder"
+msgstr ""
+
+#: ../src/mail/mail-config.ui.h:104
+msgid "Go to the previ_ous message after message deletion"
+msgstr ""
+
+#: ../src/mail/mail-config.ui.h:105
 msgid "Archive Mail"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:97
+#: ../src/mail/mail-config.ui.h:106
+msgid "Archive folder to use for On This Computer messages"
+msgstr ""
+
+#: ../src/mail/mail-config.ui.h:107
 #, fuzzy
 #| msgid "On This Computer"
 msgid "On This Computer A_rchive folder:"
 msgstr "Sur ĉi tiu komputilo a_rkivo-dosierujo:"
 
-#: ../mail/mail-config.ui.h:98
-msgid "Archive folder to use for On This Computer messages"
-msgstr ""
-
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:100
+#: ../src/mail/mail-config.ui.h:109
 msgid "_Show animated images"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:101
+#: ../src/mail/mail-config.ui.h:110
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:102
-msgid "Loading Images"
+#: ../src/mail/mail-config.ui.h:111
+msgid "Loading Remote Content"
+msgstr ""
+
+#: ../src/mail/mail-config.ui.h:112
+msgid "_Never load remote content from the Internet"
+msgstr ""
+
+#: ../src/mail/mail-config.ui.h:113
+msgid "_Load remote content only in messages from contacts"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:103
-msgid "_Never load images from the Internet"
+#: ../src/mail/mail-config.ui.h:114
+msgid "_Always load remote content from the Internet"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:104
-msgid "_Load images only in messages from contacts"
+#: ../src/mail/mail-config.ui.h:115
+msgid "Notify about _missing remote content in the message preview"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:105
-msgid "_Always load images from the Internet"
+#: ../src/mail/mail-config.ui.h:116
+#, fuzzy
+#| msgid "_Add"
+msgid "Add"
+msgstr "_Aldoni"
+
+#: ../src/mail/mail-config.ui.h:117
+#, fuzzy
+#| msgid "_Remove"
+msgid "Remove"
+msgstr "Fo_rigi"
+
+#: ../src/mail/mail-config.ui.h:118
+msgid "Allow for sites:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:106
+#: ../src/mail/mail-config.ui.h:119
+#, fuzzy
+#| msgid "All local folders"
+msgid "Allow for senders:"
+msgstr "Ĉiuj lokaj dosierujoj:"
+
+#: ../src/mail/mail-config.ui.h:120
 msgid "HTML Messages"
 msgstr "HTML-mesaĝoj"
 
-#: ../mail/mail-config.ui.h:107 ../mail/message-list.etspec.h:19
-msgid "Labels"
-msgstr "Etikedoj"
-
-#: ../mail/mail-config.ui.h:108
+#: ../src/mail/mail-config.ui.h:122
 msgid "Sender Photograph"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:109
+#: ../src/mail/mail-config.ui.h:123
 msgid "_Show the photograph of sender in the message preview"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:110
+#: ../src/mail/mail-config.ui.h:124
 msgid "Search gra_vatar.com for the photograph of sender"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:111
+#: ../src/mail/mail-config.ui.h:125
 msgid "Displayed Message Headers"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:112
+#: ../src/mail/mail-config.ui.h:126
 msgid "Mail Headers Table"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:113
-#: ../modules/addressbook/autocompletion-config.c:117
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
+#: ../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 "Dato/tempo-aranĝo"
 
-#: ../mail/mail-config.ui.h:115
+#: ../src/mail/mail-config.ui.h:129
 msgid "Check incoming _messages for junk"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:116
+#: ../src/mail/mail-config.ui.h:130
 #, fuzzy
 #| msgid "_Delete Message"
 msgid "_Delete junk messages"
 msgstr "_Forigi mesaĝojn"
 
-#: ../mail/mail-config.ui.h:117
+#: ../src/mail/mail-config.ui.h:131
 #, fuzzy
 #| msgid "Junk Test"
 msgid "Junk Test Options"
 msgstr "Rubaĵtesto"
 
-#: ../mail/mail-config.ui.h:118
+#: ../src/mail/mail-config.ui.h:132
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:119
+#: ../src/mail/mail-config.ui.h:133
 msgid "_Lookup in local address book only"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:120
+#: ../src/mail/mail-config.ui.h:134
 msgid "Check cu_stom headers for junk"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:122
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:224
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:174
+#: ../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 "Nenia ĉifro"
 
-#: ../mail/mail-config.ui.h:123
+#: ../src/mail/mail-config.ui.h:137
 msgid "TLS encryption"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:124
+#: ../src/mail/mail-config.ui.h:138
 msgid "SSL encryption"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:1
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-
-#: ../mail/mail-dialogs.ui.h:3
-msgid "_Flag:"
-msgstr ""
-
-#: ../mail/mail-dialogs.ui.h:4
-msgid "_Due By:"
-msgstr ""
-
-#. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:7
-msgid "Co_mpleted"
-msgstr ""
-
-#: ../mail/mail-dialogs.ui.h:8
+#: ../src/mail/mail-dialogs.ui.h:1
 msgid "Call"
 msgstr "Voko"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../src/mail/mail-dialogs.ui.h:2
 msgid "Do Not Forward"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../src/mail/mail-dialogs.ui.h:3
 msgid "Follow-Up"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../src/mail/mail-dialogs.ui.h:4
 msgid "For Your Information"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../src/mail/mail-dialogs.ui.h:5
 msgid "Forward"
 msgstr "Antaŭen"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../src/mail/mail-dialogs.ui.h:6
 msgid "No Response Necessary"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../src/mail/mail-dialogs.ui.h:10
 msgid "Reply to All"
-msgstr "Respondy al ĉiuj"
+msgstr "Respondi al ĉiuj"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../src/mail/mail-dialogs.ui.h:11
 msgid "Review"
 msgstr "Recenzo"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../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."
+msgstr ""
+
+#: ../src/mail/mail-dialogs.ui.h:14
+msgid "_Flag:"
+msgstr ""
+
+#: ../src/mail/mail-dialogs.ui.h:15
+msgid "_Due By:"
+msgstr ""
+
+#. Translators: Flag Completed
+#: ../src/mail/mail-dialogs.ui.h:18
+msgid "Co_mpleted"
+msgstr ""
+
+#: ../src/mail/mail-dialogs.ui.h:19
 msgid "License Agreement"
 msgstr "Permesilo"
 
-#: ../mail/mail-dialogs.ui.h:20
-msgid "_Tick this to accept the license agreement"
+#: ../src/mail/mail-dialogs.ui.h:21
+msgid "_Accept License"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:22
-msgid "_Accept License"
+#: ../src/mail/mail-dialogs.ui.h:22
+msgid "_Tick this to accept the license agreement"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../src/mail/mail-dialogs.ui.h:23
 msgid "Security Information"
 msgstr "Sekurecinformo"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../src/mail/mail-dialogs.ui.h:25
 msgid "Digital Signature"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../src/mail/mail-dialogs.ui.h:26
 msgid "Encryption"
 msgstr "Ĉifrado"
 
-#: ../mail/mail.error.xml.h:1
+#: ../src/mail/mail.error.xml.h:1
 msgid "Invalid authentication"
 msgstr "Nevalida aŭtentigo"
 
-#: ../mail/mail.error.xml.h:2
+#: ../src/mail/mail.error.xml.h:2
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:3
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "Via ensaluto al via servilo \"{0}\" kiel \"{0}\" malsukcesis."
+#: ../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 "Via ensaluto al via servilo “{0}” kiel “{0}” malsukcesis."
 
-#: ../mail/mail.error.xml.h:4
+#: ../src/mail/mail.error.xml.h:4
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:5
+#: ../src/mail/mail.error.xml.h:5
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:6
+#: ../src/mail/mail.error.xml.h:6
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
 "{0}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:9
+#: ../src/mail/mail.error.xml.h:9
 msgid "Are you sure you want to send a message without a subject?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:10
+#: ../src/mail/mail.error.xml.h:10
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:11
+#: ../src/mail/mail.error.xml.h:11
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:12
+#: ../src/mail/mail.error.xml.h:12
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -17004,7 +19494,7 @@ msgid ""
 "recipient. "
 msgstr ""
 
-#: ../mail/mail.error.xml.h:15
+#: ../src/mail/mail.error.xml.h:15
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -17012,122 +19502,130 @@ msgid ""
 "recipient."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:16
+#: ../src/mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:17
+#: ../src/mail/mail.error.xml.h:18
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:19
+#: ../src/mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:20
+#: ../src/mail/mail.error.xml.h:21
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:22
+#: ../src/mail/mail.error.xml.h:23
 msgid "Send private reply?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:23
+#: ../src/mail/mail.error.xml.h:24
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
 "you sure you want to proceed?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:24
+#: ../src/mail/mail.error.xml.h:25
 msgid "Reply _Privately"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:26
+#: ../src/mail/mail.error.xml.h:27
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
 "proceed?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:28
+#: ../src/mail/mail.error.xml.h:29
 msgid "Send reply to all recipients?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:29
+#: ../src/mail/mail.error.xml.h:30
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:30
+#: ../src/mail/mail.error.xml.h:31
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:31
+#: ../src/mail/mail.error.xml.h:32
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:32
+#: ../src/mail/mail.error.xml.h:33
 msgid "Use default drafts folder?"
 msgstr "Ĉu uzi defaŭltan malnet-dosierujon?"
 
-#: ../mail/mail.error.xml.h:33
+#: ../src/mail/mail.error.xml.h:34
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+"folder instead?\n"
+"\n"
+"The reported error was “{0}”."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:34
+#: ../src/mail/mail.error.xml.h:37
 msgid "Use _Default"
 msgstr "Uzi _defaŭlton"
 
-#: ../mail/mail.error.xml.h:35
+#: ../src/mail/mail.error.xml.h:38
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to permanently remove all the deleted messages in "
+#| "all folders?"
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder \"{0}\"?"
+"folder “{0}”?"
 msgstr ""
+"Ĉu vi certe volas daŭre forigi ĉiujn forigitaj mesaĝoj en ĉiuj mesaĝujoj "
+"“{0}”?"
 
-#: ../mail/mail.error.xml.h:36
+#: ../src/mail/mail.error.xml.h:39
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:37
+#: ../src/mail/mail.error.xml.h:40
 msgid "_Expunge"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:38
+#: ../src/mail/mail.error.xml.h:41
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr ""
 "Ĉu vi certe volas daŭre forigi ĉiujn forigitaj mesaĝoj en ĉiuj mesaĝujoj?"
 
-#: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1579
+#: ../src/mail/mail.error.xml.h:42
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1631
 msgid "_Empty Trash"
 msgstr "_Malplenigi rubujon"
 
-#: ../mail/mail.error.xml.h:40
+#: ../src/mail/mail.error.xml.h:43
 msgid "Opening too many messages at once may take a long time."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:41
+#: ../src/mail/mail.error.xml.h:44
 msgid "_Open Messages"
 msgstr "_Malfermi mesaĝoj"
 
-#: ../mail/mail.error.xml.h:42
+#: ../src/mail/mail.error.xml.h:45
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:43
+#: ../src/mail/mail.error.xml.h:46
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -17136,265 +19634,299 @@ msgstr ""
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:47
+#: ../src/mail/mail.error.xml.h:50
 msgid "Error while {0}."
 msgstr "Eraro dum {0}."
 
-#: ../mail/mail.error.xml.h:48
+#: ../src/mail/mail.error.xml.h:51
 msgid "Error while performing operation."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:49
+#: ../src/mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "Enigi pasvorton."
 
-#: ../mail/mail.error.xml.h:50
+#: ../src/mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:51
-msgid "Cannot save to directory \"{0}\"."
-msgstr ""
+#: ../src/mail/mail.error.xml.h:54
+#| msgid "Cannot save file \"{0}\"."
+msgid "Cannot save to directory “{0}”."
+msgstr "Ne eblis konservi dosierujon “{0}”."
 
-#: ../mail/mail.error.xml.h:52
-msgid "Cannot save to file \"{0}\"."
-msgstr ""
+#: ../src/mail/mail.error.xml.h:55
+#| msgid "Cannot save file \"{0}\"."
+msgid "Cannot save to file “{0}”."
+msgstr "Ne eblis konservi dosieron “{0}”."
 
-#: ../mail/mail.error.xml.h:53
-msgid "Cannot create the save directory, because \"{1}\""
+#: ../src/mail/mail.error.xml.h:56
+msgid "Cannot create the save directory, because “{1}”"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:54
+#: ../src/mail/mail.error.xml.h:57
 msgid "Cannot create temporary save directory."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:55
+#: ../src/mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:56
+#: ../src/mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:57
-msgid "Cannot delete folder \"{0}\"."
-msgstr "Ne eblis forigi dosierujon \"{0}\"."
+#: ../src/mail/mail.error.xml.h:60
+#| msgid "Cannot delete folder \"{0}\"."
+msgid "Cannot delete folder “{0}”."
+msgstr "Ne eblis forigi dosierujon “{0}”."
 
-#: ../mail/mail.error.xml.h:58
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Ne eblis forigi sistemdosierujon \"{0}\"."
+#: ../src/mail/mail.error.xml.h:61
+#| msgid "Cannot delete system folder \"{0}\"."
+msgid "Cannot delete system folder “{0}”."
+msgstr "Ne eblis forigi sistemdosierujon “{0}”."
 
-#: ../mail/mail.error.xml.h:59
+#: ../src/mail/mail.error.xml.h:62
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:60
+#: ../src/mail/mail.error.xml.h:63
 #, fuzzy
 #| msgid "Failed to open folder."
-msgid "Failed to expunge folder &quot;{0}&quot;."
-msgstr "Malsukcesis malfermi dosierujon &quot;{0}&quot;."
+msgid "Failed to expunge folder “{0}”."
+msgstr "Malsukcesis malfermi dosierujon “{0}”."
 
-#: ../mail/mail.error.xml.h:62
-#| msgid "Failed to open folder."
-msgid "Failed to refresh folder &quot;{0}&quot;."
-msgstr "Malsukcesis aktualigi dosierujon &quot;{0}&quot;."
+#: ../src/mail/mail.error.xml.h:65
+#, fuzzy
+#| msgid "Failed to refresh folder &quot;{0}&quot;."
+msgid "Failed to refresh folder “{0}”."
+msgstr "Malsukcesis aktualigi dosierujon “{0}”."
 
-#: ../mail/mail.error.xml.h:63
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr ""
+#: ../src/mail/mail.error.xml.h:66
+#, fuzzy
+#| msgid "Cannot delete system folder \"{0}\"."
+msgid "Cannot rename or move system folder “{0}”."
+msgstr "Ne eblis forigi sistemdosierujon “{0}”."
 
-#: ../mail/mail.error.xml.h:64
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
+#: ../src/mail/mail.error.xml.h:67
+msgid "Really delete folder “{0}” and all of its subfolders?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:65
+#: ../src/mail/mail.error.xml.h:68
 msgid ""
-"If you delete the folder, all of its contents and its subfolders' contents "
+"If you delete the folder, all of its contents and its subfolders’ contents "
 "will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:67
-msgid "Really delete folder \"{0}\"?"
-msgstr "Ĉu certe forigi dosierujon \"{0}\"?"
+#: ../src/mail/mail.error.xml.h:70
+#, fuzzy
+#| msgid "Really delete folder \"{0}\"?"
+msgid "Really unsubscribe folder “{0}”?"
+msgstr "Ĉu certe forigi dosierujon “{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."
+msgstr ""
+
+#: ../src/mail/mail.error.xml.h:72
+#, fuzzy
+#| msgid "_Unsubscribe"
+msgid "Do _Not Unsubscribe"
+msgstr "_Malaboni"
+
+#: ../src/mail/mail.error.xml.h:74
+#, fuzzy
+#| msgid "Really delete folder \"{0}\"?"
+msgid "Really delete folder “{0}”?"
+msgstr "Ĉu certe forigi dosierujon “{0}”?"
 
-#: ../mail/mail.error.xml.h:68
+#: ../src/mail/mail.error.xml.h:75
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:69
+#: ../src/mail/mail.error.xml.h:76
 msgid "These messages are not copies."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:70
+#: ../src/mail/mail.error.xml.h:77
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
 "Folder will delete the actual messages from the folder or folders in which "
 "they physically reside. Do you really want to delete these messages?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:71
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "Ne eblis alinomi \"{0}\" al \"{1}\"."
+#: ../src/mail/mail.error.xml.h:78
+#| msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgid "Cannot rename “{0}” to “{1}”."
+msgstr "Ne eblis alinomi “{0}” al “{1}”."
 
-#: ../mail/mail.error.xml.h:72
-msgid "A folder named \"{1}\" already exists. Please use a different name."
+#: ../src/mail/mail.error.xml.h:79
+msgid "A folder named “{1}” already exists. Please use a different name."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:73
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Ne eblis movi dosieron \"{0}\" al \"{1}\"."
+#: ../src/mail/mail.error.xml.h:80
+#, fuzzy
+#| msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgid "Cannot move folder “{0}” to “{1}”."
+msgstr "Ne eblis movi dosieron “{0}” al “{1}”."
 
-#: ../mail/mail.error.xml.h:74
-#| msgid "Cannot open source \"{2}\"."
+#: ../src/mail/mail.error.xml.h:81
 msgid "Cannot open source folder. Error: {2}"
 msgstr "Ne eblis malfermi font-dosierujon. Eraro: {2}"
 
-#: ../mail/mail.error.xml.h:75
-#| msgid "Cannot open target \"{2}\"."
+#: ../src/mail/mail.error.xml.h:82
 msgid "Cannot open target folder. Error: {2}"
 msgstr "Ne eblis malfermi cel-dosierujon. Eraro: {2}"
 
-#: ../mail/mail.error.xml.h:76
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Ne eblis kopii dosierujon \"{0}\" al \"{1}\"."
+#: ../src/mail/mail.error.xml.h:83
+#, fuzzy
+#| msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgid "Cannot copy folder “{0}” to “{1}”."
+msgstr "Ne eblis kopii dosierujon “{0}” al “{1}”."
 
-#: ../mail/mail.error.xml.h:77
-msgid "Cannot create folder \"{0}\"."
-msgstr "Ne eblis kreii dosierujon \"{0}\"."
+#: ../src/mail/mail.error.xml.h:84
+#, fuzzy
+#| msgid "Cannot create folder \"{0}\"."
+msgid "Cannot create folder “{0}”."
+msgstr "Ne eblis kreii dosierujon “{0}”."
 
-#: ../mail/mail.error.xml.h:78
-#| msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+#: ../src/mail/mail.error.xml.h:85
 msgid "Cannot open folder. Error: {1}"
 msgstr "Ne eblis malfermi dosierujon. Eraro: {1}"
 
-#: ../mail/mail.error.xml.h:79
+#: ../src/mail/mail.error.xml.h:86
 msgid "Cannot save changes to account."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:80
+#: ../src/mail/mail.error.xml.h:87
 msgid "You have not filled in all of the required information."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:81
+#: ../src/mail/mail.error.xml.h:88
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:82
-msgid "Are you sure you want to delete this account?"
-msgstr "Ĉu vi certe volas forigi ĉi tiun konton?"
+#: ../src/mail/mail.error.xml.h:89
+#, fuzzy
+#| msgid "Are you sure you want to delete this account?"
+msgid "Are you sure you want to delete account “{0}”?"
+msgstr "Ĉu vi certe volas forigi ĉi tiun konton “{0}”?"
 
-#: ../mail/mail.error.xml.h:83
+#: ../src/mail/mail.error.xml.h:90
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:84
+#: ../src/mail/mail.error.xml.h:91
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:85
+#: ../src/mail/mail.error.xml.h:92
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:87
+#: ../src/mail/mail.error.xml.h:94
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:88
+#: ../src/mail/mail.error.xml.h:95
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:89
+#: ../src/mail/mail.error.xml.h:96
 msgid "Do _Not Disable"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:90
-#: ../plugins/publish-calendar/publish-calendar.c:655
+#: ../src/mail/mail.error.xml.h:97
 msgid "_Disable"
 msgstr "_Elŝalti"
 
-#: ../mail/mail.error.xml.h:91
-msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+#: ../src/mail/mail.error.xml.h:98
+msgid "Cannot edit Search Folder “{0}” as it does not exist."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:92
+#: ../src/mail/mail.error.xml.h:99
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:94
-msgid "Cannot add Search Folder \"{0}\"."
-msgstr ""
+#: ../src/mail/mail.error.xml.h:101
+#, fuzzy
+#| msgid "Cannot delete folder \"{0}\"."
+msgid "Cannot add Search Folder “{0}”."
+msgstr "Ne eblis forigi dosierujon “{0}”."
 
-#: ../mail/mail.error.xml.h:95
-msgid "A folder named \"{0}\" already exists. Please use a different name."
+#: ../src/mail/mail.error.xml.h:102
+msgid "A folder named “{0}” already exists. Please use a different name."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:96
+#: ../src/mail/mail.error.xml.h:103
 msgid "Search Folders automatically updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:97
+#: ../src/mail/mail.error.xml.h:104
 msgid "Mail filters automatically updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:98
+#: ../src/mail/mail.error.xml.h:105
 msgid "Missing folder."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:99
+#: ../src/mail/mail.error.xml.h:106
 msgid "You must specify a folder."
 msgstr "Vi devas specifi dosierujon."
 
-#: ../mail/mail.error.xml.h:101
+#: ../src/mail/mail.error.xml.h:108
 msgid "You must name this Search Folder."
 msgstr "Vi devas nomi tiun serĉdosierujon."
 
-#: ../mail/mail.error.xml.h:102
-#| msgid "%d selected"
+#: ../src/mail/mail.error.xml.h:109
 msgid "No folder selected."
 msgstr "Neniu dosierujo estas elektita."
 
-#: ../mail/mail.error.xml.h:103
+#: ../src/mail/mail.error.xml.h:110
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:105
-msgid "Problem migrating old mail folder \"{0}\"."
+#: ../src/mail/mail.error.xml.h:112
+msgid "Problem migrating old mail folder “{0}”."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:106
+#: ../src/mail/mail.error.xml.h:113
 msgid ""
-"A non-empty folder at \"{1}\" already exists.\n"
+"A non-empty folder at “{1}” already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:110
+#: ../src/mail/mail.error.xml.h:117
 msgid "_Overwrite"
 msgstr "_Anstataŭigi"
 
-#: ../mail/mail.error.xml.h:111
+#: ../src/mail/mail.error.xml.h:118
 msgid "_Append"
 msgstr "_Postglui"
 
-#: ../mail/mail.error.xml.h:112
-msgid "Evolution's local mail format has changed."
+#: ../src/mail/mail.error.xml.h:119
+msgid "Evolution’s local mail format has changed."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:113
+#: ../src/mail/mail.error.xml.h:120
 msgid ""
-"Evolution's local mail format has changed from mbox to Maildir. Your local "
+"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"
@@ -17403,1031 +19935,1273 @@ msgid ""
 "sure there is enough disk space if you choose to migrate now."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:116
+#: ../src/mail/mail.error.xml.h:123
 msgid "_Exit Evolution"
 msgstr "Ĉ_esi Evolutionon"
 
-#: ../mail/mail.error.xml.h:117
+#: ../src/mail/mail.error.xml.h:124
 msgid "_Migrate Now"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:118
+#: ../src/mail/mail.error.xml.h:125
 msgid "Unable to read license file."
 msgstr "Ne eblis legi permesildosieron."
 
-#: ../mail/mail.error.xml.h:119
+#: ../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."
+"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."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:120
+#: ../src/mail/mail.error.xml.h:127
 msgid "Please wait."
 msgstr "Bonvole atendu."
 
-#: ../mail/mail.error.xml.h:121
+#: ../src/mail/mail.error.xml.h:128
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:122
+#: ../src/mail/mail.error.xml.h:129
 msgid ""
 "Failed to query server for a list of supported authentication mechanisms."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:123
+#: ../src/mail/mail.error.xml.h:130
+#| msgid "Detailed error message:"
+msgid "Failed to get server setup."
+msgstr ""
+
+#: ../src/mail/mail.error.xml.h:131
 msgid "Synchronize folders locally for offline usage?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:124
+#: ../src/mail/mail.error.xml.h:132
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:125
+#: ../src/mail/mail.error.xml.h:133
 msgid "Do _Not Synchronize"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:126
+#: ../src/mail/mail.error.xml.h:134
 msgid "_Synchronize"
 msgstr "_Sinkronigi"
 
-#: ../mail/mail.error.xml.h:127
+#: ../src/mail/mail.error.xml.h:135
 msgid "Do you want to mark all messages as read?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:128
+#: ../src/mail/mail.error.xml.h:136
 msgid "This will mark all messages as read in the selected folder."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:129
+#: ../src/mail/mail.error.xml.h:137
 msgid "Also mark messages in subfolders?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:130
+#: ../src/mail/mail.error.xml.h:138
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:131
+#: ../src/mail/mail.error.xml.h:139
 msgid "In Current Folder and _Subfolders"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:132
+#: ../src/mail/mail.error.xml.h:140
 msgid "In Current _Folder Only"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:133
+#: ../src/mail/mail.error.xml.h:141
 msgid "Should Evolution close this window when replying or forwarding?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:134
+#: ../src/mail/mail.error.xml.h:142
 #, fuzzy
 #| msgid "_Always"
 msgid "_Yes, Always"
 msgstr "Ĉi_am"
 
-#: ../mail/mail.error.xml.h:135
-#| msgid "Never"
+#: ../src/mail/mail.error.xml.h:143
 msgid "_No, Never"
 msgstr "_Ne, neniam"
 
-#: ../mail/mail.error.xml.h:136
+#: ../src/mail/mail.error.xml.h:144
 #, fuzzy
 #| msgid "Copying folder %s"
 msgid "Copy folder in folder tree."
 msgstr "Kopii dosierujon en dosieran arbon."
 
-#: ../mail/mail.error.xml.h:137
-#| msgid "Are you sure you want to delete the memo '{0}'?"
-msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
-msgstr "Ĉu vi certe volas kopii dosierujon '{0}' al dosierujo '{1}'?"
+#: ../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 "Ĉu vi certe volas kopii dosierujon “{0}” al dosierujo “{1}”?"
+
+#: ../src/mail/mail.error.xml.h:147
+#, fuzzy
+#| msgid "Do _not Send"
+msgid "Do _not copy"
+msgstr "_Ne sendi"
 
-#: ../mail/mail.error.xml.h:140
-msgid "_Always"
+#: ../src/mail/mail.error.xml.h:148
+#, fuzzy
+#| msgid "_Always"
+msgid "_Always copy"
 msgstr "Ĉi_am"
 
-#: ../mail/mail.error.xml.h:141
-msgid "N_ever"
+#: ../src/mail/mail.error.xml.h:149
+#, fuzzy
+#| msgid "N_ever"
+msgid "N_ever copy"
 msgstr "N_eniam"
 
-#: ../mail/mail.error.xml.h:142
+#: ../src/mail/mail.error.xml.h:150
 #, fuzzy
 #| msgid "Moving folder %s"
 msgid "Move folder in folder tree."
 msgstr "Movi dosierujon en dosieran arbon."
 
-#: ../mail/mail.error.xml.h:143
-#| msgid "Are you sure you want to delete the '{0}' task?"
-msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
-msgstr "Ĉu vi certe volas movi dosierujon '{0}' al dosierujo '{1}'?"
+#: ../src/mail/mail.error.xml.h:151
+#, fuzzy
+#| 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 "Ĉu vi certe volas movi dosierujon “{0}” al dosierujo “{1}”?"
 
-#: ../mail/mail.error.xml.h:144
+#: ../src/mail/mail.error.xml.h:153
+#, fuzzy
+#| msgid "Do _not Send"
+msgid "Do _not move"
+msgstr "_Ne sendi"
+
+#: ../src/mail/mail.error.xml.h:154
+#, fuzzy
+#| msgid "_Always"
+msgid "_Always move"
+msgstr "Ĉi_am"
+
+#: ../src/mail/mail.error.xml.h:155
+#, fuzzy
+#| msgid "N_ever"
+msgid "N_ever move"
+msgstr "N_eniam"
+
+#: ../src/mail/mail.error.xml.h:156
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:145
+#: ../src/mail/mail.error.xml.h:157
 msgid "Please enable the account or send using another account."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:146
+#: ../src/mail/mail.error.xml.h:158
+msgid "This message cannot be sent because there is no mail account configured"
+msgstr ""
+
+#: ../src/mail/mail.error.xml.h:159
+msgid ""
+"There had not been found any active mail account to send the message. Create "
+"or enable one first, please."
+msgstr ""
+
+#: ../src/mail/mail.error.xml.h:160
 msgid "Mail Deletion Failed"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:147
+#: ../src/mail/mail.error.xml.h:161
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:148
-msgid "\"Check Junk\" Failed"
+#: ../src/mail/mail.error.xml.h:162
+msgid "“Check Junk” Failed"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:149
-msgid "\"Report Junk\" Failed"
+#: ../src/mail/mail.error.xml.h:163
+msgid "“Report Junk” Failed"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:150
-msgid "\"Report Not Junk\" Failed"
+#: ../src/mail/mail.error.xml.h:164
+msgid "“Report Not Junk” Failed"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:151
+#: ../src/mail/mail.error.xml.h:165
 msgid "Remove duplicate messages?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:152
+#: ../src/mail/mail.error.xml.h:166
 msgid "No duplicate messages found."
 msgstr ""
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:154
-msgid "Folder '{0}' doesn't contain any duplicate message."
+#: ../src/mail/mail.error.xml.h:168
+msgid "Folder “{0}” doesn’t contain any duplicate message."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:155
-#| msgid "Because &quot;{1}&quot;."
-msgid "Failed to connect account &quot;{0}&quot;."
-msgstr "Malsukcesis konekti konton &quot;{0}&quot;."
+#: ../src/mail/mail.error.xml.h:169
+#, fuzzy
+#| msgid "Failed to connect account &quot;{0}&quot;."
+msgid "Failed to connect account “{0}”."
+msgstr "Malsukcesis konekti konton “{0}”."
 
-#: ../mail/mail.error.xml.h:156
-msgid "Failed to disconnect account &quot;{0}&quot;."
-msgstr ""
+#: ../src/mail/mail.error.xml.h:170
+#, fuzzy
+#| msgid "Failed to connect account &quot;{0}&quot;."
+msgid "Failed to disconnect account “{0}”."
+msgstr "Malsukcesis konekti konton “{0}”."
 
-#: ../mail/mail.error.xml.h:157
-#| msgid "Failed to unsubscribe from folder."
-msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
-msgstr "Malsukcesis malaboni de dosierujo &quot;{0}&quot;."
+#: ../src/mail/mail.error.xml.h:171
+#, fuzzy
+#| msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
+msgid "Failed to unsubscribe from folder “{0}”."
+msgstr "Malsukcesis malaboni de dosierujo “{0}”."
 
-#: ../mail/mail.error.xml.h:158
+#: ../src/mail/mail.error.xml.h:172
 msgid "Unable to retrieve message."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:159
+#: ../src/mail/mail.error.xml.h:173
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:160
+#: ../src/mail/mail.error.xml.h:174
 msgid "Message is not available in offline mode."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:161
+#: ../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-&gt;Download Messages for Offline Usage, when this "
+"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."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:162
+#: ../src/mail/mail.error.xml.h:176
 msgid "Failed to open folder."
 msgstr "Malsukcesis malfermi dosierujon."
 
-#: ../mail/mail.error.xml.h:164
+#: ../src/mail/mail.error.xml.h:178
 msgid "Failed to find duplicate messages."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:165
+#: ../src/mail/mail.error.xml.h:179
 msgid "Failed to retrieve messages."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:166
-#| msgid "Timeout for marking message as seen."
+#: ../src/mail/mail.error.xml.h:180
 msgid "Failed to mark messages as read."
 msgstr "Malsukcesis marki mesaĝojn kiel legitaj."
 
-#: ../mail/mail.error.xml.h:167
+#: ../src/mail/mail.error.xml.h:181
 msgid "Failed to remove attachments from messages."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:168
+#: ../src/mail/mail.error.xml.h:182
 msgid "Failed to download messages for offline viewing."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:169
+#: ../src/mail/mail.error.xml.h:183
 msgid "Failed to save messages to disk."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:170
+#: ../src/mail/mail.error.xml.h:184
 msgid "Hidden file is attached."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:171
+#: ../src/mail/mail.error.xml.h:185
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:172
-#| msgid "Print this calendar"
+#: ../src/mail/mail.error.xml.h:186
 msgid "Printing failed."
 msgstr "Presado malsukcesis."
 
-#: ../mail/mail.error.xml.h:173
-#| msgid "Because &quot;{1}&quot;."
-msgid "The printer replied &quot;{0}&quot;."
-msgstr "La presilo respondis &quot;{0}&quot;."
+#: ../src/mail/mail.error.xml.h:187
+#, fuzzy
+#| msgid "The printer replied &quot;{0}&quot;."
+msgid "The printer replied “{0}”."
+msgstr "La presilo respondis “{0}”."
 
-#: ../mail/mail.error.xml.h:174
-#| msgid "Could not open destination"
+#: ../src/mail/mail.error.xml.h:188
 msgid "Could not perform this operation on {0}."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:175
+#: ../src/mail/mail.error.xml.h:189
 msgid "You must be working online to complete this operation."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:176
-msgid "Message from &quot;{0}&quot; account:"
+#: ../src/mail/mail.error.xml.h:190
+msgid "Message from “{0}” account:"
+msgstr ""
+
+#: ../src/mail/mail.error.xml.h:191
+msgid "Failed to mark thread to be ignored in folder “{0}”"
+msgstr ""
+
+#: ../src/mail/mail.error.xml.h:192
+msgid "Failed to unmark thread from being ignored in folder “{0}”"
+msgstr ""
+
+#: ../src/mail/mail.error.xml.h:193
+msgid "Failed to mark subthread to be ignored in folder “{0}”"
+msgstr ""
+
+#: ../src/mail/mail.error.xml.h:194
+msgid "Failed to unmark subthread from being ignored in folder “{0}”"
+msgstr ""
+
+#: ../src/mail/mail.error.xml.h:195
+msgid "Remote content download had been blocked for this message."
+msgstr ""
+
+#: ../src/mail/mail.error.xml.h:196
+msgid ""
+"You can download remote content manually, or set to remember to download "
+"remote content for this sender or used sites."
+msgstr ""
+
+#. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
+#: ../src/mail/mail.error.xml.h:198
+#, fuzzy
+#| msgid " (Completed "
+msgid "{0}, Completed on {1}"
+msgstr "{0}, Plenumite je {1}"
+
+#. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
+#: ../src/mail/mail.error.xml.h:200
+msgid "{0} by {1}"
+msgstr ""
+
+#. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
+#: ../src/mail/mail.error.xml.h:202
+msgid "Overdue: {0} by {1}"
+msgstr ""
+
+#: ../src/mail/mail.error.xml.h:204
+#, fuzzy
+#| msgid "This event has been changed."
+msgid "This message note has been changed, but has not been saved."
+msgstr "Tiu evento estas ŝanĝita."
+
+#. Translators: {0} is the name of the folder where the delete of the message note failed.
+#: ../src/mail/mail.error.xml.h:207
+#, fuzzy
+#| msgid "Failed to delete an event in the calendar “{0}”"
+msgid "Failed to delete message note in folder “{0}”"
+msgstr "Malsukcesis forigi eventon en la kalendaro “{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}”"
+msgstr ""
+
+#: ../src/mail/mail.error.xml.h:210
+msgid "Something has gone wrong when displaying the message"
+msgstr ""
+
+#: ../src/mail/mail.error.xml.h:211
+msgid ""
+"A WebKitWebProcess crashed when displaying the message. You can try again by "
+"moving to another message and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:177
-msgid "Failed to mark thread to be ignored in folder '{0}'"
+#: ../src/mail/mail.error.xml.h:212
+msgid "Something has gone wrong when displaying the signature"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:178
-msgid "Failed to unmark thread from being ignored in folder '{0}'"
+#: ../src/mail/mail.error.xml.h:213
+msgid ""
+"A WebKitWebProcess crashed when displaying the signature. You can try again "
+"by moving to another signature and back. If the issue persists, please file "
+"a bug report in the GNOME bugzilla."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:179
-msgid "Failed to mark subthread to be ignored in folder '{0}'"
+#: ../src/mail/mail.error.xml.h:214
+#, fuzzy
+#| 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 ""
+"Ĉu vi certe volas daŭre forigi ĉiujn forigitaj mesaĝoj en ĉiuj mesaĝujoj?"
 
-#: ../mail/mail.error.xml.h:180
-#| msgid "Failed to unsubscribe from folder."
-msgid "Failed to unmark subthread from being ignored in folder '{0}'"
+#: ../src/mail/mail.error.xml.h:215
+msgid ""
+"These messages will be shown in the Trash folder, where they can be "
+"permanently deleted later."
 msgstr ""
 
-#: ../mail/mail-send-recv.c:191
+#: ../src/mail/mail.error.xml.h:216
+#, fuzzy
+#| msgid "_Not Junk"
+msgid "_Empty Junk"
+msgstr "_Ne rubaĵo"
+
+#: ../src/mail/mail.error.xml.h:217
+#, fuzzy
+#| msgid "Failed to open folder."
+msgid "Failed to empty Junk folder “{0}”"
+msgstr "Malsukcesis malplenigi dosierujon “{0}”"
+
+#: ../src/mail/mail-send-recv.c:192
 msgid "Canceling..."
 msgstr ""
 
-#: ../mail/mail-send-recv.c:631
+#: ../src/mail/mail-send-recv.c:640
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:645
+#: ../src/mail/mail-send-recv.c:654
 msgid "Cancel _All"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:1249
+#: ../src/mail/mail-send-recv.c:744 ../src/mail/mail-send-recv.c:1262
 msgid "Updating..."
 msgstr "Ĝisdatigante..."
 
-#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:817
+#: ../src/mail/mail-send-recv.c:744 ../src/mail/mail-send-recv.c:826
 msgid "Waiting..."
 msgstr "Atendante..."
 
-#: ../mail/mail-send-recv.c:1220
+#: ../src/mail/mail-send-recv.c:1228
 #, c-format
-msgid "Checking for new mail at '%s'"
+msgid "Checking for new mail at “%s”"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:1434
+#: ../src/mail/mail-send-recv.c:1455
 #, c-format
-msgid "Deleting junk and expunging trash at '%s'"
+msgid "Deleting junk and expunging trash at “%s”"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:1436
+#: ../src/mail/mail-send-recv.c:1457
 #, fuzzy, c-format
 #| msgid "Meeting - %s"
-msgid "Deleting junk at '%s'"
-msgstr "Forigante trudaĵon ĉe '%s'"
+msgid "Deleting junk at “%s”"
+msgstr "Forigante trudaĵon ĉe “%s”"
 
-#: ../mail/mail-send-recv.c:1438
+#: ../src/mail/mail-send-recv.c:1459
 #, fuzzy, c-format
 #| msgid "Opening tasks at %s"
-msgid "Expunging trash at '%s'"
-msgstr "Malfermante taskojn ĉe '%s'"
+msgid "Expunging trash at “%s”"
+msgstr "Malfermante taskojn ĉe “%s”"
 
-#: ../mail/mail-vfolder-ui.c:66
+#: ../src/mail/mail-vfolder-ui.c:67
 msgid "Search Folders"
 msgstr "Serĉdosierujoj"
 
-#: ../mail/mail-vfolder-ui.c:146
+#: ../src/mail/mail-vfolder-ui.c:147
 msgid "Edit Search Folder"
 msgstr ""
 
-#: ../mail/mail-vfolder-ui.c:267
+#: ../src/mail/mail-vfolder-ui.c:268
 msgid "New Search Folder"
 msgstr ""
 
-#: ../mail/message-list.c:291
+#: ../src/mail/message-list.c:301
 msgid "Unseen"
 msgstr "Nevidite"
 
-#: ../mail/message-list.c:292
+#: ../src/mail/message-list.c:302
 msgid "Seen"
 msgstr "Vidite"
 
-#: ../mail/message-list.c:293
+#: ../src/mail/message-list.c:303
 msgid "Answered"
 msgstr "Respondite"
 
-#: ../mail/message-list.c:294
+#: ../src/mail/message-list.c:304
 msgid "Forwarded"
 msgstr "Plusendite"
 
-#: ../mail/message-list.c:295
+#: ../src/mail/message-list.c:305
 msgid "Multiple Unseen Messages"
 msgstr "Multaj neviditaj mesaĝoj"
 
-#: ../mail/message-list.c:296
+#: ../src/mail/message-list.c:306
 msgid "Multiple Messages"
 msgstr ""
 
-#: ../mail/message-list.c:309
+#: ../src/mail/message-list.c:319
 msgid "Lowest"
 msgstr "Plej malalte"
 
-#: ../mail/message-list.c:310
+#: ../src/mail/message-list.c:320
 msgid "Lower"
 msgstr "Pli malalte"
 
-#: ../mail/message-list.c:314
+#: ../src/mail/message-list.c:324
 msgid "Higher"
 msgstr "Pli alte"
 
-#: ../mail/message-list.c:315
+#: ../src/mail/message-list.c:325
 msgid "Highest"
 msgstr "Plej alte"
 
-#: ../mail/message-list.c:459 ../mail/message-list.c:6041
+#: ../src/mail/message-list.c:471 ../src/mail/message-list.c:6304
 msgid "Generating message list"
 msgstr ""
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:2041 ../modules/itip-formatter/itip-view.c:237
+#: ../src/mail/message-list.c:2075
+#: ../src/modules/itip-formatter/itip-view.c:267
 msgid "Today %l:%M %p"
 msgstr "Hodiaŭ %l:%M %p"
 
-#: ../mail/message-list.c:2050
+#: ../src/mail/message-list.c:2084
 msgid "Yesterday %l:%M %p"
 msgstr "Hieraŭ %l:%M %p"
 
-#: ../mail/message-list.c:2062
+#: ../src/mail/message-list.c:2096
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:2070
+#: ../src/mail/message-list.c:2104
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:2072
+#: ../src/mail/message-list.c:2106
 msgid "%b %d %Y"
 msgstr "%d-an de %b %Y"
 
-#: ../mail/message-list.c:2967
+#: ../src/mail/message-list.c:3063
 msgid "Select all visible messages"
 msgstr "Elekti ĉiujn videblajn mesaĝojn"
 
-#: ../mail/message-list.c:3629 ../mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:3782 ../src/mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Mesaĝoj"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4985
+#: ../src/mail/message-list.c:5214
 msgid "Follow-up"
 msgstr ""
 
-#: ../mail/message-list.c:5978
+#: ../src/mail/message-list.c:6243
 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."
+"running a new search either by clearing it with Search→Clear menu item or by "
+"changing the query above."
 msgstr ""
 
-#: ../mail/message-list.c:5986
+#: ../src/mail/message-list.c:6251
 msgid "There are no messages in this folder."
 msgstr ""
 
-#: ../mail/message-list.etspec.h:2
+#: ../src/mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Flagita"
 
-#: ../mail/message-list.etspec.h:8
+#: ../src/mail/message-list.etspec.h:8
 msgid "Received"
 msgstr ""
 
-#: ../mail/message-list.etspec.h:11
+#: ../src/mail/message-list.etspec.h:11
 msgid "Flag Status"
 msgstr ""
 
-#: ../mail/message-list.etspec.h:12
+#: ../src/mail/message-list.etspec.h:12
 msgid "Follow Up Flag"
 msgstr ""
 
-#: ../mail/message-list.etspec.h:13
+#: ../src/mail/message-list.etspec.h:13
 msgid "Due By"
 msgstr ""
 
-#: ../mail/message-list.etspec.h:18
+#: ../src/mail/message-list.etspec.h:18
 #, fuzzy
 #| msgid "Messages"
 msgid "Messages To"
 msgstr "Mesaĝoj"
 
-#: ../mail/message-list.etspec.h:20
-msgid "Subject - Trimmed"
+#: ../src/mail/message-list.etspec.h:20
+msgid "Subject — Trimmed"
 msgstr ""
 
-#: ../mail/searchtypes.xml.in.h:23 ../mail/vfoldertypes.xml.in.h:23
+#: ../src/mail/message-list.etspec.h:21
+#: ../src/plugins/save-calendar/csv-format.c:372
+msgid "UID"
+msgstr "UID"
+
+#: ../src/mail/searchtypes.xml.in.h:23 ../src/mail/vfoldertypes.xml.in.h:23
 #, fuzzy
 #| msgid "Any Category"
 msgid "Any header"
 msgstr "Iu kategorio"
 
-#: ../mail/searchtypes.xml.in.h:55
+#: ../src/mail/searchtypes.xml.in.h:57
 msgid "Subject or Addresses contains"
 msgstr ""
 
-#: ../mail/searchtypes.xml.in.h:56
-#: ../modules/mail/e-mail-shell-view-actions.c:2070
+#: ../src/mail/searchtypes.xml.in.h:58
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2179
 msgid "Recipients contain"
 msgstr ""
 
-#: ../mail/searchtypes.xml.in.h:57
-#: ../modules/mail/e-mail-shell-view-actions.c:2063
+#: ../src/mail/searchtypes.xml.in.h:59
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2172
 msgid "Message contains"
 msgstr ""
 
-#: ../mail/searchtypes.xml.in.h:58
-#: ../modules/mail/e-mail-shell-view-actions.c:2084
+#: ../src/mail/searchtypes.xml.in.h:60
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2193
 msgid "Subject contains"
 msgstr ""
 
-#: ../mail/searchtypes.xml.in.h:59
-#: ../modules/mail/e-mail-shell-view-actions.c:2077
+#: ../src/mail/searchtypes.xml.in.h:61
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2186
 msgid "Sender contains"
 msgstr ""
 
-#: ../mail/searchtypes.xml.in.h:60
-#: ../modules/mail/e-mail-shell-view-actions.c:2049
+#: ../src/mail/searchtypes.xml.in.h:62
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2158
 msgid "Body contains"
 msgstr ""
 
-#: ../mail/searchtypes.xml.in.h:61
-#: ../modules/mail/e-mail-shell-view-actions.c:2056
+#: ../src/mail/searchtypes.xml.in.h:63
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2165
 #, fuzzy
 #| msgid "Expression"
 msgid "Free form expression"
 msgstr "Esprimo"
 
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:275
+#, fuzzy
+#| msgid "Edit Location"
+msgid "Edit Collection"
+msgstr "Redakti lokon"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:312
+#, fuzzy
+#| msgid "Search Folders"
+msgid "Use for"
+msgstr "Serĉdosierujoj"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:316
+#: ../src/plugins/pst-import/pst-importer.c:522
+msgid "_Mail"
+msgstr "_Retpoŝto"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:327
+#| msgid "Calendar"
+msgid "C_alendar"
+msgstr "K_alendaro"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:428
+#: ../src/modules/addressbook/e-book-shell-backend.c:262
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:137
+msgid "New Address Book"
+msgstr "Nova adresaro"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:436
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:185
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:178
+msgid "New Memo List"
+msgstr "Nova notolisto"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:480
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:210
+msgid "Address Book Properties"
+msgstr "Adresaro-agordoj"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:484
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:283
+msgid "Calendar Properties"
+msgstr "Kalendar-ecoj"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:488
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:250
+msgid "Memo List Properties"
+msgstr "Ecoj de notlisto"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:492
+#: ../src/modules/calendar/e-task-shell-view-actions.c:274
+msgid "Task List Properties"
+msgstr "Tasklist-ecoj"
+
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:174
+#| msgid "Go Back"
+msgid "_Back"
+msgstr "_Reen"
+
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:195
+msgid "_Browse"
+msgstr ""
+
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:197
+msgid ""
+"Browse a WebDAV (CalDAV or CardDAV) server and create, edit or delete "
+"address books, calendars, memo lists or task lists there"
+msgstr ""
+
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
-#: ../modules/addressbook/autocompletion-config.c:123
-#: ../modules/mail/em-mailer-prefs.c:1234
+#: ../src/modules/addressbook/autocompletion-config.c:124
+#: ../src/modules/mail/em-mailer-prefs.c:1568
 msgid "_Table column:"
 msgstr ""
 
-#: ../modules/addressbook/autocompletion-config.c:126
-msgid "Address formatting"
+#: ../src/modules/addressbook/autocompletion-config.c:130
+msgid "_Format address according to standard of its destination country"
 msgstr ""
 
-#: ../modules/addressbook/autocompletion-config.c:129
-msgid "_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 "Malfermi _mapon per"
+
+#. Translators: This is part of "Open maps with OpenStreetMap"
+#: ../src/modules/addressbook/autocompletion-config.c:150
+msgctxt "OpenMap"
+msgid "OpenStreetMap"
 msgstr ""
 
-#: ../modules/addressbook/autocompletion-config.c:137
+#. 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"
+
+#: ../src/modules/addressbook/autocompletion-config.c:169
 msgid "Autocompletion"
 msgstr "Aŭtomata kompletigo"
 
-#: ../modules/addressbook/autocompletion-config.c:140
+#: ../src/modules/addressbook/autocompletion-config.c:172
 msgid "Always _show address of the autocompleted contact"
 msgstr ""
 
-#: ../modules/addressbook/eab-composer-util.c:147
+#: ../src/modules/addressbook/eab-composer-util.c:98
 msgid "Multiple vCards"
 msgstr ""
 
-#: ../modules/addressbook/eab-composer-util.c:155
+#: ../src/modules/addressbook/eab-composer-util.c:106
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard por %s"
 
-#: ../modules/addressbook/eab-composer-util.c:167
-#: ../modules/addressbook/eab-composer-util.c:194
+#: ../src/modules/addressbook/eab-composer-util.c:117
+#: ../src/modules/addressbook/eab-composer-util.c:144
 #, c-format
 msgid "Contact information"
 msgstr "Kontaktinformo"
 
-#: ../modules/addressbook/eab-composer-util.c:196
+#: ../src/modules/addressbook/eab-composer-util.c:146
 #, c-format
 msgid "Contact information for %s"
 msgstr "Kontaktinformo por %s"
 
-#: ../modules/addressbook/e-book-shell-backend.c:258
-#: ../modules/addressbook/e-book-shell-view-actions.c:124
-msgid "New Address Book"
-msgstr "Nova adresaro"
-
-#: ../modules/addressbook/e-book-shell-backend.c:267
+#: ../src/modules/addressbook/e-book-shell-backend.c:271
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakto"
 
-#: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:1023
+#: ../src/modules/addressbook/e-book-shell-backend.c:273
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1049
 msgid "Create a new contact"
 msgstr "Krei novan kontakton"
 
-#: ../modules/addressbook/e-book-shell-backend.c:274
+#: ../src/modules/addressbook/e-book-shell-backend.c:278
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Kontakt_listo"
 
-#: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:1030
+#: ../src/modules/addressbook/e-book-shell-backend.c:280
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1056
 msgid "Create a new contact list"
 msgstr "Krei novan kontaktliston"
 
-#: ../modules/addressbook/e-book-shell-backend.c:284
+#: ../src/modules/addressbook/e-book-shell-backend.c:288
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Adresaro"
 
-#: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:946
+#: ../src/modules/addressbook/e-book-shell-backend.c:290
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:972
 msgid "Create a new address book"
 msgstr "Krei novan adresaron"
 
-#: ../modules/addressbook/e-book-shell-backend.c:314
-msgid "Certificates"
-msgstr "Atestiloj"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:197
-msgid "Address Book Properties"
-msgstr "Adresaro-agordoj"
-
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:520
-#: ../modules/addressbook/e-book-shell-view-actions.c:816
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:534
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:835
 msgid "Save as vCard"
 msgstr "Konservi kiel vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:942
 msgid "Co_py All Contacts To..."
 msgstr "Ko_pii ĉiujn kontaktojn al..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:925
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Copy the contacts of the selected address book to another"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:930
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:949
 msgid "D_elete Address Book"
 msgstr "_Forigi adresaron"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:932
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:951
 msgid "Delete the selected address book"
 msgstr "Forigi la elektitan adresaron"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:937
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:956
+#, fuzzy
+#| msgid "_Add to Address Book..."
+msgid "_Manage Address Book groups..."
+msgstr "_Aldoni al adresaro..."
+
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:958
+#: ../src/modules/calendar/e-task-shell-view-actions.c:719
+msgid "Manage task list groups order and visibility"
+msgstr ""
+
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:963
 msgid "Mo_ve All Contacts To..."
 msgstr "Mo_vi ĉiujn kontaktojn al..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:939
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:965
 msgid "Move the contacts of the selected address book to another"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:944
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:970
 msgid "_New Address Book"
 msgstr "_Nova adresaro"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:951
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:977
 msgid "Address _Book Properties"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:953
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:979
 msgid "Show properties of the selected address book"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
-#: ../modules/calendar/e-cal-shell-view-actions.c:1254
-#: ../modules/calendar/e-memo-shell-view-actions.c:578
-#: ../modules/calendar/e-task-shell-view-actions.c:703
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:984
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:612
+#: ../src/modules/calendar/e-task-shell-view-actions.c:738
 msgid "Re_fresh"
 msgstr "_Aktualigi"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:960
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:986
 #, fuzzy
 #| msgid "Rename the selected address book"
 msgid "Refresh the selected address book"
 msgstr "Alinomi la elektitan adresaron"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:965
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:991
 msgid "Address Book _Map"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:967
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:993
 msgid "Show map with all contacts from selected address book"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:972
-#: ../modules/calendar/e-cal-shell-view-actions.c:1261
-#: ../modules/calendar/e-memo-shell-view-actions.c:585
-#: ../modules/calendar/e-task-shell-view-actions.c:710
-#: ../modules/mail/e-mail-shell-view-actions.c:1671
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:998
+#: ../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
 msgid "_Rename..."
 msgstr "_Alinomigi..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:974
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1000
 msgid "Rename the selected address book"
 msgstr "Alinomi la elektitan adresaron"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:981
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1007
 msgid "Stop loading"
 msgstr "Ĉesigi ŝargadon"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:986
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1012
 msgid "_Copy Contact To..."
 msgstr "_Kopii kontakton al..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:988
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1014
 msgid "Copy selected contacts to another address book"
 msgstr "Kopii elektitajn kontaktojn al alia adresaro"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:993
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1019
 msgid "_Delete Contact"
 msgstr "_Forigi kontakton"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1000
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1026
 msgid "_Find in Contact..."
 msgstr "_Serĉi en kontakto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1002
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1028
 msgid "Search for text in the displayed contact"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1007
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1033
 msgid "_Forward Contact..."
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1009
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1035
 msgid "Send selected contacts to another person"
 msgstr "Sendi elektitajn kontaktojn al alia persono"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1014
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1040
 msgid "_Move Contact To..."
 msgstr "_Movi kontakton al..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1016
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1042
 msgid "Move selected contacts to another address book"
 msgstr "Movi elektitajn kontaktojn al alia adresaro"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1021
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1047
 msgid "_New Contact..."
 msgstr "_Nova kontakto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1028
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1054
 msgid "New Contact _List..."
 msgstr "Nova kontakt_listo..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1061
 msgid "_Open Contact"
 msgstr "_Malfermi kontakton"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1037
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1063
 msgid "View the current contact"
 msgstr "Montri la aktualan kontakton"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1042
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1068
 msgid "_Send Message to Contact..."
 msgstr "_Sendi mesaĝon al kontakto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1044
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1070
 msgid "Send a message to the selected contacts"
 msgstr "Sendi mesaĝon al la elektitaj kontaktoj"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1051
-#: ../modules/calendar/e-cal-shell-view-actions.c:1417
-#: ../modules/calendar/e-task-shell-view-actions.c:768
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1077
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1507
+#: ../src/modules/calendar/e-task-shell-view-actions.c:810
 msgid "_Actions"
 msgstr "_Agoj"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1058
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
-#: ../modules/calendar/e-task-shell-view-actions.c:775
-#: ../modules/mail/e-mail-shell-view-actions.c:1836
+#: ../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
 msgid "_Preview"
 msgstr "_Antaŭrigardi"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1079
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1097
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1536
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:680
+#: ../src/modules/calendar/e-task-shell-view-actions.c:834
+#| msgid "_Manager:"
+msgid "_Manage groups..."
+msgstr "_Administri grupojn..."
+
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1109
 msgid "Address Book Map"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1111
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1141
 msgid "Contact _Preview"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1113
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1143
 msgid "Show contact preview window"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1119
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1149
 msgid "Show _Maps"
 msgstr "Montri _mapojn"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1121
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1151
 msgid "Show maps in contact preview window"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1140
-#: ../modules/calendar/e-memo-shell-view-actions.c:692
-#: ../modules/calendar/e-task-shell-view-actions.c:857
-#: ../modules/mail/e-mail-shell-view-actions.c:1966
+#: ../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
 msgid "_Classic View"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1142
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1172
 msgid "Show contact preview below the contact list"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1147
-#: ../modules/calendar/e-memo-shell-view-actions.c:699
-#: ../modules/calendar/e-task-shell-view-actions.c:864
-#: ../modules/mail/e-mail-shell-view-actions.c:1973
+#: ../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
 msgid "_Vertical View"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1149
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1179
 msgid "Show contact preview alongside the contact list"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1164
-#: ../modules/calendar/e-cal-shell-view-actions.c:1594
-#: ../modules/calendar/e-memo-shell-view-actions.c:716
-#: ../modules/calendar/e-task-shell-view-actions.c:916
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1194
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1696
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:765
+#: ../src/modules/calendar/e-task-shell-view-actions.c:966
 msgid "Unmatched"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1174
-#: ../modules/calendar/e-cal-shell-view-actions.c:1604
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
-#: ../modules/calendar/e-task-shell-view-actions.c:926
-#: ../modules/mail/e-mail-shell-view-actions.c:2042
-#: ../shell/e-shell-content.c:657
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1204
+#: ../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/shell/e-shell-content.c:637
 msgid "Advanced Search"
 msgstr "Detala sercô"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1207
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1237
 msgid "Print all shown contacts"
 msgstr "Presi ĉiujn montratajn kontaktojn"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1214
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1244
 msgid "Preview the contacts to be printed"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1221
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1251
 msgid "Print selected contacts"
 msgstr "Presi elektitajn kontaktojn"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1236
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1266
 msgid "S_ave Address Book as vCard"
 msgstr "_Konservi adresaron kiel vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1238
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1268
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Konservi la kontaktoj de la elektita adresaro kiel vCard"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1244
-#: ../modules/addressbook/e-book-shell-view-actions.c:1254
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1274
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1284
 msgid "_Save as vCard..."
 msgstr "_Konservi kiel vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1246
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1276
 msgid "Save selected contacts as a vCard"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view.c:313
+#: ../src/modules/addressbook/e-book-shell-view.c:311
 msgid "_Forward Contacts"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view.c:315
+#: ../src/modules/addressbook/e-book-shell-view.c:313
 msgid "_Forward Contact"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view.c:346
+#: ../src/modules/addressbook/e-book-shell-view.c:344
 msgid "_Send Message to Contacts"
 msgstr "_Sendi mesaĝon al kontaktoj"
 
-#: ../modules/addressbook/e-book-shell-view.c:348
+#: ../src/modules/addressbook/e-book-shell-view.c:346
 msgid "_Send Message to List"
 msgstr "_Sendi mesaĝon al listo"
 
-#: ../modules/addressbook/e-book-shell-view.c:350
+#: ../src/modules/addressbook/e-book-shell-view.c:348
 msgid "_Send Message to Contact"
 msgstr "_Sendi mesaĝon al kontakto"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:163
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:162
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
 "This will restore all your personal data, settings mail filters, etc."
 msgstr ""
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:178
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:177
 msgid "_Restore from a backup file:"
 msgstr ""
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:189
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:188
 msgid "Choose a backup file to restore"
 msgstr ""
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/backup-restore/e-mail-config-restore-page.c:309
-#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:56
-#| msgid "_Restore Default"
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:291
+#: ../src/modules/backup-restore/e-mail-config-restore-ready-page.c:57
 msgid "Restore from Backup"
 msgstr "Restaŭri de savkopio"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:216
+#: ../src/modules/backup-restore/evolution-backup-restore.c:304
 msgid "Select name of the Evolution backup file"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-restore.c:249
+#: ../src/modules/backup-restore/evolution-backup-restore.c:349
 msgid "_Restart Evolution after backup"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-restore.c:276
-msgid "Select name of the Evolution backup file to restore"
-msgstr ""
-
-#: ../modules/backup-restore/evolution-backup-restore.c:289
+#: ../src/modules/backup-restore/evolution-backup-restore.c:384
 #, fuzzy
 #| msgid "Restart Evolution"
 msgid "Re_start Evolution after restore"
 msgstr "Re_startigi Evolucion post restaŭro"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:307
+#: ../src/modules/backup-restore/evolution-backup-restore.c:426
+msgid "Select name of the Evolution backup file to restore"
+msgstr ""
+
+#: ../src/modules/backup-restore/evolution-backup-restore.c:435
+#, c-format
+msgid "Checking content of backup file “%s”, please wait..."
+msgstr ""
+
+#: ../src/modules/backup-restore/evolution-backup-restore.c:456
 msgid "_Back up Evolution Data..."
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-restore.c:309
+#: ../src/modules/backup-restore/evolution-backup-restore.c:458
 msgid "Back up Evolution data and settings to an archive file"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-restore.c:314
+#: ../src/modules/backup-restore/evolution-backup-restore.c:463
 msgid "R_estore Evolution Data..."
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-restore.c:316
+#: ../src/modules/backup-restore/evolution-backup-restore.c:465
 msgid "Restore Evolution data and settings from an archive file"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:75
+#: ../src/modules/backup-restore/evolution-backup-tool.c:73
 msgid "Back up Evolution directory"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:77
+#: ../src/modules/backup-restore/evolution-backup-tool.c:75
 msgid "Restore Evolution directory"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:79
+#: ../src/modules/backup-restore/evolution-backup-tool.c:77
 msgid "Check Evolution Back up"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:81
+#: ../src/modules/backup-restore/evolution-backup-tool.c:79
 msgid "Restart Evolution"
 msgstr "Restartigi Evolucion"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:83
+#: ../src/modules/backup-restore/evolution-backup-tool.c:81
 msgid "With Graphical User Interface"
 msgstr "Per grafika interfaco"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:281
-#: ../modules/backup-restore/evolution-backup-tool.c:485
+#: ../src/modules/backup-restore/evolution-backup-tool.c:294
+#: ../src/modules/backup-restore/evolution-backup-tool.c:498
 msgid "Shutting down Evolution"
 msgstr "Elŝalti Evolucion"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:290
+#: ../src/modules/backup-restore/evolution-backup-tool.c:303
 msgid "Backing Evolution accounts and settings"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:307
+#: ../src/modules/backup-restore/evolution-backup-tool.c:320
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:323
+#: ../src/modules/backup-restore/evolution-backup-tool.c:336
 msgid "Back up complete"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:330
-#: ../modules/backup-restore/evolution-backup-tool.c:679
+#: ../src/modules/backup-restore/evolution-backup-tool.c:343
+#: ../src/modules/backup-restore/evolution-backup-tool.c:705
 msgid "Restarting Evolution"
 msgstr "Restartante Evolucion"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:491
+#: ../src/modules/backup-restore/evolution-backup-tool.c:504
 msgid "Back up current Evolution data"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:498
+#: ../src/modules/backup-restore/evolution-backup-tool.c:511
 msgid "Extracting files from back up"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:580
+#: ../src/modules/backup-restore/evolution-backup-tool.c:606
 msgid "Loading Evolution settings"
 msgstr "Ŝargante Evolucio-agordojn"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:650
+#: ../src/modules/backup-restore/evolution-backup-tool.c:676
 msgid "Removing temporary back up files"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:664
+#: ../src/modules/backup-restore/evolution-backup-tool.c:690
 msgid "Reloading registry service"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:867
+#: ../src/modules/backup-restore/evolution-backup-tool.c:899
 msgid "Evolution Back Up"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:868
+#: ../src/modules/backup-restore/evolution-backup-tool.c:900
 #, c-format
-msgid "Backing up to the folder %s"
+msgid "Backing up to the file %s"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:872
+#: ../src/modules/backup-restore/evolution-backup-tool.c:904
 msgid "Evolution Restore"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:873
-#, c-format
-msgid "Restoring from the folder %s"
-msgstr ""
+#: ../src/modules/backup-restore/evolution-backup-tool.c:905
+#, fuzzy, c-format
+#| msgid "Storing folder “%s”"
+msgid "Restoring from the file %s"
+msgstr "Konserva dosierujo %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:942
+#: ../src/modules/backup-restore/evolution-backup-tool.c:974
 msgid "Backing up Evolution Data"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:943
+#: ../src/modules/backup-restore/evolution-backup-tool.c:975
 msgid "Please wait while Evolution is backing up your data."
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:945
+#: ../src/modules/backup-restore/evolution-backup-tool.c:977
 msgid "Restoring Evolution Data"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:946
+#: ../src/modules/backup-restore/evolution-backup-tool.c:978
 msgid "Please wait while Evolution is restoring your data."
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:968
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1000
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:1
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Invalid Evolution backup file"
 msgstr ""
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Please select a valid backup file to restore."
-msgstr ""
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
+#| msgid "File is not a valid .desktop file"
+msgid "File “{0}” is not a valid Evolution backup file."
+msgstr "Dosiero “{0}” ne estas valida savkopi dosiero de Evolucio."
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid "Are you sure you want to close Evolution?"
 msgstr "Ĉu vi vere volas fermi Evolucion?"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:4
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid ""
 "To back up your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding."
 msgstr ""
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Close and _Back up Evolution"
 msgstr ""
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid ""
 "Are you sure you want to restore Evolution from the selected backup file?"
 msgstr ""
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:7
 msgid ""
 "To restore your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding. This will delete "
@@ -18435,311 +21209,313 @@ msgid ""
 "backup."
 msgstr ""
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
-#| msgid "Restart Evolution"
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid "Close and _Restore Evolution"
 msgstr "Fermi kaj _restaŭri Evolucion"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
 msgid "Insufficient Permissions"
 msgstr "Nesufiĉaj permesoj"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:10
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:10
 msgid "The selected folder is not writable."
 msgstr "La elektita dosierujo ne estas skribebla."
 
-#: ../modules/bogofilter/evolution-bogofilter.c:161
+#: ../src/modules/bogofilter/evolution-bogofilter.c:158
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:179
+#: ../src/modules/bogofilter/evolution-bogofilter.c:176
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:228
+#: ../src/modules/bogofilter/evolution-bogofilter.c:225
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:373
+#: ../src/modules/bogofilter/evolution-bogofilter.c:370
 msgid "Bogofilter Options"
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:382
+#: ../src/modules/bogofilter/evolution-bogofilter.c:379
 msgid "Convert message text to _Unicode"
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:540
-#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
+#: ../src/modules/bogofilter/evolution-bogofilter.c:537
+#: ../src/modules/bogofilter/org.gnome.Evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr ""
 
-#: ../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 ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:441
+#: ../src/modules/book-config-google/evolution-book-config-google.c:93
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:994
+#: ../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
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:469
+#, fuzzy
+#| msgid "The file cannot be read"
+msgid "User name cannot be empty"
+msgstr "La dosiero ne estas legebla"
+
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:443
 #, fuzzy
 #| msgid "Standard"
 msgid "Standard LDAP Port"
 msgstr "Standarde"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
-msgid "LDAP over SSL (deprecated)"
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:449
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:632
+msgid "LDAP over SSL/TLS (deprecated)"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:455
 msgid "Microsoft Global Catalog"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
-msgid "Microsoft Global Catalog over SSL"
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:461
+msgid "Microsoft Global Catalog over SSL/TLS"
 msgstr ""
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:568
 msgid "Connecting to LDAP"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:585
 msgid "Server Information"
 msgstr "Servilo-informo"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:612
 msgid "Port:"
 msgstr "Pordo:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:620
+#: ../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 ""
+
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:635
 msgid "StartTLS (recommended)"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:637
 msgid "Encryption:"
 msgstr "Ĉifrado:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:648
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:195
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:661
+#: ../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 "Aŭtentokontrolo"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:671
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
 #, fuzzy
 #| msgid "Anonymously"
 msgid "Anonymous"
 msgstr "Anonime"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:674
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:687
 msgid "Using email address"
 msgstr "Uzas retpoŝtadreson"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:690
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
-#| msgid "Input Methods"
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:692
 msgid "Method:"
 msgstr "Metodo:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../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."
+"setting this to “Using email address” requires anonymous access to your LDAP "
+"server."
 msgstr ""
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:712
 msgid "Using LDAP"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
-#: ../modules/mail/e-mail-shell-view.c:120
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:729
+#: ../src/modules/mail/e-mail-shell-view.c:118
 msgid "Searching"
 msgstr "Serĉante"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:738
-#| msgid "Search _base:"
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:751
 msgid "Search Base:"
 msgstr "Serĉbazo:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:742
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:755
 msgid "Find Possible Search Bases"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:764
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:777
 msgid "One Level"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:766
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:779
 msgid "Subtree"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
-#| msgid "Search _base:"
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:781
 msgid "Search Scope:"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
+#: ../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."
+"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."
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:782
-#| msgid "Search Filter"
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:795
 msgid "Search Filter:"
 msgstr "Serĉfiltrilo:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:807
 msgid "Downloading"
 msgstr "Elŝutante"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:815
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:828
 msgid "Limit:"
 msgstr "Limo:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:826
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:839
 msgid "contacts"
 msgstr "kontaktoj"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:844
 msgid "Browse until limit is reached"
 msgstr ""
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:135
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:220
-#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
-msgid "URL:"
-msgstr "URL:"
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:979
+#: ../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:"
+msgid "Server address cannot be empty"
+msgstr "Serviladreso ne povas esti malplena"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:145
-msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr ""
+#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:93
+#, fuzzy
+#| msgid "New Address Book"
+msgid "Choose an Address Book"
+msgstr "Nova adresaro"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:422
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:431
-#: ../modules/cal-config-google/e-google-chooser.c:424
-#: ../modules/cal-config-google/e-google-chooser.c:433
-#, fuzzy, c-format
-#| msgid "GConf error: %s"
-msgid "HTTP Error: %s"
-msgstr "Eraro de GConf: %s"
+#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:241
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:297
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:128
+msgid "URL:"
+msgstr "URL:"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:460
-#: ../modules/cal-config-google/e-google-chooser.c:462
+#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:250
 #, fuzzy
-#| msgid "Could not open source"
-msgid "Could not parse response"
-msgstr "Ne eblis malfermi fonton"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:469
-#: ../modules/cal-config-google/e-google-chooser.c:471
-#| msgid "_Empty Trash"
-msgid "Empty response"
-msgstr "Malplena respondo"
+#| msgid "Address Book"
+msgid "Find Address Books"
+msgstr "Adresaro"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:477
-#: ../modules/cal-config-google/e-google-chooser.c:479
-msgid "Unexpected reply from server"
+#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:260
+msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr ""
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1099
-#: ../modules/cal-config-google/e-google-chooser.c:1101
-#| msgid "Could not create message."
-msgid "Could not locate user's calendars"
-msgstr "Ne eblis trovi kalendarojn de uzanto"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1321
-msgid "Path"
-msgstr "Vojo"
+#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:309
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:413
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:185
+msgid "URL is not a valid http:// nor https:// URL"
+msgstr ""
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:348
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:348
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:110
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:225
 #, fuzzy
 #| msgid "Choose calendar file"
 msgid "Choose a Calendar"
 msgstr "Elekti kalendardosieron"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:351
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:351
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:114
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:229
 #, fuzzy
 #| msgid "New Memo List"
 msgid "Choose a Memo List"
 msgstr "Nova notolisto"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:354
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:354
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:118
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:233
 #, fuzzy
 #| msgid "Select a Task List"
 msgid "Choose a Task List"
 msgstr "Elekti taskliston"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:234
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:311
 #, fuzzy
 #| msgid "Web Calendars"
 msgid "Find Calendars"
 msgstr "Retaj kalendaroj"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:237
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:314
 #, fuzzy
 #| msgid "Memo List"
 msgid "Find Memo Lists"
 msgstr "Notolisto"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:240
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:317
 #, fuzzy
 #| msgid "Task List"
 msgid "Find Task Lists"
 msgstr "Tasklisto"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:258
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:335
 msgid "Email:"
 msgstr "Retpoŝtadreso:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:263
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:340
 msgid "Server handles meeting invitations"
 msgstr ""
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:70
+#: ../src/modules/cal-config-contacts/evolution-cal-config-contacts.c:71
 #, fuzzy
 #| msgid "Add local address books to Evolution."
 msgid "Choose which address books to use."
 msgstr "Aldoni lokan adresaron al Evolucio."
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
+#: ../src/modules/cal-config-contacts/evolution-cal-config-contacts.c:204
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr ""
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:143
-#| msgid "D_elete Calendar"
+#: ../src/modules/cal-config-google/e-cal-config-google.c:101
+msgid "Enable Calendars to synchronize"
+msgstr ""
+
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:144
 msgid "Default User Calendar"
 msgstr "Defaŭlta uzanto-kalendaro"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:159
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:159
 msgid "Use an existing iCalendar (ics) file"
 msgstr ""
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:184
-#| msgid "iCalendar (.ics)"
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:184
 msgid "iCalendar File"
 msgstr "iCalendar-dosiero"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:196
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:196
 #, fuzzy
 #| msgid "Choose calendar file"
 msgid "Choose an iCalendar file"
 msgstr "Elekti kalendardosieron"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:199
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:199
 msgid "File:"
 msgstr "Dosiero:"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:214
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:214
 msgid "Allow Evolution to update the file"
 msgstr ""
 
@@ -18749,424 +21525,492 @@ msgstr ""
 #. *
 #. * This string is just a fallback mechanism for systems on
 #. * which _NL_MEASUREMENT_MEASUREMENT is not available.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:187
-#| msgid "Default"
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:187
 msgctxt "locale-metric"
 msgid "default:mm"
 msgstr "default:mm"
 
 #. Translators: This is the temperature in degrees
 #. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:259
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:259
 msgid "Fahrenheit (°F)"
 msgstr "Farenhejta (°F)"
 
 #. Translators: This is the temperature in degrees
 #. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:264
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:264
 msgid "Centigrade (°C)"
 msgstr "Celcia (°C)"
 
 #. Translators: This is the temperature in kelvin.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:268
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:268
 msgid "Kelvin (K)"
 msgstr "Kelvina (K)"
 
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:270
-#| msgid "_Units:"
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:270
 msgid "Units:"
 msgstr "Unuoj:"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:287
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:322
+msgid "Location cannot be empty"
+msgstr ""
+
+#: ../src/modules/calendar/e-cal-attachment-handler.c:285
+#: ../src/smime/gui/smime-ui.ui.h:7
 msgid "I_mport"
 msgstr "I_mporti"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:337
+#: ../src/modules/calendar/e-cal-attachment-handler.c:335
 #, fuzzy
 #| msgid "Important"
 msgid "Importing an event"
 msgstr "Grave"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:341
-#| msgid "Importing '%s'"
+#: ../src/modules/calendar/e-cal-attachment-handler.c:339
 msgid "Importing a memo"
 msgstr "Enportante noton"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:345
-#| msgid "Importing '%s'"
+#: ../src/modules/calendar/e-cal-attachment-handler.c:343
 msgid "Importing a task"
 msgstr "Enportante taskon"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:403
+#: ../src/modules/calendar/e-cal-attachment-handler.c:401
 msgid "Select a Calendar"
 msgstr "Elekti kalendaron"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:410
-#| msgid "D_elete Memo List"
+#: ../src/modules/calendar/e-cal-attachment-handler.c:408
 msgid "Select a Memo List"
 msgstr "Elekti notoliston"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:417
+#: ../src/modules/calendar/e-cal-attachment-handler.c:415
 msgid "Select a Task List"
 msgstr "Elekti taskliston"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:424
+#: ../src/modules/calendar/e-cal-attachment-handler.c:422
 msgid "I_mport to Calendar"
 msgstr "I_mporti al kalendaro"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:431
+#: ../src/modules/calendar/e-cal-attachment-handler.c:429
 #, fuzzy
 #| msgid "I_mport to Tasks"
 msgid "I_mport to Memo List"
 msgstr "I_mporti al taskoj"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:438
+#: ../src/modules/calendar/e-cal-attachment-handler.c:436
 #, fuzzy
 #| msgid "I_mport to Tasks"
 msgid "I_mport to Task List"
 msgstr "I_mporti al taskoj"
 
-#: ../modules/calendar/e-cal-base-shell-backend.c:186
-#: ../modules/calendar/e-cal-shell-view-actions.c:162
-msgid "New Calendar"
-msgstr "Nova kalendaro"
-
-#: ../modules/calendar/e-cal-base-shell-backend.c:190
-#: ../modules/calendar/e-memo-shell-view-actions.c:164
-msgid "New Memo List"
-msgstr "Nova notolisto"
-
-#: ../modules/calendar/e-cal-base-shell-backend.c:194
-#: ../modules/calendar/e-task-shell-view-actions.c:187
-msgid "New Task List"
-msgstr "Nova tasklisto"
-
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:548
-#, c-format
-#| msgid "Unable to open the calendar '%s': %s"
-msgid "Copying an event into the calendar '%s'"
-msgstr "Kopiante eventon en kalendaron '%s'"
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:563
+#, fuzzy, c-format
+#| msgid "Copying an event into the calendar “%s”"
+msgid "Copying an event into the calendar “%s”"
+msgstr "Kopiante eventon en kalendaron “%s”"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:549
-#, c-format
-#| msgid "Unable to open the calendar '%s': %s"
-msgid "Moving an event into the calendar '%s'"
-msgstr "Movante eventon en kalendaron '%s'"
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:564
+#, fuzzy, c-format
+#| msgid "Moving an event into the calendar “%s”"
+msgid "Moving an event into the calendar “%s”"
+msgstr "Movante eventon en kalendaron “%s”"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:554
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:569
 #, c-format
-msgid "Copying a memo into the memo list '%s'"
-msgstr ""
+#| msgid "Copying a memo into the memo list “{0}”"
+msgid "Copying a memo into the memo list “%s”"
+msgstr "Kopiante noton en notoliston “%s”"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:555
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:570
 #, c-format
-msgid "Moving a memo into the memo list '%s'"
-msgstr ""
+#| msgid "Moving a memo into the memo list “{0}”"
+msgid "Moving a memo into the memo list “%s”"
+msgstr "Movante noton en notoliston “%s”"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:560
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:575
 #, c-format
-msgid "Copying a task into the task list '%s'"
-msgstr ""
+#| msgid "Copying a task into the task list “{0}”"
+msgid "Copying a task into the task list “%s”"
+msgstr "Kopiante taskon en taskoliston “%s”"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:561
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:576
 #, c-format
-msgid "Moving a task into the task list '%s'"
-msgstr ""
+#| msgid "Moving a task into the task list “{0}”"
+msgid "Moving a task into the task list “%s”"
+msgstr "Movante taskon en taskoliston “%s”"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:658
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:693
 msgid "Calendar Selector"
 msgstr "Kalendar-elektilo"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:664
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:699
 msgid "Memo List Selector"
 msgstr "Memolist-elektilo"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:669
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:704
 msgid "Task List Selector"
 msgstr "Tasklist-elektilo"
 
-#: ../modules/calendar/e-calendar-preferences.c:516
+#: ../src/modules/calendar/e-calendar-preferences.c:523
 #, fuzzy
 #| msgid "Select a Calendar"
-msgid "Selected Calendars for Alarms"
+msgid "Selected Calendars for Notifications of Reminders"
 msgstr "Elekti kalendaron"
 
-#: ../modules/calendar/e-calendar-preferences.c:924
+#: ../src/modules/calendar/e-calendar-preferences.c:530
+msgid "Selected Memo Lists for Notifications of Reminders"
+msgstr ""
+
+#: ../src/modules/calendar/e-calendar-preferences.c:537
+msgid "Selected Task Lists for Notifications of Reminders"
+msgstr ""
+
+#: ../src/modules/calendar/e-calendar-preferences.c:633
+msgid "Meeting Invitations"
+msgstr ""
+
+#: ../src/modules/calendar/e-calendar-preferences.c:659
+msgid "_Delete message after acting"
+msgstr ""
+
+#: ../src/modules/calendar/e-calendar-preferences.c:673
+#: ../src/modules/calendar/e-calendar-preferences.c:704
+msgid "Conflict Search"
+msgstr ""
+
+#. Source selector
+#: ../src/modules/calendar/e-calendar-preferences.c:688
+msgid "Select the calendars to search for meeting conflicts"
+msgstr ""
+
+#: ../src/modules/calendar/e-calendar-preferences.c:1100
 msgid "Ti_me and date:"
 msgstr "T_empo kaj dato:"
 
-#: ../modules/calendar/e-calendar-preferences.c:925
+#: ../src/modules/calendar/e-calendar-preferences.c:1101
 msgid "_Date only:"
 msgstr "Nur _dato:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:1
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Minutes"
 msgstr "Minutoj"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:2
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Hours"
 msgstr "Horoj"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:3
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Days"
 msgstr "Tagoj"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:4
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:4
 msgid "60 minutes"
 msgstr "60 minutoj"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:5
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:5
 msgid "30 minutes"
 msgstr "30 minutoj"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:6
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:6
 msgid "15 minutes"
 msgstr "15 minutoj"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:7
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:7
 msgid "10 minutes"
 msgstr "10 minutoj"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:8
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:8
 msgid "05 minutes"
 msgstr "05 minutoj"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Se_cond zone:"
 msgstr "_Dua zono:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:12
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:12
 msgid "(Shown in a Day View)"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:14
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:13
+msgid "Time _zone:"
+msgstr "Hor_zono:"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:14
 msgid "Use s_ystem time zone"
 msgstr "Uzi s_isteman horzonon"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:15
 msgid "Time format:"
 msgstr "Tempoaranĝo:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:16
 msgid "_12 hour (AM/PM)"
 msgstr "_12 hore (ATM/PTM)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:17
 msgid "_24 hour"
 msgstr "_24 hore"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
-#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:18
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1658
 msgid "Work Week"
 msgstr "Laborsemajno"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Wee_k starts on:"
 msgstr "Semajno _komencas je:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:21
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:21
 msgid "Work days:"
 msgstr "Labortagoj:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:22
 msgid "_Day begins:"
 msgstr "_Tago komencas:"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:24
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:24
 msgid "_Mon"
 msgstr "_Lun"
 
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:25
+msgid "Monday"
+msgstr "Lundo"
+
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:27
 msgid "_Tue"
 msgstr "_Mar"
 
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Tuesday"
+msgstr "Mardo"
+
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:30
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:30
 msgid "_Wed"
 msgstr "_Mer"
 
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:31
+msgid "Wednesday"
+msgstr "Merkredo"
+
 #. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:33
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:33
 msgid "T_hu"
 msgstr "Ĵ_aŭ"
 
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:34
+msgid "Thursday"
+msgstr "Ĵaŭdo"
+
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:36
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:36
 msgid "_Fri"
 msgstr "_Ven"
 
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:37
+msgid "Friday"
+msgstr "Vendredo"
+
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:39
 msgid "_Sat"
 msgstr "_Sab"
 
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:40
+msgid "Saturday"
+msgstr "Sabato"
+
 #. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:42
 msgid "S_un"
 msgstr "_Dim"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:43
+msgid "Sunday"
+msgstr "Dimanĉo"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:44
 msgid "Day _ends:"
 msgstr "Tago _finos:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:47
+msgid "Create events, memos and tasks as _Private by default"
+msgstr ""
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:49
 #, fuzzy
 #| msgid "Send Options"
 msgid "View Options"
 msgstr "Send-agordoj"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:50
 msgid "_Time divisions:"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:49
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:51
 msgid "_Show appointment end times in week and month view"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:52
+msgid "Show appointment _icons in the month view"
+msgstr ""
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:53
 msgid "_Compress weekends in month view"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Show week _numbers"
 msgstr "Montri semajn_numerojn"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:55
 msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:56
 msgid "Sc_roll Month View by a week"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:57
 msgid "Alerts"
 msgstr "Avertoj"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:58
 msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
 msgid "Display"
 msgstr "Montri"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Task List"
 msgstr "Tasklisto"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
 msgid "Highlight t_asks due today"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Highlight _overdue tasks"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
 msgid "_Hide completed tasks after"
 msgstr "_Kaŝi plenumitaj taskoj poste"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:64
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:67
 msgid "Display reminders in _notification area only"
 msgstr ""
 
-#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
-msgid "Sh_ow a reminder"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
+#, fuzzy
+msgid "Keep reminder notification _window always on top"
 msgstr "M_ontri memorigilon"
 
-#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:68
-msgid "before every appointment"
-msgstr ""
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
+#| msgid "Delete completed tasks"
+msgid "Display reminders for completed _tasks"
+msgstr "Forigi memorigilojn por plenumitaj _taskoj"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
+#| msgid "Set or unset reminders for this event"
+msgid "Display reminders for _past events"
+msgstr "Montri memorigilojn por _pasintaj eventoj"
+
+#. 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
+#, fuzzy
+#| msgid "Sh_ow a reminder"
+msgid "Set _default reminder"
+msgstr "M_ontri memorigilon"
+
+#. 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 "Create a new appointment"
+msgid "before every new appointment"
+msgstr "antaŭ ĉiu nova rendevuo"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:70
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:76
 msgid "Show a _reminder"
 msgstr "Montri memo_rigilon"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:72
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:78
 msgid "before every anniversary/birthday"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
-msgid "Select the calendars for reminder notification"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:79
+msgid "Default _snooze time (in minutes)"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:80
+msgid "Select the sources for reminder notification:"
+msgstr "Elekti la fontoj de memorigilon:"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:84
 msgid "Default Free/Busy Server"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
-msgid "Template:"
-msgstr "Ŝablono:"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:78
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
 msgid "Publishing Information"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-backend.c:114
+#: ../src/modules/calendar/e-cal-shell-backend.c:113
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Rendevuo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:116
-#: ../modules/calendar/e-cal-shell-view-actions.c:1361
+#: ../src/modules/calendar/e-cal-shell-backend.c:115
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1451
 msgid "Create a new appointment"
 msgstr "Kreii novan rendevuon"
 
-#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../src/modules/calendar/e-cal-shell-backend.c:120
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Tuttaga _rendevuo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:123
+#: ../src/modules/calendar/e-cal-shell-backend.c:122
 msgid "Create a new all-day appointment"
 msgstr "Krei novan tuttagan rendevuon"
 
-#: ../modules/calendar/e-cal-shell-backend.c:128
+#: ../src/modules/calendar/e-cal-shell-backend.c:127
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Kunsido"
 
-#: ../modules/calendar/e-cal-shell-backend.c:130
+#: ../src/modules/calendar/e-cal-shell-backend.c:129
 msgid "Create a new meeting request"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-backend.c:138
+#: ../src/modules/calendar/e-cal-shell-backend.c:137
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_ndaro"
 
-#: ../modules/calendar/e-cal-shell-backend.c:140
-#: ../modules/calendar/e-cal-shell-view-actions.c:1235
+#: ../src/modules/calendar/e-cal-shell-backend.c:139
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1311
 msgid "Create a new calendar"
 msgstr "Krei novan kalendaron"
 
-#: ../modules/calendar/e-cal-shell-backend.c:257
+#: ../src/modules/calendar/e-cal-shell-backend.c:256
 msgid "Calendar and Tasks"
 msgstr "Kalendaro kaj taskoj"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:181
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:197
 msgid "Print"
 msgstr "Presi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:267
-msgid "Calendar Properties"
-msgstr "Kalendar-ecoj"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:296
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:312
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -19175,372 +22019,392 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:313
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:329
 msgid "Purge events older than"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:895
-#| msgid "Make this Occurrence _Movable"
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:924
 msgid "Making an occurrence movable"
 msgstr "Igi okazon movebla"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1055
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1124
 msgid "event"
 msgstr "evento"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1057
-#: ../modules/calendar/e-cal-shell-view-memopad.c:208
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:276
-#: ../modules/calendar/e-memo-shell-view-actions.c:469
-#: ../modules/calendar/e-task-shell-view-actions.c:587
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1126
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:207
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:275
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:496
+#: ../src/modules/calendar/e-task-shell-view-actions.c:615
 msgid "Save as iCalendar"
 msgstr "Konservi kiel iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1191
-#: ../modules/calendar/e-memo-shell-view-actions.c:550
-#: ../modules/calendar/e-task-shell-view-actions.c:675
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:577
+#: ../src/modules/calendar/e-task-shell-view-actions.c:703
 msgid "_Copy..."
 msgstr "_Kopii..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1198
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1267
 msgid "D_elete Calendar"
 msgstr "_Forigi kalendaron"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1200
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1269
 msgid "Delete the selected calendar"
 msgstr "Forigi la elektitan kalendaron"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1207
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1276
 msgid "Go Back"
 msgstr "Reen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1214
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1283
 msgid "Go Forward"
 msgstr "Antaŭen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1221
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1290
 msgid "Select today"
 msgstr "Elekti hodiaŭ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1226
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1295
 msgid "Select _Date"
 msgstr "Elekti _daton"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1228
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1297
 msgid "Select a specific date"
 msgstr "Elekti specifan daton"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1233
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1302
+#, fuzzy
+#| msgid "_New Calendar..."
+msgid "_Manage Calendar groups..."
+msgstr "_Nova kalendaro..."
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1304
+msgid "Manage Calendar groups order and visibility"
+msgstr ""
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1309
 msgid "_New Calendar"
 msgstr "_Nova kalendaro"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1247
-#: ../modules/calendar/e-task-shell-view-actions.c:759
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1323
+#: ../src/modules/calendar/e-task-shell-view-actions.c:801
 msgid "Purg_e"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1249
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1325
 msgid "Purge old appointments and meetings"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1256
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1332
 msgid "Refresh the selected calendar"
 msgstr "Aktualigi la elektitan kalendaron"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1263
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1339
 msgid "Rename the selected calendar"
 msgstr "Alinomi la elektitan kalendaron"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1268
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1344
 #, fuzzy
 #| msgid "_Next"
 msgid "Find _Next"
 msgstr "_Sekva"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1270
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1346
 msgid "Find next occurrence of the current search string"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1275
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1351
 #, fuzzy
 #| msgid "_Previous"
 msgid "Find _Previous"
 msgstr "_Antaŭa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1277
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1353
 msgid "Find previous occurrence of the current search string"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1282
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1358
 msgid "Stop _Running Search"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1360
 msgid "Stop currently running search"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1289
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1365
+#| msgid "Local Calendars"
+msgid "Sho_w All Calendars"
+msgstr "_Montri ĉiujn kalendarojn"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1372
 msgid "Show _Only This Calendar"
 msgstr "Montri _nur ĉi tiun kalendaron"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1296
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Cop_y to Calendar..."
 msgstr "Kopi_i al kalendaro..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1303
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "_Delegate Meeting..."
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1310
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "_Delete Appointment"
 msgstr "_Forigi rendevuon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1395
 msgid "Delete selected appointments"
 msgstr "Forigi elektitajn rendevuojn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1317
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "Delete This _Occurrence"
 msgstr "Forigi tiun _okazon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1319
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1402
 msgid "Delete this occurrence"
 msgstr "Forigi tiun okazon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1324
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "Delete All Occ_urrences"
 msgstr "Forigi ĉi_ujn okazojn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1326
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1409
 msgid "Delete all occurrences"
 msgstr "Forigi ĉiujn okazojn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1331
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1414
+#, fuzzy
+#| msgid "_Edit as New Message..."
+msgid "Edit as Ne_w..."
+msgstr "_Redakti kiel nova mesaĝo..."
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1416
+#, fuzzy
+#| msgid "View the current appointment"
+msgid "Edit the current appointment as new"
+msgstr "Montri la aktualan rendevuon"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1421
 msgid "New All Day _Event..."
 msgstr "Nova tuttaga _evento..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1333
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1423
 msgid "Create a new all day event"
 msgstr "Kreii novan tuttagan eventon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1338
-#: ../modules/calendar/e-cal-shell-view-memopad.c:242
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
-#: ../modules/calendar/e-memo-shell-view-actions.c:543
-#: ../modules/calendar/e-task-shell-view-actions.c:668
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:241
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:315
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:570
+#: ../src/modules/calendar/e-task-shell-view-actions.c:696
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1345
-msgid "New _Meeting..."
-msgstr "Nova _kunsido..."
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1437
 msgid "Create a new meeting"
 msgstr "Kreii novan kunsidon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1352
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_vi al kalendaro..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1359
-msgid "New _Appointment..."
-msgstr "Nova _rendevuo..."
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1366
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "Make this Occurrence _Movable"
 msgstr "Igi tiun okazon _movebla"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1373
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1463
 msgid "_Open Appointment"
 msgstr "_Malfermi rendevuon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1375
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1465
 msgid "View the current appointment"
 msgstr "Montri la aktualan rendevuon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1380
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1470
 msgid "_Reply"
 msgstr "_Respondi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1486
 msgid "Converts an appointment to a meeting"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1401
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1491
 msgid "Conv_ert to Appointment..."
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1493
 msgid "Converts a meeting to an appointment"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1498
 msgid "Quit"
 msgstr "Ĉesi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1528
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1630
 msgid "Day"
 msgstr "Tago"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1530
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Show one day"
 msgstr "Montri unu tagon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1535
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1637
 msgid "List"
 msgstr "Listo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1537
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Show as list"
 msgstr "Montri kiel listo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1542
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1644
 msgid "Month"
 msgstr "Monato"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1544
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1646
 msgid "Show one month"
 msgstr "Montri unu monaton"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1549
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1651
 msgid "Week"
 msgstr "Semajno"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1551
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1653
 msgid "Show one week"
 msgstr "Montri unu semajnon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1558
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1660
 msgid "Show one work week"
 msgstr "Montri unu laborsemajnon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1668
 msgid "Active Appointments"
 msgstr "Aktivaj rendevuoj"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
-msgid "Next 7 Days' Appointments"
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1682
+#| msgctxt "New"
+#| msgid "All Day A_ppointment"
+msgid "Next 7 Days’ Appointments"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1689
 msgid "Occurs Less Than 5 Times"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
-#: ../modules/calendar/e-memo-shell-view-actions.c:740
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:789
+#: ../src/modules/calendar/e-task-shell-view-actions.c:990
 msgid "Description contains"
 msgstr "Priskripo enhavas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1625
-#: ../modules/calendar/e-memo-shell-view-actions.c:747
-#: ../modules/calendar/e-task-shell-view-actions.c:947
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1727
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:796
+#: ../src/modules/calendar/e-task-shell-view-actions.c:997
 msgid "Summary contains"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1635
-#: ../modules/calendar/e-cal-shell-view-actions.c:1649
-#: ../modules/calendar/e-cal-shell-view-memopad.c:273
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-memo-shell-view-actions.c:757
-#: ../modules/calendar/e-memo-shell-view-actions.c:771
-#: ../modules/calendar/e-task-shell-view-actions.c:957
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1737
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1751
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:272
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:360
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:806
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:820
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1007
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1021
 msgid "Print..."
 msgstr "Presi..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1637
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1739
 msgid "Print this calendar"
 msgstr "Presi tiun kalendaron"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1644
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1746
 msgid "Preview the calendar to be printed"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1666
-#: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:988
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1768
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:282
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:370
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:837
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1038
 msgid "_Save as iCalendar..."
 msgstr "_Konservi kiel iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1743
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1845
 msgid "Go To"
 msgstr "Iri al"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:206
-#: ../modules/calendar/e-memo-shell-view-actions.c:467
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:205
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:494
 msgid "memo"
 msgstr "noto"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:249
-#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:248
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:640
 msgid "New _Memo"
 msgstr "Nova _noto"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:251
-#: ../modules/calendar/e-memo-shell-backend.c:65
-#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../src/modules/calendar/e-memo-shell-backend.c:79
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Create a new memo"
 msgstr "Krei novan noton"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:256
-#: ../modules/calendar/e-memo-shell-view-actions.c:606
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:255
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:647
 msgid "_Open Memo"
 msgstr "Malfermi n_oton"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:258
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:649
 msgid "View the selected memo"
 msgstr "Montri la elektitan noton"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:263
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
-#: ../modules/calendar/e-memo-shell-view-actions.c:613
-#: ../modules/calendar/e-task-shell-view-actions.c:752
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:262
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:350
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:654
+#: ../src/modules/calendar/e-task-shell-view-actions.c:794
 msgid "Open _Web Page"
 msgstr "Malfermi _retpaĝon"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:275
-#: ../modules/calendar/e-memo-shell-view-actions.c:773
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:274
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:822
 msgid "Print the selected memo"
 msgstr "Presi la elektitan noton"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:810
+#: ../src/modules/calendar/e-cal-shell-view-private.c:811
 #, fuzzy
 #| msgid "Print this event"
 msgid "Searching next matching event"
 msgstr "Presi tiun eventon"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:811
+#: ../src/modules/calendar/e-cal-shell-view-private.c:812
 msgid "Searching previous matching event"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-private.c:832
+#: ../src/modules/calendar/e-cal-shell-view-private.c:833
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../modules/calendar/e-cal-shell-view-private.c:836
+#: ../src/modules/calendar/e-cal-shell-view-private.c:837
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../modules/calendar/e-cal-shell-view-private.c:859
+#: ../src/modules/calendar/e-cal-shell-view-private.c:860
 msgid "Cannot search with no active calendar"
 msgstr ""
 
@@ -19548,209 +22412,215 @@ msgstr ""
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:274
-#: ../modules/calendar/e-task-shell-view-actions.c:585
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:273
+#: ../src/modules/calendar/e-task-shell-view-actions.c:613
 msgid "task"
 msgstr "tasko"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:309
-#: ../modules/calendar/e-task-shell-view-actions.c:647
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:308
+#: ../src/modules/calendar/e-task-shell-view-actions.c:675
 msgid "_Assign Task"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
-#: ../modules/calendar/e-task-shell-view-actions.c:724
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:322
+#: ../src/modules/calendar/e-task-shell-view-actions.c:766
 msgid "_Mark as Complete"
 msgstr "_Marki kiel plenumite"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:325
-#: ../modules/calendar/e-task-shell-view-actions.c:726
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:324
+#: ../src/modules/calendar/e-task-shell-view-actions.c:768
 msgid "Mark selected tasks as complete"
 msgstr "Marki elektitajn taskojn kiel plenumite"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:329
 msgid "_Mark as Incomplete"
 msgstr "_Marki kiel neplenumite"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
-#: ../modules/calendar/e-task-shell-view-actions.c:733
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:331
+#: ../src/modules/calendar/e-task-shell-view-actions.c:775
 msgid "Mark selected tasks as incomplete"
 msgstr "Marki elektitajn taskojn kiel plenumite"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:336
+#: ../src/modules/calendar/e-task-shell-view-actions.c:780
 msgid "New _Task"
 msgstr "Nova _tasko"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
-#: ../modules/calendar/e-task-shell-backend.c:64
-#: ../modules/calendar/e-task-shell-view-actions.c:740
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../src/modules/calendar/e-task-shell-backend.c:77
+#: ../src/modules/calendar/e-task-shell-view-actions.c:782
 msgid "Create a new task"
 msgstr "Krei novan taskon"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:343
+#: ../src/modules/calendar/e-task-shell-view-actions.c:787
 msgid "_Open Task"
 msgstr "_Malfermi taskon"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../src/modules/calendar/e-task-shell-view-actions.c:789
 msgid "View the selected task"
 msgstr "Montri la elektitan taskon"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:363
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:362
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1023
 msgid "Print the selected task"
 msgstr "Presi la elektitajn taskojn"
 
-#: ../modules/calendar/e-memo-shell-backend.c:63
+#: ../src/modules/calendar/e-memo-shell-backend.c:77
 msgctxt "New"
 msgid "Mem_o"
 msgstr ""
 
-#: ../modules/calendar/e-memo-shell-backend.c:70
+#: ../src/modules/calendar/e-memo-shell-backend.c:84
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Komuna noto"
 
-#: ../modules/calendar/e-memo-shell-backend.c:72
+#: ../src/modules/calendar/e-memo-shell-backend.c:86
 msgid "Create a new shared memo"
 msgstr "Krei novan komunan noton"
 
-#: ../modules/calendar/e-memo-shell-backend.c:80
+#: ../src/modules/calendar/e-memo-shell-backend.c:94
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Notoli_sto"
 
-#: ../modules/calendar/e-memo-shell-backend.c:82
-#: ../modules/calendar/e-memo-shell-view-actions.c:566
+#: ../src/modules/calendar/e-memo-shell-backend.c:96
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:600
 msgid "Create a new memo list"
 msgstr "Krei novan notoliston"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:180
-#: ../modules/calendar/e-memo-shell-view-actions.c:195
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:194
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:209
 msgid "Print Memos"
 msgstr "Presi notojn"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:236
-msgid "Memo List Properties"
-msgstr "Ecoj de notlisto"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:529
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:556
 msgid "_Delete Memo"
 msgstr "_Forigi notojn"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:536
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:563
 msgid "_Find in Memo..."
 msgstr "_Serĉi en noto..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:538
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:565
 msgid "Search for text in the displayed memo"
 msgstr "Serĉi tekston en la montrata noto"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:557
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:584
 msgid "D_elete Memo List"
 msgstr "_Forigi la notoliston"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:559
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:586
 msgid "Delete the selected memo list"
 msgstr "Forigi la elektitan notoliston"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:564
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:591
+msgid "_Manage Memo List groups..."
+msgstr ""
+
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:593
+msgid "Manage Memo List groups order and visibility"
+msgstr ""
+
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:598
 msgid "_New Memo List"
 msgstr "_Nova notolisto"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:580
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:614
 msgid "Refresh the selected memo list"
 msgstr "Aktualigi la elektitan notoliston"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:587
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:621
 msgid "Rename the selected memo list"
 msgstr "Alinomi la elektitan notoliston"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:592
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:626
 msgid "Show _Only This Memo List"
 msgstr "Montri _nur ĉi tiun notoliston"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:671
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:633
+#, fuzzy
+#| msgid "Show _Only This Memo List"
+msgid "Sho_w All Memo Lists"
+msgstr "Montri _nur ĉi tiun notoliston"
+
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:720
 msgid "Memo _Preview"
 msgstr "Noto-_antaŭrigardo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:673
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:722
 msgid "Show memo preview pane"
 msgstr ""
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:694
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:743
 msgid "Show memo preview below the memo list"
 msgstr ""
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:701
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:750
 msgid "Show memo preview alongside the memo list"
 msgstr ""
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:759
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:808
 msgid "Print the list of memos"
 msgstr "Presi la liston de notoj"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:766
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:815
 msgid "Preview the list of memos to be printed"
 msgstr "Antaŭrigardi la presotan liston de notoj"
 
-#: ../modules/calendar/e-memo-shell-view.c:212
+#: ../src/modules/calendar/e-memo-shell-view.c:217
 msgid "Delete Memos"
 msgstr "Forigi notojn"
 
-#: ../modules/calendar/e-memo-shell-view.c:214
+#: ../src/modules/calendar/e-memo-shell-view.c:219
 msgid "Delete Memo"
 msgstr "Forigi noton"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:369
+#: ../src/modules/calendar/e-memo-shell-view-private.c:367
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d noto"
 msgstr[1] "%d notoj"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:373
-#: ../modules/calendar/e-task-shell-view-private.c:539
+#: ../src/modules/calendar/e-memo-shell-view-private.c:371
+#: ../src/modules/calendar/e-task-shell-view-private.c:548
 #, c-format
 msgid "%d selected"
 msgstr "%d elektite"
 
-#: ../modules/calendar/e-task-shell-backend.c:62
+#: ../src/modules/calendar/e-task-shell-backend.c:75
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tasko"
 
-#: ../modules/calendar/e-task-shell-backend.c:69
+#: ../src/modules/calendar/e-task-shell-backend.c:82
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "_Atribuita tasko"
 
-#: ../modules/calendar/e-task-shell-backend.c:71
+#: ../src/modules/calendar/e-task-shell-backend.c:84
 msgid "Create a new assigned task"
 msgstr "Krei novan atribuitan taskon"
 
-#: ../modules/calendar/e-task-shell-backend.c:79
+#: ../src/modules/calendar/e-task-shell-backend.c:92
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Tas_klisto"
 
-#: ../modules/calendar/e-task-shell-backend.c:81
-#: ../modules/calendar/e-task-shell-view-actions.c:691
+#: ../src/modules/calendar/e-task-shell-backend.c:94
+#: ../src/modules/calendar/e-task-shell-view-actions.c:726
 msgid "Create a new task list"
 msgstr "Krei novan taskliston"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:203
-#: ../modules/calendar/e-task-shell-view-actions.c:218
+#: ../src/modules/calendar/e-task-shell-view-actions.c:218
+#: ../src/modules/calendar/e-task-shell-view-actions.c:233
 msgid "Print Tasks"
 msgstr "Presi taskojn"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:259
-msgid "Task List Properties"
-msgstr "Tasklist-ecoj"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:529
+#: ../src/modules/calendar/e-task-shell-view-actions.c:557
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -19762,983 +22632,1077 @@ msgstr ""
 "\n"
 "Ĉe certe forigi tiujn taskojn?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:536
+#: ../src/modules/calendar/e-task-shell-view-actions.c:564
 msgid "Do not ask me again"
 msgstr "Ne demandu min denove"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:654
+#: ../src/modules/calendar/e-task-shell-view-actions.c:682
 msgid "_Delete Task"
 msgstr "_Forigi taskon"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:661
+#: ../src/modules/calendar/e-task-shell-view-actions.c:689
 msgid "_Find in Task..."
 msgstr "_Serĉi en tasko..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:663
+#: ../src/modules/calendar/e-task-shell-view-actions.c:691
 msgid "Search for text in the displayed task"
 msgstr "Serĉi tekston en la montrita tasko"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:682
+#: ../src/modules/calendar/e-task-shell-view-actions.c:710
 msgid "D_elete Task List"
 msgstr "_Forigi taskliston"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:684
+#: ../src/modules/calendar/e-task-shell-view-actions.c:712
 msgid "Delete the selected task list"
 msgstr "Forigi la elektitan taskliston"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:689
+#: ../src/modules/calendar/e-task-shell-view-actions.c:717
+msgid "_Manage Task List groups..."
+msgstr ""
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:724
 msgid "_New Task List"
 msgstr "_Nova tasklisto"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:705
+#: ../src/modules/calendar/e-task-shell-view-actions.c:740
 msgid "Refresh the selected task list"
 msgstr "Aktualigi la elektitan taskliston"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:712
+#: ../src/modules/calendar/e-task-shell-view-actions.c:747
 msgid "Rename the selected task list"
 msgstr "Alinomi la elektitan taskliston"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../src/modules/calendar/e-task-shell-view-actions.c:752
+#, fuzzy
+#| msgid "Show _Only This Task List"
+msgid "Sho_w All Task Lists"
+msgstr "Montri _nur tiun taskliston"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:759
 msgid "Show _Only This Task List"
 msgstr "Montri _nur tiun taskliston"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:731
+#: ../src/modules/calendar/e-task-shell-view-actions.c:773
 msgid "Mar_k as Incomplete"
 msgstr "Mar_ki kiel neplenumite"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../src/modules/calendar/e-task-shell-view-actions.c:803
 msgid "Delete completed tasks"
 msgstr "Forigi plenumitaj taskoj"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:836
+#: ../src/modules/calendar/e-task-shell-view-actions.c:886
 msgid "Task _Preview"
 msgstr "Tasko_antaŭrigardo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:838
+#: ../src/modules/calendar/e-task-shell-view-actions.c:888
 msgid "Show task preview pane"
 msgstr ""
 
-#: ../modules/calendar/e-task-shell-view-actions.c:859
+#: ../src/modules/calendar/e-task-shell-view-actions.c:909
 msgid "Show task preview below the task list"
 msgstr ""
 
-#: ../modules/calendar/e-task-shell-view-actions.c:866
+#: ../src/modules/calendar/e-task-shell-view-actions.c:916
 msgid "Show task preview alongside the task list"
 msgstr ""
 
-#: ../modules/calendar/e-task-shell-view-actions.c:874
+#: ../src/modules/calendar/e-task-shell-view-actions.c:924
 msgid "Active Tasks"
 msgstr "Aktivaj taskoj"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:888
+#: ../src/modules/calendar/e-task-shell-view-actions.c:938
 msgid "Completed Tasks"
 msgstr "Plenumigitaj taskoj"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:895
-msgid "Next 7 Days' Tasks"
+#: ../src/modules/calendar/e-task-shell-view-actions.c:945
+msgid "Next 7 Days’ Tasks"
 msgstr ""
 
-#: ../modules/calendar/e-task-shell-view-actions.c:902
+#: ../src/modules/calendar/e-task-shell-view-actions.c:952
 msgid "Overdue Tasks"
 msgstr "Malfruaj taskoj"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:909
+#: ../src/modules/calendar/e-task-shell-view-actions.c:959
 msgid "Tasks with Attachments"
 msgstr "Taskoj kun aldonaĵoj"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:959
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1009
 msgid "Print the list of tasks"
 msgstr "Presi la liston de taskoj"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:966
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1016
 msgid "Preview the list of tasks to be printed"
 msgstr ""
 
-#: ../modules/calendar/e-task-shell-view.c:316
+#: ../src/modules/calendar/e-task-shell-view.c:321
 msgid "Delete Tasks"
 msgstr "Forigi taskojn"
 
-#: ../modules/calendar/e-task-shell-view.c:318
+#: ../src/modules/calendar/e-task-shell-view.c:323
 msgid "Delete Task"
 msgstr "Forigi taskon"
 
-#: ../modules/calendar/e-task-shell-view-private.c:535
+#: ../src/modules/calendar/e-task-shell-view-private.c:544
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tasko"
 msgstr[1] "%d taskoj"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:149
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:319
+#, fuzzy
+#| msgid "Create a _Meeting"
+msgid "Convert to M_eeting"
+msgstr "Krei _kunsidon"
+
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:321
+#, fuzzy
+#| msgid "Convert mail messages to Unicode"
+msgid "Convert the message to a meeting request"
+msgstr "Konverti la mesaĝojn al rendevu-demandon"
+
+#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:357
+#| msgid "Important Messages"
+msgid "Convert to M_essage"
+msgstr ""
+
+#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:359
+#, fuzzy
+#| msgid "Compose a new mail message"
+msgid "Convert to the mail message"
+msgstr "Krei novan retpoŝtan mesaĝon"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:83
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:84
+#, fuzzy
+#| msgid "CalDAV"
+msgid "CalDAV server"
+msgstr "CalDAV"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:85
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:86
+msgid "CardDAV server"
+msgstr ""
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
+#, fuzzy
+#| msgid "On LDAP Servers"
+msgid "LDAP server"
+msgstr "En LDAP-serviloj"
+
+#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:162
 msgid "ITIP"
 msgstr ""
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:150
+#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:163
 msgid "Display part as an invitation"
 msgstr "Montri parton kiel invito"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:228
+#: ../src/modules/itip-formatter/itip-view.c:258
 msgid "Today %H:%M"
 msgstr "Hodiaŭ %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:232
+#: ../src/modules/itip-formatter/itip-view.c:262
 msgid "Today %H:%M:%S"
 msgstr "Hodiaŭ %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:241
+#: ../src/modules/itip-formatter/itip-view.c:271
 msgid "Today %l:%M:%S %p"
 msgstr "Hodiaŭ %l:%M:%S %p"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:256
+#: ../src/modules/itip-formatter/itip-view.c:286
 msgid "Tomorrow %H:%M"
 msgstr "Morgaŭ %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:260
+#: ../src/modules/itip-formatter/itip-view.c:290
 msgid "Tomorrow %H:%M:%S"
 msgstr "Morgaŭ %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:265
+#: ../src/modules/itip-formatter/itip-view.c:295
 msgid "Tomorrow %l:%M %p"
 msgstr "Morgaŭ %l:%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:269
+#: ../src/modules/itip-formatter/itip-view.c:299
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Morgaŭ %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:288
+#: ../src/modules/itip-formatter/itip-view.c:318
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:293
+#: ../src/modules/itip-formatter/itip-view.c:323
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:297
+#: ../src/modules/itip-formatter/itip-view.c:327
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:302
+#: ../src/modules/itip-formatter/itip-view.c:332
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:306
+#: ../src/modules/itip-formatter/itip-view.c:336
 msgid "%A %l:%M:%S %p"
 msgstr ""
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../modules/itip-formatter/itip-view.c:315
+#: ../src/modules/itip-formatter/itip-view.c:345
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:321
+#: ../src/modules/itip-formatter/itip-view.c:351
 msgid "%A, %B %e %H:%M"
 msgstr ""
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:325
+#: ../src/modules/itip-formatter/itip-view.c:355
 msgid "%A, %B %e %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:330
+#: ../src/modules/itip-formatter/itip-view.c:360
 msgid "%A, %B %e %l:%M %p"
 msgstr ""
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:334
+#: ../src/modules/itip-formatter/itip-view.c:364
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: ../modules/itip-formatter/itip-view.c:340
+#: ../src/modules/itip-formatter/itip-view.c:370
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:345
+#: ../src/modules/itip-formatter/itip-view.c:375
 msgid "%A, %B %e, %Y %H:%M"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:349
+#: ../src/modules/itip-formatter/itip-view.c:379
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:354
+#: ../src/modules/itip-formatter/itip-view.c:384
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:358
+#: ../src/modules/itip-formatter/itip-view.c:388
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:396
-#: ../modules/itip-formatter/itip-view.c:397
-#: ../modules/itip-formatter/itip-view.c:486
-#: ../modules/itip-formatter/itip-view.c:487
-#: ../modules/itip-formatter/itip-view.c:576
+#: ../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:517
+#: ../src/modules/itip-formatter/itip-view.c:606
 msgid "An unknown person"
 msgstr "Nekonata persono"
 
-#: ../modules/itip-formatter/itip-view.c:401
-#: ../modules/itip-formatter/itip-view.c:491
-#: ../modules/itip-formatter/itip-view.c:580
+#: ../src/modules/itip-formatter/itip-view.c:431
+#: ../src/modules/itip-formatter/itip-view.c:521
+#: ../src/modules/itip-formatter/itip-view.c:610
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:403
-#: ../modules/itip-formatter/itip-view.c:493
-#: ../modules/itip-formatter/itip-view.c:582
+#: ../src/modules/itip-formatter/itip-view.c:433
+#: ../src/modules/itip-formatter/itip-view.c:523
+#: ../src/modules/itip-formatter/itip-view.c:612
 #, c-format
 msgid "Received on behalf of %s"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:408
+#: ../src/modules/itip-formatter/itip-view.c:438
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:410
+#: ../src/modules/itip-formatter/itip-view.c:440
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:415
+#: ../src/modules/itip-formatter/itip-view.c:445
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:418
+#: ../src/modules/itip-formatter/itip-view.c:448
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:420
+#: ../src/modules/itip-formatter/itip-view.c:450
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:426
+#: ../src/modules/itip-formatter/itip-view.c:456
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:428
+#: ../src/modules/itip-formatter/itip-view.c:458
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:432
+#: ../src/modules/itip-formatter/itip-view.c:462
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:434
+#: ../src/modules/itip-formatter/itip-view.c:464
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:438
+#: ../src/modules/itip-formatter/itip-view.c:468
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:440
+#: ../src/modules/itip-formatter/itip-view.c:470
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:444
+#: ../src/modules/itip-formatter/itip-view.c:474
 #, c-format
-msgid "%s through %s has canceled the following meeting:"
+msgid "%s through %s has cancelled the following meeting:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:446
+#: ../src/modules/itip-formatter/itip-view.c:476
 #, c-format
-msgid "%s has canceled the following meeting:"
+msgid "%s has cancelled the following meeting:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:450
+#: ../src/modules/itip-formatter/itip-view.c:480
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:452
+#: ../src/modules/itip-formatter/itip-view.c:482
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:456
+#: ../src/modules/itip-formatter/itip-view.c:486
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:458
+#: ../src/modules/itip-formatter/itip-view.c:488
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:498
+#: ../src/modules/itip-formatter/itip-view.c:528
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:500
+#: ../src/modules/itip-formatter/itip-view.c:530
 #, c-format
 msgid "%s has published the following task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:505
+#: ../src/modules/itip-formatter/itip-view.c:535
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:508
+#: ../src/modules/itip-formatter/itip-view.c:538
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:510
+#: ../src/modules/itip-formatter/itip-view.c:540
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:516
+#: ../src/modules/itip-formatter/itip-view.c:546
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:518
+#: ../src/modules/itip-formatter/itip-view.c:548
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:522
+#: ../src/modules/itip-formatter/itip-view.c:552
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "assigned task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:524
+#: ../src/modules/itip-formatter/itip-view.c:554
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:528
+#: ../src/modules/itip-formatter/itip-view.c:558
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:530
+#: ../src/modules/itip-formatter/itip-view.c:560
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:534
+#: ../src/modules/itip-formatter/itip-view.c:564
 #, c-format
-msgid "%s through %s has canceled the following assigned task:"
+msgid "%s through %s has cancelled the following assigned task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:536
+#: ../src/modules/itip-formatter/itip-view.c:566
 #, c-format
-msgid "%s has canceled the following assigned task:"
+msgid "%s has cancelled the following assigned task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:540
+#: ../src/modules/itip-formatter/itip-view.c:570
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:542
+#: ../src/modules/itip-formatter/itip-view.c:572
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:546
+#: ../src/modules/itip-formatter/itip-view.c:576
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:548
+#: ../src/modules/itip-formatter/itip-view.c:578
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:587
+#: ../src/modules/itip-formatter/itip-view.c:617
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:589
+#: ../src/modules/itip-formatter/itip-view.c:619
 #, c-format
 msgid "%s has published the following memo:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:594
+#: ../src/modules/itip-formatter/itip-view.c:624
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:596
+#: ../src/modules/itip-formatter/itip-view.c:626
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:600
+#: ../src/modules/itip-formatter/itip-view.c:630
 #, c-format
-msgid "%s through %s has canceled the following shared memo:"
+msgid "%s through %s has cancelled the following shared memo:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:602
+#: ../src/modules/itip-formatter/itip-view.c:632
 #, c-format
-msgid "%s has canceled the following shared memo:"
+msgid "%s has cancelled the following shared memo:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:676
+#: ../src/modules/itip-formatter/itip-view.c:857
 msgid "All day:"
 msgstr "Tuttage:"
 
-#: ../modules/itip-formatter/itip-view.c:682
+#: ../src/modules/itip-formatter/itip-view.c:863
 msgid "Start day:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:682
-#: ../modules/itip-formatter/itip-view.c:1517
+#: ../src/modules/itip-formatter/itip-view.c:863
+#: ../src/modules/itip-formatter/itip-view.c:1679
 msgid "Start time:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:691
+#: ../src/modules/itip-formatter/itip-view.c:872
 msgid "End day:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:691
-#: ../modules/itip-formatter/itip-view.c:1518
+#: ../src/modules/itip-formatter/itip-view.c:872
+#: ../src/modules/itip-formatter/itip-view.c:1680
 msgid "End time:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1041
+#: ../src/modules/itip-formatter/itip-view.c:1210
 #, fuzzy
 #| msgid "_Open Calendar"
 msgid "Ope_n Calendar"
 msgstr "_Malfermi kalendaron"
 
-#: ../modules/itip-formatter/itip-view.c:1044
+#: ../src/modules/itip-formatter/itip-view.c:1213
 msgid "_Decline all"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1047
+#: ../src/modules/itip-formatter/itip-view.c:1216
 msgid "_Decline"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1050
+#: ../src/modules/itip-formatter/itip-view.c:1219
 msgid "_Tentative all"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1053
+#: ../src/modules/itip-formatter/itip-view.c:1222
 msgid "_Tentative"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1056
+#: ../src/modules/itip-formatter/itip-view.c:1225
 #, fuzzy
 #| msgid "A_ccept all"
 msgid "Acce_pt all"
 msgstr "Ak_cepti ĉiujn"
 
-#: ../modules/itip-formatter/itip-view.c:1059
-#| msgid "Accept"
+#: ../src/modules/itip-formatter/itip-view.c:1228
 msgid "Acce_pt"
 msgstr "Akce_pti"
 
-#: ../modules/itip-formatter/itip-view.c:1062
+#: ../src/modules/itip-formatter/itip-view.c:1231
 #, fuzzy
 #| msgid "Server Information"
 msgid "Send _Information"
 msgstr "Servilo-_informo"
 
-#: ../modules/itip-formatter/itip-view.c:1065
+#: ../src/modules/itip-formatter/itip-view.c:1234
 msgid "_Update Attendee Status"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1068
-#: ../smime/gui/certificate-manager.c:1664
+#: ../src/modules/itip-formatter/itip-view.c:1237
+#: ../src/smime/gui/certificate-manager.c:1677
 msgid "_Update"
 msgstr "Ĝ_isdatigi"
 
-#: ../modules/itip-formatter/itip-view.c:1520
-#: ../modules/itip-formatter/itip-view.c:1568
-#: ../modules/itip-formatter/itip-view.c:1639
+#: ../src/modules/itip-formatter/itip-view.c:1682
+#: ../src/modules/itip-formatter/itip-view.c:1730
+#: ../src/modules/itip-formatter/itip-view.c:1801
 msgid "Comment:"
 msgstr "Komento:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1556
+#: ../src/modules/itip-formatter/itip-view.c:1718
 #, fuzzy
 #| msgid "_Reply to Sender"
 msgid "Send reply to sender"
 msgstr "Sendi respondon al sendinto"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1571
+#: ../src/modules/itip-formatter/itip-view.c:1733
 msgid "Send _updates to attendees"
 msgstr ""
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1574
+#: ../src/modules/itip-formatter/itip-view.c:1736
 msgid "_Apply to all instances"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1575
+#: ../src/modules/itip-formatter/itip-view.c:1737
 msgid "Show time as _free"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1576
+#: ../src/modules/itip-formatter/itip-view.c:1738
 msgid "_Preserve my reminder"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1577
+#: ../src/modules/itip-formatter/itip-view.c:1739
 msgid "_Inherit reminder"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1910
+#: ../src/modules/itip-formatter/itip-view.c:2048
 msgid "_Tasks:"
 msgstr "_Taskoj:"
 
-#: ../modules/itip-formatter/itip-view.c:1913
+#: ../src/modules/itip-formatter/itip-view.c:2051
 msgid "_Memos:"
 msgstr "_Notoj:"
 
-#: ../modules/itip-formatter/itip-view.c:3219
+#: ../src/modules/itip-formatter/itip-view.c:2964
 msgid "Sa_ve"
 msgstr "Kons_ervi"
 
-#: ../modules/itip-formatter/itip-view.c:3681
-#: ../modules/itip-formatter/itip-view.c:5130
+#: ../src/modules/itip-formatter/itip-view.c:3486
+#: ../src/modules/itip-formatter/itip-view.c:5015
 msgid "Attendee status updated"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:3861
+#: ../src/modules/itip-formatter/itip-view.c:3701
 #, 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 ""
 
-#: ../modules/itip-formatter/itip-view.c:3890
+#: ../src/modules/itip-formatter/itip-view.c:3707
 #, c-format
-msgid "Found the appointment in the calendar '%s'"
+msgid ""
+"The calendar “%s” contains an appointment which conflicts with this meeting"
+msgid_plural ""
+"The calendar “%s” contains %d appointments which conflict with this meeting"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/modules/itip-formatter/itip-view.c:3740
+#, fuzzy, c-format
+#| msgid "Moving an event into the calendar “%s”"
+msgid "Found the appointment in the calendar “%s”"
+msgstr "Movante eventon en kalendaron “%s”"
+
+#: ../src/modules/itip-formatter/itip-view.c:3749
+msgid "This meeting invitation is obsolete. It had been updated."
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4003
+#: ../src/modules/itip-formatter/itip-view.c:3891
 msgid "Unable to find any calendars"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4011
+#: ../src/modules/itip-formatter/itip-view.c:3899
 msgid "Unable to find this meeting in any calendar"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4016
+#: ../src/modules/itip-formatter/itip-view.c:3904
 msgid "Unable to find this task in any task list"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4021
+#: ../src/modules/itip-formatter/itip-view.c:3909
 msgid "Unable to find this memo in any memo list"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4366
+#: ../src/modules/itip-formatter/itip-view.c:4250
 msgid "Opening the calendar. Please wait..."
 msgstr "Malfermante la kalendaron. Bonvole atendu..."
 
-#: ../modules/itip-formatter/itip-view.c:4371
+#: ../src/modules/itip-formatter/itip-view.c:4255
 msgid "Searching for an existing version of this appointment"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4766
-#, c-format
-msgid "Unable to send item to calendar '%s'.  %s"
-msgstr ""
+#: ../src/modules/itip-formatter/itip-view.c:4654
+#, fuzzy, c-format
+#| msgid "Unable to open memos in “%s”: %s"
+msgid "Unable to send item to calendar “%s”.  %s"
+msgstr "Ne eblis malfermi notoj en “%s”.  %s"
 
-#: ../modules/itip-formatter/itip-view.c:4781
+#: ../src/modules/itip-formatter/itip-view.c:4669
 #, c-format
-msgid "Sent to calendar '%s' as accepted"
+msgid "Sent to calendar “%s” as accepted"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4786
+#: ../src/modules/itip-formatter/itip-view.c:4674
 #, c-format
-msgid "Sent to calendar '%s' as tentative"
+msgid "Sent to calendar “%s” as tentative"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4792
+#: ../src/modules/itip-formatter/itip-view.c:4680
 #, c-format
-msgid "Sent to calendar '%s' as declined"
+msgid "Sent to calendar “%s” as declined"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4798
+#: ../src/modules/itip-formatter/itip-view.c:4686
 #, c-format
-msgid "Sent to calendar '%s' as canceled"
+msgid "Sent to calendar “%s” as cancelled"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4819
-#: ../modules/itip-formatter/itip-view.c:5277
-#: ../modules/itip-formatter/itip-view.c:5383
+#: ../src/modules/itip-formatter/itip-view.c:4706
+#: ../src/modules/itip-formatter/itip-view.c:5152
+#: ../src/modules/itip-formatter/itip-view.c:5255
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Konservante ŝanĝojn al kalendaro. Bonvole atendu..."
 
-#: ../modules/itip-formatter/itip-view.c:4860
+#: ../src/modules/itip-formatter/itip-view.c:4747
 msgid "Unable to parse item"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5053
+#: ../src/modules/itip-formatter/itip-view.c:4939
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5070
+#: ../src/modules/itip-formatter/itip-view.c:4956
 msgid "Sent a cancelation notice to the delegate"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5074
+#: ../src/modules/itip-formatter/itip-view.c:4960
 msgid "Could not send the cancelation notice to the delegate"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5122
+#: ../src/modules/itip-formatter/itip-view.c:5007
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5166
+#: ../src/modules/itip-formatter/itip-view.c:5042
 msgid "The meeting is invalid and cannot be updated"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5242
+#: ../src/modules/itip-formatter/itip-view.c:5117
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5314
-#: ../modules/itip-formatter/itip-view.c:5353
+#: ../src/modules/itip-formatter/itip-view.c:5188
+#: ../src/modules/itip-formatter/itip-view.c:5226
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5416
+#: ../src/modules/itip-formatter/itip-view.c:5287
 msgid "Meeting information sent"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5421
+#: ../src/modules/itip-formatter/itip-view.c:5292
 msgid "Task information sent"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5426
+#: ../src/modules/itip-formatter/itip-view.c:5297
 msgid "Memo information sent"
 msgstr "Noto-informoj estas sendite"
 
-#: ../modules/itip-formatter/itip-view.c:5437
+#: ../src/modules/itip-formatter/itip-view.c:5308
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5442
+#: ../src/modules/itip-formatter/itip-view.c:5313
 msgid "Unable to send task information, the task does not exist"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5447
+#: ../src/modules/itip-formatter/itip-view.c:5318
 msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5512
+#: ../src/modules/itip-formatter/itip-view.c:5383
 msgid "calendar.ics"
 msgstr "kalendaro.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5517
+#: ../src/modules/itip-formatter/itip-view.c:5388
 msgid "Save Calendar"
 msgstr "Konservi kalendaron"
 
-#: ../modules/itip-formatter/itip-view.c:5566
-#: ../modules/itip-formatter/itip-view.c:5579
+#: ../src/modules/itip-formatter/itip-view.c:5436
+#: ../src/modules/itip-formatter/itip-view.c:5449
 msgid "The calendar attached is not valid"
 msgstr "La aldonita kalendaro ne estas valida"
 
-#: ../modules/itip-formatter/itip-view.c:5567
-#: ../modules/itip-formatter/itip-view.c:5580
+#: ../src/modules/itip-formatter/itip-view.c:5437
+#: ../src/modules/itip-formatter/itip-view.c:5450
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5622
-#: ../modules/itip-formatter/itip-view.c:5652
-#: ../modules/itip-formatter/itip-view.c:5753
+#: ../src/modules/itip-formatter/itip-view.c:5492
+#: ../src/modules/itip-formatter/itip-view.c:5522
+#: ../src/modules/itip-formatter/itip-view.c:5625
 msgid "The item in the calendar is not valid"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5623
-#: ../modules/itip-formatter/itip-view.c:5653
-#: ../modules/itip-formatter/itip-view.c:5754
+#: ../src/modules/itip-formatter/itip-view.c:5493
+#: ../src/modules/itip-formatter/itip-view.c:5523
+#: ../src/modules/itip-formatter/itip-view.c:5626
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5668
+#: ../src/modules/itip-formatter/itip-view.c:5538
 msgid "The calendar attached contains multiple items"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5669
+#: ../src/modules/itip-formatter/itip-view.c:5539
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:6171
+#: ../src/modules/itip-formatter/itip-view.c:6057
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Nenio"
 
-#: ../modules/itip-formatter/itip-view.c:6187
+#: ../src/modules/itip-formatter/itip-view.c:6073
 msgid "Tentatively Accepted"
 msgstr "Prove akceptita"
 
-#: ../modules/itip-formatter/itip-view.c:6347
+#: ../src/modules/itip-formatter/itip-view.c:6239
 msgid "This meeting recurs"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:6350
+#: ../src/modules/itip-formatter/itip-view.c:6242
 msgid "This task recurs"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:6353
+#: ../src/modules/itip-formatter/itip-view.c:6245
 msgid "This memo recurs"
 msgstr ""
 
-#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
+#: ../src/modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
 
-#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+#: ../src/modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
 msgstr ""
 
-#: ../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}'?"
-msgstr ""
-
-#: ../modules/itip-formatter/plugin/config-ui.c:81
-msgid "Meeting Invitations"
-msgstr ""
-
-#: ../modules/itip-formatter/plugin/config-ui.c:107
-msgid "_Delete message after acting"
-msgstr ""
-
-#: ../modules/itip-formatter/plugin/config-ui.c:121
-#: ../modules/itip-formatter/plugin/config-ui.c:152
-msgid "Conflict Search"
-msgstr ""
-
-#. Source selector
-#: ../modules/itip-formatter/plugin/config-ui.c:136
-msgid "Select the calendars to search for meeting conflicts"
-msgstr ""
-
-#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Itip Formatter"
+#: ../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}”?"
 msgstr ""
 
-#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:2
-msgid "Display \"text/calendar\" MIME parts in mail messages."
-msgstr ""
-
-#: ../modules/mail-config/e-mail-config-google-summary.c:250
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:283
 msgid "Google Features"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:259
-#| msgid "Add local calendars to Evolution."
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:292
 msgid "Add Google Ca_lendar to this account"
 msgstr "Aldoni Google-ka_lendaron al tiu konto"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:267
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:301
 msgid "Add Google Con_tacts to this account"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:275
-msgid "You may need to enable 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:312
+msgctxt "GoggleSummary"
+msgid "IMAP access"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:245
-#: ../modules/mail-config/e-mail-config-local-accounts.c:291
+#. 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
+#, fuzzy
+#| msgid "Calendar Properties"
+msgctxt "GoggleSummary"
+msgid "Calendars to synchronize"
+msgstr "Kalendar-ecoj"
+
+#. 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
+#, c-format
+msgctxt "GoggleSummary"
+msgid "You may need to enable %s and %s"
+msgstr ""
+
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:268
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:316
 msgid "Mail _Directory:"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:246
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:269
 #, fuzzy
 #| msgid "Choose a File"
 msgid "Choose a MH mail directory"
 msgstr "Elekti dosieron"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:268
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:271
+msgid "MH mail directory cannot be empty"
+msgstr ""
+
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:292
 msgid "Local Delivery _File:"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:269
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:293
 #, fuzzy
 #| msgid "Choose calendar file"
 msgid "Choose a local delivery file"
 msgstr "Elekti kalendardosieron"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:295
+#, fuzzy
+#| msgid "The file cannot be read"
+msgid "Local delivery file cannot be empty"
+msgstr "La dosiero ne estas legebla"
+
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:317
 msgid "Choose a Maildir mail directory"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:314
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:319
+msgid "Maildir mail directory cannot be empty"
+msgstr ""
+
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:340
 #, fuzzy
 #| msgid "_File:"
 msgid "Spool _File:"
 msgstr "_Dosiero:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:341
 #, fuzzy
 #| msgid "Choose a File"
 msgid "Choose a mbox spool file"
 msgstr "Elekti dosieron"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:337
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:343
+#, fuzzy
+#| msgid "The file cannot be read"
+msgid "Mbox spool file cannot be empty"
+msgstr "La dosiero ne estas legebla"
+
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:364
 msgid "Spool _Directory:"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:338
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:365
 msgid "Choose a mbox spool directory"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:136
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:92
-#: ../modules/plugin-manager/evolution-plugin-manager.c:158
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:367
+msgid "Mbox spool directory cannot be empty"
+msgstr ""
+
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:198
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:59
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:154
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:156
 msgid "Configuration"
 msgstr "Agordo"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:154
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
-#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+#: ../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 "_Servilo:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:168
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:230
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:185
 msgid "_Port:"
 msgstr "_Pordo:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:180
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:242
+#. do not reference
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:251
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:313
 msgid "User_name:"
 msgstr "Uzanto_nomo:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:213
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
-#| msgid "Encryption:"
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:265
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:327
+#, fuzzy
+#| msgid "_Forget Passwords"
+msgid "_Forget password"
+msgstr "_Forgesigi pasvortojn"
+
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:291
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:234
 msgid "Encryption _method:"
 msgstr "Ĉifrado-_metodo:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:228
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:178
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:306
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:249
 msgid "STARTTLS after connecting"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:232
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:182
-msgid "SSL on a dedicated port"
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:310
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:253
+msgid "TLS on a dedicated port"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
-msgid "_Use custom binary, instead of 'sendmail'"
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:75
+msgid "_Use custom binary, instead of “sendmail”"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:74
-#| msgid "Custom Alarm:"
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:79
 msgid "_Custom binary:"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:98
 #, fuzzy
 #| msgid "Use custom fonts"
 msgid "U_se custom arguments"
 msgstr "U_zu personecigitajn riparojn"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:102
 #, fuzzy
 #| msgid "Custom Alarm:"
 msgid "Cus_tom arguments:"
 msgstr "Cus_tom argumentoj:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
+#: ../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"
+"Default arguments are “-i -f %F -- %R”, where\n"
+"   %F — stands for the From address\n"
+"   %R — stands for the recipient addresses"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:128
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:135
 #, fuzzy
 #| msgid "Start in offline mode"
 msgid "Send mail also when in offline _mode"
 msgstr "Starti per nekonektita _reĝimo"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:135
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:208
+msgid "Custom binary cannot be empty"
+msgstr ""
+
+#. do not reference
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:206
 msgid "Ser_ver requires authentication"
 msgstr "Ser_vilo bezonas aŭtentigon"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:224
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:295
 msgid "T_ype:"
 msgstr "T_ipo:"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:245
+#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:252
 msgid "Yahoo! Features"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:254
+#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:261
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr ""
 
-#: ../modules/mail/e-mail-attachment-handler.c:424
+#: ../src/modules/mail/e-mail-attachment-handler.c:671
 #, fuzzy, c-format
 #| msgid "%d attached messages"
 msgid "%d attached message"
@@ -20746,729 +23710,856 @@ msgid_plural "%d attached messages"
 msgstr[0] "%d aldonitaj mesaĝoj"
 msgstr[1] "%d aldonitaj mesaĝoj"
 
-#: ../modules/mail/e-mail-shell-backend.c:349
+#: ../src/modules/mail/e-mail-shell-backend.c:383
 msgctxt "New"
 msgid "_Mail Message"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:351
+#: ../src/modules/mail/e-mail-shell-backend.c:385
 msgid "Compose a new mail message"
 msgstr "Krei novan retpoŝtan mesaĝon"
 
-#: ../modules/mail/e-mail-shell-backend.c:359
+#: ../src/modules/mail/e-mail-shell-backend.c:393
 #, fuzzy
 #| msgid "Mail Accounts"
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "Retpoŝt_konto"
 
-#: ../modules/mail/e-mail-shell-backend.c:361
+#: ../src/modules/mail/e-mail-shell-backend.c:395
 #, fuzzy
 #| msgid "Create a new contact"
 msgid "Create a new mail account"
 msgstr "Krei novan kontakton"
 
-#: ../modules/mail/e-mail-shell-backend.c:366
+#: ../src/modules/mail/e-mail-shell-backend.c:400
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Retpoŝta _dosierujo"
 
-#: ../modules/mail/e-mail-shell-backend.c:368
+#: ../src/modules/mail/e-mail-shell-backend.c:402
 msgid "Create a new mail folder"
 msgstr "Krei novan retpoŝtan dosierujon"
 
-#: ../modules/mail/e-mail-shell-backend.c:683
-msgid "Mail Accounts"
-msgstr "Retpoŝtkontoj"
+#. 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
+msgctxt "NetworkMonitor"
+msgid "base"
+msgstr ""
+
+#. 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
+msgctxt "NetworkMonitor"
+msgid "netlink"
+msgstr ""
+
+#. 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
+msgctxt "NetworkMonitor"
+msgid "networkmanager"
+msgstr ""
+
+#: ../src/modules/mail/e-mail-shell-backend.c:753
+msgctxt "NetworkMonitor"
+msgid "Method to detect _online state:"
+msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:692
+#. Always as the first
+#: ../src/modules/mail/e-mail-shell-backend.c:762
+#, fuzzy
+#| msgid "Default"
+msgctxt "NetworkMonitor"
+msgid "Default"
+msgstr "Defaŭlto"
+
+#. Always as the last
+#: ../src/modules/mail/e-mail-shell-backend.c:776
+#, fuzzy
+#| msgid "Always"
+msgctxt "NetworkMonitor"
+msgid "Always Online"
+msgstr "Ĉiam"
+
+#: ../src/modules/mail/e-mail-shell-backend.c:845
 msgid "Mail Preferences"
 msgstr "Agordoj de retpoŝto"
 
-#: ../modules/mail/e-mail-shell-backend.c:701
+#: ../src/modules/mail/e-mail-shell-backend.c:854
 msgid "Composer Preferences"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:711
+#: ../src/modules/mail/e-mail-shell-backend.c:863
 msgid "Network Preferences"
 msgstr ""
 
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:1003
+#: ../src/modules/mail/e-mail-shell-backend.c:1216
 msgctxt "label"
 msgid "None"
 msgstr "Neniu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:712
-#| msgid "Mark Me_ssages as Read"
+#: ../src/modules/mail/e-mail-shell-view-actions.c:781
 msgid "Marking messages as read..."
 msgstr "Marki mesaĝojn kiel legite..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1572
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1140
+#, fuzzy
+#| msgid "Move to Folder"
+msgid "Go to Folder"
+msgstr "Movi al dosierujo"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1144
+#| msgid "Select"
+msgid "_Select"
+msgstr "_Elekti"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1624
 msgid "_Disable Account"
 msgstr "_Elŝalti konton"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1574
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1626
 msgid "Disable this account"
 msgstr "Elŝalti tiun konton"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1581
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1633
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1588
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1638
+#, fuzzy
+#| msgid "_Junk"
+msgid "Empty _Junk"
+msgstr "_Rubaĵo"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1640
+#, fuzzy
+#| msgid "Permanently remove all deleted messages from this folder"
+msgid "Delete all Junk messages from all folders"
+msgstr "Daŭre forigi ĉiujn forigitajn mesaĝojn de tiu dosierujo"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1647
 msgid "Edit properties of this account"
 msgstr "Redakti atribuojn de tiu ĉi konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1595
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1654
 #, fuzzy
 #| msgid "Refresh the folder list"
 msgid "Refresh list of folders of this account"
 msgstr "Aktualigi la dosierujoliston"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1600
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1659
 msgid "_Download Messages for Offline Usage"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1602
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1661
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1607
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Fl_ush Outbox"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1614
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
 msgid "_Copy Folder To..."
 msgstr "_Kopii dosierujon al..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1616
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1675
 msgid "Copy the selected folder into another folder"
 msgstr "Kopii la elektitan dosierujon al alia dosierujo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1623
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1682
 msgid "Permanently remove this folder"
 msgstr "Daŭre forigi tiun dosierujon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1628
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1687
 msgid "E_xpunge"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1630
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1689
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Daŭre forigi ĉiujn forigitajn mesaĝojn de tiu dosierujo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1635
-#: ../modules/mail/e-mail-shell-view-actions.c:1736
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1802
 msgid "Mar_k All Messages as Read"
 msgstr "Mar_ki ĉiujn mesaĝojn kiel legite"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1637
-#: ../modules/mail/e-mail-shell-view-actions.c:1738
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1696
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1804
 msgid "Mark all messages in the folder as read"
 msgstr "Marki ĉiujn mesaĝojn en la dosierujo kiel legite"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1642
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
 msgid "_Move Folder To..."
 msgstr "_Movi dosierujon al..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1644
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1703
 msgid "Move the selected folder into another folder"
 msgstr "Movi la elektitan dosierujon al alia dosierujo"
 
 #. Translators: An action caption to create a new mail folder
-#: ../modules/mail/e-mail-shell-view-actions.c:1650
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1709
 msgid "_New..."
 msgstr "_Nova..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1652
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1711
 msgid "Create a new folder for storing mail"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1659
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1718
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1666
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1725
 msgid "Refresh the folder"
 msgstr "Aktualigi la dosierujon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1673
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1732
 msgid "Change the name of this folder"
 msgstr "Ŝanĝi la nomon de la dosierujo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1678
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1737
 msgid "Select Message _Thread"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1680
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1739
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1685
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
 msgid "Select Message S_ubthread"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1687
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1746
 msgid "Select all replies to the currently selected message"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1699
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
 msgid "Empty _Trash"
 msgstr "Malplenigi _rubujon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1701
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1760
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1706
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1765
+#| msgid "Move to Folder"
+msgid "Go to _Folder"
+msgstr "Iri al _dosierujo"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1767
+msgid "Opens a dialog to select a folder to go to"
+msgstr ""
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1772
 msgid "_New Label"
 msgstr "_Nova etikedo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1715
+#. 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
 msgid "N_one"
 msgstr "N_eniu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1729
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1795
 msgid "_Manage Subscriptions"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1731
-#: ../modules/mail/e-mail-shell-view-actions.c:1815
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1797
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1881
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1743
-#: ../modules/mail/e-mail-shell-view-actions.c:1764
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1809
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1830
 msgid "Send / _Receive"
 msgstr "Sendi / _Ricevi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1745
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1811
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1750
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1816
 msgid "R_eceive All"
 msgstr "R_icevi ĉiujn"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1752
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1818
 msgid "Receive new items from all accounts"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1757
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1823
 msgid "_Send All"
 msgstr "_Sendi ĉiujn"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1759
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1825
 msgid "Send queued items in all accounts"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1787
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1853
 msgid "Cancel the current mail operation"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1792
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1858
 msgid "Collapse All _Threads"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1794
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1860
 msgid "Collapse all message threads"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1799
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1865
 msgid "E_xpand All Threads"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1801
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1867
 msgid "Expand all message threads"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1806
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1872
 msgid "_Message Filters"
 msgstr "_Mesaĝfiltriloj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1808
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1874
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1813
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1879
 msgid "_Subscriptions..."
 msgstr "_Subskriboj..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1822
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1888
 msgid "F_older"
 msgstr "D_osierujo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1829
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1895
 msgid "_Label"
 msgstr "_Etikedo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1846
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1912
 msgid "C_reate Search Folder From Search..."
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1853
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1919
 msgid "Search F_olders"
 msgstr "Serĉ_dosierujoj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1855
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1921
 msgid "Create or edit search folder definitions"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1894
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1964
 msgid "_New Folder..."
 msgstr "_Nova dosierujo..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1922
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1992
 msgid "Show Message _Preview"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1924
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1994
 msgid "Show message preview pane"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1930
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2000
+#, fuzzy
+#| msgid "Show Attachment _Bar"
+msgid "Show _Attachment Bar"
+msgstr "Montri aldonaĵ_breton"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2002
+msgid ""
+"Show Attachment Bar below the message preview pane when the message has "
+"attachments"
+msgstr ""
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2008
 msgid "Show _Deleted Messages"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1932
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2010
 msgid "Show deleted messages with a line through them"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1938
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2016
+#| msgid "Sent Messages"
+msgid "Show _Junk Messages"
+msgstr "Montri _rubmesaĝojn"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2018
+msgid "Show junk messages with a red line through them"
+msgstr ""
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2024
 msgid "_Group By Threads"
 msgstr "_Grupigi laŭ fadenoj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1940
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2026
 msgid "Threaded message list"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1946
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2032
+#, fuzzy
+#| msgid "Show _Tool Bar"
+msgid "Show To _Do Bar"
+msgstr "Montri _ilobreton"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2034
+msgid "Show To Do bar with appointments and tasks"
+msgstr ""
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2040
 msgid "_Unmatched Folder Enabled"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1948
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2042
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1968
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2062
 msgid "Show message preview below the message list"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1975
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2069
 msgid "Show message preview alongside the message list"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1983
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2077
 msgid "All Messages"
 msgstr "Ĉiuj mesaĝoj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1990
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2084
 msgid "Important Messages"
 msgstr "Gravaj mesaĝoj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1997
-msgid "Last 5 Days' Messages"
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2091
+msgid "Last 5 Days’ Messages"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2004
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2098
 msgid "Messages Not Junk"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2011
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2105
 msgid "Messages with Attachments"
 msgstr "Mesaĝoj kun aldonaĵoj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2018
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2112
+#, fuzzy
+#| msgid "Messages with Attachments"
+msgid "Messages with Notes"
+msgstr "Mesaĝoj kun aldonaĵoj"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2119
 msgid "No Label"
 msgstr "Neniu etikedo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2025
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2126
 msgid "Read Messages"
 msgstr "Legitaj mesaĝoj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2032
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2133
 msgid "Unread Messages"
 msgstr "Nelegitaj mesaĝoj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2091
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2140
+#, fuzzy
+#| msgid "Message Header"
+msgid "Message Thread"
+msgstr "Mesaĝokapo"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2200
 msgid "Subject or Addresses contain"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2101
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2210
 msgid "All Accounts"
 msgstr "Ĉiuj kontoj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2108
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2217
 msgid "Current Account"
 msgstr "Aktualo konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2115
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2224
 msgid "Current Folder"
 msgstr "Aktuala dosierujo"
 
-#: ../modules/mail/e-mail-shell-view.c:700
+#: ../src/modules/mail/e-mail-shell-view.c:777
 msgid "All Account Search"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view.c:808
+#: ../src/modules/mail/e-mail-shell-view.c:885
 msgid "Account Search"
 msgstr "Kontoserĉo"
 
-#: ../modules/mail/e-mail-shell-view-private.c:986
+#: ../src/modules/mail/e-mail-shell-view-private.c:925
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d elektite, "
 msgstr[1] "%d elektite, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:995
-#: ../modules/mail/e-mail-shell-view-private.c:1012
+#: ../src/modules/mail/e-mail-shell-view-private.c:934
+#: ../src/modules/mail/e-mail-shell-view-private.c:951
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d forigite"
 msgstr[1] "%d forigite"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1021
-#: ../modules/mail/e-mail-shell-view-private.c:1027
+#: ../src/modules/mail/e-mail-shell-view-private.c:960
+#: ../src/modules/mail/e-mail-shell-view-private.c:966
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d trudmesaĵo"
 msgstr[1] "%d trudmesaĵoj"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1034
+#: ../src/modules/mail/e-mail-shell-view-private.c:973
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d malneto"
 msgstr[1] "%d malnetoj"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1040
+#: ../src/modules/mail/e-mail-shell-view-private.c:979
 #, fuzzy, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d nesendita"
 msgstr[1] "%d nesenditaj"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1046
+#: ../src/modules/mail/e-mail-shell-view-private.c:985
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sendite"
 msgstr[1] "%d sendite"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1058
+#: ../src/modules/mail/e-mail-shell-view-private.c:1002
 #, c-format
-msgid "%d unread, "
-msgid_plural "%d unread, "
-msgstr[0] "%d nelegite, "
-msgstr[1] "%d nelegite, "
-
-#: ../modules/mail/e-mail-shell-view-private.c:1061
-#, fuzzy, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "%d totala"
-msgstr[1] "%d totalaj"
+#| msgid "%d unread, "
+#| msgid_plural "%d unread, "
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d nelegite"
+msgstr[1] "%d nelegite"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1569
+#: ../src/modules/mail/e-mail-shell-view-private.c:1520
 msgid "Send / Receive"
 msgstr "Sendi / Ricevi"
 
-#: ../modules/mail/em-composer-prefs.c:413
+#: ../src/modules/mail/em-composer-prefs.c:419
 #, fuzzy
 #| msgid "Select Folder"
 msgid "Select Folder to Add"
 msgstr "Elekti dosierujon"
 
-#: ../modules/mail/em-composer-prefs.c:883
+#: ../src/modules/mail/em-composer-prefs.c:895
 msgid "Folder"
 msgstr "Dosierujo"
 
-#: ../modules/mail/em-composer-prefs.c:919
+#: ../src/modules/mail/em-composer-prefs.c:931
 msgid "Recipient"
 msgstr ""
 
-#: ../modules/mail/em-composer-prefs.c:1192
+#: ../src/modules/mail/em-composer-prefs.c:1222
 #, fuzzy
 #| msgid "Outbox"
 msgid "Keep in Outbox"
 msgstr "Elirkesto"
 
-#: ../modules/mail/em-composer-prefs.c:1193
-#| msgid "_Send message"
+#: ../src/modules/mail/em-composer-prefs.c:1223
 msgid "Send immediately"
 msgstr "Sendi tuj"
 
-#: ../modules/mail/em-composer-prefs.c:1194
-#| msgid "05 minutes"
+#: ../src/modules/mail/em-composer-prefs.c:1224
 msgid "Send after 5 minutes"
 msgstr "Sendi post 5 minutoj"
 
-#: ../modules/mail/em-composer-prefs.c:1267
+#: ../src/modules/mail/em-composer-prefs.c:1309
 msgid "Language(s)"
 msgstr "Lingvo(j)"
 
-#: ../modules/mail/em-mailer-prefs.c:79
+#: ../src/modules/mail/em-mailer-prefs.c:77
 #, fuzzy
 #| msgid "Every time"
 msgid "On exit, every time"
 msgstr "Ĉiam"
 
-#: ../modules/mail/em-mailer-prefs.c:80
+#: ../src/modules/mail/em-mailer-prefs.c:78
 msgid "Once per day"
 msgstr "Unufoje dum tago"
 
-#: ../modules/mail/em-mailer-prefs.c:81
+#: ../src/modules/mail/em-mailer-prefs.c:79
 msgid "Once per week"
 msgstr "Unufoje dum semajno"
 
-#: ../modules/mail/em-mailer-prefs.c:82
+#: ../src/modules/mail/em-mailer-prefs.c:80
 msgid "Once per month"
 msgstr "Unufoje dum monato"
 
-#: ../modules/mail/em-mailer-prefs.c:83
+#: ../src/modules/mail/em-mailer-prefs.c:81
 msgid "Immediately, on folder leave"
 msgstr ""
 
-#: ../modules/mail/em-mailer-prefs.c:356
+#: ../src/modules/mail/em-mailer-prefs.c:418
 msgid "Header"
 msgstr "Paĝokapo"
 
-#: ../modules/mail/em-mailer-prefs.c:360
+#: ../src/modules/mail/em-mailer-prefs.c:422
 msgid "Contains Value"
 msgstr ""
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1236
+#: ../src/modules/mail/em-mailer-prefs.c:1570
 msgid "_Date header:"
 msgstr ""
 
-#: ../modules/mail/em-mailer-prefs.c:1237
+#: ../src/modules/mail/em-mailer-prefs.c:1571
 msgid "Show _original header value"
 msgstr ""
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:140
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:112
+#| msgid "Do not warn me again"
+msgid "Do _not change settings"
+msgstr "_Ne ŝanĝi agordojn"
+
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:113
+#| msgid "Mark as _default task list"
+msgid "_Set as default email client"
+msgstr "_Marki kiel defaŭlta retpoŝtumilo"
+
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:138
 msgid "Do you want to make Evolution your default email client?"
 msgstr "Ĉu vi volas igi Evolucion je via defaŭlta retpoŝtumilo?"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:304
+#: ../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 ""
 
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:370
+#: ../src/modules/mdn/evolution-mdn.c:374
 #, c-format
-msgid "Delivery Notification for \"%s\""
+msgid "Delivery Notification for “%s”"
 msgstr ""
 
-#: ../modules/mdn/evolution-mdn.c:531
+#: ../src/modules/mdn/evolution-mdn.c:540
 #, c-format
-msgid "Send a read receipt to '%s'"
+msgid "Send a read receipt to “%s”"
 msgstr ""
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:536
+#: ../src/modules/mdn/evolution-mdn.c:545
 msgid "_Notify Sender"
 msgstr ""
 
-#: ../modules/mdn/evolution-mdn.error.xml.h:1
+#: ../src/modules/mdn/evolution-mdn.error.xml.h:1
 msgid "Sender wants to be notified when you have read this message."
 msgstr ""
 
-#: ../modules/mdn/evolution-mdn.error.xml.h:2
+#: ../src/modules/mdn/evolution-mdn.error.xml.h:2
 msgid "Sender has been notified that you have read this message."
 msgstr ""
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
+#: ../src/modules/offline-alert/evolution-offline-alert.error.xml.h:1
 msgid "Evolution is currently offline."
 msgstr "Evolutionon nun estas senkonekta."
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
-msgid "Click 'Work Online' to return to online mode."
+#: ../src/modules/offline-alert/evolution-offline-alert.error.xml.h:2
+msgid "Click “Work Online” to return to online mode."
 msgstr ""
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
+#: ../src/modules/offline-alert/evolution-offline-alert.error.xml.h:3
 msgid "Evolution is currently offline due to a network outage."
 msgstr ""
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
+#: ../src/modules/offline-alert/evolution-offline-alert.error.xml.h:4
 msgid ""
 "Evolution will return to online mode once a network connection is "
 "established."
 msgstr ""
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:65
 msgid "Author(s)"
 msgstr "Aŭtoro(j)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:253
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:251
 msgid "Plugin Manager"
 msgstr "Kromprogram-administrilo"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:268
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:266
 msgid "Note: Some changes will not take effect until restart"
 msgstr ""
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:297
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:294
 msgid "Overview"
 msgstr "Superrigardo"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:366
-#: ../modules/plugin-manager/evolution-plugin-manager.c:449
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:363
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:446
 msgid "Plugin"
 msgstr "Kromprogramo"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:484
 msgid "_Plugins"
 msgstr "_Kromprogramoj"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:488
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:485
 msgid "Enable and disable plugins"
 msgstr "Enŝalti kaj elŝalti kromprogramojn"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:139
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:137
 #, fuzzy
 #| msgid "Display the next message"
 msgid "Display plain text version"
 msgstr "Montri la sekvan mesaĝon"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:141
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:139
 #, fuzzy
 #| msgid "Display the next important message"
 msgid "Display plain text version of multipart/alternative message"
 msgstr "Montri la sekvan gravan mesaĝon"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:147
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:145
 msgid "Display HTML version"
 msgstr "Vidigi HTML-version"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:149
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:147
 #, fuzzy
 #| msgid "Display the previous important message"
 msgid "Display HTML version of multipart/alternative message"
 msgstr "Montri la antaŭan gravan mesaĝon"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
-#: ../modules/prefer-plain/plugin/config-ui.c:43
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:77
+#: ../src/modules/prefer-plain/plugin/config-ui.c:35
 msgid "Show HTML if present"
 msgstr ""
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
-#: ../modules/prefer-plain/plugin/config-ui.c:44
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../src/modules/prefer-plain/plugin/config-ui.c:36
 msgid "Let Evolution choose the best part to show."
 msgstr ""
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
-#: ../modules/prefer-plain/plugin/config-ui.c:47
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:81
+#: ../src/modules/prefer-plain/plugin/config-ui.c:39
 msgid "Show plain text if present"
 msgstr ""
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
-#: ../modules/prefer-plain/plugin/config-ui.c:48
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../src/modules/prefer-plain/plugin/config-ui.c:40
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr ""
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
-#: ../modules/prefer-plain/plugin/config-ui.c:52
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:86
+#: ../src/modules/prefer-plain/plugin/config-ui.c:44
+msgid "Show plain text if present, or HTML source"
+msgstr ""
+
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../src/modules/prefer-plain/plugin/config-ui.c:45
+msgid "Show plain text part, if present, otherwise the HTML part source."
+msgstr ""
+
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:91
+#: ../src/modules/prefer-plain/plugin/config-ui.c:49
 msgid "Only ever show plain text"
 msgstr ""
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
-#: ../modules/prefer-plain/plugin/config-ui.c:53
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:92
+#: ../src/modules/prefer-plain/plugin/config-ui.c:50
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr ""
 
-#: ../modules/prefer-plain/plugin/config-ui.c:104
+#: ../src/modules/prefer-plain/plugin/config-ui.c:101
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr ""
 
-#: ../modules/prefer-plain/plugin/config-ui.c:126
+#: ../src/modules/prefer-plain/plugin/config-ui.c:123
 msgid "HTML _Mode"
 msgstr "HTML-_reĝomo"
 
-#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:1
+#: ../src/modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:1
 msgid "Prefer Plain Text"
 msgstr "Preferi platan tekston"
 
 #. but then we also need to create our own section frame
-#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:3
+#: ../src/modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:3
 msgid "Plain Text Mode"
 msgstr ""
 
-#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:4
+#: ../src/modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:4
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:187
+#: ../src/modules/spamassassin/evolution-spamassassin.c:188
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:210
+#: ../src/modules/spamassassin/evolution-spamassassin.c:211
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:229
+#: ../src/modules/spamassassin/evolution-spamassassin.c:230
 #, c-format
-msgid "Failed to write '%s' to SpamAssassin: "
+msgid "Failed to write “%s” to SpamAssassin: "
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:257
+#: ../src/modules/spamassassin/evolution-spamassassin.c:258
 msgid "Failed to read output from SpamAssassin: "
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:312
+#: ../src/modules/spamassassin/evolution-spamassassin.c:313
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:535
+#: ../src/modules/spamassassin/evolution-spamassassin.c:536
 msgid "SpamAssassin Options"
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:550
+#: ../src/modules/spamassassin/evolution-spamassassin.c:551
 msgid "I_nclude remote tests"
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:564
+#: ../src/modules/spamassassin/evolution-spamassassin.c:565
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:739
-#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
+#: ../src/modules/spamassassin/evolution-spamassassin.c:740
+#: ../src/modules/spamassassin/org.gnome.Evolution-spamassassin.metainfo.xml.in.h:1
 msgid "SpamAssassin"
 msgstr ""
 
-#: ../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 ""
 
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/startup-wizard/e-mail-config-import-page.c:260
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:339
+#: ../src/modules/startup-wizard/e-mail-config-import-page.c:271
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:340
 msgid "Importing Files"
 msgstr "Enportante dosierojn"
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:258
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:257
 msgid "Import cancelled."
 msgstr "Nuligita enporto."
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:275
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:274
 msgid "Import complete."
 msgstr "Kompleta enporto."
 
-#: ../modules/startup-wizard/e-startup-assistant.c:155
+#: ../src/modules/startup-wizard/e-startup-assistant.c:158
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
@@ -21476,357 +24567,356 @@ msgid ""
 "and to import files from other applications."
 msgstr ""
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:228
+#: ../src/modules/startup-wizard/e-startup-assistant.c:165
+#, fuzzy
+#| msgid "_Do not show this message again"
+msgid "Do not _show this wizard again"
+msgstr "Ne _plu montri ĉi tiun mesaĝon"
+
+#: ../src/modules/startup-wizard/evolution-startup-wizard.c:212
 msgid "Loading accounts..."
 msgstr "Ŝargante kontojn..."
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:94
+#: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:93
 #, fuzzy
 #| msgid "_Format:"
 msgid "_Format as..."
 msgstr "_Formigi kiel..."
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:102
+#: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:101
 #, fuzzy
 #| msgid "_Languages"
 msgid "_Other languages"
 msgstr "_Lingvoj"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:438
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:453
 msgid "Text Highlight"
 msgstr ""
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:439
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:454
 msgid "Syntax highlighting of mail parts"
 msgstr ""
 
-#: ../modules/text-highlight/languages.c:31
+#: ../src/modules/text-highlight/languages.c:29
 msgid "_Plain text"
 msgstr "_Plata teksto"
 
-#: ../modules/text-highlight/languages.c:37
+#: ../src/modules/text-highlight/languages.c:35
 msgid "_Assembler"
 msgstr ""
 
-#: ../modules/text-highlight/languages.c:42
+#: ../src/modules/text-highlight/languages.c:40
 msgid "_Bash"
 msgstr "_Bash"
 
-#: ../modules/text-highlight/languages.c:53
+#: ../src/modules/text-highlight/languages.c:51
 msgid "_C/C++"
 msgstr "_C/C++"
 
-#: ../modules/text-highlight/languages.c:62
+#: ../src/modules/text-highlight/languages.c:60
 msgid "_C#"
 msgstr "_C#"
 
-#: ../modules/text-highlight/languages.c:67
+#: ../src/modules/text-highlight/languages.c:65
 msgid "_Cascade Style Sheet"
 msgstr ""
 
-#: ../modules/text-highlight/languages.c:80
+#: ../src/modules/text-highlight/languages.c:78
 msgid "_Java"
 msgstr "_Java"
 
-#: ../modules/text-highlight/languages.c:86
+#: ../src/modules/text-highlight/languages.c:84
 msgid "_JavaScript"
 msgstr "_JavaScript"
 
-#: ../modules/text-highlight/languages.c:92
+#: ../src/modules/text-highlight/languages.c:90
 msgid "_Patch/diff"
 msgstr ""
 
-#: ../modules/text-highlight/languages.c:98
+#: ../src/modules/text-highlight/languages.c:96
 msgid "_Perl"
 msgstr "_Perl"
 
-#: ../modules/text-highlight/languages.c:109
+#: ../src/modules/text-highlight/languages.c:107
 msgid "_PHP"
 msgstr "_PHP"
 
-#: ../modules/text-highlight/languages.c:122
+#: ../src/modules/text-highlight/languages.c:120
 msgid "_Python"
 msgstr "_Python"
 
-#: ../modules/text-highlight/languages.c:127
+#: ../src/modules/text-highlight/languages.c:125
 msgid "_Ruby"
 msgstr "_Ruby"
 
-#: ../modules/text-highlight/languages.c:134
+#: ../src/modules/text-highlight/languages.c:132
 msgid "_Tcl/Tk"
 msgstr "_Tcl/Tk"
 
-#: ../modules/text-highlight/languages.c:140
+#: ../src/modules/text-highlight/languages.c:138
 msgid "_TeX/LaTeX"
 msgstr "_TeX/LaTeX"
 
-#: ../modules/text-highlight/languages.c:146
+#: ../src/modules/text-highlight/languages.c:144
 msgid "_Vala"
 msgstr "_Vala"
 
-#: ../modules/text-highlight/languages.c:151
+#: ../src/modules/text-highlight/languages.c:149
 msgid "_Visual Basic"
 msgstr "_Visual Basic"
 
-#: ../modules/text-highlight/languages.c:158
+#: ../src/modules/text-highlight/languages.c:156
 msgid "_XML"
 msgstr "_XML"
 
-#: ../modules/text-highlight/languages.c:176
+#: ../src/modules/text-highlight/languages.c:174
 msgid "_ActionScript"
 msgstr "_ActionScript"
 
-#: ../modules/text-highlight/languages.c:181
+#: ../src/modules/text-highlight/languages.c:179
 msgid "_ADA95"
 msgstr "_ADA95"
 
-#: ../modules/text-highlight/languages.c:188
+#: ../src/modules/text-highlight/languages.c:186
 msgid "_ALGOL 68"
 msgstr "_ALGOL 68"
 
-#: ../modules/text-highlight/languages.c:193
+#: ../src/modules/text-highlight/languages.c:191
 msgid "(_G)AWK"
 msgstr "(_G)AWK"
 
-#: ../modules/text-highlight/languages.c:198
+#: ../src/modules/text-highlight/languages.c:196
 msgid "_COBOL"
 msgstr "_COBOL"
 
-#: ../modules/text-highlight/languages.c:203
+#: ../src/modules/text-highlight/languages.c:201
 msgid "_DOS Batch"
 msgstr "_DOS Batch"
 
-#: ../modules/text-highlight/languages.c:208
+#: ../src/modules/text-highlight/languages.c:206
 msgid "_D"
 msgstr "_D"
 
-#: ../modules/text-highlight/languages.c:213
+#: ../src/modules/text-highlight/languages.c:211
 msgid "_Erlang"
 msgstr "_Erlang"
 
-#: ../modules/text-highlight/languages.c:218
+#: ../src/modules/text-highlight/languages.c:216
 msgid "_FORTRAN 77"
 msgstr "_FORTRAN 77"
 
-#: ../modules/text-highlight/languages.c:224
+#: ../src/modules/text-highlight/languages.c:222
 msgid "_FORTRAN 90"
 msgstr "_FORTRAN 90"
 
-#: ../modules/text-highlight/languages.c:229
+#: ../src/modules/text-highlight/languages.c:227
 msgid "_F#"
 msgstr "_F#"
 
-#: ../modules/text-highlight/languages.c:234
+#: ../src/modules/text-highlight/languages.c:232
 msgid "_Go"
 msgstr "_Go"
 
-#: ../modules/text-highlight/languages.c:239
+#: ../src/modules/text-highlight/languages.c:237
 msgid "_Haskell"
 msgstr "_Haskell"
 
-#: ../modules/text-highlight/languages.c:244
+#: ../src/modules/text-highlight/languages.c:242
 msgid "_JSP"
 msgstr "_JSP"
 
-#: ../modules/text-highlight/languages.c:249
+#: ../src/modules/text-highlight/languages.c:247
 msgid "_Lisp"
 msgstr "_Lisp"
 
-#: ../modules/text-highlight/languages.c:257
+#: ../src/modules/text-highlight/languages.c:255
 msgid "_Lotus"
 msgstr "_Lotus"
 
-#: ../modules/text-highlight/languages.c:262
+#: ../src/modules/text-highlight/languages.c:260
 msgid "_Lua"
 msgstr "_Lua"
 
-#: ../modules/text-highlight/languages.c:267
+#: ../src/modules/text-highlight/languages.c:265
 msgid "_Maple"
 msgstr "_Maple"
 
-#: ../modules/text-highlight/languages.c:272
+#: ../src/modules/text-highlight/languages.c:270
 msgid "_Matlab"
 msgstr "_Matlab"
 
-#: ../modules/text-highlight/languages.c:277
+#: ../src/modules/text-highlight/languages.c:275
 msgid "_Maya"
 msgstr "_Maya"
 
-#: ../modules/text-highlight/languages.c:282
+#: ../src/modules/text-highlight/languages.c:280
 msgid "_Oberon"
 msgstr "_Oberon"
 
-#: ../modules/text-highlight/languages.c:287
+#: ../src/modules/text-highlight/languages.c:285
 msgid "_Objective C"
 msgstr "_Objective C"
 
-#: ../modules/text-highlight/languages.c:293
+#: ../src/modules/text-highlight/languages.c:291
 msgid "_OCaml"
 msgstr "_OCaml"
 
-#: ../modules/text-highlight/languages.c:298
+#: ../src/modules/text-highlight/languages.c:296
 msgid "_Octave"
 msgstr "_Octave"
 
-#: ../modules/text-highlight/languages.c:303
+#: ../src/modules/text-highlight/languages.c:301
 msgid "_Object Script"
 msgstr "_Object Script"
 
-#: ../modules/text-highlight/languages.c:308
+#: ../src/modules/text-highlight/languages.c:306
 msgid "_Pascal"
 msgstr "_Pascal"
 
-#: ../modules/text-highlight/languages.c:313
+#: ../src/modules/text-highlight/languages.c:311
 msgid "_POV-Ray"
 msgstr "_POV-Ray"
 
-#: ../modules/text-highlight/languages.c:318
-#| msgid "_Program:"
+#: ../src/modules/text-highlight/languages.c:316
 msgid "_Prolog"
 msgstr "_Prolog"
 
-#: ../modules/text-highlight/languages.c:323
+#: ../src/modules/text-highlight/languages.c:321
 msgid "_R"
 msgstr "_R"
 
-#: ../modules/text-highlight/languages.c:328
+#: ../src/modules/text-highlight/languages.c:326
 msgid "_RPM Spec"
 msgstr "_RPM Spec"
 
-#: ../modules/text-highlight/languages.c:333
+#: ../src/modules/text-highlight/languages.c:331
 msgid "_Scala"
 msgstr "_Scala"
 
-#: ../modules/text-highlight/languages.c:338
+#: ../src/modules/text-highlight/languages.c:336
 msgid "_Smalltalk"
 msgstr "_Smalltalk"
 
-#: ../modules/text-highlight/languages.c:344
+#: ../src/modules/text-highlight/languages.c:342
 msgid "_TCSH"
 msgstr "_TCSH"
 
-#: ../modules/text-highlight/languages.c:349
+#: ../src/modules/text-highlight/languages.c:347
 msgid "_VHDL"
 msgstr "_VHDL"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:131
-#: ../modules/vcard-inline/e-mail-part-vcard.c:151
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:129
+#: ../src/modules/vcard-inline/e-mail-part-vcard.c:188
 #, fuzzy
 #| msgid "Show _Tool Bar"
 msgid "Show F_ull vCard"
 msgstr "Montri _ilobreton"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:134
-#: ../modules/vcard-inline/e-mail-part-vcard.c:169
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:132
+#: ../src/modules/vcard-inline/e-mail-part-vcard.c:193
 #, fuzzy
 #| msgid "Show _Status Bar"
 msgid "Show Com_pact vCard"
 msgstr "Montri _statbreton"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:162
-#| msgid "Save in Address Book"
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:163
 msgid "Save _To Addressbook"
 msgstr "Konservi _en adresaro"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:187
 msgid "There is one other contact."
 msgstr ""
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:189
+#. Translators: This will always be two or more.
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:192
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Estas %d alia kontakto."
 msgstr[1] "Estas %d aliaj kontaktoj."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:215
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:218
 #, fuzzy
 #| msgid "Address book source"
 msgid "Addressbook Contact"
 msgstr "Adresaro-fonto"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:216
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:219
 msgid "Display the part as an addressbook contact"
 msgstr ""
 
-#: ../modules/web-inspector/evolution-web-inspector.c:95
-#, fuzzy
-#| msgid "Evolution Website"
-msgid "Evolution Web Inspector"
-msgstr "Retpaĝaro de Evolucio"
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:123
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:169
 msgid "_Do not show this message again."
 msgstr "_Ne montru tiun mesaĝon denove."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:584
-#: ../plugins/templates/templates.c:478
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:570
+#: ../src/plugins/templates/templates.c:488
 msgid "Keywords"
 msgstr "Ŝlosilvortoj"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+#: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
 msgid "Message has no attachments"
 msgstr "Mesaĝo ne havas aldonaĵojn"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
+#: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
 msgstr ""
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+#: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "_Add Attachment..."
 msgstr "_Aldoni aldonaĵon..."
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Edit Message"
 msgstr "_Redakti mesaĝon"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+#: ../src/plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 msgid "Attachment Reminder"
 msgstr "Aldonaĵ-rememorigolo"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+#: ../src/plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:724 ../plugins/bbdb/bbdb.c:835
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
+#: ../src/plugins/bbdb/bbdb.c:735 ../src/plugins/bbdb/bbdb.c:846
+#: ../src/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr ""
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:739
+#: ../src/plugins/bbdb/bbdb.c:750
 msgid "Create _address book entries when sending mails"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:749
+#: ../src/plugins/bbdb/bbdb.c:760
 msgid "Select Address book for Automatic Contacts"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:769
+#: ../src/plugins/bbdb/bbdb.c:780
 msgid "Instant Messaging Contacts"
 msgstr ""
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:784
+#: ../src/plugins/bbdb/bbdb.c:795
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:794
+#: ../src/plugins/bbdb/bbdb.c:805
 msgid "Select Address book for Pidgin buddy list"
 msgstr ""
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:810
+#: ../src/plugins/bbdb/bbdb.c:821
 msgid "Synchronize with _buddy list now"
 msgstr ""
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+#: ../src/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid "BBDB"
 msgstr ""
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+#: ../src/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid ""
 "Takes the gruntwork out of managing your address book.\n"
 "\n"
@@ -21835,317 +24925,347 @@ msgid ""
 "lists."
 msgstr ""
 
-#: ../plugins/dbx-import/dbx-importer.c:278
+#: ../src/plugins/dbx-import/dbx-importer.c:274
 msgid "Importing Outlook Express data"
 msgstr ""
 
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
+#: ../src/plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
 msgid "Outlook DBX import"
 msgstr ""
 
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
+#: ../src/plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr ""
 
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+#: ../src/plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
 msgid "Import Outlook Express messages from DBX file"
 msgstr ""
 
-#: ../plugins/email-custom-header/email-custom-header.c:293
+#: ../src/plugins/email-custom-header/email-custom-header.c:291
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Sekureco:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:297
+#: ../src/plugins/email-custom-header/email-custom-header.c:295
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Persona"
 
-#: ../plugins/email-custom-header/email-custom-header.c:298
+#: ../src/plugins/email-custom-header/email-custom-header.c:296
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Nekategoriigite"
 
-#: ../plugins/email-custom-header/email-custom-header.c:299
+#: ../src/plugins/email-custom-header/email-custom-header.c:297
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Protektite"
 
-#: ../plugins/email-custom-header/email-custom-header.c:300
+#: ../src/plugins/email-custom-header/email-custom-header.c:298
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Konfidence"
 
-#: ../plugins/email-custom-header/email-custom-header.c:301
+#: ../src/plugins/email-custom-header/email-custom-header.c:299
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Sekrete"
 
-#: ../plugins/email-custom-header/email-custom-header.c:302
+#: ../src/plugins/email-custom-header/email-custom-header.c:300
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Sekretege"
 
-#: ../plugins/email-custom-header/email-custom-header.c:362
+#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from 
Composer,
+#. * indicating the header will not be added to a mail message
+#: ../src/plugins/email-custom-header/email-custom-header.c:360
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "Neniu"
 
-#: ../plugins/email-custom-header/email-custom-header.c:539
+#: ../src/plugins/email-custom-header/email-custom-header.c:537
 msgid "_Custom Header"
 msgstr ""
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the 
format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:809
+#: ../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 \";\"."
+"Name of the Custom Header key values separated by “;”."
 msgstr ""
 
-#: ../plugins/email-custom-header/email-custom-header.c:862
+#: ../src/plugins/email-custom-header/email-custom-header.c:860
 msgid "Key"
 msgstr "Ŝlosilo"
 
-#: ../plugins/email-custom-header/email-custom-header.c:879
-#: ../plugins/templates/templates.c:487
+#: ../src/plugins/email-custom-header/email-custom-header.c:877
+#: ../src/plugins/templates/templates.c:497
 msgid "Values"
 msgstr "Valoroj"
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:1
+#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:1
 msgid "Custom Header"
 msgstr "Propra paĝokapo"
 
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to 
specify what value for the message header would be added
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
 msgid "Add custom headers to outgoing mail messages."
 msgstr ""
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
+#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
 msgid "Email Custom Header"
 msgstr ""
 
-#: ../plugins/external-editor/external-editor.c:113
+#: ../src/plugins/external-editor/external-editor.c:111
 msgid "Command to be executed to launch the editor: "
 msgstr ""
 
-#: ../plugins/external-editor/external-editor.c:114
+#: ../src/plugins/external-editor/external-editor.c:112
 msgid ""
-"For XEmacs use \"xemacs\"\n"
-"For Vim use \"gvim -f\""
+"For XEmacs use “xemacs”\n"
+"For Vim use “gvim -f”"
 msgstr ""
 
-#: ../plugins/external-editor/external-editor.c:124
+#: ../src/plugins/external-editor/external-editor.c:122
 msgid "_Automatically launch when a new mail is edited"
 msgstr ""
 
-#: ../plugins/external-editor/external-editor.c:469
-#: ../plugins/external-editor/external-editor.c:471
+#: ../src/plugins/external-editor/external-editor.c:453
+#: ../src/plugins/external-editor/external-editor.c:455
 msgid "Compose in External Editor"
 msgstr ""
 
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+#: ../src/plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid "External Editor"
 msgstr "Ekstera redaktilo"
 
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+#: ../src/plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
 msgid "Use an external editor to compose plain-text mail messages."
 msgstr ""
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
+#: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Editor not launchable"
 msgstr ""
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
+#: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
 msgstr ""
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
+#: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:3
 msgid "Cannot create Temporary File"
 msgstr ""
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+#: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:4
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
 msgstr ""
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+#: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:5
 msgid "External editor still running"
 msgstr ""
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
+#: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
 "The external editor is still running. The mail composer window cannot be "
 "closed as long as the editor is active."
 msgstr ""
 
-#: ../plugins/face/face.c:288
+#: ../src/plugins/face/face.c:292
 msgid "Select a Face Picture"
 msgstr ""
 
-#: ../plugins/face/face.c:298
+#: ../src/plugins/face/face.c:302
 msgid "Image files"
 msgstr "Bilddosieroj"
 
-#: ../plugins/face/face.c:357
+#: ../src/plugins/face/face.c:390
 msgid "_Insert Face picture by default"
 msgstr ""
 
-#: ../plugins/face/face.c:370
+#: ../src/plugins/face/face.c:403
 msgid "Load new _Face picture"
 msgstr ""
 
-#: ../plugins/face/face.c:431
+#: ../src/plugins/face/face.c:447
+#, fuzzy
+msgid "Change Face Image"
+msgstr "Elekti fonbildon"
+
+#: ../src/plugins/face/face.c:535
 msgid "Include _Face"
 msgstr ""
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+#: ../src/plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Attach a small picture of your face to outgoing messages."
 msgstr ""
 
-#: ../plugins/face/org-gnome-face.error.xml.h:1
+#: ../src/plugins/face/org-gnome-face.error.xml.h:1
 msgid "Failed Read"
 msgstr ""
 
-#: ../plugins/face/org-gnome-face.error.xml.h:2
+#: ../src/plugins/face/org-gnome-face.error.xml.h:2
 msgid "The file cannot be read"
 msgstr "La dosiero ne estas legebla"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:3
+#: ../src/plugins/face/org-gnome-face.error.xml.h:3
 msgid "Invalid Image Size"
 msgstr "Nevalida bildogrando"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:4
-msgid "Please select an image of size 48 * 48"
+#: ../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."
+msgstr ""
+
+#: ../src/plugins/face/org-gnome-face.error.xml.h:5
+msgid "Incorrect Face Image Byte Size"
+msgstr ""
+
+#: ../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."
 msgstr ""
 
-#: ../plugins/face/org-gnome-face.error.xml.h:5
+#: ../src/plugins/face/org-gnome-face.error.xml.h:7
 msgid "Not an image"
 msgstr "Ne estas bildo"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:6
-msgid "The file you selected does not look like a valid .png image. Error: {0}"
+#: ../src/plugins/face/org-gnome-face.error.xml.h:8
+msgid "The file you selected does not look like a valid PNG image. Error: {0}"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:364
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:413
 msgid "Get List _Archive"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:415
 msgid "Get an archive of the list this message belongs to"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:371
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:420
+msgid "Copy _Message Archive URL"
+msgstr ""
+
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:422
+#, fuzzy
+#| msgid "Apply filter rules to the selected messages"
+msgid "Copy direct URL for the selected message in its archive"
+msgstr "Apliki filtril-regulojn al la elektitaj mesaĝoj"
+
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:427
 msgid "Get List _Usage Information"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:429
 msgid "Get information about the usage of the list this message belongs to"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:378
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:434
 msgid "Contact List _Owner"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:436
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:385
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:441
 msgid "_Post Message to List"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:443
 msgid "Post a message to the mailing list this message belongs to"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:392
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:448
 msgid "_Subscribe to List"
 msgstr "_Aboni liston"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:450
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Aboni la dissendoliston al kiu tiu ĉi mesaĝo apartenas"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:399
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:455
 msgid "_Unsubscribe from List"
 msgstr "_Malaboni liston"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:401
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:457
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Malaboni la dissendoliston al kiu tiu ĉi mesaĝo apartenas"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:408
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:464
 msgid "Mailing _List"
 msgstr "Dissendo_listo"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Mailing List Actions"
 msgstr "Dissendolist-agoj"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
 msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
 msgstr ""
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
 msgstr "Ago ne desponeblas"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
 "This message does not contain the header information required for this "
 "action."
 msgstr ""
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:3
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:3
 msgid "Posting not allowed"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:4
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:4
 msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
 msgstr ""
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
 msgid "Send e-mail message to mailing list?"
 msgstr "Ĉu sendi retpoŝtmesaĝon al dissendolisto?"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
+#: ../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 "
+"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."
 msgstr ""
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "_Send message"
 msgstr "_Sendi mesaĝon"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid "_Edit message"
 msgstr "_Redakti mesaĝon"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:11
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:11
 msgid "Malformed header"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:12
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:12
 msgid ""
 "The {0} header of this message is malformed and could not be processed.\n"
 "\n"
 "Header: {1}"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:15
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:15
 msgid "No e-mail action"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
 msgid ""
 "The action could not be performed. The header for this action did not "
 "contain any action that could be processed.\n"
@@ -22153,8 +25273,9 @@ msgid ""
 "Header: {0}"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:394
-#: ../plugins/mail-notification/mail-notification.c:430
+#. Translators: '%d' is the count of mails received.
+#: ../src/plugins/mail-notification/mail-notification.c:401
+#: ../src/plugins/mail-notification/mail-notification.c:437
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -22163,75 +25284,75 @@ msgstr[1] "Vi ricevis %d novajn mesaĝojn."
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:405
+#: ../src/plugins/mail-notification/mail-notification.c:412
 #, c-format
 msgid "From: %s"
 msgstr "De: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:419
+#: ../src/plugins/mail-notification/mail-notification.c:426
 #, c-format
 msgid "Subject: %s"
 msgstr "Temo: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:436
+#: ../src/plugins/mail-notification/mail-notification.c:443
 #, fuzzy
 #| msgid "Restarting Evolution"
 msgid "New email in Evolution"
 msgstr "Restartante Evolucion"
 
-#. Translators: The '%s' is a mail
+#. Translators: The “%s” is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:471
+#: ../src/plugins/mail-notification/mail-notification.c:483
 #, c-format
 msgid "Show %s"
 msgstr "Montri na %s"
 
-#: ../plugins/mail-notification/mail-notification.c:673
+#: ../src/plugins/mail-notification/mail-notification.c:687
 msgid "_Play sound when a new message arrives"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:705
+#: ../src/plugins/mail-notification/mail-notification.c:719
 msgid "_Beep"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:718
+#: ../src/plugins/mail-notification/mail-notification.c:732
 msgid "Use sound _theme"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:737
+#: ../src/plugins/mail-notification/mail-notification.c:751
 msgid "Play _file:"
 msgstr "Lodi _dosieron:"
 
-#: ../plugins/mail-notification/mail-notification.c:746
+#: ../src/plugins/mail-notification/mail-notification.c:760
 msgid "Select sound file"
 msgstr "Elekti sondosieron"
 
-#: ../plugins/mail-notification/mail-notification.c:802
+#: ../src/plugins/mail-notification/mail-notification.c:837
 msgid "Notify new messages for _Inbox only"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:812
+#: ../src/plugins/mail-notification/mail-notification.c:853
 msgid "Show _notification when a new message arrives"
 msgstr ""
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+#: ../src/plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
 msgstr ""
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+#: ../src/plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Notifies you when new mail messages arrive."
 msgstr ""
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:229
+#: ../src/plugins/mail-to-task/mail-to-task.c:194
 #, c-format
 msgid "Created from a mail by %s"
 msgstr ""
 
 #. Translators: Dialog button to Cancel edit of an existing event/memo/task
-#: ../plugins/mail-to-task/mail-to-task.c:594
+#: ../src/plugins/mail-to-task/mail-to-task.c:576
 #, fuzzy
 #| msgid "Cancel"
 msgctxt "mail-to-task"
@@ -22239,39 +25360,40 @@ msgid "_Cancel"
 msgstr "_Nuligi"
 
 #. Translators: Dialog button to Edit an existing event/memo/task
-#: ../plugins/mail-to-task/mail-to-task.c:596
+#: ../src/plugins/mail-to-task/mail-to-task.c:578
 msgctxt "mail-to-task"
 msgid "_Edit"
 msgstr "R_edakti"
 
 #. Translators: Dialog button to create a New event/memo/task
-#: ../plugins/mail-to-task/mail-to-task.c:598
+#: ../src/plugins/mail-to-task/mail-to-task.c:580
 msgctxt "mail-to-task"
 msgid "_New"
 msgstr "_Nova"
 
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#: ../src/plugins/mail-to-task/mail-to-task.c:598
 #, c-format
 msgid ""
-"Selected calendar contains event '%s' already. Would you like to edit the "
+"Selected calendar contains event “%s” already. Would you like to edit the "
 "old event?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:619
+#: ../src/plugins/mail-to-task/mail-to-task.c:601
 #, c-format
 msgid ""
-"Selected task list contains task '%s' already. Would you like to edit the "
+"Selected task list contains task “%s” already. Would you like to edit the "
 "old task?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:622
+#: ../src/plugins/mail-to-task/mail-to-task.c:604
 #, c-format
 msgid ""
-"Selected memo list contains memo '%s' already. Would you like to edit the "
+"Selected memo list contains memo “%s” already. Would you like to edit the "
 "old memo?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:642
+#. Translators: Note there are always more than 10 mails selected
+#: ../src/plugins/mail-to-task/mail-to-task.c:624
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -22282,7 +25404,8 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:649
+#. Translators: Note there are always more than 10 mails selected
+#: ../src/plugins/mail-to-task/mail-to-task.c:631
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -22293,7 +25416,8 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:656
+#. Translators: Note there are always more than 10 mails selected
+#: ../src/plugins/mail-to-task/mail-to-task.c:638
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -22304,370 +25428,355 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:677
+#: ../src/plugins/mail-to-task/mail-to-task.c:659
 msgid "Do you wish to continue converting remaining mails?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:753
+#: ../src/plugins/mail-to-task/mail-to-task.c:735
 msgid "[No Summary]"
 msgstr "[Neniu resumo]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:766
+#: ../src/plugins/mail-to-task/mail-to-task.c:748
 msgid "Invalid object returned from a server"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:821
+#: ../src/plugins/mail-to-task/mail-to-task.c:802
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:857
+#: ../src/plugins/mail-to-task/mail-to-task.c:838
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Ne eblis malfermi kalendaron. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:861
+#: ../src/plugins/mail-to-task/mail-to-task.c:842
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:864
+#: ../src/plugins/mail-to-task/mail-to-task.c:845
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:867
+#: ../src/plugins/mail-to-task/mail-to-task.c:848
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:1269
-#| msgid "Create a new appointment"
+#: ../src/plugins/mail-to-task/mail-to-task.c:1252
 msgid "Create an _Appointment"
 msgstr "Kreii _rendevuon"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1271
+#: ../src/plugins/mail-to-task/mail-to-task.c:1254
 msgid "Create a new event from the selected message"
 msgstr "Krei novan eventon de la elektita mesaĝo"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1276
+#: ../src/plugins/mail-to-task/mail-to-task.c:1259
 msgid "Create a Mem_o"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:1278
+#: ../src/plugins/mail-to-task/mail-to-task.c:1261
 msgid "Create a new memo from the selected message"
 msgstr "Krei novan noton de la elektita mesaĝo"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1283
+#: ../src/plugins/mail-to-task/mail-to-task.c:1266
 msgid "Create a _Task"
 msgstr "Krei _taskon"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1285
+#: ../src/plugins/mail-to-task/mail-to-task.c:1268
 msgid "Create a new task from the selected message"
 msgstr "Krei novan taskon de la elektita mesaĝo"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1293
+#: ../src/plugins/mail-to-task/mail-to-task.c:1276
 msgid "Create a _Meeting"
 msgstr "Krei _kunsidon"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1295
+#: ../src/plugins/mail-to-task/mail-to-task.c:1278
 msgid "Create a new meeting from the selected message"
 msgstr "Krei novan kunsidon de la elektita mesaĝo"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#: ../src/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
 msgid "Convert a mail message to a task."
 msgstr ""
 
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.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 ""
 
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
-msgid "Outlook personal folders (.pst)"
-msgstr ""
-
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+#: ../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 ""
 
-#: ../plugins/pst-import/pst-importer.c:526
-msgid "_Mail"
-msgstr "_Retpoŝto"
+#: ../src/plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+msgid "Outlook personal folders (.pst)"
+msgstr ""
 
-#: ../plugins/pst-import/pst-importer.c:555
+#: ../src/plugins/pst-import/pst-importer.c:551
 msgid "Destination folder:"
 msgstr "Celdosierujo:"
 
-#: ../plugins/pst-import/pst-importer.c:565
+#: ../src/plugins/pst-import/pst-importer.c:561
 msgid "_Address Book"
 msgstr "_Adresaro"
 
-#: ../plugins/pst-import/pst-importer.c:570
+#: ../src/plugins/pst-import/pst-importer.c:566
 msgid "A_ppointments"
 msgstr "_Rendevuoj"
 
-#: ../plugins/pst-import/pst-importer.c:575 ../views/tasks/galview.xml.h:1
-msgid "_Tasks"
-msgstr "_Taskoj"
-
-#: ../plugins/pst-import/pst-importer.c:580
+#: ../src/plugins/pst-import/pst-importer.c:576
 msgid "_Journal entries"
 msgstr ""
 
-#: ../plugins/pst-import/pst-importer.c:697
+#: ../src/plugins/pst-import/pst-importer.c:693
 msgid "Importing Outlook data"
 msgstr ""
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:140
-#: ../plugins/publish-calendar/publish-calendar.c:147
+#: ../src/plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+#: ../src/plugins/publish-calendar/publish-calendar.c:138
+#: ../src/plugins/publish-calendar/publish-calendar.c:145
 msgid "Calendar Publishing"
 msgstr ""
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+#: ../src/plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
 msgstr "Lokoj"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#: ../src/plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
 msgid "Publish calendars to the web."
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:217
-#: ../plugins/publish-calendar/publish-calendar.c:484
+#: ../src/plugins/publish-calendar/publish-calendar.c:215
+#: ../src/plugins/publish-calendar/publish-calendar.c:482
 #, c-format
 msgid "Could not open %s:"
 msgstr "Ne eblis malfemi %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:236
+#: ../src/plugins/publish-calendar/publish-calendar.c:234
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:242
+#: ../src/plugins/publish-calendar/publish-calendar.c:240
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:290
+#: ../src/plugins/publish-calendar/publish-calendar.c:288
 #, c-format
 msgid "Mount of %s failed:"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:655
-#: ../plugins/publish-calendar/publish-calendar.ui.h:35
-msgid "E_nable"
-msgstr "E_nŝalti"
-
-#: ../plugins/publish-calendar/publish-calendar.c:805
+#: ../src/plugins/publish-calendar/publish-calendar.c:787
 msgid "Are you sure you want to remove this location?"
 msgstr "Ĉu vi certe volas forigi tiun lokon?"
 
 #. 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.
-#: ../plugins/publish-calendar/publish-calendar.c:1144
+#: ../src/plugins/publish-calendar/publish-calendar.c:1097
 msgid "Could not create publish thread."
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:1154
+#: ../src/plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:1
 msgid "iCal"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:3
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:3
 msgid "Daily"
 msgstr "Ĉiutage"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "Weekly"
 msgstr "Ĉiusemajne"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:5
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:5
 msgid "Manual (via Actions menu)"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:9
 msgid "Secure FTP (SFTP)"
 msgstr "Sekura FTP (SFTP)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:10
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Public FTP"
 msgstr "Publika FTP"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:11
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:11
 msgid "FTP (with login)"
 msgstr "FTP (per ensaluto)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:12
 msgid "Windows share"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:13
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "WebDAV (HTTP)"
 msgstr "WebDAV (HTTP)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:14
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Secure WebDAV (HTTPS)"
 msgstr "Sekura WebDAV (HTTPS)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:15
 msgid "Custom Location"
 msgstr "Propra loko"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:17
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "_Publish as:"
 msgstr "_Publiki kiel:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:18
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:18
 msgid "Publishing _Frequency:"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:19
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:20
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:20
 msgid "Sources"
 msgstr "Fontoj"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:23
 msgid "Service _type:"
 msgstr "Servo_tipo:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:25
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_File:"
 msgstr "_Dosiero:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "P_ort:"
 msgstr "P_ordo:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:28
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Username:"
 msgstr "_Uzantonomo:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:29
-#: ../smime/gui/certificate-manager.c:772
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:29
+#: ../src/smime/gui/certificate-manager.c:785
 msgid "_Password:"
 msgstr "_Pasvorto:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
 msgid "_Remember password"
 msgstr "_Memori pasvorton"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:31
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
 msgid "Publishing Location"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-format-fb.c:101
-#: ../plugins/publish-calendar/publish-format-ical.c:104
+#: ../src/plugins/publish-calendar/publish-format-fb.c:82
+#: ../src/plugins/publish-calendar/publish-format-ical.c:102
 #, fuzzy, c-format
-#| msgid "Invalid folder URI '%s'"
-msgid "Invalid source UID '%s'"
-msgstr "Nevalida dosierujo-adreso '%s'"
+#| msgid "Invalid folder URI “%s”"
+msgid "Invalid source UID “%s”"
+msgstr "Nevalida dosierujo-adreso “%s”"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:544
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:542
 msgid "New Location"
 msgstr "Nova loko"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:546
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:544
 msgid "Edit Location"
 msgstr "Redakti lokon"
 
 #. Translators: the %F %T is the third argument for a
 #. * strftime function.  It lets you define the formatting
 #. * of the date in the csv-file.
-#: ../plugins/save-calendar/csv-format.c:160
+#: ../src/plugins/save-calendar/csv-format.c:158
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:374
-msgid "UID"
-msgstr "UID"
-
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../src/plugins/save-calendar/csv-format.c:374
 msgid "Description List"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../src/plugins/save-calendar/csv-format.c:375
 msgid "Categories List"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../src/plugins/save-calendar/csv-format.c:376
 msgid "Comment List"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../src/plugins/save-calendar/csv-format.c:379
 msgid "Contact List"
 msgstr "Kontaktlisto"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../src/plugins/save-calendar/csv-format.c:380
 msgid "Start"
 msgstr "Komenco"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../src/plugins/save-calendar/csv-format.c:381
 msgid "End"
 msgstr "Fino"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../src/plugins/save-calendar/csv-format.c:382
 msgid "Due"
 msgstr "Limdato"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../src/plugins/save-calendar/csv-format.c:383
 msgid "percent Done"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../src/plugins/save-calendar/csv-format.c:385
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../src/plugins/save-calendar/csv-format.c:386
 msgid "Attendees List"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../src/plugins/save-calendar/csv-format.c:388
 msgid "Modified"
 msgstr "Modifite"
 
-#: ../plugins/save-calendar/csv-format.c:563
+#: ../src/plugins/save-calendar/csv-format.c:561
 msgid "A_dvanced options for the CSV format"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:571
+#: ../src/plugins/save-calendar/csv-format.c:569
 msgid "Prepend a _header"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:580
+#: ../src/plugins/save-calendar/csv-format.c:578
 msgid "_Value delimiter:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:591
+#: ../src/plugins/save-calendar/csv-format.c:589
 msgid "_Record delimiter:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:602
+#: ../src/plugins/save-calendar/csv-format.c:600
 msgid "_Encapsulate values with:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:628
+#: ../src/plugins/save-calendar/csv-format.c:626
 msgid "Comma separated values (.csv)"
 msgstr ""
 
-#: ../plugins/save-calendar/ical-format.c:183 ../shell/e-shell-utils.c:177
+#: ../src/plugins/save-calendar/ical-format.c:181
+#: ../src/shell/e-shell-utils.c:182
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
+#: ../src/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr ""
 
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
+#: ../src/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
 msgid "Save a calendar or task list to disk."
 msgstr ""
 
@@ -22676,84 +25785,113 @@ msgstr ""
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:147
+#: ../src/plugins/save-calendar/rdf-format.c:145
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:385
+#: ../src/plugins/save-calendar/rdf-format.c:383
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:119
+#: ../src/plugins/save-calendar/save-calendar.c:117
 msgid "_Format:"
 msgstr "_Formo:"
 
-#: ../plugins/save-calendar/save-calendar.c:184
+#: ../src/plugins/save-calendar/save-calendar.c:182
 msgid "Select destination file"
 msgstr "Elekti celdosieron"
 
-#: ../plugins/save-calendar/save-calendar.c:188
+#: ../src/plugins/save-calendar/save-calendar.c:186
 #, fuzzy
 #| msgid "_Save"
 msgid "_Save As"
 msgstr "Kon_servi"
 
-#: ../plugins/save-calendar/save-calendar.c:347
+#: ../src/plugins/save-calendar/save-calendar.c:349
 msgid "Save the selected calendar to disk"
 msgstr "Konservi la elektitan kalendaron al disko"
 
-#: ../plugins/save-calendar/save-calendar.c:378
+#: ../src/plugins/save-calendar/save-calendar.c:380
 msgid "Save the selected memo list to disk"
 msgstr "Konversi la elektitan notoliston al datumportilo"
 
-#: ../plugins/save-calendar/save-calendar.c:409
+#: ../src/plugins/save-calendar/save-calendar.c:411
 msgid "Save the selected task list to disk"
 msgstr "Konservi la elektitan taskliston al disko"
 
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#: ../src/plugins/templates/e-templates-store.c:115
+msgid "No Title"
+msgstr "Sen titolo"
+
+#: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
 "$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
 "an email you are replying to."
 msgstr ""
 
-#: ../plugins/templates/templates.c:1245
-msgid "No Title"
-msgstr "Sen titolo"
+#: ../src/plugins/templates/templates.c:1299
+#, fuzzy
+#| msgid "Saving message to Outbox."
+msgid "Saving message template"
+msgstr "Konservi mesaĝon en senditujo"
 
-#: ../plugins/templates/templates.c:1354
+#: ../src/plugins/templates/templates.c:1320
 msgid "Save as _Template"
 msgstr "Konservi kiel ŝ_ablono"
 
-#: ../plugins/templates/templates.c:1356
+#: ../src/plugins/templates/templates.c:1322
 msgid "Save as Template"
 msgstr "Savu kiel ŝablono"
 
-#: ../shell/e-shell.c:337
+#: ../src/shell/e-shell.c:379
 msgid "Preparing to go offline..."
 msgstr ""
 
-#: ../shell/e-shell.c:390
+#: ../src/shell/e-shell.c:408
 msgid "Preparing to go online..."
 msgstr ""
 
-#: ../shell/e-shell.c:501
+#: ../src/shell/e-shell.c:519
 msgid "Preparing to quit"
 msgstr ""
 
-#: ../shell/e-shell.c:507
+#: ../src/shell/e-shell.c:525
 msgid "Preparing to quit..."
 msgstr ""
 
-#: ../shell/e-shell.c:915
+#: ../src/shell/e-shell.c:926
+#| msgid "Settings"
+msgid "Open _Settings"
+msgstr "Malfermi _agordojn"
+
+#: ../src/shell/e-shell.c:1127
 msgid "Credentials are required to connect to the destination host."
 msgstr ""
 
-#: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
+#: ../src/shell/e-shell.c:1297 ../src/shell/e-shell-window-actions.c:866
+msgid "New _Window"
+msgstr "Nova _fenestro"
+
+#: ../src/shell/e-shell.c:1308
+#, fuzzy
+#| msgid "_Preferences"
+msgid "Quick _Reference"
+msgstr "_Agordoj"
+
+#: ../src/shell/e-shell.c:1310 ../src/shell/e-shell-window-actions.c:796
+msgid "_About"
+msgstr "_Pri"
+
+#: ../src/shell/e-shell.c:1311 ../src/shell/e-shell-window-actions.c:901
+msgid "_Quit"
+msgstr "_Forlasi"
+
+#: ../src/shell/e-shell-content.c:700 ../src/shell/e-shell-content.c:701
 msgid "Searches"
 msgstr "Serĉoj"
 
-#: ../shell/e-shell-content.c:764
+#: ../src/shell/e-shell-content.c:744
 msgid "Save Search"
 msgstr "Konservi serĉon"
 
@@ -22761,337 +25899,351 @@ msgstr "Konservi serĉon"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:930
+#: ../src/shell/e-shell-searchbar.c:925
 msgid "Sho_w:"
 msgstr "_Montri:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:955
+#: ../src/shell/e-shell-searchbar.c:950
 msgid "Sear_ch:"
 msgstr "_Serĉi:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1023
+#: ../src/shell/e-shell-searchbar.c:1018
 msgid "i_n"
 msgstr "e_n"
 
-#: ../shell/e-shell-utils.c:174
+#: ../src/shell/e-shell-utils.c:179
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:198
+#: ../src/shell/e-shell-utils.c:205
 msgid "All Files (*)"
 msgstr "Ĉiuj dosieroj (*)"
 
-#: ../shell/e-shell-view.c:292
-msgid "Saving user interface state"
-msgstr ""
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:72
+#: ../src/shell/e-shell-utils.c:419
 msgid "translator-credits"
 msgstr ""
-"Aisano, Eliovir, Kim RIBEIRO, Leo ARIAS, Matt PEPERELL, Michael MORONI, Patrick (Petriko) OUDEJANS, Serge 
LEBLANC, Simon TITE, Yekrats, chops, maku, trio, Kristjan SCHMIDT, Daniel "
-"PUENTES"
+"Aisano, Eliovir, Kim RIBEIRO, Leo ARIAS, Matt PEPERELL, Michael MORONI, "
+"Patrick (Petriko) OUDEJANS, Serge LEBLANC, Simon TITE, Yekrats, chops, maku, "
+"trio, Kristjan SCHMIDT, Daniel PUENTES"
 
-#: ../shell/e-shell-window-actions.c:83
+#: ../src/shell/e-shell-utils.c:430
 msgid "Evolution Website"
 msgstr "Retejo de Evolucio"
 
-#: ../shell/e-shell-window-actions.c:339
+#: ../src/shell/e-shell-view.c:290
+msgid "Saving user interface state"
+msgstr ""
+
+#: ../src/shell/e-shell-window-actions.c:293
 msgid "Categories Editor"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:715
+#: ../src/shell/e-shell-window-actions.c:612
 msgid "Bug Buddy is not installed."
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:716
+#: ../src/shell/e-shell-window-actions.c:613
 msgid "Bug Buddy could not be run."
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:894
-msgid "_About"
-msgstr "_Pri"
-
-#: ../shell/e-shell-window-actions.c:896
+#: ../src/shell/e-shell-window-actions.c:798
 msgid "Show information about Evolution"
 msgstr "Montri informojn pri Evolucio"
 
-#: ../shell/e-shell-window-actions.c:901 ../shell/e-shell-window-actions.c:915
+#: ../src/shell/e-shell-window-actions.c:803
+#| msgid "_Account:"
+msgid "_Accounts"
+msgstr "_Kontoj"
+
+#: ../src/shell/e-shell-window-actions.c:805
+#, fuzzy
+#| msgid "Configure Evolution"
+msgid "Configure Evolution Accounts"
+msgstr "Agordi Evolucion"
+
+#: ../src/shell/e-shell-window-actions.c:810
+#: ../src/shell/e-shell-window-actions.c:824
 msgid "_Close Window"
 msgstr "_Fermi fenestron"
 
-#: ../shell/e-shell-window-actions.c:922
+#: ../src/shell/e-shell-window-actions.c:831
 msgid "_Contents"
 msgstr "_Enhavoj"
 
-#: ../shell/e-shell-window-actions.c:924
+#: ../src/shell/e-shell-window-actions.c:833
 msgid "Open the Evolution User Guide"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:950
+#: ../src/shell/e-shell-window-actions.c:859
 msgid "I_mport..."
 msgstr "I_mporto..."
 
-#: ../shell/e-shell-window-actions.c:952
+#: ../src/shell/e-shell-window-actions.c:861
 msgid "Import data from other programs"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:957
-msgid "New _Window"
-msgstr "Nova _fenestro"
-
-#: ../shell/e-shell-window-actions.c:959
+#: ../src/shell/e-shell-window-actions.c:868
 msgid "Create a new window displaying this view"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:971
+#: ../src/shell/e-shell-window-actions.c:880
 msgid "Available Cate_gories"
 msgstr "Disponeblaj kate_gorioj"
 
-#: ../shell/e-shell-window-actions.c:973
+#: ../src/shell/e-shell-window-actions.c:882
 msgid "Manage available categories"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:985
+#: ../src/shell/e-shell-window-actions.c:894
 msgid "_Quick Reference"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:987
-msgid "Show Evolution's shortcut keys"
+#: ../src/shell/e-shell-window-actions.c:896
+msgid "Show Evolution’s shortcut keys"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:992
-msgid "_Quit"
-msgstr "_Forlasi"
-
-#: ../shell/e-shell-window-actions.c:994
+#: ../src/shell/e-shell-window-actions.c:903
 msgid "Exit the program"
 msgstr "Eliri de la programon"
 
-#: ../shell/e-shell-window-actions.c:999
+#: ../src/shell/e-shell-window-actions.c:908
 msgid "_Advanced Search..."
 msgstr "_Detala serĉo..."
 
-#: ../shell/e-shell-window-actions.c:1001
+#: ../src/shell/e-shell-window-actions.c:910
 msgid "Construct a more advanced search"
 msgstr "Krei pli specialan serĉon"
 
-#: ../shell/e-shell-window-actions.c:1008
+#: ../src/shell/e-shell-window-actions.c:917
 msgid "Clear the current search parameters"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1013
+#: ../src/shell/e-shell-window-actions.c:922
 msgid "_Edit Saved Searches..."
 msgstr "_Redakti konservitajn serĉojn..."
 
-#: ../shell/e-shell-window-actions.c:1015
+#: ../src/shell/e-shell-window-actions.c:924
 msgid "Manage your saved searches"
 msgstr "Administri viajn konservitajn serĉojn"
 
-#: ../shell/e-shell-window-actions.c:1022
+#: ../src/shell/e-shell-window-actions.c:931
 msgid "Click here to change the search type"
 msgstr "Klaku ĉi tie por ŝanĝi la serĉtipon"
 
-#: ../shell/e-shell-window-actions.c:1027
+#: ../src/shell/e-shell-window-actions.c:936
 msgid "_Find Now"
 msgstr "_Serĉi nun"
 
-#: ../shell/e-shell-window-actions.c:1029
+#: ../src/shell/e-shell-window-actions.c:938
 msgid "Execute the current search parameters"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1034
+#: ../src/shell/e-shell-window-actions.c:943
 msgid "_Save Search..."
 msgstr "_Konservi serĉon..."
 
-#: ../shell/e-shell-window-actions.c:1036
+#: ../src/shell/e-shell-window-actions.c:945
 msgid "Save the current search parameters"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1048
+#: ../src/shell/e-shell-window-actions.c:957
 msgid "Submit _Bug Report..."
 msgstr "Transsendi __cimraporton..."
 
-#: ../shell/e-shell-window-actions.c:1050
+#: ../src/shell/e-shell-window-actions.c:959
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Transsendi cimraporton per Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1055
+#: ../src/shell/e-shell-window-actions.c:964
 msgid "_Work Offline"
 msgstr "Labori _senkonekte"
 
-#: ../shell/e-shell-window-actions.c:1057
+#: ../src/shell/e-shell-window-actions.c:966
 msgid "Put Evolution into offline mode"
 msgstr "Ŝalti Evolucion al nekonektita reĝimo"
 
-#: ../shell/e-shell-window-actions.c:1062
+#: ../src/shell/e-shell-window-actions.c:971
 msgid "_Work Online"
 msgstr "_Labori konektite"
 
-#: ../shell/e-shell-window-actions.c:1064
+#: ../src/shell/e-shell-window-actions.c:973
 msgid "Put Evolution into online mode"
 msgstr "Ŝalti Evolucion al konektita reĝimo"
 
-#: ../shell/e-shell-window-actions.c:1092
+#: ../src/shell/e-shell-window-actions.c:1001
 msgid "Lay_out"
 msgstr ""
 
 #. Translators: This is a New menu item caption, under File->New
-#: ../shell/e-shell-window-actions.c:1100
+#: ../src/shell/e-shell-window-actions.c:1009
 msgid "_New"
 msgstr "_Nova"
 
-#: ../shell/e-shell-window-actions.c:1107
+#: ../src/shell/e-shell-window-actions.c:1016
 msgid "_Search"
 msgstr "_Serĉi"
 
-#: ../shell/e-shell-window-actions.c:1114
+#: ../src/shell/e-shell-window-actions.c:1023
 msgid "_Switcher Appearance"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1128
+#: ../src/shell/e-shell-window-actions.c:1037
 msgid "_Window"
 msgstr "_Fenestro"
 
-#: ../shell/e-shell-window-actions.c:1157
+#: ../src/shell/e-shell-window-actions.c:1066
+#, fuzzy
+#| msgid "Show _Status Bar"
+msgid "Show _Menu Bar"
+msgstr "Montri _statbreton"
+
+#: ../src/shell/e-shell-window-actions.c:1068
+#, fuzzy
+#| msgid "Show the side bar"
+msgid "Show the menu bar"
+msgstr "Montri la flankan breton"
+
+#: ../src/shell/e-shell-window-actions.c:1074
 msgid "Show Side _Bar"
 msgstr "Montri flankan _breton"
 
-#: ../shell/e-shell-window-actions.c:1159
+#: ../src/shell/e-shell-window-actions.c:1076
 msgid "Show the side bar"
 msgstr "Montri la flankan breton"
 
-#: ../shell/e-shell-window-actions.c:1165
+#: ../src/shell/e-shell-window-actions.c:1082
 msgid "Show _Buttons"
 msgstr "Montri _butonojn"
 
-#: ../shell/e-shell-window-actions.c:1167
+#: ../src/shell/e-shell-window-actions.c:1084
 msgid "Show the switcher buttons"
 msgstr "Montri la ŝaltbutonojn"
 
-#: ../shell/e-shell-window-actions.c:1173
+#: ../src/shell/e-shell-window-actions.c:1090
 msgid "Show _Status Bar"
 msgstr "Montri _statbreton"
 
-#: ../shell/e-shell-window-actions.c:1175
+#: ../src/shell/e-shell-window-actions.c:1092
 msgid "Show the status bar"
 msgstr "Montri la statbreton"
 
-#: ../shell/e-shell-window-actions.c:1181
+#: ../src/shell/e-shell-window-actions.c:1098
 msgid "Show _Tool Bar"
 msgstr "Montri _ilobreton"
 
-#: ../shell/e-shell-window-actions.c:1183
+#: ../src/shell/e-shell-window-actions.c:1100
 msgid "Show the tool bar"
 msgstr "Montri la ilobreton"
 
-#: ../shell/e-shell-window-actions.c:1205
+#: ../src/shell/e-shell-window-actions.c:1122
 msgid "_Icons Only"
 msgstr "Nur _bildsimboloj"
 
-#: ../shell/e-shell-window-actions.c:1207
+#: ../src/shell/e-shell-window-actions.c:1124
 msgid "Display window buttons with icons only"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1212
+#: ../src/shell/e-shell-window-actions.c:1129
 msgid "_Text Only"
 msgstr "Nur _teksto"
 
-#: ../shell/e-shell-window-actions.c:1214
+#: ../src/shell/e-shell-window-actions.c:1131
 msgid "Display window buttons with text only"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1219
+#: ../src/shell/e-shell-window-actions.c:1136
 msgid "Icons _and Text"
 msgstr "Bildsimboloj _kaj tekto"
 
-#: ../shell/e-shell-window-actions.c:1221
+#: ../src/shell/e-shell-window-actions.c:1138
 msgid "Display window buttons with icons and text"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../src/shell/e-shell-window-actions.c:1143
 msgid "Tool_bar Style"
 msgstr "Ilo_bret-stilo"
 
-#: ../shell/e-shell-window-actions.c:1228
+#: ../src/shell/e-shell-window-actions.c:1145
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1236
+#: ../src/shell/e-shell-window-actions.c:1153
 #, fuzzy
 #| msgid "Save Current View"
 msgid "Delete Current View"
 msgstr "Konservi aktualan vidon"
 
-#: ../shell/e-shell-window-actions.c:1243
+#: ../src/shell/e-shell-window-actions.c:1160
 msgid "Save Custom View..."
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1245
+#: ../src/shell/e-shell-window-actions.c:1162
 msgid "Save current custom view"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1252
+#: ../src/shell/e-shell-window-actions.c:1169
 msgid "C_urrent View"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1262
+#: ../src/shell/e-shell-window-actions.c:1179
 msgid "Custom View"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1264
+#: ../src/shell/e-shell-window-actions.c:1181
 msgid "Current view is a customized view"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1272
+#: ../src/shell/e-shell-window-actions.c:1189
 msgid "Page Set_up..."
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1274
+#: ../src/shell/e-shell-window-actions.c:1191
 msgid "Change the page settings for your current printer"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1635
+#: ../src/shell/e-shell-window-actions.c:1560
 #, c-format
 msgid "Switch to %s"
 msgstr "Ŝanĝi al %s"
 
-#: ../shell/e-shell-window-actions.c:1758
+#: ../src/shell/e-shell-window-actions.c:1683
 #, c-format
 msgid "Select view: %s"
 msgstr "Elekti vidon: %s"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../src/shell/e-shell-window-actions.c:1700
 #, fuzzy, c-format
 #| msgid "Select view: %s"
 msgid "Delete view: %s"
 msgstr "Elekti vidon: %s"
 
-#: ../shell/e-shell-window-actions.c:1869
+#: ../src/shell/e-shell-window-actions.c:1804
 msgid "Execute these search parameters"
 msgstr ""
 
 #. Translators: a 'New' toolbar button caption which is context sensitive and
 #. runs one of the actions under File->New menu
-#: ../shell/e-shell-window.c:505
+#: ../src/shell/e-shell-window.c:563
 msgctxt "toolbar-button"
 msgid "New"
 msgstr "Nova"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:640
-#, c-format
-msgid "%s - Evolution"
+#: ../src/shell/e-shell-window-private.c:756
+#, fuzzy, c-format
+#| msgid "%s - Evolution"
+msgid "%s — Evolution"
 msgstr "%s - Evolucio"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:183
+#: ../src/shell/main.c:195
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -23111,7 +26263,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: ../shell/main.c:207
+#: ../src/shell/main.c:219
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -23119,80 +26271,82 @@ msgstr ""
 "Dankon\n"
 "La Evolucio-teamo\n"
 
-#: ../shell/main.c:213
+#: ../src/shell/main.c:225
 msgid "Do not tell me again"
 msgstr ""
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:302
+#: ../src/shell/main.c:314
 msgid ""
 "Start Evolution showing the specified component. Available options are "
-"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
+"“mail”, “calendar”, “contacts”, “tasks”, and “memos”"
 msgstr ""
 
-#: ../shell/main.c:306
+#: ../src/shell/main.c:318
 msgid "Apply the given geometry to the main window"
 msgstr ""
 
-#: ../shell/main.c:310
+#: ../src/shell/main.c:322
 msgid "Start in online mode"
 msgstr ""
 
-#: ../shell/main.c:312
+#: ../src/shell/main.c:324
 msgid "Ignore network availability"
 msgstr ""
 
-#: ../shell/main.c:315
+#: ../src/shell/main.c:327
 msgid "Forcibly shut down Evolution"
 msgstr ""
 
-#: ../shell/main.c:318
+#: ../src/shell/main.c:330
 msgid "Disable loading of any plugins."
 msgstr ""
 
-#: ../shell/main.c:320
+#: ../src/shell/main.c:332
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr ""
 
-#: ../shell/main.c:324
+#: ../src/shell/main.c:336
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr ""
 
-#: ../shell/main.c:326
+#: ../src/shell/main.c:338
 msgid "Request a running Evolution process to quit"
 msgstr ""
 
-#: ../shell/main.c:403
+#: ../src/shell/main.c:415
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
 "System error: %s"
 msgstr ""
 
-#: ../shell/main.c:457 ../shell/main.c:462
-msgid "- The Evolution PIM and Email Client"
-msgstr ""
+#: ../src/shell/main.c:466 ../src/shell/main.c:471
+#, fuzzy
+#| msgid "Evolution Mail and Calendar"
+msgid "— The Evolution PIM and Email Client"
+msgstr "— Evolucio - Retpoŝto kaj Kalendaro"
 
-#: ../shell/main.c:520
+#: ../src/shell/main.c:533
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
-"  Run '%s --help' for more information.\n"
+"  Run “%s --help” for more information.\n"
 msgstr ""
 
-#: ../shell/main.c:526
+#: ../src/shell/main.c:539
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
-"  Run '%s --help' for more information.\n"
+"  Run “%s --help” for more information.\n"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:2
+#: ../src/shell/shell.error.xml.h:2
 msgid "Upgrade from previous version failed:"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:3
+#: ../src/shell/shell.error.xml.h:3
 msgid ""
 "{0}\n"
 "\n"
@@ -23200,168 +26354,220 @@ msgid ""
 "data.\n"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:7
+#: ../src/shell/shell.error.xml.h:7
 msgid "Continue Anyway"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:8
+#: ../src/shell/shell.error.xml.h:8
 msgid "Quit Now"
 msgstr "Ĉesi nun"
 
-#: ../shell/shell.error.xml.h:9
+#: ../src/shell/shell.error.xml.h:9
 msgid "Cannot upgrade directly from version {0}"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:10
+#: ../src/shell/shell.error.xml.h:10
 msgid ""
 "Evolution no longer supports upgrading directly from version {0}. However as "
 "a workaround you might try first upgrading to Evolution 2, and then "
 "upgrading to Evolution 3."
 msgstr ""
 
-#: ../shell/shell.error.xml.h:11
+#: ../src/shell/shell.error.xml.h:11
 msgid "Close Evolution with pending background operations?"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:12
+#: ../src/shell/shell.error.xml.h:12
 msgid ""
 "Evolution is taking a long time to shut down, possibly due to network "
 "connectivity issues. Would you like to cancel all pending operations and "
 "close immediately, or keep waiting?"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:13
+#: ../src/shell/shell.error.xml.h:13
 msgid "_Close Immediately"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:14
+#: ../src/shell/shell.error.xml.h:14
 #, fuzzy
 #| msgid "Waiting..."
 msgid "Keep _Waiting"
 msgstr "_Atendante"
 
-#: ../shell/shell.error.xml.h:15
-msgid "Failed to get values from '{0}'"
-msgstr ""
+#: ../src/shell/shell.error.xml.h:15
+#, fuzzy
+#| msgid "Failed to open calendar “{0}”"
+msgid "Failed to get values from “{0}”"
+msgstr "Malsukcesis malfermi la kalendaron “{0}”"
 
-#: ../shell/shell.error.xml.h:16
+#: ../src/shell/shell.error.xml.h:16
 #, fuzzy
 #| msgid "Failed to authenticate with LDAP server."
-msgid "Failed to invoke authenticate for '{0}'"
-msgstr "Malsukcesis alvoki aŭtentikigon por '{0}'"
+msgid "Failed to invoke authenticate for “{0}”"
+msgstr "Malsukcesis alvoki aŭtentikigon por “{0}”"
 
-#: ../shell/shell.error.xml.h:17
-#| msgid "Failed to open client '%s': %s"
-msgid "Failed to connect to '{0}'"
-msgstr "Malsukcesis konekti al '{0}'"
+#: ../src/shell/shell.error.xml.h:17
+#, fuzzy
+#| msgid "Failed to connect to “{0}”"
+msgid "Failed to connect “{0}”"
+msgstr "Malsukcesis konekti al “{0}”"
 
-#: ../shell/shell.error.xml.h:18
+#: ../src/shell/shell.error.xml.h:18
 #, fuzzy
 #| msgid "_Recover"
 msgid "_Reconnect"
 msgstr "_Ripari"
 
-#: ../shell/shell.error.xml.h:19
-msgid "Failed to prompt for credentials for '{0}'"
+#: ../src/shell/shell.error.xml.h:19
+#, fuzzy
+#| msgid "Failed to refresh address book “{0}”"
+msgid "Failed to connect address book “{0}”"
+msgstr "Malsukcesis aktualigi la adresaron “{0}”"
+
+#: ../src/shell/shell.error.xml.h:20
+#, fuzzy
+#| msgid "Failed to open calendar “{0}”"
+msgid "Failed to connect calendar “{0}”"
+msgstr "Malsukcesis malfermi la kalendaron “{0}”"
+
+#: ../src/shell/shell.error.xml.h:21
+#, fuzzy
+#| msgid "Failed to connect account &quot;{0}&quot;."
+msgid "Failed to connect mail account “{0}”"
+msgstr "Malsukcesis konekti konton “{0}”"
+
+#: ../src/shell/shell.error.xml.h:22
+#, fuzzy
+#| msgid "Failed to open memo list “{0}”"
+msgid "Failed to connect memo list “{0}”"
+msgstr "Malsukcesis malfermi la notoliston “{0}”"
+
+#: ../src/shell/shell.error.xml.h:23
+#, fuzzy
+#| msgid "Failed to open task list “{0}”"
+msgid "Failed to connect task list “{0}”"
+msgstr "Malsukcesis malfermi la taskoliston “{0}”"
+
+#: ../src/shell/shell.error.xml.h:24
+msgid "Failed to prompt for credentials for “{0}”"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:20
-#| msgid "Failed to unsubscribe from folder."
-msgid "Failed to finish trust prompt for '{0}'"
+#: ../src/shell/shell.error.xml.h:25
+msgid "Failed to finish trust prompt for “{0}”"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:21
-msgid "SSL certificate for '{0}' is not trusted."
+#: ../src/shell/shell.error.xml.h:26
+msgid "SSL certificate for “{0}” is not trusted."
 msgstr ""
 
-#: ../shell/shell.error.xml.h:22
+#: ../src/shell/shell.error.xml.h:27
 msgid "Reason: {1}"
 msgstr ""
 
-#: ../smime/gui/ca-trust-dialog.c:106
+#: ../src/shell/shell.error.xml.h:29
+msgid "SSL certificate for address book “{0}” is not trusted."
+msgstr ""
+
+#: ../src/shell/shell.error.xml.h:30
+msgid "SSL certificate for calendar “{0}” is not trusted."
+msgstr ""
+
+#: ../src/shell/shell.error.xml.h:31
+msgid "SSL certificate for mail account “{0}” is not trusted."
+msgstr ""
+
+#: ../src/shell/shell.error.xml.h:32
+msgid "SSL certificate for memo list “{0}” is not trusted."
+msgstr ""
+
+#: ../src/shell/shell.error.xml.h:33
+msgid "SSL certificate for task list “{0}” is not trusted."
+msgstr ""
+
+#: ../src/smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
-"Certificate '%s' is a CA certificate.\n"
+"Certificate “%s” is a CA certificate.\n"
 "\n"
 "Edit trust settings:"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:123
+#: ../src/smime/gui/certificate-manager.c:82
+#: ../src/smime/gui/certificate-manager.c:101
+#: ../src/smime/gui/certificate-manager.c:121
 msgid "Certificate Name"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:85
-#: ../smime/gui/certificate-manager.c:105
+#: ../src/smime/gui/certificate-manager.c:83
+#: ../src/smime/gui/certificate-manager.c:103
 msgid "Issued To Organization"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:86
-#: ../smime/gui/certificate-manager.c:106
+#: ../src/smime/gui/certificate-manager.c:84
+#: ../src/smime/gui/certificate-manager.c:104
 msgid "Issued To Organizational Unit"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:87
-#: ../smime/gui/certificate-manager.c:107
-#: ../smime/gui/certificate-manager.c:125
+#: ../src/smime/gui/certificate-manager.c:85
+#: ../src/smime/gui/certificate-manager.c:105
+#: ../src/smime/gui/certificate-manager.c:123
 msgid "Serial Number"
 msgstr "Seria numero"
 
-#: ../smime/gui/certificate-manager.c:88
-#: ../smime/gui/certificate-manager.c:108
-#: ../smime/gui/certificate-manager.c:126
+#: ../src/smime/gui/certificate-manager.c:86
+#: ../src/smime/gui/certificate-manager.c:106
+#: ../src/smime/gui/certificate-manager.c:124
 msgid "Purposes"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:89
-#: ../smime/gui/certificate-manager.c:109
-#: ../smime/gui/certificate-manager.c:127
+#: ../src/smime/gui/certificate-manager.c:87
+#: ../src/smime/gui/certificate-manager.c:107
+#: ../src/smime/gui/certificate-manager.c:125
 msgid "Issued By"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:90
-#: ../smime/gui/certificate-manager.c:110
-#: ../smime/gui/certificate-manager.c:128
+#: ../src/smime/gui/certificate-manager.c:88
+#: ../src/smime/gui/certificate-manager.c:108
+#: ../src/smime/gui/certificate-manager.c:126
 msgid "Issued By Organization"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:91
-#: ../smime/gui/certificate-manager.c:111
-#: ../smime/gui/certificate-manager.c:129
+#: ../src/smime/gui/certificate-manager.c:89
+#: ../src/smime/gui/certificate-manager.c:109
+#: ../src/smime/gui/certificate-manager.c:127
 msgid "Issued By Organizational Unit"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:92
-#: ../smime/gui/certificate-manager.c:112
-#: ../smime/gui/certificate-manager.c:130
+#: ../src/smime/gui/certificate-manager.c:90
+#: ../src/smime/gui/certificate-manager.c:110
+#: ../src/smime/gui/certificate-manager.c:128
 msgid "Issued"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:93
-#: ../smime/gui/certificate-manager.c:113
-#: ../smime/gui/certificate-manager.c:131
+#: ../src/smime/gui/certificate-manager.c:91
+#: ../src/smime/gui/certificate-manager.c:111
+#: ../src/smime/gui/certificate-manager.c:129
 msgid "Expires"
 msgstr "Senvalidiĝo"
 
-#: ../smime/gui/certificate-manager.c:94
-#: ../smime/gui/certificate-manager.c:114
-#: ../smime/gui/certificate-manager.c:132
+#: ../src/smime/gui/certificate-manager.c:92
+#: ../src/smime/gui/certificate-manager.c:112
+#: ../src/smime/gui/certificate-manager.c:130
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:95
-#: ../smime/gui/certificate-manager.c:115
-#: ../smime/gui/certificate-manager.c:133
+#: ../src/smime/gui/certificate-manager.c:93
+#: ../src/smime/gui/certificate-manager.c:113
+#: ../src/smime/gui/certificate-manager.c:131
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:124
+#: ../src/smime/gui/certificate-manager.c:102
+#: ../src/smime/gui/certificate-manager.c:122
 msgid "Email Address"
 msgstr "Retpoŝtadreso"
 
-#: ../smime/gui/certificate-manager.c:650
+#: ../src/smime/gui/certificate-manager.c:663
 msgid "Select a file to backup your key and certificate..."
 msgstr ""
 
@@ -23370,58 +26576,51 @@ msgstr ""
 #. * when a user wants to backup one of her/his private keys/certificates.
 #. * For example: gnomedev-backup.p12
 #.
-#: ../smime/gui/certificate-manager.c:662
+#: ../src/smime/gui/certificate-manager.c:675
 #, c-format
 msgid "%s-backup.p12"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:676
-#: ../smime/gui/certificate-manager.c:965
-msgid "All files"
-msgstr "Ĉiuj dosieroj"
-
-#: ../smime/gui/certificate-manager.c:728
+#: ../src/smime/gui/certificate-manager.c:741
 #, fuzzy
 #| msgid "Certificate"
 msgid "Backup Certificate"
 msgstr "Atestilo"
 
 #. filename selection
-#: ../smime/gui/certificate-manager.c:742
-#| msgid "_Filename:"
+#: ../src/smime/gui/certificate-manager.c:755
 msgid "_File name:"
 msgstr "_Dosiernomo:"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
-#: ../smime/gui/certificate-manager.c:747
-#| msgid "Please select a folder"
+#: ../src/smime/gui/certificate-manager.c:760
 msgid "Please select a file..."
 msgstr "Bonvole elektu dosieron..."
 
-#: ../smime/gui/certificate-manager.c:761
+#: ../src/smime/gui/certificate-manager.c:774
 msgid "_Include certificate chain in the backup"
 msgstr ""
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:767
+#: ../src/smime/gui/certificate-manager.c:780
 msgid ""
 "The certificate backup password you set here protects the backup file that "
 "you are about to create.\n"
 "You must set this password to proceed with the backup."
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:786
+#: ../src/smime/gui/certificate-manager.c:799
 #, fuzzy
 #| msgid "_Password:"
 msgid "_Repeat Password:"
 msgstr "_Pasvorto:"
 
-#: ../smime/gui/certificate-manager.c:805
+#: ../src/smime/gui/certificate-manager.c:818
 msgid "Passwords do not match"
 msgstr ""
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:813
+#: ../src/smime/gui/certificate-manager.c:826
 msgid ""
 "Important:\n"
 "If you forget your certificate backup password, you will not be able to "
@@ -23429,391 +26628,664 @@ msgid ""
 "Please record it in a safe location."
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:858
+#: ../src/smime/gui/certificate-manager.c:871
 msgid "No file name provided"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:862
+#: ../src/smime/gui/certificate-manager.c:875
 msgid "Failed to backup key and certificate"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:951
+#: ../src/smime/gui/certificate-manager.c:964
 msgid "Select a certificate to import..."
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1001
+#: ../src/smime/gui/certificate-manager.c:1014
 msgid "Failed to import certificate"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1117
+#: ../src/smime/gui/certificate-manager.c:1130
 msgctxt "CamelTrust"
 msgid "Ask when used"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1119
+#: ../src/smime/gui/certificate-manager.c:1132
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "Neniam"
 
-#: ../smime/gui/certificate-manager.c:1121
+#: ../src/smime/gui/certificate-manager.c:1134
 msgctxt "CamelTrust"
-msgid "Marginal"
+msgid "Marginally"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1123
+#: ../src/smime/gui/certificate-manager.c:1136
 msgctxt "CamelTrust"
 msgid "Fully"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1125
+#: ../src/smime/gui/certificate-manager.c:1138
 msgctxt "CamelTrust"
-msgid "Ultimate"
+msgid "Ultimately"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1127
+#: ../src/smime/gui/certificate-manager.c:1140
 msgctxt "CamelTrust"
-msgid "Temporary"
+msgid "Temporarily"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1333
+#: ../src/smime/gui/certificate-manager.c:1346
 #, fuzzy
 #| msgid "Certificates"
 msgid "Change certificate trust"
 msgstr "Atestiloj"
 
-#: ../smime/gui/certificate-manager.c:1345
+#: ../src/smime/gui/certificate-manager.c:1358
 #, c-format
-msgid "Change trust for the host '%s':"
+msgid "Change trust for the host “%s”:"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1369
+#: ../src/smime/gui/certificate-manager.c:1382
 msgctxt "CamelTrust"
 msgid "_Ask when used"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1370
+#: ../src/smime/gui/certificate-manager.c:1383
+#, fuzzy
+#| msgid "_View Certificate"
 msgctxt "CamelTrust"
-msgid "_Temporary (this session only)"
-msgstr ""
+msgid "_Never trust this certificate"
+msgstr "_Montri ateston"
 
-#: ../smime/gui/certificate-manager.c:1371
+#: ../src/smime/gui/certificate-manager.c:1384
 msgctxt "CamelTrust"
-msgid "_Never"
-msgstr "_Neniam"
+msgid "_Temporarily trusted (this session only)"
+msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1372
+#: ../src/smime/gui/certificate-manager.c:1385
 msgctxt "CamelTrust"
-msgid "_Marginal"
+msgid "_Marginally trusted"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1373
+#: ../src/smime/gui/certificate-manager.c:1386
 #, fuzzy
 #| msgid "_Full name"
 msgctxt "CamelTrust"
-msgid "_Fully"
+msgid "_Fully trusted"
 msgstr "_Tuta nomo"
 
-#: ../smime/gui/certificate-manager.c:1374
+#: ../src/smime/gui/certificate-manager.c:1387
 msgctxt "CamelTrust"
-msgid "_Ultimate"
+msgid "_Ultimately trusted"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1378
+#: ../src/smime/gui/certificate-manager.c:1391
 msgid ""
 "Before trusting this site, you should examine its certificate and its policy "
 "and procedures (if available)."
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1393
+#: ../src/smime/gui/certificate-manager.c:1406
 #, fuzzy
 #| msgid "_View Certificate"
 msgid "_Display certificate"
 msgstr "_Montri ateston"
 
-#: ../smime/gui/certificate-manager.c:1598
+#: ../src/smime/gui/certificate-manager.c:1611
 msgid "You have certificates on file that identify these mail servers:"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1629
+#: ../src/smime/gui/certificate-manager.c:1642
 #, fuzzy
 #| msgid "_List name:"
 msgid "Host name"
 msgstr "Aparatnomo"
 
-#: ../smime/gui/certificate-manager.c:1631
+#: ../src/smime/gui/certificate-manager.c:1644
 msgid "Issuer"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1632
-#| msgid "Fingerprints"
+#: ../src/smime/gui/certificate-manager.c:1645
 msgid "Fingerprint"
 msgstr "Fingropremo"
 
-#: ../smime/gui/certificate-manager.c:1633
+#: ../src/smime/gui/certificate-manager.c:1646
 msgid "Trust"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1654
+#: ../src/smime/gui/certificate-manager.c:1667
 #, fuzzy
 #| msgid "_Edit Full"
 msgid "_Edit Trust"
 msgstr "R_edakti plene"
 
-#: ../smime/gui/certificate-manager.c:1973
+#: ../src/smime/gui/certificate-manager.c:2121
 msgid "All PKCS12 files"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1990
+#: ../src/smime/gui/certificate-manager.c:2138
 msgid "All email certificate files"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:2007
+#: ../src/smime/gui/certificate-manager.c:2155
 msgid "All CA certificate files"
 msgstr ""
 
-#: ../smime/gui/cert-trust-dialog.c:152
+#: ../src/smime/gui/cert-trust-dialog.c:150
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
 msgstr ""
 
-#: ../smime/gui/cert-trust-dialog.c:157
+#: ../src/smime/gui/cert-trust-dialog.c:155
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
 msgstr ""
 
-#: ../smime/gui/component.c:55
+#: ../src/smime/gui/component.c:53
 #, fuzzy, c-format
-#| msgid "Enter the password for '%s'"
-msgid "Enter the password for '%s', token '%s'"
-msgstr "Enigu la pasvorton por '%s', *token* '%s'"
+#| msgid "Enter the password for “%s”"
+msgid "Enter the password for “%s”, token “%s”"
+msgstr "Enigu la pasvorton por “%s”, *token* “%s”"
 
-#: ../smime/gui/component.c:57
-#, c-format
-msgid "Enter the password for '%s'"
-msgstr "Enigu la pasvorton por '%s'"
+#: ../src/smime/gui/component.c:55
+#, fuzzy, c-format
+#| msgid "Enter the password for “%s”"
+msgid "Enter the password for “%s”"
+msgstr "Enigu la pasvorton por “%s”"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:85
+#: ../src/smime/gui/component.c:83
 msgid "Enter new password for certificate database"
 msgstr ""
 
-#: ../smime/gui/component.c:88
+#: ../src/smime/gui/component.c:86
 msgid "Enter new password"
 msgstr "Enigu novan pasvorton"
 
-#: ../smime/gui/e-cert-selector.c:180
+#: ../src/smime/gui/e-cert-selector.c:178
 msgid "Select certificate"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:3
+#: ../src/smime/gui/smime-ui.ui.h:1
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:4
+#: ../src/smime/gui/smime-ui.ui.h:2
 msgid "Certificates Table"
 msgstr ""
 
 #. This is a verb, as in "make a backup".
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../src/smime/gui/smime-ui.ui.h:5
 msgid "_Backup"
 msgstr "_Sekurkopio"
 
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../src/smime/gui/smime-ui.ui.h:6
 msgid "Backup _All"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../src/smime/gui/smime-ui.ui.h:9
 msgid "Your Certificates"
 msgstr "Viaj atestiloj"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../src/smime/gui/smime-ui.ui.h:10
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../src/smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../src/smime/gui/smime-ui.ui.h:13
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:16
+#: ../src/smime/gui/smime-ui.ui.h:14
 msgid "Authorities"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../src/smime/gui/smime-ui.ui.h:15
 msgid "Certificate Authority Trust"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../src/smime/gui/smime-ui.ui.h:19
 msgid "Trust this CA to identify _websites."
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../src/smime/gui/smime-ui.ui.h:20
 msgid "Trust this CA to identify _email users."
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../src/smime/gui/smime-ui.ui.h:21
 msgid "Trust this CA to identify _software developers."
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../src/smime/gui/smime-ui.ui.h:22
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:25
-msgid "Certificate"
-msgstr "Atestilo"
-
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../src/smime/gui/smime-ui.ui.h:23
 msgid "Email Certificate Trust Settings"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../src/smime/gui/smime-ui.ui.h:24
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: ../src/smime/gui/smime-ui.ui.h:25
 msgid "Trust the authenticity of this certificate"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../src/smime/gui/smime-ui.ui.h:26
 msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:29
-msgid "_Edit CA Trust"
-msgstr ""
+#: ../src/smime/gui/smime-ui.ui.h:29
+#| msgid "Certificate"
+msgid "C_ertificate:"
+msgstr "At_estilo:"
 
-#: ../smime/lib/e-cert.c:236 ../smime/lib/e-cert.c:248
+#: ../src/smime/lib/e-cert.c:235 ../src/smime/lib/e-cert.c:247
 msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:404
+#: ../src/smime/lib/e-cert.c:403
 msgid "Sign"
 msgstr "Subskribi"
 
-#: ../smime/lib/e-cert.c:405
+#: ../src/smime/lib/e-cert.c:404
 msgid "Encrypt"
 msgstr "Ĉifradi"
 
-#: ../smime/lib/e-cert-db.c:787
+#: ../src/smime/lib/e-cert-db.c:788
 msgid "Certificate already exists"
 msgstr "Atestilo jam ekzistas"
 
-#: ../smime/lib/e-pkcs12.c:201
+#: ../src/smime/lib/e-pkcs12.c:200
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:202
+#: ../src/smime/lib/e-pkcs12.c:201
 msgid "Enter password for PKCS12 file:"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:328
+#: ../src/smime/lib/e-pkcs12.c:327
 #, c-format
 msgid "Unable to create export context, err_code: %i"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:335
+#: ../src/smime/lib/e-pkcs12.c:334
 #, c-format
 msgid "Unable to setup password integrity, err_code: %i"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:345
+#: ../src/smime/lib/e-pkcs12.c:344
 #, c-format
 msgid "Unable to create safe bag, err_code: %i"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:363
+#: ../src/smime/lib/e-pkcs12.c:362
 #, c-format
 msgid "Unable to add key/cert to the store, err_code: %i"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:381
+#: ../src/smime/lib/e-pkcs12.c:380
 #, c-format
 msgid "Unable to write store to disk, err_code: %i"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:408
+#: ../src/smime/lib/e-pkcs12.c:407
 msgid "Imported Certificate"
 msgstr ""
 
-#: ../views/addressbook/galview.xml.h:1
-msgid "_Address Cards"
-msgstr ""
+#~ msgid "Delete address book “{0}”?"
+#~ msgstr "Forigi adresaron “{0}”?"
 
-#: ../views/addressbook/galview.xml.h:2 ../views/calendar/galview.xml.h:5
-msgid "_List View"
-msgstr ""
+#~ msgid "Specify the output file instead of standard output"
+#~ msgstr "Uzi la eligitan dosieron anstataŭ la defaŭltan eligon"
 
-#: ../views/addressbook/galview.xml.h:3
-msgid "By _Company"
-msgstr ""
+#~ msgid "OUTPUTFILE"
+#~ msgstr "ELIGDOSIERO"
 
-#: ../views/calendar/galview.xml.h:1
-msgid "_Day View"
-msgstr ""
+#~ msgid "List local address book folders"
+#~ msgstr "Listigi lokajn adresar-dosierujojn"
 
-#: ../views/calendar/galview.xml.h:2
-msgid "_Work Week View"
-msgstr ""
+#~ msgid "Show cards as vcard or csv file"
+#~ msgstr "Montri kartojn kiel vcard- aŭ csv-dosiero"
 
-#: ../views/calendar/galview.xml.h:3
-msgid "W_eek View"
-msgstr ""
+#~ msgid "[vcard|csv]"
+#~ msgstr "[vcard|csv]"
 
-#: ../views/calendar/galview.xml.h:4
-msgid "_Month View"
-msgstr ""
+#~ msgid ""
+#~ "Command line arguments error, please use --help option to see the usage."
+#~ msgstr ""
+#~ "Eraro de komandliniaj argumentoj, bonvolu uzi opcion --help por vidi la "
+#~ "uzadon."
 
-#: ../views/mail/galview.xml.h:1
-msgid "_Messages"
-msgstr "_Mesaĝoj"
+#~ msgid "Only support csv or vcard format."
+#~ msgstr "Nur subteni CSV- aŭ vcard-aranĝonjn."
 
-#: ../views/mail/galview.xml.h:2
-msgid "As _Sent Folder"
-msgstr ""
+#~ msgid "Unhandled error"
+#~ msgstr "Netraktita eraro"
 
-#: ../views/mail/galview.xml.h:3
-msgid "By Su_bject"
-msgstr ""
+#~ msgid "Delete calendar “{0}”?"
+#~ msgstr "Ĉu forigi kalendaron “{0}”?"
 
-#: ../views/mail/galview.xml.h:4
-msgid "By Se_nder"
-msgstr ""
+#~ msgid "Delete task list “{0}”?"
+#~ msgstr "Ĉu forigi taskliston “{0}”?"
 
-#: ../views/mail/galview.xml.h:5
-msgid "By S_tatus"
-msgstr ""
+#~ msgid "Delete memo list “{0}”?"
+#~ msgstr "Ĉu forigi notoliston “{0}”?"
 
-#: ../views/mail/galview.xml.h:6
-msgid "By _Follow Up Flag"
-msgstr ""
+#~ msgid "Delete remote calendar “{0}”?"
+#~ msgstr "Ĉu forigi la foran kalendaron “{0}”?"
 
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr ""
+#~ msgid "Delete remote task list “{0}”?"
+#~ msgstr "Ĉu forigi la foran taskoliston “{0}”?"
 
-#: ../views/mail/galview.xml.h:8
-msgid "As Sent Folder for Wi_de View"
-msgstr ""
+#~ msgid "Delete remote memo list “{0}”?"
+#~ msgstr "Ĉu forigi la notoliston “{0}”?"
 
-#: ../views/memos/galview.xml.h:1
-msgid "_Memos"
-msgstr "_Notoj"
+#~ msgid "Edit Reminder"
+#~ msgstr "Redakti memorigaĵon"
 
-#: ../views/tasks/galview.xml.h:2
-msgid "With _Due Date"
-msgstr ""
+#~ msgid "start of appointment"
+#~ msgstr "komenco de rendevuo"
 
-#: ../views/tasks/galview.xml.h:3
-msgid "With _Status"
-msgstr ""
+#~ msgid "end of appointment"
+#~ msgstr "fino de rendevuo"
+
+#~ msgid "Add Reminder"
+#~ msgstr "Aldoni memorigaĵon"
+
+#~ msgid "Reminder"
+#~ msgstr "Memorigilo"
+
+#~ msgid "Repeat"
+#~ msgstr "Ripeti"
+
+#~ msgid "Mes_sage:"
+#~ msgstr "Me_saĝo:"
+
+#~ msgid "_Sound:"
+#~ msgstr "_Sono:"
+
+#~ msgid "Select A File"
+#~ msgstr "Elekti dosieron"
+
+#~ msgid "Action/Trigger"
+#~ msgstr "Ago/Ekagigo"
+
+#~ msgid "This event has been deleted."
+#~ msgstr "Tiu evento estas forigita."
+
+#~ msgid "This task has been deleted."
+#~ msgstr "Tiu tasko estas forigita."
+
+#~ msgid "This memo has been deleted."
+#~ msgstr "Tiu noto estas forigite."
+
+#~ msgid ""
+#~ "%s  You have made changes. Forget those changes and close the editor?"
+#~ msgstr ""
+#~ "%s  Vi faris ŝanĝojn. Ĉu forgesi tiajn ŝanĝojn kaj fermi la redaktilon?"
+
+#~ msgid "%s  You have made no changes, close the editor?"
+#~ msgstr "%s  Vi ne faris ŝanĝojn. Ĉu fermi la redaktilon?"
+
+#~ msgid "This task has been changed."
+#~ msgstr "Tiu tasko estas ŝanĝita."
+
+#~ msgid "This memo has been changed."
+#~ msgstr "Tiu noto estas ŝanĝite."
+
+#~ msgid ""
+#~ "%s  You have made changes. Forget those changes and update the editor?"
+#~ msgstr ""
+#~ "%s  Vi faris ŝanĝojn. Ĉu forgesi tiajn ŝanĝojn kaj ĝisdatigi la "
+#~ "redaktilon?"
+
+#~ msgid "%s  You have made no changes, update the editor?"
+#~ msgstr "%s  Vi ne faris ŝanĝojn, ĉu aktualigi la redaktilon?"
+
+#~ msgid "Could not update object"
+#~ msgstr "Ne eblis aktualigi onjekton"
+
+#~ msgid "Edit Appointment"
+#~ msgstr "Redakti rendevuon"
+
+#~ msgid "Keep original item?"
+#~ msgstr "Ĉu manteni originan eron?"
+
+#~ msgid "Unable to synchronize with the server"
+#~ msgstr "Ne eblas sinkronigi kun la servilo"
+
+#, fuzzy
+#~ msgid "Changes made to this item may be discarded if an update arrives"
+#~ msgstr ""
+#~ "Ŝanĝoj de tiu ĉi ero povus ne esti konservitaj, se ĝisdatigo alvenas"
+
+#~ msgid "Unable to use current version!"
+#~ msgstr "Ne eblas uzi aktualan version!"
+
+#~ msgid "Validation error: %s"
+#~ msgstr "Validig-eraro: %s"
+
+#, fuzzy
+#~ msgid "Enter Delegate"
+#~ msgstr "Enigi delegon"
+
+#~ msgid "Delegate To:"
+#~ msgstr "Deligi al:"
+
+#~ msgid "Contacts..."
+#~ msgstr "Kantaktoj..."
+
+#, fuzzy
+#~ msgid "_Recurrence"
+#~ msgstr "_Rikuro"
+
+#~ msgid "Make this a recurring event"
+#~ msgstr "Farigi tiun ĉi eventon rikura"
+
+#~ msgid "Insert advanced send options"
+#~ msgstr "Enmeti specialajn opciojn de sendo"
+
+#~ msgid "_Free/Busy"
+#~ msgstr "_Libere/okupite"
+
+#~ msgid "Print this event"
+#~ msgstr "Presi tiun eventon"
+
+#~ msgid "This event has reminders"
+#~ msgstr "Tiu evento havas memorigaĵojn"
+
+#~ msgid "Event with no start date"
+#~ msgstr "Evento sen komencdato"
+
+#~ msgid "Event with no end date"
+#~ msgstr "Evento sen findato"
+
+#~ msgid "Start date is wrong"
+#~ msgstr "Komencdato estas neĝusta"
+
+#~ msgid "End date is wrong"
+#~ msgstr "Findato estas neĝusta"
+
+#~ msgid "Start time is wrong"
+#~ msgstr "Komenctempo estas neĝusta"
+
+#~ msgid "End time is wrong"
+#~ msgstr "Fintempo estas neĝusta"
+
+#~ msgid "_Delegatees"
+#~ msgstr "_Delegantoj"
+
+#~ msgid "Atte_ndees"
+#~ msgstr "Alestan_toj"
+
+#~ msgctxt "eventpage"
+#~ msgid "15 minutes before appointment"
+#~ msgstr "15 minutoj antaŭ la rendevuo"
+
+#~ msgctxt "eventpage"
+#~ msgid "1 hour before appointment"
+#~ msgstr "1 horo antaŭ la rendevuo"
+
+#~ msgctxt "eventpage"
+#~ msgid "1 day before appointment"
+#~ msgstr "1 tago antaŭ la rendevuo"
+
+#~ msgid "_Time:"
+#~ msgstr "_Tempo:"
+
+#~ msgid "Event Description"
+#~ msgstr "Event-priskribo"
+
+#~ msgid "Print this memo"
+#~ msgstr "Presi tiun noton"
+
+#~ msgid "Memo's start date is in the past"
+#~ msgstr "La startdato de la noto estas en la pasinteco"
+
+#~ msgid "Organi_zer:"
+#~ msgstr "Organi_zilo:"
+
+#~ msgid "T_o:"
+#~ msgstr "_Al:"
+
+#~ msgid "Su_mmary:"
+#~ msgstr "_Resumo:"
+
+#~ msgid "Could not get a selection to modify."
+#~ msgstr "Ne eblis akiri modifotan elekton."
+
+#~ msgid "Could not get a selection to delete."
+#~ msgstr "Ne eblis akiri forigotan elekton."
+
+#~ msgid "Date/Time"
+#~ msgstr "Dato/tempo"
+
+#~ msgctxt "recurrpage"
+#~ msgid "day(s)"
+#~ msgstr "tago(j)"
+
+#~ msgctxt "recurrpage"
+#~ msgid "for"
+#~ msgstr "por"
+
+#~ msgctxt "recurrpage"
+#~ msgid "until"
+#~ msgstr "ĝis"
+
+#~ msgid "_Send Options"
+#~ msgstr "_Send-agordoj"
+
+#~ msgid "Print this task"
+#~ msgstr "Presi la taskon"
+
+#~ msgid ""
+#~ "Task cannot be edited, because the selected task list does not support "
+#~ "assigned tasks"
+#~ msgstr ""
+#~ "Ne eblas redakti taskon, ĉar la elektita tasko ne subtenas atribuitajn "
+#~ "taskojn"
+
+#~ msgid "Due date is wrong"
+#~ msgstr "Limdato estas erara"
+
+#~ msgid "Canceled"
+#~ msgstr "Nuligite"
+
+#~ msgid "Time zone:"
+#~ msgstr "Horzono:"
+
+#~ msgid "%s at the start of the appointment"
+#~ msgstr "%s je la starto de la rendevuo"
+
+#~ msgid "%s at the end of the appointment"
+#~ msgstr "%s je la fino de la rendevuo"
+
+#~ msgid "Gnome Calendar"
+#~ msgstr "Gnomo Kalendaro"
+
+#~ msgid "Because &quot;{1}&quot;."
+#~ msgstr "Ĉar &quot;{1}&quot;."
+
+#, fuzzy
+#~ msgid "Enable developer mode"
+#~ msgstr "Ĉiuj lokaj dosierujoj"
+
+#~ msgid ""
+#~ "This can have three possible values. \"0\" for errors. \"1\" for "
+#~ "warnings. \"2\" for debug messages."
+#~ msgstr ""
+#~ "Tio ĉi povas havi unu el tri valoroj. \"0\" = eraro. \"1\" = averto. "
+#~ "\"2\" = erarospura informo."
+
+#~ msgid "Could not open “%s”"
+#~ msgstr "Ne eblis malfermi na “%s”"
+
+#, fuzzy
+#~| msgid "Calendar Properties"
+#~ msgid "Changed property"
+#~ msgstr "Kalendar-ecoj"
+
+#~ msgid "_Unsort"
+#~ msgstr "_Neordigite"
+
+#~ msgid "Canceled."
+#~ msgstr "Nuligite."
+
+#~ msgctxt "PGPKeyDescription"
+#~ msgid "%s - %s"
+#~ msgstr "%s - %s"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#, fuzzy
+#~| msgid "GConf error: %s"
+#~ msgid "HTTP Error: %s"
+#~ msgstr "Eraro de GConf: %s"
+
+#, fuzzy
+#~| msgid "Could not open source"
+#~ msgid "Could not parse response"
+#~ msgstr "Ne eblis malfermi fonton"
+
+#~| msgid "_Empty Trash"
+#~ msgid "Empty response"
+#~ msgstr "Malplena respondo"
+
+#~| msgid "Could not create message."
+#~ msgid "Could not locate user's calendars"
+#~ msgstr "Ne eblis trovi kalendarojn de uzanto"
+
+#~ msgid "Path"
+#~ msgstr "Vojo"
+
+#~ msgid "Template:"
+#~ msgstr "Ŝablono:"
+
+#, fuzzy
+#~| msgid "Evolution Website"
+#~ msgid "Evolution Web Inspector"
+#~ msgstr "Retpaĝaro de Evolucio"
+
+#~ msgid "E_nable"
+#~ msgstr "E_nŝalti"
+
+#~ msgctxt "CamelTrust"
+#~ msgid "_Never"
+#~ msgstr "_Neniam"
 
 #~ msgid ""
 #~ "Currently you can only access the GroupWise System Address Book from "
@@ -23855,7 +27327,7 @@ msgstr ""
 #~ "The number of cards in one output file in asynchronous mode, default size "
 #~ "100."
 #~ msgstr ""
-#~ "Nombro de kartoj en unu eliga dosiero dum malsamtempa modo, apriora "
+#~ "Nombro de kartoj en unu eliga dosiero dum malsamtempa modo, defaŭlta "
 #~ "grando: 100."
 
 #~ msgid "NUMBER"
@@ -23882,10 +27354,10 @@ msgstr ""
 #~ "normalan memorilan dialogkeston."
 
 #~ msgid ""
-#~ "'{0}' is a read-only calendar and cannot be modified. Please select a "
+#~ "“{0}” is a read-only calendar and cannot be modified. Please select a "
 #~ "different calendar from the side bar in the Calendar view."
 #~ msgstr ""
-#~ "'{0}' estas nurlega kalendaro kaj ne estas modifebla. Bonvolu elekti "
+#~ "“{0}” estas nurlega kalendaro kaj ne estas modifebla. Bonvolu elekti "
 #~ "alian kalendaron de la flankbreto en la kalendarvido."
 
 #~ msgid "Cannot create a new event"
@@ -23933,10 +27405,6 @@ msgstr ""
 #~ msgid "_Type:"
 #~ msgstr "_Tipo:"
 
-#, fuzzy
-#~ msgid "Sh_ow reminder notifications"
-#~ msgstr "M_ontri memorigilon"
-
 #~ msgid "Recent _Documents"
 #~ msgstr "Freŝaj _dokumentoj"
 
@@ -23949,17 +27417,14 @@ msgstr ""
 #~ msgid "Custom Reminder:"
 #~ msgstr "Adapti memorigaĵon:"
 
-#~ msgid "Unable to open memos in '%s': %s"
-#~ msgstr "Ne eblis malfermi notoj en '%s': %s"
-
 #~ msgid "Web Page"
 #~ msgstr "Retpaĝo"
 
 #~ msgid "Stat_us:"
 #~ msgstr "Stat_o:"
 
-#~ msgid "Unable to open tasks in '%s': %s"
-#~ msgstr "Ne eblis malfermi la taskojn en '%s': %s"
+#~ msgid "Unable to open tasks in “%s”: %s"
+#~ msgstr "Ne eblis malfermi la taskojn en “%s”: %s"
 
 #~ msgid "Categor_ies..."
 #~ msgstr "Kategor_ioj..."
@@ -23979,9 +27444,6 @@ msgstr ""
 #~ msgid "Please enter your password."
 #~ msgstr "Bonvole enigu vian pasvorton."
 
-#~ msgid "CalDAV"
-#~ msgstr "CalDAV"
-
 #~ msgid "Personal details:"
 #~ msgstr "Persondetaloj:"
 
@@ -23991,9 +27453,6 @@ msgstr ""
 #~ msgid "Details:"
 #~ msgstr "Detaloj:"
 
-#~ msgid "Server address:"
-#~ msgstr "Serviladreso:"
-
 #~ msgid "Use encryption:"
 #~ msgstr "Uti ĉifradon:"
 
@@ -24012,12 +27471,6 @@ msgstr ""
 #~ msgid "Add a new account"
 #~ msgstr "Aldoni novan konton"
 
-#~ msgid "Account management"
-#~ msgstr "Konto-administrado"
-
-#~ msgid "Settings"
-#~ msgstr "Agordoj"
-
 #~ msgid "Save draft"
 #~ msgstr "Konservi malneton"
 
@@ -24076,8 +27529,8 @@ msgstr ""
 #~ msgid "Create R_ule"
 #~ msgstr "Krei reg_ulon"
 
-#~ msgid "Folder '%s'"
-#~ msgstr "Dosierujo '%s'"
+#~ msgid "Folder “%s”"
+#~ msgstr "Dosierujo “%s”"
 
 #~ msgid "Enter Password for %s"
 #~ msgstr "Enigu pasvorton por %s"
@@ -24085,8 +27538,8 @@ msgstr ""
 #~ msgid "Enter Password"
 #~ msgstr "Enigu pasvorton"
 
-#~ msgid "Unsubscribing from folder '%s'"
-#~ msgstr "Malaboni de dosierujo '%s'"
+#~ msgid "Unsubscribing from folder “%s”"
+#~ msgstr "Malaboni de dosierujo “%s”"
 
 #~ msgctxt "mail-signature"
 #~ msgid "None"
@@ -24173,15 +27626,9 @@ msgstr ""
 #~ msgid "Signature Already Exists"
 #~ msgstr "Subskribo jam ekzistas"
 
-#~ msgid "Sent Messages"
-#~ msgstr "Senditaj mesaĝoj"
-
 #~ msgid "Details"
 #~ msgstr "Detaloj"
 
-#~ msgid "On LDAP Servers"
-#~ msgstr "En LDAP-serviloj"
-
 #~ msgid "5"
 #~ msgstr "5"
 
@@ -24210,14 +27657,7 @@ msgstr ""
 #~ "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 #~ msgstr ""
 #~ "Koloro por kolori la nunhoromontrilan linion en la tempa tabulbarilo "
-#~ "(malplenigu la kampon elektos la aprioran koloron)."
-
-#~ msgid ""
-#~ "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-#~ "debug messages."
-#~ msgstr ""
-#~ "Tio povas havi tri eblajn valorojn: 0 por eraroj. 1 por avertoj. 2 por "
-#~ "sencimigaj mesaĝoj."
+#~ "(malplenigu la kampon elektos la defaŭltan koloron)."
 
 #~ msgid ""
 #~ "Use the system timezone instead of the timezone selected in Evolution."
@@ -24231,18 +27671,12 @@ msgstr ""
 #~ msgid "Loading calendars"
 #~ msgstr "Ŝarĝante kalendarojn"
 
-#~ msgid "_New Calendar..."
-#~ msgstr "_Nova kalendaro..."
-
 #~ msgid "Copy..."
 #~ msgstr "Kopii..."
 
 #~ msgid "Local Address Books"
 #~ msgstr "Loka adresaro"
 
-#~ msgid "Events"
-#~ msgstr "Eventoj"
-
 #~ msgid "Enter password for user %s on server %s"
 #~ msgstr "Enigu pasvorton por uzanto %s sur servilo %s"
 
@@ -24258,9 +27692,6 @@ msgstr ""
 #~ msgid "File _name:"
 #~ msgstr "Dosier_nomo:"
 
-#~ msgid "Local Calendars"
-#~ msgstr "Lokaj kalendaroj"
-
 #~ msgid "Userna_me:"
 #~ msgstr "Uzantono_mo:"
 
@@ -24304,15 +27735,9 @@ msgstr ""
 #~ msgid "Add weather calendars to Evolution."
 #~ msgstr "Aldoni veter-kalendaroj al Evolucio."
 
-#~ msgid "Weather Calendars"
-#~ msgstr "Veter-kalendaroj"
-
 #~ msgid "Default Sources"
 #~ msgstr "Defaŭltaj fontoj"
 
-#~ msgid "Server"
-#~ msgstr "Servilo"
-
 #~ msgid "Unknown error."
 #~ msgstr "Nekonata eraro."
 
@@ -24350,9 +27775,6 @@ msgstr ""
 #~ msgid "WebDAV contacts"
 #~ msgstr "WebDAV-kontaktoj"
 
-#~ msgid "WebDAV"
-#~ msgstr "WebDAV"
-
 #~ msgid "HTTP proxy host name"
 #~ msgstr "HTTP-prokura komputilnomo"
 
@@ -24377,20 +27799,14 @@ msgstr ""
 #~ msgid "Secure HTTP proxy port"
 #~ msgstr "Sekura HTTP-prokura pordo"
 
-#~ msgid "_Forget Passwords"
-#~ msgstr "_Forgesigi pasvortojn"
-
 #~ msgid "Forget all remembered passwords"
 #~ msgstr "Forgesigi ĉiujn pasvortojn"
 
 #~ msgid "_Forget"
 #~ msgstr "_Forgesi"
 
-#~ msgid "File is not a valid .desktop file"
-#~ msgstr "Dosiero ne estas valida .desktop-dosiero"
-
-#~ msgid "Unrecognized desktop file Version '%s'"
-#~ msgstr "Nerekonata versio '%s' de labortabla dosiero"
+#~ msgid "Unrecognized desktop file Version “%s”"
+#~ msgstr "Nerekonata versio “%s” de labortabla dosiero"
 
 #~ msgid "Starting %s"
 #~ msgstr "Lanĉante %s"
@@ -24480,9 +27896,6 @@ msgstr ""
 #~ msgid "Available Fields"
 #~ msgstr "Disponeblaj kampoj"
 
-#~ msgid "A_vailable Fields:"
-#~ msgstr "_Disponeblaj kampoj:"
-
 #~ msgid "Move _Up"
 #~ msgstr "Movi s_upren"
 
@@ -24533,15 +27946,12 @@ msgstr ""
 #~ msgid "Migration"
 #~ msgstr "Migrigado"
 
-#~ msgid "Migrating '%s':"
-#~ msgstr "Migrigado '%s'"
+#~ msgid "Migrating “%s”:"
+#~ msgstr "Migrigado “%s”"
 
 #~ msgid "Migrating Folders"
 #~ msgstr "Migrigad-dosierujoj"
 
-#~ msgid "Local Folders"
-#~ msgstr "Lokaj dosierujoj"
-
 #~ msgid "Alarm programs"
 #~ msgstr "Alarmprogramoj"
 
@@ -24588,9 +27998,6 @@ msgstr ""
 #~ msgid "Con_tacts..."
 #~ msgstr "Kon_taktoj..."
 
-#~ msgid "Users:"
-#~ msgstr "Uzantoj:"
-
 #~ msgid "Add/Edit"
 #~ msgstr "Aldoni/Redakti"
 
@@ -24600,9 +28007,6 @@ msgstr ""
 #~ msgid "_Write"
 #~ msgstr "_Skribi"
 
-#~ msgid "Proxy"
-#~ msgstr "Prokurilo"
-
 #~ msgctxt "GW"
 #~ msgid "Proxy"
 #~ msgstr "Prokurilo"