[evolution] Update Esperanto translation



commit 801658325f66361bd4224dddf030b6fe6fb68794
Author: Carmen Bianca BAKKER <carmen carmenbianca eu>
Date:   Wed May 1 19:52:23 2019 +0000

    Update Esperanto translation

 po/eo.po | 2137 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 1208 insertions(+), 929 deletions(-)
---
diff --git a/po/eo.po b/po/eo.po
index 567b544bc6..4d3182d40f 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -3,15 +3,16 @@
 # 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.
-# Carmen Bianca BAKKER <carmen carmenbianca eu>, 2018.
 # Tirifto <tirifto posteo cz>, 2019.
 # Kristjan SCHMIDT <kristjan schmidt googlemail com>, 2011-2019.
+# Carmen Bianca BAKKER <carmen carmenbianca eu>, 2018-2019.
+#: ../src/shell/main.c:527
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution/issues\n";
-"POT-Creation-Date: 2019-03-01 16:28+0000\n"
-"PO-Revision-Date: 2019-03-09 11:47+0200\n"
+"POT-Creation-Date: 2019-04-24 08:00+0000\n"
+"PO-Revision-Date: 2019-05-01 21:49+0200\n"
 "Last-Translator: Kristjan SCHMIDT <kristjan schmidt googlemail com>\n"
 "Language-Team: Esperanto <gnome-eo-list gnome org>\n"
 "Language: eo\n"
@@ -661,6 +662,14 @@ msgstr "Listo de vortaraj lingvokodoj uzataj por literum-kontrolado."
 msgid "List of recently used spell checking languages"
 msgstr "Listo de freŝe uzitaj literum-kontrolataj lingvoj"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
+#, fuzzy
+#| msgid "List of dictionary language codes used for spell checking."
+msgid ""
+"List of dictionary language codes used for spell checking, which had been "
+"used recently."
+msgstr "Listo de vortaraj lingvokodoj uzataj por literum-kontrolado."
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
 msgid "How many recently used spell checking languages to remember"
 msgstr "Kiom da freŝe uzitaj literum-kontrolataj lingvoj memori"
@@ -669,10 +678,34 @@ msgstr "Kiom da freŝe uzitaj literum-kontrolataj lingvoj memori"
 msgid "Show “Bcc” field when sending a mail message"
 msgstr "Montri kampon “Kaŝkopio” dum sendado de retmesaĝo"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#, fuzzy
+#| msgid ""
+#| "Show the “From” override field when sending a mail message. This is "
+#| "controlled from the View menu when a mail account is chosen."
+msgid ""
+"Show the “Bcc” field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"Montri la transpasan kampon “De” dum sendado de mesaĝo. Tion eblas agordi de "
+"la vida menuo, kiam retpoŝta konto estas elektita."
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
 msgid "Show “Cc” field when sending a mail message"
 msgstr "Montri kampon “Kopio” dum sendado de retmesaĝo"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#, fuzzy
+#| msgid ""
+#| "Show the “From” override field when sending a mail message. This is "
+#| "controlled from the View menu when a mail account is chosen."
+msgid ""
+"Show the “Cc” field when sending a mail message. This is controlled from the "
+"View menu when a mail account is chosen."
+msgstr ""
+"Montri la transpasan kampon “De” dum sendado de mesaĝo. Tion eblas agordi de "
+"la vida menuo, kiam retpoŝta konto estas elektita."
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
 msgid "Show “From” override field when sending a mail message"
 msgstr "Montri transpasan kampon “From” dum sendado de retmesaĝo"
@@ -689,14 +722,50 @@ msgstr ""
 msgid "Show “Reply To” field when sending a mail message"
 msgstr "Monti kampon “Respondi al” dum sendado de retmesaĝo"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#, fuzzy
+#| msgid ""
+#| "Show the “From” override field when sending a mail message. This is "
+#| "controlled from the View menu when a mail account is chosen."
+msgid ""
+"Show the “Reply To” field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+msgstr ""
+"Montri la transpasan kampon “De” dum sendado de mesaĝo. Tion eblas agordi de "
+"la vida menuo, kiam retpoŝta konto estas elektita."
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
 msgid "Show “From” field when posting to a newsgroup"
 msgstr "Montri kampon “De” dum sendado al novaĵgrupo"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+#, fuzzy
+#| msgid ""
+#| "Show the “From” override field when sending a mail message. This is "
+#| "controlled from the View menu when a mail account is chosen."
+msgid ""
+"Show the “From” field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+"Montri la transpasan kampon “De” dum sendado de mesaĝo. Tion eblas agordi de "
+"la vida menuo, kiam retpoŝta konto estas elektita."
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
 msgid "Show “Reply To” field when posting to a newsgroup"
 msgstr "Montri kampon “Respondi al” dum sendado al novaĵgrupo"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+#, fuzzy
+#| msgid ""
+#| "Show the “From” override field when sending a mail message. This is "
+#| "controlled from the View menu when a mail account is chosen."
+msgid ""
+"Show the “Reply To” field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+msgstr ""
+"Montri la transpasan kampon “De” dum sendado de mesaĝo. Tion eblas agordi de "
+"la vida menuo, kiam retpoŝta konto estas elektita."
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
 msgid "Digitally sign replies when the original message is signed"
 msgstr "Cifere subskribi respondojn kiam la origina esti subskribita"
@@ -1474,11 +1543,17 @@ msgstr "Malsukcesis elŝuti mesaĝojn por senreta montro."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:293
 #, fuzzy
+#| msgid "Display reminders in _notification area only"
+msgid "Whether display delivery notification parts inline."
+msgstr "Montri memorigilojn nur en la sciiga areo."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
+#, fuzzy
 #| msgid "_Forward style:"
 msgid "(Deprecated) Default forward style"
 msgstr "Implicita plusenda stilo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:297
 #, fuzzy
 #| msgid "Default Sources"
 msgid "(Deprecated) Default reply style"
@@ -1563,6 +1638,12 @@ msgstr "Forigi mesaĝon"
 msgid "Whether to delete processed iTip objects"
 msgstr "Ĉu montri notojn en la redaktilo"
 
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:3
+#, fuzzy
+#| msgid "_Preserve my reminder"
+msgid "Preserve exiting reminder by default"
+msgstr "Konservi mian memorigilon"
+
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
 #, fuzzy
 #| msgid "Notify new messages for _Inbox only"
@@ -1770,6 +1851,12 @@ msgstr "Pepi aŭ ludi sondosieron."
 msgid "Default sidebar width"
 msgstr "Implicita uzanto-kalendaro"
 
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:38
+#, fuzzy
+#| msgid "Send a message to the selected contacts"
+msgid "Prefix of the URI to use to search the web with selected text."
+msgstr "Sendi mesaĝon al la elektitaj kontaktoj."
+
 #: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:1
 #, fuzzy
 #| msgid "Beep or play sound file."
@@ -1842,8 +1929,8 @@ 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-collection-account-wizard.c:784
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:948
+#: ../src/e-util/e-collection-account-wizard.c:816
 #: ../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:199
 #: ../src/modules/calendar/e-cal-shell-view.c:604
@@ -1855,14 +1942,14 @@ msgstr "Kalendaro"
 #: ../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:1489
+#: ../src/modules/mail/e-mail-shell-view.c:1493
 #: ../src/smime/gui/certificate-manager.c:1666
 msgid "Mail"
 msgstr "Retpoŝto"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:11
 #: ../src/calendar/gui/e-memo-table.c:374 ../src/e-util/e-webdav-browser.c:459
-#: ../src/modules/calendar/e-cal-shell-content.c:1736
+#: ../src/modules/calendar/e-cal-shell-content.c:1743
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:196
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:211
 #: ../src/modules/calendar/e-memo-shell-view.c:335
@@ -1875,7 +1962,7 @@ msgstr "Notoj"
 #: ../src/calendar/importers/icalendar-importer.c:1109
 #: ../src/e-util/e-webdav-browser.c:460
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:71
-#: ../src/modules/calendar/e-cal-shell-content.c:1696
+#: ../src/modules/calendar/e-cal-shell-content.c:1703
 #: ../src/modules/calendar/e-task-shell-view-actions.c:220
 #: ../src/modules/calendar/e-task-shell-view-actions.c:235
 #: ../src/modules/calendar/e-task-shell-view.c:507
@@ -2104,13 +2191,13 @@ msgstr ""
 #: ../src/addressbook/addressbook.error.xml.h:31
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:721
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1505
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1537
 #: ../src/e-util/e-accounts-window.c:1563
 #: ../src/e-util/e-mail-signature-manager.c:328
 #: ../src/e-util/e-name-selector-dialog.c:1033 ../src/e-util/filter.ui.h:25
 #: ../src/mail/e-mail-account-manager.c:719
 #: ../src/mail/e-mail-label-manager.c:371
-#: ../src/mail/em-folder-properties.c:1044
+#: ../src/mail/em-folder-properties.c:1330
 #: ../src/mail/em-vfolder-editor-rule.c:408
 #: ../src/mail/em-vfolder-editor-rule.c:637 ../src/mail/mail-config.ui.h:63
 #: ../src/modules/mail/em-composer-prefs.c:423
@@ -2214,14 +2301,13 @@ msgid "Do you want to unset contact image?"
 msgstr "Ĉu vi ŝatus reakiri nefaritajn mesaĝojn?"
 
 #: ../src/addressbook/addressbook.error.xml.h:50
-#, fuzzy
 #| msgid "Do _Not Unsubscribe"
 msgid "Do _Not Unset"
-msgstr "_Ne malaboni"
+msgstr "_Ne malagordi"
 
 #: ../src/addressbook/addressbook.error.xml.h:51
 msgid "_Unset"
-msgstr "_Neordigita"
+msgstr "_Malagordi"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:1
 msgid "Show Telephone"
@@ -2275,7 +2361,7 @@ msgid "Contact Editor"
 msgstr "Kontaktredaktilo"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1985
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2020
 #: ../src/mail/mail-config.ui.h:40
 msgid "Options"
 msgstr "Agordoj"
@@ -2305,9 +2391,9 @@ msgstr "Agordoj"
 #: ../src/e-util/e-attachment-store.c:854 ../src/e-util/e-attachment-view.c:301
 #: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:171
 #: ../src/e-util/e-category-editor.c:259 ../src/e-util/e-charset-combo-box.c:99
-#: ../src/e-util/e-collection-account-wizard.c:231
-#: ../src/e-util/e-collection-account-wizard.c:1801
-#: ../src/e-util/e-collection-account-wizard.c:2037
+#: ../src/e-util/e-collection-account-wizard.c:238
+#: ../src/e-util/e-collection-account-wizard.c:1838
+#: ../src/e-util/e-collection-account-wizard.c:2074
 #: ../src/e-util/e-color-chooser-widget.c:125
 #: ../src/e-util/e-filter-datespec.c:300
 #: ../src/e-util/e-html-editor-actions.c:304
@@ -2325,7 +2411,7 @@ msgstr "Agordoj"
 #: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4318
 #: ../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:160 ../src/mail/em-composer-utils.c:4175
+#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4019
 #: ../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:874
 #: ../src/mail/mail-send-recv.c:955 ../src/mail/mail-vfolder-ui.c:149
@@ -2405,8 +2491,8 @@ msgid "Full _Name..."
 msgstr "Tuta _nomo..."
 
 #: ../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/eab-contact-formatter.c:829
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1286
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Email"
 msgstr "Retpoŝto"
@@ -2526,16 +2612,16 @@ msgid "_Anniversary:"
 msgstr "_Datreveno:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:893
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:996
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../src/calendar/gui/e-calendar-view.c:2079
+#: ../src/calendar/gui/e-calendar-view.c:2073
 msgid "Anniversary"
 msgstr "Datreveno"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:892
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:995
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../src/calendar/gui/e-calendar-view.c:2078
+#: ../src/calendar/gui/e-calendar-view.c:2072
 msgid "Birthday"
 msgstr "Naskiĝtago"
 
@@ -2584,7 +2670,7 @@ msgstr "Hejmo"
 
 #: ../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/eab-contact-formatter.c:963
 #: ../src/addressbook/gui/widgets/e-contact-map.c:380
 msgid "Work"
 msgstr "Laborejo"
@@ -2592,7 +2678,7 @@ msgstr "Laborejo"
 #: ../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/addressbook/gui/widgets/eab-contact-formatter.c:1030
 #: ../src/calendar/gui/e-cal-model.c:3827
 msgid "Other"
 msgstr "Aliaj"
@@ -2617,14 +2703,14 @@ msgstr "Aldoni _X.509"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:69
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1521
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1553
 #: ../src/e-util/e-attachment-view.c:355 ../src/e-util/e-filter-rule.c:409
 #: ../src/e-util/e-mail-signature-manager.c:368
 #: ../src/e-util/e-name-selector-dialog.c:1037
 #: ../src/e-util/filter.error.xml.h:18 ../src/e-util/filter.ui.h:27
 #: ../src/mail/e-mail-config-identity-page.c:871
 #: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:678
-#: ../src/mail/em-folder-properties.c:1050
+#: ../src/mail/em-folder-properties.c:1336
 #: ../src/mail/em-vfolder-editor-rule.c:642 ../src/mail/mail-config.ui.h:64
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:554
 #: ../src/plugins/email-custom-header/email-custom-header.c:848
@@ -3010,7 +3096,7 @@ msgstr "Retpoŝto komencas kun"
 #: ../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:1295
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1740
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1731
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:809
 #: ../src/modules/calendar/e-task-shell-view-actions.c:1017
 msgid "Any field contains"
@@ -3060,152 +3146,153 @@ msgstr "Malfermi mapon"
 msgid "SIP"
 msgstr "SIP"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:694
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:689
 msgid "List Members:"
 msgstr "Listanoj:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:766
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:763
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:950
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:991
+msgid "Phone"
+msgstr "Telefono"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:869
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "Kromnomo"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:767
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:870
 msgid "AIM"
 msgstr "AIM"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:768
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:871
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:769
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:872
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:770
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:873
 msgid "Jabber"
 msgstr "Jabero"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:771
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:874
 msgid "MSN"
 msgstr "MSN"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:772
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:875
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:773
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:876
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:774
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:877
 msgid "Skype"
 msgstr "Skajpo"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:775
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:878
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:837
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:940
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "Firmao"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:838
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:941
 msgid "Department"
 msgstr "Distrikto"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:839
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:942
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Office"
 msgstr "Oficejo"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:840
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:943
 msgid "Profession"
 msgstr "Profesio"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:841
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:944
 msgid "Position"
 msgstr "Pozicio"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:842
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:945
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "Estro"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:843
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:946
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "Asistanto"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:844
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:947
 msgid "Video Chat"
 msgstr "Video-babilado"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:846
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:949
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Libera/okupita"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:847
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:888
-msgid "Phone"
-msgstr "Telefono"
-
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:848
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:951
 msgid "Fax"
 msgstr "Faksilo"
 
-#: ../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
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:953
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:994
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1020
 msgid "Address"
 msgstr "Adreso"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:886
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:989
 msgid "Home Page"
 msgstr "Hejmpaĝo"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:887
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:990
 msgid "Web Log"
 msgstr "Blogo"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:889
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:992
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Mobile Phone"
 msgstr "Poŝtelefono"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:894
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:997
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "Edz(in)o"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:904
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1007
 msgid "Personal"
 msgstr "Persona"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:949
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1052
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "Noto"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1145
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1248
 msgid "List Members"
 msgstr "Listanoj"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1166
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1271
 msgid "Job Title"
 msgstr "Postena titolo"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1207
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1312
 msgid "Home page"
 msgstr "Hejmpaĝo"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1217
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1322
 msgid "Blog"
 msgstr "Blogo"
 
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:259
-#: ../src/calendar/gui/e-cal-component-preview.c:322
+#: ../src/calendar/gui/e-cal-component-preview.c:342
 #: ../src/calendar/gui/e-cal-model-tasks.c:272
 #: ../src/calendar/gui/e-cal-model-tasks.c:526
 #: ../src/calendar/gui/e-task-table.c:210
@@ -3453,10 +3540,10 @@ msgstr "Ĉu certe vi volas forigi tiun ĉi kontaktulon (%s)?"
 #: ../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:1173
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1547
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1538
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:699
 #: ../src/modules/calendar/e-task-shell-view-actions.c:853
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1589
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1628
 #: ../src/shell/e-shell-window-actions.c:859
 #: ../src/smime/gui/certificate-manager.c:1656 ../src/smime/gui/smime-ui.ui.h:8
 msgid "_Delete"
@@ -3656,7 +3743,7 @@ msgstr "Zom_i"
 
 #. Zoom-out button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
-#: ../src/mail/e-mail-reader.c:2829
+#: ../src/mail/e-mail-reader.c:2862
 msgid "Zoom _Out"
 msgstr "Malz_omi"
 
@@ -4602,7 +4689,7 @@ msgstr "ne entenas"
 #: ../src/calendar/gui/memotypes.xml.in.h:4
 #: ../src/calendar/gui/tasktypes.xml.in.h:4
 #: ../src/e-util/e-attachment-tree-view.c:147
-#: ../src/e-util/e-collection-account-wizard.c:1893
+#: ../src/e-util/e-collection-account-wizard.c:1930
 #: ../src/e-util/e-table-config.ui.h:20
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Description"
@@ -4902,28 +4989,28 @@ msgstr[1] "%d sekundoj"
 
 #. 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:1820
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1855
 msgctxt "cal-reminders"
 msgid "Play a sound"
 msgstr "Ludi sonon"
 
 #. 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:1818
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1853
 msgctxt "cal-reminders"
 msgid "Pop up an alert"
 msgstr "Ŝpruci averton"
 
 #. 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:1824
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1859
 msgctxt "cal-reminders"
 msgid "Send an email"
 msgstr "Sendu retpoŝton"
 
 #. 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:1822
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1857
 msgctxt "cal-reminders"
 msgid "Run a program"
 msgstr "Lanĉi programon"
@@ -5015,45 +5102,39 @@ msgstr "kalendara vido por monato"
 msgid "calendar view for one or more weeks"
 msgstr "kalendara vido por unu aŭ plu semanjoj"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:216
+#: ../src/calendar/gui/e-cal-component-preview.c:239
 #: ../src/e-util/e-filter-rule.c:986 ../src/mail/e-mail-config-page.c:124
 msgid "Untitled"
 msgstr "Sentitola"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:224
+#: ../src/calendar/gui/e-cal-component-preview.c:252
 msgid "Categories:"
 msgstr "Kategorioj:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:258
+#: ../src/calendar/gui/e-cal-component-preview.c:289
 #: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
 #: ../src/modules/itip-formatter/itip-view.c:1682
 #: ../src/modules/itip-formatter/itip-view.c:1793
 msgid "Location:"
 msgstr "Loko:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:266
+#: ../src/calendar/gui/e-cal-component-preview.c:295
 msgid "Start Date:"
 msgstr "Komencodato:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:277
+#: ../src/calendar/gui/e-cal-component-preview.c:304
 msgid "End Date:"
 msgstr "Findato:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:288
+#: ../src/calendar/gui/e-cal-component-preview.c:313
 msgid "Due Date:"
 msgstr "Limdato:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:300
+#: ../src/calendar/gui/e-cal-component-preview.c:323
 msgid "Recurs:"
 msgstr "Reokazas:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:312
-#: ../src/modules/itip-formatter/itip-view.c:1685
-#: ../src/modules/itip-formatter/itip-view.c:1802
-msgid "Status:"
-msgstr "Stato:"
-
-#: ../src/calendar/gui/e-cal-component-preview.c:316
+#: ../src/calendar/gui/e-cal-component-preview.c:336
 #: ../src/calendar/gui/e-cal-model-tasks.c:268
 #: ../src/calendar/gui/e-cal-model-tasks.c:522
 #: ../src/calendar/gui/e-cal-model-tasks.c:603
@@ -5063,7 +5144,7 @@ msgstr "Stato:"
 msgid "In Progress"
 msgstr "Progresante"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:319
+#: ../src/calendar/gui/e-cal-component-preview.c:339
 #: ../src/calendar/gui/e-cal-model-tasks.c:270
 #: ../src/calendar/gui/e-cal-model-tasks.c:524
 #: ../src/calendar/gui/e-meeting-store.c:205
@@ -5076,7 +5157,7 @@ msgstr "Progresante"
 msgid "Completed"
 msgstr "Plenumita"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:326
+#: ../src/calendar/gui/e-cal-component-preview.c:346
 #: ../src/calendar/gui/e-cal-model-tasks.c:266
 #: ../src/calendar/gui/e-cal-model-tasks.c:520
 #: ../src/calendar/gui/e-task-table.c:204
@@ -5086,38 +5167,53 @@ msgstr "Plenumita"
 msgid "Not Started"
 msgstr "Ne startita"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:339
-msgid "Priority:"
-msgstr "Prioritato:"
+#: ../src/calendar/gui/e-cal-component-preview.c:350
+#: ../src/modules/itip-formatter/itip-view.c:1685
+#: ../src/modules/itip-formatter/itip-view.c:1802
+msgid "Status:"
+msgstr "Stato:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:341
+#: ../src/calendar/gui/e-cal-component-preview.c:357
 #: ../src/calendar/gui/e-task-table.c:549
 #: ../src/calendar/gui/tasktypes.xml.in.h:19
-#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:328
+#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:330
 msgid "High"
 msgstr "Alta"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:343
+#: ../src/calendar/gui/e-cal-component-preview.c:359
 #: ../src/calendar/gui/e-cal-model.c:1911
 #: ../src/calendar/gui/e-task-table.c:550
 #: ../src/calendar/gui/tasktypes.xml.in.h:20
-#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:327
+#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:329
 msgid "Normal"
 msgstr "Normala"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:345
+#: ../src/calendar/gui/e-cal-component-preview.c:361
 #: ../src/calendar/gui/e-task-table.c:551
 #: ../src/calendar/gui/tasktypes.xml.in.h:21
-#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:326
+#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:328
 msgid "Low"
 msgstr "Malalta"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:364
+#: ../src/calendar/gui/e-cal-component-preview.c:363
+msgid "Priority:"
+msgstr "Prioritato:"
+
+#: ../src/calendar/gui/e-cal-component-preview.c:378
+msgid "Organizer:"
+msgstr "Organizilo:"
+
+#: ../src/calendar/gui/e-cal-component-preview.c:417
+#| msgid "Attendees: "
+msgid "Attendees:"
+msgstr "Alestantoj:"
+
+#: ../src/calendar/gui/e-cal-component-preview.c:464
 #: ../src/mail/e-mail-config-service-page.c:533
 msgid "Description:"
 msgstr "Priskribo:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:408
+#: ../src/calendar/gui/e-cal-component-preview.c:515
 msgid "Web Page:"
 msgstr "Retpaĝo:"
 
@@ -5168,7 +5264,7 @@ msgid "Select Date"
 msgstr "Elekti daton"
 
 #: ../src/calendar/gui/e-cal-dialogs.c:693
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1304
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1295
 msgid "Select _Today"
 msgstr "Elekti _hodiaŭ"
 
@@ -5314,7 +5410,7 @@ msgstr "Algluante iCalendar-datumojn"
 #. * "Organizer: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../src/calendar/gui/e-calendar-view.c:1854
+#: ../src/calendar/gui/e-calendar-view.c:1848
 #: ../src/calendar/gui/e-memo-table.c:499
 #: ../src/calendar/gui/e-task-table.c:819
 #, c-format
@@ -5324,7 +5420,7 @@ msgstr "Organizilo: %s <%s>"
 #. 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:1858
+#: ../src/calendar/gui/e-calendar-view.c:1852
 #: ../src/calendar/gui/e-memo-table.c:504
 #: ../src/calendar/gui/e-task-table.c:823
 #, c-format
@@ -5333,26 +5429,26 @@ msgstr "Organizilo: %s"
 
 #. Translators: It will display "Location: PlaceOfTheMeeting"
 #. Translators: It will display "Location: LocationOfTheAppointment"
-#: ../src/calendar/gui/e-calendar-view.c:1874
+#: ../src/calendar/gui/e-calendar-view.c:1868
 #: ../src/calendar/gui/e-meeting-time-sel.c:2580
 #: ../src/calendar/gui/e-task-table.c:839
-#: ../src/calendar/gui/e-to-do-pane.c:363 ../src/calendar/gui/print.c:3545
+#: ../src/calendar/gui/e-to-do-pane.c:364 ../src/calendar/gui/print.c:3545
 #, c-format
 msgid "Location: %s"
 msgstr "Loko: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
 #. Translators: It will display "Time: StartDateAndTime (Duration)"
-#: ../src/calendar/gui/e-calendar-view.c:1914
-#: ../src/calendar/gui/e-to-do-pane.c:460
+#: ../src/calendar/gui/e-calendar-view.c:1908
+#: ../src/calendar/gui/e-to-do-pane.c:461
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tempo: %s %s"
 
+#: ../src/calendar/gui/e-calendar-view.c:2303
+#: ../src/calendar/gui/e-calendar-view.c:2306
 #: ../src/calendar/gui/e-calendar-view.c:2309
-#: ../src/calendar/gui/e-calendar-view.c:2312
-#: ../src/calendar/gui/e-calendar-view.c:2315
-#: ../src/calendar/gui/e-calendar-view.c:2316
+#: ../src/calendar/gui/e-calendar-view.c:2310
 msgid "%d %b %Y"
 msgstr "%-d-a de %b %Y"
 
@@ -5361,14 +5457,14 @@ msgstr "%-d-a de %b %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../src/calendar/gui/e-calendar-view.c:2311
+#: ../src/calendar/gui/e-calendar-view.c:2305
 #: ../src/calendar/gui/e-day-view.c:3095
 #: ../src/calendar/gui/e-day-view-top-item.c:865
 #: ../src/calendar/gui/e-week-view-main-item.c:228
 msgid "%d %b"
 msgstr "%-d-a de %b"
 
-#: ../src/calendar/gui/e-calendar-view.c:2322
+#: ../src/calendar/gui/e-calendar-view.c:2316
 msgid "%A %d %b %Y"
 msgstr "%A %-d-a de %b %Y"
 
@@ -5378,16 +5474,16 @@ msgstr "%A %-d-a de %b %Y"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../src/calendar/gui/e-calendar-view.c:2324
+#: ../src/calendar/gui/e-calendar-view.c:2318
 #: ../src/calendar/gui/e-day-view.c:3079
 #: ../src/calendar/gui/e-day-view-top-item.c:861
 #: ../src/calendar/gui/e-week-view-main-item.c:214
 msgid "%a %d %b"
 msgstr "%a %-d-a de %b"
 
-#: ../src/calendar/gui/e-calendar-view.c:2325
-#: ../src/calendar/gui/e-calendar-view.c:2327
-#: ../src/calendar/gui/e-calendar-view.c:2328
+#: ../src/calendar/gui/e-calendar-view.c:2319
+#: ../src/calendar/gui/e-calendar-view.c:2321
+#: ../src/calendar/gui/e-calendar-view.c:2322
 msgid "%a %d %b %Y"
 msgstr "%a %-d-a de %b %Y"
 
@@ -5427,8 +5523,8 @@ msgstr "Fonto"
 #: ../src/calendar/gui/e-meeting-store.c:170
 #: ../src/calendar/gui/e-meeting-store.c:233 ../src/calendar/gui/print.c:1256
 #: ../src/calendar/gui/print.c:1273 ../src/e-util/e-charset.c:49
-#: ../src/modules/itip-formatter/itip-view.c:3587
-#: ../src/modules/itip-formatter/itip-view.c:6409
+#: ../src/modules/itip-formatter/itip-view.c:3598
+#: ../src/modules/itip-formatter/itip-view.c:6577
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:97
 msgid "Unknown"
 msgstr "Nekonata"
@@ -5468,7 +5564,7 @@ msgstr "Atribuita"
 #: ../src/calendar/gui/e-meeting-list-view.c:207
 #: ../src/calendar/gui/e-meeting-store.c:177
 #: ../src/calendar/gui/e-meeting-store.c:187
-#: ../src/calendar/gui/e-meeting-store.c:1098
+#: ../src/calendar/gui/e-meeting-store.c:1090
 msgid "Yes"
 msgstr "Jes"
 
@@ -5483,7 +5579,7 @@ msgstr "Ne"
 #: ../src/calendar/gui/e-meeting-list-view.c:219
 #: ../src/calendar/gui/e-meeting-store.c:197
 #: ../src/calendar/gui/e-meeting-store.c:220
-#: ../src/modules/itip-formatter/itip-view.c:6397
+#: ../src/modules/itip-formatter/itip-view.c:6565
 msgid "Accepted"
 msgstr "Akceptita"
 
@@ -5491,7 +5587,7 @@ msgstr "Akceptita"
 #: ../src/calendar/gui/e-meeting-list-view.c:220
 #: ../src/calendar/gui/e-meeting-store.c:199
 #: ../src/calendar/gui/e-meeting-store.c:222
-#: ../src/modules/itip-formatter/itip-view.c:6403
+#: ../src/modules/itip-formatter/itip-view.c:6571
 msgid "Declined"
 msgstr "Malakceptita"
 
@@ -5507,7 +5603,7 @@ msgstr "Provizora"
 #: ../src/calendar/gui/e-meeting-list-view.c:222
 #: ../src/calendar/gui/e-meeting-store.c:203
 #: ../src/calendar/gui/e-meeting-store.c:226
-#: ../src/modules/itip-formatter/itip-view.c:6406
+#: ../src/modules/itip-formatter/itip-view.c:6574
 msgid "Delegated"
 msgstr "Delegita"
 
@@ -5566,15 +5662,15 @@ msgstr "Modifante noton"
 msgid "Modifying a task"
 msgstr "Modifante taskon"
 
-#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1954
+#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1981
 msgid "Removing an event"
 msgstr "Provizore forigante eventon"
 
-#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1958
+#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1985
 msgid "Removing a memo"
 msgstr "Provizore forigante taskon"
 
-#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1962
+#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1989
 msgid "Removing a task"
 msgstr "Provizore forigante taskon"
 
@@ -5771,10 +5867,10 @@ msgstr "Komencotempo ne estas valida tempo"
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:206
 #: ../src/calendar/gui/e-comp-editor.c:337
 #: ../src/em-format/e-mail-part-secure-button.c:93
-#: ../src/e-util/e-misc-utils.c:4218 ../src/e-util/e-misc-utils.c:4230
-#: ../src/e-util/e-misc-utils.c:4244 ../src/mail/e-mail-autoconfig.c:1027
+#: ../src/e-util/e-misc-utils.c:4250 ../src/e-util/e-misc-utils.c:4262
+#: ../src/e-util/e-misc-utils.c:4276 ../src/mail/e-mail-autoconfig.c:1029
 #: ../src/mail/e-mail-display.c:2292 ../src/mail/e-mail-reader-utils.c:805
-#: ../src/mail/em-composer-utils.c:3969 ../src/mail/em-composer-utils.c:4000
+#: ../src/mail/em-composer-utils.c:3813 ../src/mail/em-composer-utils.c:3844
 #: ../src/mail/mail-send-recv.c:598 ../src/mail/mail-send-recv.c:1496
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:172
 #: ../src/plugins/face/face.c:175 ../src/shell/e-shell.c:1235
@@ -6029,71 +6125,71 @@ msgid_plural "Failed to delete selected attendees"
 msgstr[0] "Malsukcesis forigi elektitan alestanton"
 msgstr[1] "Malsukcesis forigi elektitajn alestantojn"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:510
+#: ../src/calendar/gui/e-comp-editor-page-general.c:536
 msgid "Organizer address is not a valid user mail address"
 msgstr "Adreso de organizanto ne estas valida retpoŝtadreso"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:675
+#: ../src/calendar/gui/e-comp-editor-page-general.c:701
 msgid "A_ttendees"
 msgstr "Ales_tantoj"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:677
+#: ../src/calendar/gui/e-comp-editor-page-general.c:703
 msgid "Toggles whether the Attendees are displayed"
 msgstr "Baskuligas ĉu montri la alestantojn"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:686
+#: ../src/calendar/gui/e-comp-editor-page-general.c:712
 msgid "R_ole Field"
 msgstr "R_ola kampo"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:688
+#: ../src/calendar/gui/e-comp-editor-page-general.c:714
 msgid "Toggles whether the Role field is displayed"
 msgstr "Baskuligas ĉu montri la rolan kampon"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:694
+#: ../src/calendar/gui/e-comp-editor-page-general.c:720
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:696
+#: ../src/calendar/gui/e-comp-editor-page-general.c:722
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Baskuligas ĉu montri la RSVP-kampon"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:702
+#: ../src/calendar/gui/e-comp-editor-page-general.c:728
 msgid "_Status Field"
 msgstr "_Statokampo"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:704
+#: ../src/calendar/gui/e-comp-editor-page-general.c:730
 msgid "Toggles whether the Status field is displayed"
 msgstr "Baskuligas ĉu montri la statokampon"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:710
+#: ../src/calendar/gui/e-comp-editor-page-general.c:736
 msgid "_Type Field"
 msgstr "S_pecokampo"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:712
+#: ../src/calendar/gui/e-comp-editor-page-general.c:738
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Baskuligas ĉu montri la specon de alestanto"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1058
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1084
 msgid "An organizer is required."
 msgstr "Organizanto estas necesa."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1068
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1199
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1094
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1225
 msgid "At least one attendee is required."
 msgstr "Necesas almenaŭ unu alestanto."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1323
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1349
 msgid "Or_ganizer:"
 msgstr "Or_ganizanto:"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1420
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1446
 msgid ""
 "Override color of the event. If not set, then color of the calendar is used."
 msgstr ""
 "Transpasi koloron de la evento. Se ne agordita, oni uzas la koloron de la "
 "kalendaro."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1422
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1448
 msgid ""
 "Override color of the memo. If not set, then color of the memo list is used."
 msgstr ""
@@ -6101,19 +6197,19 @@ msgstr ""
 "notolisto."
 
 #. E_SOURCE_EXTENSION_TASK_LIST
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1424
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1450
 msgid ""
 "Override color of the task. If not set, then color of the task list is used."
 msgstr ""
 "Transpasi koloron de la tasko. Se ne agordita, oni uzas la koloron de la "
 "taskolisto."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1436
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1462
 msgctxt "ECompEditor"
 msgid "Atte_ndees..."
 msgstr "Alesta_ntoj..."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1513
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1545
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2231
 #: ../src/calendar/gui/e-comp-editor.c:2070
 #: ../src/e-util/e-accounts-window.c:1745
@@ -6122,7 +6218,7 @@ msgstr "Alesta_ntoj..."
 #: ../src/e-util/e-webdav-browser.c:2681 ../src/e-util/filter.ui.h:26
 #: ../src/mail/e-mail-account-manager.c:728 ../src/mail/e-mail-browser.c:195
 #: ../src/mail/e-mail-label-manager.c:380
-#: ../src/mail/em-folder-properties.c:1047 ../src/mail/mail-config.ui.h:68
+#: ../src/mail/em-folder-properties.c:1333 ../src/mail/mail-config.ui.h:68
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:549
 #: ../src/plugins/email-custom-header/email-custom-header.c:843
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
@@ -6388,14 +6484,14 @@ msgid "Exceptions"
 msgstr "Esceptoj"
 
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2223
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1774
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1809
 #: ../src/mail/e-mail-config-identity-page.c:853
 #: ../src/mail/mail-config.ui.h:67
 msgid "A_dd"
 msgstr "Al_doni"
 
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2239
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1782
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1817
 #: ../src/mail/mail-config.ui.h:69
 msgid "Re_move"
 msgstr "Fo_rigi"
@@ -6408,38 +6504,38 @@ msgstr "Antaŭrigardo"
 msgid "Send To"
 msgstr "Sendi al"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1550
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1585
 msgid "_Reminders"
 msgstr "Memo_rigiloj"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1552
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1587
 msgid "Set or unset reminders"
 msgstr "Ĉu agordi memorigilojn por tiu ĉi evento"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1614
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1649
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:72
 msgid "Reminders"
 msgstr "Memorigiloj"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1639
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1674
 msgid "_Reminder"
 msgstr "Memo_rigilo"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1672
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1707
 #, c-format
 msgid "%d day before"
 msgid_plural "%d days before"
 msgstr[0] "%d tago antaŭ la rendevuo"
 msgstr[1] "%d tagoj antaŭ la rendevuo"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1679
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1714
 #, c-format
 msgid "%d hour before"
 msgid_plural "%d hours before"
 msgstr[0] "%d horo antaŭ la rendevuo"
 msgstr[1] "%d horoj antaŭ la rendevuo"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1686
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1721
 #, c-format
 msgid "%d minute before"
 msgid_plural "%d minutes before"
@@ -6447,131 +6543,131 @@ msgstr[0] "%d minuto antaŭ la rendevuo"
 msgstr[1] "%d minutoj antaŭ la rendevuo"
 
 #. Translators: "None" for "No reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1694
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1729
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Neniu"
 
 #. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1696
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1731
 msgctxt "cal-reminders"
 msgid "15 minutes before"
 msgstr "15 minutoj antaŭe"
 
 #. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1698
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1733
 msgctxt "cal-reminders"
 msgid "1 hour before"
 msgstr "1 horo antaŭe"
 
 #. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1700
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1735
 msgctxt "cal-reminders"
 msgid "1 day before"
 msgstr "1 tago antaŭe"
 
 #. Translators: "Custom" for "Custom reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1712
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1747
 msgctxt "cal-reminders"
 msgid "Custom"
 msgstr "Propra"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1855
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1890
 msgctxt "cal-reminders"
 msgid "minute(s)"
 msgstr "minuto(j)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1857
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1892
 msgctxt "cal-reminders"
 msgid "hour(s)"
 msgstr "horo(j)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1859
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1894
 msgctxt "cal-reminders"
 msgid "day(s)"
 msgstr "tago(j)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1876
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1911
 msgctxt "cal-reminders"
 msgid "before"
 msgstr "antaŭ"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1878
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1913
 msgctxt "cal-reminders"
 msgid "after"
 msgstr "post"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1894
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1929
 msgctxt "cal-reminders"
 msgid "start"
 msgstr "komenco"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1896
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1931
 msgctxt "cal-reminders"
 msgid "end"
 msgstr "fino"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1915
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1950
 msgid "Re_peat the reminder"
 msgstr "_Ripeti la memorigilon"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1940
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1975
 msgctxt "cal-reminders"
 msgid "extra times every"
 msgstr "aldona tempo ĉiuj"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1977
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2012
 msgctxt "cal-reminders"
 msgid "minutes"
 msgstr "minutoj"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1979
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2014
 msgctxt "cal-reminders"
 msgid "hours"
 msgstr "horoj"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1981
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2016
 msgctxt "cal-reminders"
 msgid "days"
 msgstr "tagoj"
 
 #. page_reminders->priv->custom_email_entry is initialized on demand
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2018
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2175
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2053
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2210
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "Propra _mesaĝo"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2062
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2097
 msgctxt "cal-reminders"
 msgid "Custom reminder _sound"
 msgstr "Propra memorigil_sono"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2073
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2108
 msgid "Select a sound file"
 msgstr "Elekti sondosieron"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2101
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2136
 msgid "_Program:"
 msgstr "_Programo:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2126
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2161
 msgid "_Arguments:"
 msgstr "_Argumentoj:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2158
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2193
 msgid "_Send To:"
 msgstr "_Sendi al:"
 
@@ -6704,7 +6800,7 @@ msgid "Show time as _busy"
 msgstr "Montri tempon kiel _okupatan"
 
 #. Translators: This 'None' is meant for 'Color' in calendar component editor, like 'None color'
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1648
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1943
 msgctxt "ECompEditor"
 msgid "None"
 msgstr "Neniu"
@@ -6791,9 +6887,11 @@ msgstr "Neniu resumo"
 #: ../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:144 ../src/mail/e-mail-notes.c:964
-#: ../src/mail/em-filter-editor.c:45 ../src/mail/em-folder-properties.c:1172
-#: ../src/mail/em-subscription-editor.c:1739
+#: ../src/mail/e-mail-browser.c:144
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:760
+#: ../src/mail/e-mail-notes.c:964 ../src/mail/em-filter-editor.c:45
+#: ../src/mail/em-folder-properties.c:1458
+#: ../src/mail/em-subscription-editor.c:1742
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:306
 #: ../src/shell/e-shell-window-actions.c:296
 #: ../src/shell/e-shell-window-actions.c:824
@@ -6860,15 +6958,15 @@ msgid "Paste the clipboard"
 msgstr "Enmeti la tondujon"
 
 #: ../src/calendar/gui/e-comp-editor.c:2026
-#: ../src/composer/e-composer-actions.c:373 ../src/mail/e-mail-reader.c:2717
+#: ../src/composer/e-composer-actions.c:373 ../src/mail/e-mail-reader.c:2750
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1319
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1333
 msgid "_Print..."
 msgstr "_Presi..."
 
-#: ../src/calendar/gui/e-comp-editor.c:2033 ../src/mail/e-mail-reader.c:2724
+#: ../src/calendar/gui/e-comp-editor.c:2033 ../src/mail/e-mail-reader.c:2757
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1326
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1771
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1762
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:840
 #: ../src/modules/calendar/e-task-shell-view-actions.c:1048
 msgid "Pre_view..."
@@ -6928,7 +7026,7 @@ 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.
-#: ../src/calendar/gui/e-day-view.c:2147 ../src/calendar/gui/e-to-do-pane.c:241
+#: ../src/calendar/gui/e-day-view.c:2147 ../src/calendar/gui/e-to-do-pane.c:242
 #: ../src/calendar/gui/e-week-view.c:1772 ../src/calendar/gui/print.c:1079
 #: ../src/calendar/gui/print.c:1098 ../src/calendar/gui/print.c:2635
 #: ../src/calendar/gui/print.c:2655
@@ -6936,7 +7034,7 @@ msgid "am"
 msgstr "atm"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../src/calendar/gui/e-day-view.c:2150 ../src/calendar/gui/e-to-do-pane.c:245
+#: ../src/calendar/gui/e-day-view.c:2150 ../src/calendar/gui/e-to-do-pane.c:246
 #: ../src/calendar/gui/e-week-view.c:1775 ../src/calendar/gui/print.c:1084
 #: ../src/calendar/gui/print.c:1100 ../src/calendar/gui/print.c:2640
 #: ../src/calendar/gui/print.c:2657
@@ -6979,8 +7077,8 @@ msgstr "Montri la duan horzonon"
 
 #. Translators: "None" indicates no second time zone set for a day view
 #: ../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.c:311
+#: ../src/modules/calendar/e-calendar-preferences.c:363
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
@@ -6988,7 +7086,7 @@ msgstr "Nenio"
 
 #: ../src/calendar/gui/e-day-view-time-item.c:880
 #: ../src/calendar/gui/e-timezone-entry.c:333
-#: ../src/modules/calendar/e-calendar-preferences.c:396
+#: ../src/modules/calendar/e-calendar-preferences.c:394
 msgid "Select..."
 msgstr "Elekti..."
 
@@ -7015,7 +7113,7 @@ msgstr "Alestantoj"
 #: ../src/calendar/gui/e-meeting-list-view.c:179
 #: ../src/calendar/gui/e-meeting-store.c:110
 #: ../src/calendar/gui/e-meeting-store.c:127
-#: ../src/calendar/gui/e-meeting-store.c:1092 ../src/calendar/gui/print.c:1252
+#: ../src/calendar/gui/e-meeting-store.c:1084 ../src/calendar/gui/print.c:1252
 msgid "Individual"
 msgstr "Individue"
 
@@ -7047,7 +7145,7 @@ msgstr "Seĝo"
 #: ../src/calendar/gui/e-meeting-list-view.c:194
 #: ../src/calendar/gui/e-meeting-store.c:147
 #: ../src/calendar/gui/e-meeting-store.c:164
-#: ../src/calendar/gui/e-meeting-store.c:1095 ../src/calendar/gui/print.c:1270
+#: ../src/calendar/gui/e-meeting-store.c:1087 ../src/calendar/gui/print.c:1270
 msgid "Required Participant"
 msgstr "Nepra partoprenanto"
 
@@ -7066,7 +7164,7 @@ msgstr "Ne partoprenanta"
 #: ../src/calendar/gui/e-meeting-list-view.c:218
 #: ../src/calendar/gui/e-meeting-store.c:195
 #: ../src/calendar/gui/e-meeting-store.c:218
-#: ../src/calendar/gui/e-meeting-store.c:1105
+#: ../src/calendar/gui/e-meeting-store.c:1097
 msgid "Needs Action"
 msgstr "Necesas agon"
 
@@ -7080,7 +7178,7 @@ msgstr "Alestanto                          "
 #: ../src/calendar/gui/e-task-table.etspec.h:3
 #: ../src/e-util/e-accounts-window.c:1443
 #: ../src/e-util/e-attachment-tree-view.c:205
-#: ../src/e-util/e-collection-account-wizard.c:1934
+#: ../src/e-util/e-collection-account-wizard.c:1971
 #: ../src/e-util/e-webdav-browser.c:2381
 #: ../src/mail/e-mail-account-tree-view.c:158
 msgid "Type"
@@ -7097,19 +7195,19 @@ msgstr "RSVP"
 msgid "In Process"
 msgstr "Procezate"
 
-#: ../src/calendar/gui/e-meeting-store.c:1976
+#: ../src/calendar/gui/e-meeting-store.c:1968
 #, 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"
 
-#: ../src/calendar/gui/e-meeting-store.c:1986
+#: ../src/calendar/gui/e-meeting-store.c:1978
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Malsukcesa kialo: %s"
 
-#: ../src/calendar/gui/e-meeting-store.c:1991
-#: ../src/e-util/e-collection-account-wizard.c:470
+#: ../src/calendar/gui/e-meeting-store.c:1983
+#: ../src/e-util/e-collection-account-wizard.c:493
 #: ../src/plugins/publish-calendar/publish-calendar.c:350
 #: ../src/smime/gui/component.c:61
 msgid "Enter password"
@@ -7333,82 +7431,82 @@ msgid "Select Timezone"
 msgstr "Elekti horzonon"
 
 #. Translators: It will display "Start: StartDateAndTime"
-#: ../src/calendar/gui/e-to-do-pane.c:390
+#: ../src/calendar/gui/e-to-do-pane.c:391
 #, c-format
 msgid "Start: %s"
 msgstr "Komenco: %s"
 
 #. Translators: It will display "Due: DueDateAndTime"
-#: ../src/calendar/gui/e-to-do-pane.c:410
+#: ../src/calendar/gui/e-to-do-pane.c:411
 #, c-format
 msgid "Due: %s"
 msgstr "Limdato: %s"
 
 #. Translators: It will display "Completed: DateAndTimeWhenCompleted"
-#: ../src/calendar/gui/e-to-do-pane.c:424
+#: ../src/calendar/gui/e-to-do-pane.c:425
 #, c-format
 msgid "Completed: %s"
 msgstr "Plenumite: %s"
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1460 ../src/e-util/e-cell-date-edit.c:328
+#: ../src/calendar/gui/e-to-do-pane.c:1487 ../src/e-util/e-cell-date-edit.c:328
 #: ../src/e-util/e-datetime-format.c:207
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1869
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1860
 #: ../src/modules/itip-formatter/itip-view.c:255
 msgid "Today"
 msgstr "Hodiaŭ"
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1462
+#: ../src/calendar/gui/e-to-do-pane.c:1489
 #: ../src/e-util/e-datetime-format.c:218
 #: ../src/modules/itip-formatter/itip-view.c:283
 msgid "Tomorrow"
 msgstr "Morgaŭ"
 
-#: ../src/calendar/gui/e-to-do-pane.c:1472
+#: ../src/calendar/gui/e-to-do-pane.c:1499
 msgid "Tasks without Due date"
 msgstr "Taskoj sen limdato"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2045
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1472
+#: ../src/calendar/gui/e-to-do-pane.c:2072
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1463
 msgid "New _Appointment..."
 msgstr "Nova _rendevuo..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:2053
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1458
+#: ../src/calendar/gui/e-to-do-pane.c:2080
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "New _Meeting..."
 msgstr "Nova _kunsido..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:2061
+#: ../src/calendar/gui/e-to-do-pane.c:2088
 msgid "New _Task..."
 msgstr "Nova _tasko..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:2069
+#: ../src/calendar/gui/e-to-do-pane.c:2096
 msgid "_New Assigned Task..."
 msgstr "_Nova asignita tasko..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:2082
+#: ../src/calendar/gui/e-to-do-pane.c:2109
 msgid "_Open..."
 msgstr "_Malfermi..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:2096
+#: ../src/calendar/gui/e-to-do-pane.c:2123
 msgid "_Delete This Instance..."
 msgstr "Forigi tiun _okazon..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:2104
+#: ../src/calendar/gui/e-to-do-pane.c:2131
 msgid "D_elete All Instances..."
 msgstr "Forigi ĉiuj o_kazojn..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:2112
+#: ../src/calendar/gui/e-to-do-pane.c:2139
 msgid "_Delete..."
 msgstr "_Forigi..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:2129
+#: ../src/calendar/gui/e-to-do-pane.c:2156
 msgid "_Show Tasks without Due date"
 msgstr "_Montri taskojn sen limdato"
 
 # Titolo de breto
-#: ../src/calendar/gui/e-to-do-pane.c:2395
+#: ../src/calendar/gui/e-to-do-pane.c:2422
 msgid "To Do"
 msgstr "Taksoj"
 
@@ -9586,11 +9684,12 @@ msgid "_From Override Field"
 msgstr "Transpasa kampo “_De”"
 
 #: ../src/composer/e-composer-actions.c:526
-#, fuzzy
 msgid ""
 "Toggles whether the From override field to change name or email address is "
 "displayed"
-msgstr "Baskuligas ĉu montri la transpasan kampon"
+msgstr ""
+"Baskuligas ĉu montri la transpasan kampon \"De\" por ŝanĝi la montritan "
+"nomon aŭ retpoŝtadreson"
 
 #: ../src/composer/e-composer-actions.c:532
 msgid "_Reply-To Field"
@@ -9613,7 +9712,7 @@ msgid "Save Draft"
 msgstr "Konservi malneton"
 
 #: ../src/composer/e-composer-from-header.c:108
-#: ../src/e-util/e-collection-account-wizard.c:1966
+#: ../src/e-util/e-collection-account-wizard.c:2003
 #: ../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
@@ -9696,11 +9795,11 @@ msgid ""
 msgstr ""
 "Ne povis ĉifri eliran mesaĝon: Neniu ĉifra atestilo agordita por ĉi tiu konto"
 
-#: ../src/composer/e-msg-composer.c:1792 ../src/composer/e-msg-composer.c:2466
+#: ../src/composer/e-msg-composer.c:1802 ../src/composer/e-msg-composer.c:2476
 msgid "Compose Message"
 msgstr "Krei mesaĝon"
 
-#: ../src/composer/e-msg-composer.c:4987
+#: ../src/composer/e-msg-composer.c:4999
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "La komponilo enhavas netekstan mesaĝan korpon, kiun oni ne povas redakti."
@@ -9849,7 +9948,7 @@ msgid "_Save to Outbox"
 msgstr "_Konservi al senditujo"
 
 #: ../src/composer/mail-composer.error.xml.h:34
-#: ../src/e-util/e-collection-account-wizard.c:643
+#: ../src/e-util/e-collection-account-wizard.c:675
 msgid "_Try Again"
 msgstr "_Provi denove"
 
@@ -10007,7 +10106,7 @@ msgstr "(sen temo)"
 #. 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
+#: ../src/em-format/e-mail-formatter-headers.c:343
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Ĉi tiu mesaĝo estis sendita de %s nome de %s"
@@ -10042,7 +10141,7 @@ msgstr "Nomo"
 msgid "Size"
 msgstr "Grando"
 
-#: ../src/em-format/e-mail-formatter-quote-headers.c:178
+#: ../src/em-format/e-mail-formatter-quote-headers.c:182
 #: ../src/em-format/e-mail-part-headers.c:51
 #: ../src/mail/e-mail-tag-editor.c:201 ../src/mail/filtertypes.xml.in.h:16
 #: ../src/mail/message-list.etspec.h:6 ../src/mail/searchtypes.xml.in.h:17
@@ -10053,8 +10152,8 @@ msgid "Subject"
 msgstr "Temo"
 
 #. pseudo-header
-#: ../src/em-format/e-mail-formatter-quote-headers.c:197
-#: ../src/em-format/e-mail-formatter-utils.c:346
+#: ../src/em-format/e-mail-formatter-quote-headers.c:201
+#: ../src/em-format/e-mail-formatter-utils.c:347
 #: ../src/modules/mail/em-mailer-prefs.c:686
 #: ../src/modules/mail/em-mailer-prefs.c:1619
 #: ../src/modules/mail/em-mailer-prefs.c:1668
@@ -10217,8 +10316,8 @@ msgstr ""
 msgid "Display source of a MIME part"
 msgstr "Montri fonton de MIME-parto"
 
-#: ../src/em-format/e-mail-formatter-utils.c:205
-#: ../src/em-format/e-mail-formatter-utils.c:222
+#: ../src/em-format/e-mail-formatter-utils.c:206
+#: ../src/em-format/e-mail-formatter-utils.c:223
 #: ../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
@@ -10226,57 +10325,57 @@ msgstr "Montri fonton de MIME-parto"
 msgid "To"
 msgstr "Al"
 
-#: ../src/em-format/e-mail-formatter-utils.c:206
-#: ../src/em-format/e-mail-formatter-utils.c:223
+#: ../src/em-format/e-mail-formatter-utils.c:207
+#: ../src/em-format/e-mail-formatter-utils.c:224
 #: ../src/em-format/e-mail-part-headers.c:49
 #: ../src/modules/mail/em-mailer-prefs.c:63
 msgid "Cc"
 msgstr "Kopio"
 
-#: ../src/em-format/e-mail-formatter-utils.c:207
-#: ../src/em-format/e-mail-formatter-utils.c:224
+#: ../src/em-format/e-mail-formatter-utils.c:208
+#: ../src/em-format/e-mail-formatter-utils.c:225
 #: ../src/em-format/e-mail-part-headers.c:50
 #: ../src/modules/mail/em-mailer-prefs.c:64
 msgid "Bcc"
 msgstr "Kaŝkopio"
 
 # Minuskla. --Carmen
-#: ../src/em-format/e-mail-formatter-utils.c:564
+#: ../src/em-format/e-mail-formatter-utils.c:565
 msgid "GPG signed"
 msgstr "subskribita per GPG"
 
-#: ../src/em-format/e-mail-formatter-utils.c:564
+#: ../src/em-format/e-mail-formatter-utils.c:565
 msgid "partially GPG signed"
 msgstr "parte subskribita per GPG"
 
 # Minuskla. --Carmen
-#: ../src/em-format/e-mail-formatter-utils.c:565
+#: ../src/em-format/e-mail-formatter-utils.c:566
 msgid "GPG encrypted"
 msgstr "ĉifrita per GPG"
 
-#: ../src/em-format/e-mail-formatter-utils.c:565
+#: ../src/em-format/e-mail-formatter-utils.c:566
 msgid "partially GPG encrypted"
 msgstr "parte ĉifrita per GPG"
 
 # Minuskla. --Carmen
-#: ../src/em-format/e-mail-formatter-utils.c:566
+#: ../src/em-format/e-mail-formatter-utils.c:567
 msgid "S/MIME signed"
 msgstr "subskribita per S/MIME"
 
-#: ../src/em-format/e-mail-formatter-utils.c:566
+#: ../src/em-format/e-mail-formatter-utils.c:567
 msgid "partially S/MIME signed"
 msgstr "parte subskribita per S/MIME"
 
 # Minuskla. --Carmen
-#: ../src/em-format/e-mail-formatter-utils.c:567
+#: ../src/em-format/e-mail-formatter-utils.c:568
 msgid "S/MIME encrypted"
 msgstr "ĉifrita per S/MIME"
 
-#: ../src/em-format/e-mail-formatter-utils.c:567
+#: ../src/em-format/e-mail-formatter-utils.c:568
 msgid "partially S/MIME encrypted"
 msgstr "parte ĉifrita per S/MIME"
 
-#: ../src/em-format/e-mail-formatter-utils.c:680
+#: ../src/em-format/e-mail-formatter-utils.c:681
 #: ../src/mail/e-mail-config-security-page.c:856
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:273
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:216
@@ -10486,9 +10585,9 @@ msgstr "Evolucio-kontoj"
 #. gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 #. webdav_browser->priv->permissions_button = widget;
 #: ../src/e-util/e-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2699
-#: ../src/mail/em-subscription-editor.c:1950
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1561
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1632
+#: ../src/mail/em-subscription-editor.c:1953
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1600
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1678
 msgid "_Refresh"
 msgstr "_Aktualigi"
 
@@ -10536,7 +10635,7 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% plenumite)"
 
 #: ../src/e-util/e-activity-proxy.c:350
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1790
 msgid "Cancel"
 msgstr "Nuligi"
 
@@ -10713,11 +10812,11 @@ msgstr "_Aldoni aldonaĵon..."
 
 #: ../src/e-util/e-attachment-view.c:348
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1181
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1332
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1323
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:621
 #: ../src/modules/calendar/e-task-shell-view-actions.c:747
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1554
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1625
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1593
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1671
 msgid "_Properties"
 msgstr "_Ecoj"
 
@@ -10890,7 +10989,7 @@ msgid "popup list"
 msgstr "ŝpruclisto"
 
 #: ../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:2146
+#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2148
 msgid "?"
 msgstr "?"
 
@@ -11013,54 +11112,59 @@ msgstr "Alia..."
 msgid "Cannot create a client object from extension name “%s”"
 msgstr ""
 
-#: ../src/e-util/e-collection-account-wizard.c:106
+#: ../src/e-util/e-collection-account-wizard.c:107
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:83
 msgid "_Finish"
 msgstr "_Fini"
 
-#: ../src/e-util/e-collection-account-wizard.c:108
-#: ../src/e-util/e-collection-account-wizard.c:266
+#: ../src/e-util/e-collection-account-wizard.c:110
+#, fuzzy
+#| msgid "_Skip Lookup"
+msgid "_Look Up"
+msgstr "Preterpa_si elserĉon"
+
+#: ../src/e-util/e-collection-account-wizard.c:112
+#: ../src/e-util/e-collection-account-wizard.c:273
 #: ../src/e-util/e-search-bar.c:677
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:85
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:244
 msgid "_Next"
 msgstr "_Sekva"
 
-#: ../src/e-util/e-collection-account-wizard.c:180
-#, fuzzy
+#: ../src/e-util/e-collection-account-wizard.c:184
 #| msgid "Collection _Account"
 msgid "New Collection Account"
-msgstr "Nova konto"
+msgstr "Nova kolektokonto"
 
-#: ../src/e-util/e-collection-account-wizard.c:251
+#: ../src/e-util/e-collection-account-wizard.c:258
 #: ../src/e-util/e-search-bar.c:665
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:78
 msgid "_Previous"
 msgstr "_Antaŭa"
 
-#: ../src/e-util/e-collection-account-wizard.c:416
+#: ../src/e-util/e-collection-account-wizard.c:439
 msgid "Looking up details, please wait…"
 msgstr "Serĉante detalojn, bonvolu atenti…"
 
 #. Translators: The %s is replaced with a clickable text "Enter password", thus it'll be "Requires password 
to continue. Enter password." at the end.
-#: ../src/e-util/e-collection-account-wizard.c:473
+#: ../src/e-util/e-collection-account-wizard.c:496
 #, c-format
 msgid "Requires password to continue. %s."
 msgstr "Necesas pasvorto por daŭrigi. %s."
 
-#: ../src/e-util/e-collection-account-wizard.c:486
+#: ../src/e-util/e-collection-account-wizard.c:509
 msgid "View certificate"
 msgstr "Montri atestilon"
 
 #. Translators: The first %s is replaced with actual error message about site certificate invalidity,
 #. like "The signing certificate authority is not known.", the second %s is replaced with a link "View 
certificate".
-#: ../src/e-util/e-collection-account-wizard.c:490
+#: ../src/e-util/e-collection-account-wizard.c:513
 #, c-format
 msgctxt "collection-account-wizard"
 msgid "%s %s."
 msgstr "%s %s."
 
-#: ../src/e-util/e-collection-account-wizard.c:528
+#: ../src/e-util/e-collection-account-wizard.c:551
 msgid ""
 "Found no candidates. It can also mean that the server doesn’t provide any "
 "information about its configuration using the selected lookup methods. Enter "
@@ -11070,80 +11174,80 @@ msgstr ""
 "informojn pri sia agordaro, per la elektitaj serĉaj metodoj. Anstataŭe, "
 "enigu la konton mane, aŭ ŝanĝu la suprajn agordojn."
 
-#: ../src/e-util/e-collection-account-wizard.c:530
+#: ../src/e-util/e-collection-account-wizard.c:553
 #, c-format
 msgid "Found one candidate"
 msgid_plural "Found %d candidates"
 msgstr[0] "Trovis unu kandidaton"
 msgstr[1] "Trovis %d kandidatojn"
 
-#: ../src/e-util/e-collection-account-wizard.c:625
+#: ../src/e-util/e-collection-account-wizard.c:657
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
 #: ../src/smime/gui/certificate-manager.c:766
 msgid "_Password:"
 msgstr "_Pasvorto:"
 
-#: ../src/e-util/e-collection-account-wizard.c:637
+#: ../src/e-util/e-collection-account-wizard.c:669
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
 msgid "_Remember password"
 msgstr "_Memori pasvorton"
 
-#: ../src/e-util/e-collection-account-wizard.c:780
+#: ../src/e-util/e-collection-account-wizard.c:812
 #: ../src/e-util/e-webdav-browser.c:473
 msgid "Collection"
 msgstr "Kolekto"
 
-#: ../src/e-util/e-collection-account-wizard.c:781
+#: ../src/e-util/e-collection-account-wizard.c:813
 msgid "Mail Receive"
 msgstr "Ricevi retpoŝton"
 
-#: ../src/e-util/e-collection-account-wizard.c:782
+#: ../src/e-util/e-collection-account-wizard.c:814
 msgid "Mail Send"
 msgstr "Sendi retpoŝton"
 
-#: ../src/e-util/e-collection-account-wizard.c:783
+#: ../src/e-util/e-collection-account-wizard.c:815
 #: ../src/e-util/e-name-selector-dialog.c:445
 #: ../src/mail/importers/pine-importer.c:430
 msgid "Address Book"
 msgstr "Adresaro"
 
-#: ../src/e-util/e-collection-account-wizard.c:785
+#: ../src/e-util/e-collection-account-wizard.c:817
 msgid "Memo List"
 msgstr "Notolisto"
 
-#: ../src/e-util/e-collection-account-wizard.c:786
+#: ../src/e-util/e-collection-account-wizard.c:818
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Task List"
 msgstr "Tasklisto"
 
-#: ../src/e-util/e-collection-account-wizard.c:1122
+#: ../src/e-util/e-collection-account-wizard.c:1154
 msgid "Looking up LDAP server’s search base…"
 msgstr ""
 
-#: ../src/e-util/e-collection-account-wizard.c:1429
+#: ../src/e-util/e-collection-account-wizard.c:1461
 msgid "Saving account settings, please wait…"
 msgstr "Konservante kontagordojn, bonvolu atenti…"
 
-#: ../src/e-util/e-collection-account-wizard.c:1573
+#: ../src/e-util/e-collection-account-wizard.c:1612
 msgid "User details"
 msgstr "Uzanto-detaloj"
 
-#: ../src/e-util/e-collection-account-wizard.c:1586
+#: ../src/e-util/e-collection-account-wizard.c:1625
 msgid "_Email Address or User name:"
 msgstr "R_etpoŝtadreso aŭ uzantonomo:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1617
+#: ../src/e-util/e-collection-account-wizard.c:1656
 msgid "_Advanced Options"
 msgstr "_Altnivelaj agordoj"
 
-#: ../src/e-util/e-collection-account-wizard.c:1622
+#: ../src/e-util/e-collection-account-wizard.c:1661
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:217
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:173
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Server:"
 msgstr "_Servilo:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1641
+#: ../src/e-util/e-collection-account-wizard.c:1680
 msgid ""
 "Semicolon (“;”) separated list of servers to look up information for, in "
 "addition to the domain of the e-mail address."
@@ -11151,11 +11255,11 @@ msgstr ""
 "Listo de serviloj apartigite per punktokomoj (“;”), por kiuj oni serĉos "
 "informojn, krom la domajno de la retpoŝtadreso."
 
-#: ../src/e-util/e-collection-account-wizard.c:1833
+#: ../src/e-util/e-collection-account-wizard.c:1870
 msgid "Select which parts should be configured:"
 msgstr "Elektu kiujn partojn devus esti agorditaj:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1957
+#: ../src/e-util/e-collection-account-wizard.c:1994
 #: ../src/mail/e-mail-config-identity-page.c:541
 #: ../src/mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
@@ -11262,7 +11366,6 @@ msgid "gray"
 msgstr "griza"
 
 #: ../src/e-util/e-color-combo.c:106
-#| msgid "Image"
 msgid "magenta"
 msgstr "malva"
 
@@ -11329,7 +11432,7 @@ msgstr "blanka"
 #: ../src/e-util/e-color-combo.c:641 ../src/mail/e-mail-account-tree-view.c:135
 #: ../src/mail/e-mail-config-security-page.c:544
 #: ../src/mail/e-mail-config-security-page.c:708
-#: ../src/mail/e-mail-reader.c:4816 ../src/mail/mail-config.ui.h:78
+#: ../src/mail/e-mail-reader.c:4849 ../src/mail/mail-config.ui.h:78
 msgid "Default"
 msgstr "Implicita"
 
@@ -11768,7 +11871,7 @@ msgstr "Trovi erojn, kiuj konugras la sekvajn seojn"
 #: ../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:764
+#: ../src/mail/e-mail-autoconfig.c:766
 #: ../src/mail/e-mail-config-summary-page.c:141
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid "None"
@@ -11831,10 +11934,9 @@ msgid "Insert Image"
 msgstr "Enmeti bildon"
 
 #: ../src/e-util/e-html-editor-actions.c:352
-#, fuzzy
 #| msgid "Image files"
 msgid "Image file"
-msgstr "Bilddosieroj"
+msgstr "Bilddosiero"
 
 #: ../src/e-util/e-html-editor-actions.c:428
 msgid "Insert text file"
@@ -12510,7 +12612,7 @@ msgstr "Ĝisr_andigo:"
 #. Shaded
 #: ../src/e-util/e-html-editor-hrule-dialog.c:346
 msgid "S_haded"
-msgstr ""
+msgstr "_Ombrita"
 
 #: ../src/e-util/e-html-editor-hrule-dialog.c:363
 msgid "Rule properties"
@@ -13003,7 +13105,7 @@ msgstr "Malfermante adresaron “%s”"
 msgid "_Do not show this message again"
 msgstr "Ne _plu montri ĉi tiun mesaĝon"
 
-#: ../src/e-util/e-misc-utils.c:4205
+#: ../src/e-util/e-misc-utils.c:4237
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -13011,17 +13113,17 @@ msgstr ""
 "Ĉi tiu adresarservilo povas esti neatingebla aŭ la servilnomo estis "
 "mistajpita aŭ via retkonekto faliĝis."
 
-#: ../src/e-util/e-misc-utils.c:4217
+#: ../src/e-util/e-misc-utils.c:4249
 #, c-format
 msgid "Failed to set protocol version to LDAPv3 (%d): %s"
-msgstr ""
+msgstr "Malsukcesis agordi protokolversion al LDAPv3 (%d): %s"
 
-#: ../src/e-util/e-misc-utils.c:4229
+#: ../src/e-util/e-misc-utils.c:4261
 #, c-format
 msgid "Failed to authenticate with LDAP server (%d): %s"
 msgstr "Aŭtentigo al LDAP-servilo malsukcesis (%d): %s"
 
-#: ../src/e-util/e-misc-utils.c:4243
+#: ../src/e-util/e-misc-utils.c:4275
 #, c-format
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
@@ -13036,7 +13138,7 @@ msgstr ""
 "\n"
 "Detala eraro (%d): %s"
 
-#: ../src/e-util/e-misc-utils.c:4254
+#: ../src/e-util/e-misc-utils.c:4286
 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 "
@@ -13046,12 +13148,12 @@ msgstr ""
 "ĉi funkcion, aŭ eble ĝi estas mise agordita. Demandu vian administranton, "
 "kiuj serĉbazoj estas subtenataj."
 
-#: ../src/e-util/e-misc-utils.c:4287
+#: ../src/e-util/e-misc-utils.c:4319
 msgid "Evolution had not been compiled with LDAP support"
 msgstr "Evolucio ne programtradukis kun LDAP-subteno"
 
 #. Translators: %s is the language ISO code.
-#: ../src/e-util/e-misc-utils.c:4601
+#: ../src/e-util/e-misc-utils.c:4633
 #, c-format
 msgctxt "language"
 msgid "Unknown (%s)"
@@ -13059,7 +13161,7 @@ msgstr "Nekonate (%s)"
 
 #. Translators: The first %s is the language name, and the
 #. * second is the country name. Example: "French (France)"
-#: ../src/e-util/e-misc-utils.c:4610
+#: ../src/e-util/e-misc-utils.c:4642
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
@@ -13084,7 +13186,7 @@ msgstr "_Serĉi:"
 #: ../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:1271
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1702
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1693
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:785
 #: ../src/modules/calendar/e-task-shell-view-actions.c:958
 msgid "Any Category"
@@ -13104,25 +13206,25 @@ msgid "Select Contacts from Address Book"
 msgstr "Elekti kontaktulojn el la adresaro"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../src/e-util/e-name-selector-entry.c:3252
+#: ../src/e-util/e-name-selector-entry.c:3241
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "_Etendi %s entekste"
 
 #. Copy Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3268
+#: ../src/e-util/e-name-selector-entry.c:3257
 #, c-format
 msgid "Cop_y %s"
 msgstr "Kopi_i %s"
 
 #. Cut Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3279
+#: ../src/e-util/e-name-selector-entry.c:3268
 #, c-format
 msgid "C_ut %s"
 msgstr "Elt_ondi %s"
 
 #. Edit Contact item
-#: ../src/e-util/e-name-selector-entry.c:3297
+#: ../src/e-util/e-name-selector-entry.c:3286
 #, c-format
 msgid "_Edit %s"
 msgstr "R_edakti na %s"
@@ -13652,7 +13754,6 @@ msgid "Are you sure you want to delete remote collection “{0}”?"
 msgstr "Ĉu vi certe volas forigi deforan kolekton “{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?"
@@ -13660,7 +13761,7 @@ 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 "
+"La kolekto “{0}” estos daŭre forigita el la servilo. Ĉu vi vere volas "
 "daŭrigi?"
 
 #: ../src/e-util/e-system.error.xml.h:29
@@ -13958,21 +14059,20 @@ msgstr "Ŝargante…"
 
 #: ../src/e-util/e-webdav-browser.c:1383
 msgid "Searching collection children…"
-msgstr ""
+msgstr "Serĉante idojn de kolekto…"
 
 #: ../src/e-util/e-webdav-browser.c:1385
 msgid "Failed to search for collection children"
-msgstr ""
+msgstr "Malsukcesis serĉi idojn de kolekto"
 
 #: ../src/e-util/e-webdav-browser.c:1419
 msgid "Searching for user home, please wait…"
-msgstr ""
+msgstr "Serĉante la hejmon de uzanto, bonvolu atendi…"
 
 #: ../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"
+msgstr "Malsukcesis erĉi la hejmon de uzanto"
 
 #: ../src/e-util/e-webdav-browser.c:1763
 msgid "At least one component type should be set"
@@ -14118,17 +14218,15 @@ msgid "Save the image to a file"
 msgstr "Konservi la bildon al dosiero"
 
 #: ../src/e-util/e-web-view.c:474 ../src/mail/e-mail-browser.c:179
-#: ../src/mail/e-mail-reader.c:2787
-#| msgid "Searches"
+#: ../src/mail/e-mail-reader.c:2820
 msgid "Search _Web…"
 msgstr "Reta _serĉo…"
 
 #: ../src/e-util/e-web-view.c:476 ../src/mail/e-mail-browser.c:181
-#: ../src/mail/e-mail-reader.c:2789
-#, fuzzy
+#: ../src/mail/e-mail-reader.c:2822
 #| msgid "Send a message to the selected contacts"
 msgid "Search the Web with the selected text"
-msgstr "Sendi mesaĝon al la elektitaj kontaktoj"
+msgstr "Serĉi la Reton kun la elektita teksto"
 
 #: ../src/e-util/e-web-view.c:486 ../src/e-util/e-web-view.c:2097
 msgid "Select all text and images"
@@ -14423,10 +14521,9 @@ msgid "Could not save signature."
 msgstr "Ne eblis konservi subskribon."
 
 #: ../src/e-util/widgets.error.xml.h:10
-#, fuzzy
 #| msgid "Could not get a selection to delete."
 msgid "Could not get selected text."
-msgstr "Ne eblis akiri forigotan elekton."
+msgstr "Ne eblis akiri elektitan tekston."
 
 #: ../src/libemail-engine/e-mail-folder-utils.c:106
 #, c-format
@@ -14480,9 +14577,9 @@ msgid "Invalid folder URI “%s”"
 msgstr "Nevalida dosierujo-adreso “%s”"
 
 #. Some local folders
-#: ../src/libemail-engine/e-mail-session.c:117
-#: ../src/mail/em-folder-properties.c:1164
-#: ../src/mail/em-folder-tree-model.c:1237
+#: ../src/libemail-engine/e-mail-session.c:120
+#: ../src/mail/em-folder-properties.c:1444
+#: ../src/mail/em-folder-tree-model.c:1495
 #: ../src/mail/importers/kmail-libs.c:139
 #: ../src/modules/mail/e-mail-shell-view-private.c:1032
 #: ../src/modules/mail/e-mail-shell-view-private.c:1043
@@ -14490,71 +14587,71 @@ msgid "Inbox"
 msgstr "Enirkesto"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../src/libemail-engine/e-mail-session.c:118
-#: ../src/mail/em-folder-tree-model.c:1230
+#: ../src/libemail-engine/e-mail-session.c:121
+#: ../src/mail/em-folder-tree-model.c:1489
 #: ../src/mail/importers/kmail-libs.c:145
 #: ../src/modules/mail/e-mail-shell-view-private.c:1030
 msgid "Drafts"
 msgstr "Malnetaĵoj"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../src/libemail-engine/e-mail-session.c:119
-#: ../src/mail/em-folder-tree-model.c:1241
+#: ../src/libemail-engine/e-mail-session.c:122
+#: ../src/mail/em-folder-tree-model.c:1499
 #: ../src/mail/importers/kmail-libs.c:141
 #: ../src/modules/mail/e-mail-shell-view-private.c:1034
 msgid "Outbox"
 msgstr "Elirkesto"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../src/libemail-engine/e-mail-session.c:120
-#: ../src/mail/em-folder-tree-model.c:1245
+#: ../src/libemail-engine/e-mail-session.c:123
+#: ../src/mail/em-folder-tree-model.c:1503
 #: ../src/mail/importers/kmail-libs.c:143
 #: ../src/modules/mail/e-mail-shell-view-private.c:1036
 msgid "Sent"
 msgstr "Sendita"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../src/libemail-engine/e-mail-session.c:121
+#: ../src/libemail-engine/e-mail-session.c:124
 #: ../src/mail/e-mail-templates-store.c:2211
-#: ../src/mail/em-folder-tree-model.c:1233
+#: ../src/mail/em-folder-tree-model.c:1491
 #: ../src/mail/importers/kmail-libs.c:147
 #: ../src/modules/mail/e-mail-shell-view-private.c:1038
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
 msgstr "Ŝablonoj"
 
-#: ../src/libemail-engine/e-mail-session.c:1294
+#: ../src/libemail-engine/e-mail-session.c:1518
 #, c-format
 msgid "User cancelled operation"
 msgstr "Uzanto nuligis operacion"
 
-#: ../src/libemail-engine/e-mail-session.c:1351
+#: ../src/libemail-engine/e-mail-session.c:1575
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "Neniu celadreso enigita, plusenditado de la mesaĝo nuliĝis."
 
-#: ../src/libemail-engine/e-mail-session.c:1364
+#: ../src/libemail-engine/e-mail-session.c:1588
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "Neniu uzenda identeco trovita, plusenditado de la mesaĝo nuliĝis."
 
-#: ../src/libemail-engine/e-mail-session.c:1516
+#: ../src/libemail-engine/e-mail-session.c:1740
 #, fuzzy, c-format
 #| msgid "Source with UID “%s” not found"
 msgid "Corresponding source for service with UID “%s” not found"
 msgstr "Fonto kun UID “%s” ne trovita"
 
-#: ../src/libemail-engine/e-mail-session.c:1636
+#: ../src/libemail-engine/e-mail-session.c:1860
 msgid "Looking up recipient S/MIME certificates in address books…"
 msgstr "Serĉante ricevantajn S/MIME-atestilojn en la adresaroj…"
 
-#: ../src/libemail-engine/e-mail-session.c:1638
+#: ../src/libemail-engine/e-mail-session.c:1862
 msgid "Looking up recipient PGP keys in address books…"
 msgstr "Serĉante ricevantajn PGP-ŝlosilojn en la adresaroj…"
 
-#: ../src/libemail-engine/e-mail-session.c:2639
+#: ../src/libemail-engine/e-mail-session.c:2889
 #, c-format
 msgid "Waiting for “%s”"
 msgstr "Atendante por “%s”"
@@ -14798,57 +14895,57 @@ msgstr "Im_plicita"
 msgid "Invalid URI: “%s”"
 msgstr "Nevalida URI: “%s”"
 
-#: ../src/mail/e-mail-autoconfig.c:754
+#: ../src/mail/e-mail-autoconfig.c:756
 #, c-format
 msgid "Host: %s:%d"
 msgstr "Gastiganto: %s:%d"
 
-#: ../src/mail/e-mail-autoconfig.c:758
+#: ../src/mail/e-mail-autoconfig.c:760
 #, c-format
 msgid "User: %s"
 msgstr "Uzanto: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:762
+#: ../src/mail/e-mail-autoconfig.c:764
 #, c-format
 msgid "Security method: %s"
 msgstr "Sekureco-metodo: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:763
+#: ../src/mail/e-mail-autoconfig.c:765
 #: ../src/mail/e-mail-config-summary-page.c:144
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/mail/e-mail-autoconfig.c:764
+#: ../src/mail/e-mail-autoconfig.c:766
 #: ../src/mail/e-mail-config-summary-page.c:147
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: ../src/mail/e-mail-autoconfig.c:768
+#: ../src/mail/e-mail-autoconfig.c:770
 #, c-format
 msgid "Authentication mechanism: %s"
 msgstr "Metodo de aŭtentigo: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:948
+#: ../src/mail/e-mail-autoconfig.c:950
 msgid "No email address provided"
 msgstr "Neniu retpoŝtadreso"
 
-#: ../src/mail/e-mail-autoconfig.c:957
+#: ../src/mail/e-mail-autoconfig.c:959
 msgid "Missing domain in email address"
 msgstr "Mankante domajnon en retpoŝtadreso"
 
-#: ../src/mail/e-mail-autoconfig.c:1307
+#: ../src/mail/e-mail-autoconfig.c:1309
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:82
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:83
 msgid "IMAP server"
 msgstr "IMAP-servilo"
 
-#: ../src/mail/e-mail-autoconfig.c:1314
+#: ../src/mail/e-mail-autoconfig.c:1316
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:84
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:85
 msgid "POP3 server"
 msgstr "POP3-servilo"
 
-#: ../src/mail/e-mail-autoconfig.c:1321
+#: ../src/mail/e-mail-autoconfig.c:1323
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:86
 msgid "SMTP server"
 msgstr "SMTP-servilo"
@@ -14919,7 +15016,6 @@ msgid "Do Not Quote"
 msgstr "Ne citi"
 
 #: ../src/mail/e-mail-config-composing-page.c:157
-#, fuzzy
 #| msgctxt "ReplyForward"
 #| msgid "Use global setting"
 msgid "Use global setting"
@@ -14953,7 +15049,7 @@ msgid "Language for Reply and Forward attribution text"
 msgstr ""
 
 #: ../src/mail/e-mail-config-composing-page.c:524
-#: ../src/mail/em-composer-utils.c:4273 ../src/mail/mail-config.ui.h:22
+#: ../src/mail/em-composer-utils.c:4117 ../src/mail/mail-config.ui.h:22
 msgid "Start _typing at the bottom"
 msgstr "Komenci _tajpado ĉe subo"
 
@@ -15186,9 +15282,9 @@ msgid "%s — %s"
 msgstr "%s — %s"
 
 #: ../src/mail/e-mail-config-security-page.c:460
-#: ../src/mail/em-folder-properties.c:1083 ../src/mail/mail-config.ui.h:34
+#: ../src/mail/em-folder-properties.c:1367 ../src/mail/mail-config.ui.h:34
 #: ../src/modules/addressbook/autocompletion-config.c:115
-#: ../src/modules/calendar/e-calendar-preferences.c:643
+#: ../src/modules/calendar/e-calendar-preferences.c:629
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:48
 #: ../src/modules/mail/e-mail-shell-backend.c:771
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
@@ -15444,6 +15540,29 @@ msgstr "K_rei"
 msgid "Folder _name:"
 msgstr "Dosieruj_nomo:"
 
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:696
+#| msgid "Folder Properties"
+msgid "Folder Sort Order"
+msgstr "Dosierujo ordiga ordo"
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:737
+#| msgid "Close the current file"
+msgid "Reset c_urrent level"
+msgstr "Reagordi _aktualan nivelon"
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:738
+msgid "Reset sort order in the current level to the defaults"
+msgstr ""
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:748
+#| msgid "Select all headers"
+msgid "Reset _all levels"
+msgstr "Reagordi ĉ_iujn nivelojn"
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:749
+msgid "Reset sort order in all levels to their defaults"
+msgstr ""
+
 #. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
 #. The translated value should not contain spaces.
 #: ../src/mail/e-mail-free-form-exp.c:231
@@ -15476,12 +15595,12 @@ msgctxt "ffe"
 msgid "Attachment"
 msgstr "Aldonaĵo"
 
-#: ../src/mail/e-mail-free-form-exp.c:484
+#: ../src/mail/e-mail-free-form-exp.c:489
 msgctxt "ffe"
 msgid "no"
 msgstr "ne"
 
-#: ../src/mail/e-mail-free-form-exp.c:485
+#: ../src/mail/e-mail-free-form-exp.c:490
 msgctxt "ffe"
 msgid "false"
 msgstr "malvera"
@@ -15519,12 +15638,12 @@ msgid "_Later"
 msgstr "_Poste"
 
 #: ../src/mail/e-mail-label-manager.c:169 ../src/mail/e-mail-reader.c:906
-#: ../src/mail/em-folder-properties.c:855
+#: ../src/mail/em-folder-properties.c:1141
 msgid "Add Label"
 msgstr "Aldoni etikedon"
 
 #: ../src/mail/e-mail-label-manager.c:220
-#: ../src/mail/em-folder-properties.c:882
+#: ../src/mail/em-folder-properties.c:1168
 msgid "Edit Label"
 msgstr "Redakti etikedon"
 
@@ -15616,656 +15735,656 @@ msgstr "K_opii"
 msgid "Deleting message note..."
 msgstr "Forigi mesaĝan noton..."
 
-#: ../src/mail/e-mail-reader.c:1577 ../src/mail/e-mail-reader.c:1868
-#: ../src/mail/e-mail-reader.c:1908
+#: ../src/mail/e-mail-reader.c:1610 ../src/mail/e-mail-reader.c:1901
+#: ../src/mail/e-mail-reader.c:1941
 msgid "_Do not ask me again."
 msgstr "_Ne demandu min denove."
 
-#: ../src/mail/e-mail-reader.c:1914
+#: ../src/mail/e-mail-reader.c:1947
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "Ĉi_am malatenti Respondi-al por dissendolistoj."
 
-#: ../src/mail/e-mail-reader.c:2118
+#: ../src/mail/e-mail-reader.c:2151
 msgid "Failed to retrieve message:"
 msgstr "Malsukcesis ricevi mesaĝon:"
 
-#: ../src/mail/e-mail-reader.c:2164 ../src/mail/e-mail-reader.c:3641
+#: ../src/mail/e-mail-reader.c:2197 ../src/mail/e-mail-reader.c:3674
 #, c-format
 msgid "Retrieving message “%s”"
 msgstr "Ricenvante mesaĝon “%s”"
 
-#: ../src/mail/e-mail-reader.c:2365
+#: ../src/mail/e-mail-reader.c:2398
 msgid "A_dd Sender to Address Book"
 msgstr "Al_doni sendinton al adresaro"
 
-#: ../src/mail/e-mail-reader.c:2367
+#: ../src/mail/e-mail-reader.c:2400
 msgid "Add sender to address book"
 msgstr "Aldoni sendinton al adresaro"
 
-#: ../src/mail/e-mail-reader.c:2372
+#: ../src/mail/e-mail-reader.c:2405
 msgid "_Archive..."
 msgstr "_Arĥivigi..."
 
-#: ../src/mail/e-mail-reader.c:2374
+#: ../src/mail/e-mail-reader.c:2407
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "Movi elektitajn mesaĝojn al la arĥiv-dosierujo por la konto"
 
-#: ../src/mail/e-mail-reader.c:2379
+#: ../src/mail/e-mail-reader.c:2412
 msgid "Check for _Junk"
 msgstr "Kontroli por _spamo"
 
-#: ../src/mail/e-mail-reader.c:2381
+#: ../src/mail/e-mail-reader.c:2414
 msgid "Filter the selected messages for junk status"
 msgstr "Filtri la elektitajn mesaĝojn por spamstato"
 
-#: ../src/mail/e-mail-reader.c:2386
+#: ../src/mail/e-mail-reader.c:2419
 msgid "Assign C_olor…"
 msgstr "Asigni k_oloron…"
 
-#: ../src/mail/e-mail-reader.c:2388
+#: ../src/mail/e-mail-reader.c:2421
 msgid "Assign color for the selected messages"
 msgstr "Asigni koloron por la elektitaj mesaĝoj"
 
-#: ../src/mail/e-mail-reader.c:2393
+#: ../src/mail/e-mail-reader.c:2426
 msgid "Unse_t Color"
 msgstr "Ma_lasigni koloron"
 
-#: ../src/mail/e-mail-reader.c:2395
+#: ../src/mail/e-mail-reader.c:2428
 msgid "Unset color for the selected messages"
 msgstr "Malasigni koloron por la elektitaj mesaĝoj"
 
-#: ../src/mail/e-mail-reader.c:2400
+#: ../src/mail/e-mail-reader.c:2433
 msgid "_Copy to Folder..."
 msgstr "_Kopii al dosierujo..."
 
-#: ../src/mail/e-mail-reader.c:2402
+#: ../src/mail/e-mail-reader.c:2435
 msgid "Copy selected messages to another folder"
 msgstr "Kopii la elektitaj mesaĝoj al alia dosierujo"
 
-#: ../src/mail/e-mail-reader.c:2407
+#: ../src/mail/e-mail-reader.c:2440
 msgid "_Delete Message"
 msgstr "_Forigi mesaĝon"
 
-#: ../src/mail/e-mail-reader.c:2409
+#: ../src/mail/e-mail-reader.c:2442
 msgid "Mark the selected messages for deletion"
 msgstr "Marki la elektitajn mesaĝojn por forigado"
 
-#: ../src/mail/e-mail-reader.c:2414
+#: ../src/mail/e-mail-reader.c:2447
 msgid "_Add note..."
 msgstr "_Aldoni noton..."
 
-#: ../src/mail/e-mail-reader.c:2416
+#: ../src/mail/e-mail-reader.c:2449
 msgid "Add a note for the selected message"
 msgstr "Aldoni noton por la elektita mesaĝo"
 
-#: ../src/mail/e-mail-reader.c:2421
+#: ../src/mail/e-mail-reader.c:2454
 msgid "Delete no_te"
 msgstr "Forigi no_ton"
 
-#: ../src/mail/e-mail-reader.c:2423
+#: ../src/mail/e-mail-reader.c:2456
 msgid "Delete the note for the selected message"
 msgstr "Forigi la noton por la elektita mesaĝo"
 
-#: ../src/mail/e-mail-reader.c:2428
+#: ../src/mail/e-mail-reader.c:2461
 msgid "_Edit note..."
 msgstr "R_edakti noton..."
 
-#: ../src/mail/e-mail-reader.c:2430
+#: ../src/mail/e-mail-reader.c:2463
 msgid "Edit a note for the selected message"
 msgstr "Redakti noton por la elektita mesaĝo"
 
-#: ../src/mail/e-mail-reader.c:2435
+#: ../src/mail/e-mail-reader.c:2468
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Krei filtroregulon por dissendo_listo..."
 
-#: ../src/mail/e-mail-reader.c:2437
+#: ../src/mail/e-mail-reader.c:2470
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Krei regulon por filtri mesaĝojn al ĉi tiu dissendolisto"
 
-#: ../src/mail/e-mail-reader.c:2442
+#: ../src/mail/e-mail-reader.c:2475
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Krei filtroregulon por _ricevantoj..."
 
-#: ../src/mail/e-mail-reader.c:2444
+#: ../src/mail/e-mail-reader.c:2477
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Krei regulon por filtri mesaĝojn al ĉi tiuj ricevantoj"
 
-#: ../src/mail/e-mail-reader.c:2449
+#: ../src/mail/e-mail-reader.c:2482
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Krei filtroregulon por se_ndinto..."
 
-#: ../src/mail/e-mail-reader.c:2451
+#: ../src/mail/e-mail-reader.c:2484
 msgid "Create a rule to filter messages from this sender"
 msgstr "Krei regulon por filtri mesaĝojn de ĉi tiu sendinto"
 
-#: ../src/mail/e-mail-reader.c:2456
+#: ../src/mail/e-mail-reader.c:2489
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Krei filtroregulon por _temo..."
 
-#: ../src/mail/e-mail-reader.c:2458
+#: ../src/mail/e-mail-reader.c:2491
 msgid "Create a rule to filter messages with this subject"
 msgstr "Krei regulon por filtri mesaĝojn kun ĉi tiu temo"
 
-#: ../src/mail/e-mail-reader.c:2463
+#: ../src/mail/e-mail-reader.c:2496
 msgid "A_pply Filters"
 msgstr "A_pliki filtrilojn"
 
-#: ../src/mail/e-mail-reader.c:2465
+#: ../src/mail/e-mail-reader.c:2498
 msgid "Apply filter rules to the selected messages"
 msgstr "Apliki filtril-regulojn al la elektitaj mesaĝoj"
 
-#: ../src/mail/e-mail-reader.c:2470
+#: ../src/mail/e-mail-reader.c:2503
 msgid "_Find in Message..."
 msgstr "_Trovi en mesaĝo..."
 
-#: ../src/mail/e-mail-reader.c:2472
+#: ../src/mail/e-mail-reader.c:2505
 msgid "Search for text in the body of the displayed message"
 msgstr "Serĉi la tekston en la korpo de la montrita mesaĝo"
 
-#: ../src/mail/e-mail-reader.c:2477
+#: ../src/mail/e-mail-reader.c:2510
 msgid "_Clear Flag"
 msgstr "_Vakigi flagon"
 
-#: ../src/mail/e-mail-reader.c:2479
+#: ../src/mail/e-mail-reader.c:2512
 msgid "Remove the follow-up flag from the selected messages"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2484
+#: ../src/mail/e-mail-reader.c:2517
 msgid "_Flag Completed"
 msgstr "_Flago plenumita"
 
-#: ../src/mail/e-mail-reader.c:2486
+#: ../src/mail/e-mail-reader.c:2519
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2491
+#: ../src/mail/e-mail-reader.c:2524
 msgid "Follow _Up..."
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2493
+#: ../src/mail/e-mail-reader.c:2526
 msgid "Flag the selected messages for follow-up"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2498
+#: ../src/mail/e-mail-reader.c:2531
 #: ../src/modules/mail/e-mail-attachment-handler.c:431
 msgid "_Attached"
 msgstr "_Aldonita"
 
-#: ../src/mail/e-mail-reader.c:2500 ../src/mail/e-mail-reader.c:2507
+#: ../src/mail/e-mail-reader.c:2533 ../src/mail/e-mail-reader.c:2540
 #: ../src/modules/mail/e-mail-attachment-handler.c:433
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Plusendi la elektitan mesaĝon al iu kiel aldonaĵo"
 
-#: ../src/mail/e-mail-reader.c:2505
+#: ../src/mail/e-mail-reader.c:2538
 msgid "Forward As _Attached"
 msgstr "Plusendi kiel _aldonaĵo"
 
-#: ../src/mail/e-mail-reader.c:2512
+#: ../src/mail/e-mail-reader.c:2545
 #: ../src/modules/mail/e-mail-attachment-handler.c:438
 msgid "_Inline"
 msgstr "_Enteksta"
 
-#: ../src/mail/e-mail-reader.c:2514 ../src/mail/e-mail-reader.c:2521
+#: ../src/mail/e-mail-reader.c:2547 ../src/mail/e-mail-reader.c:2554
 #: ../src/modules/mail/e-mail-attachment-handler.c:440
 msgid "Forward the selected message in the body of a new message"
 msgstr "Plusendi la elektitan mesaĝon en la korpo de nova mesaĝo"
 
-#: ../src/mail/e-mail-reader.c:2519
+#: ../src/mail/e-mail-reader.c:2552
 msgid "Forward As _Inline"
 msgstr "Plusendi _entekste"
 
-#: ../src/mail/e-mail-reader.c:2526
+#: ../src/mail/e-mail-reader.c:2559
 #: ../src/modules/mail/e-mail-attachment-handler.c:445
 msgid "_Quoted"
 msgstr "_Citita"
 
-#: ../src/mail/e-mail-reader.c:2528 ../src/mail/e-mail-reader.c:2535
+#: ../src/mail/e-mail-reader.c:2561 ../src/mail/e-mail-reader.c:2568
 #: ../src/modules/mail/e-mail-attachment-handler.c:447
 msgid "Forward the selected message quoted like a reply"
 msgstr "Plusendi la elektitan mesaĝon kiel citaĵo en respondo"
 
-#: ../src/mail/e-mail-reader.c:2533
+#: ../src/mail/e-mail-reader.c:2566
 msgid "Forward As _Quoted"
 msgstr "Plusendi kiel _citaĵo"
 
-#: ../src/mail/e-mail-reader.c:2540
+#: ../src/mail/e-mail-reader.c:2573
 msgid "_New Label"
 msgstr "_Nova etikedo"
 
 #. Translators: "None" is used in the message label context menu.
 #. *              It removes all labels from the selected messages.
-#: ../src/mail/e-mail-reader.c:2549
+#: ../src/mail/e-mail-reader.c:2582
 msgid "N_one"
 msgstr "N_eniu"
 
-#: ../src/mail/e-mail-reader.c:2556
+#: ../src/mail/e-mail-reader.c:2589
 msgid "_Load Images"
 msgstr "Ŝ_argi bildojn"
 
-#: ../src/mail/e-mail-reader.c:2558
+#: ../src/mail/e-mail-reader.c:2591
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2563 ../src/mail/e-mail-reader.c:2982
+#: ../src/mail/e-mail-reader.c:2596 ../src/mail/e-mail-reader.c:3015
 msgid "_Ignore Subthread"
 msgstr "Malatent_i subfadenon"
 
-#: ../src/mail/e-mail-reader.c:2565
+#: ../src/mail/e-mail-reader.c:2598
 msgid "Mark new mails in a subthread as read automatically"
 msgstr "Aŭtomate marki novajn retmesaĝojn en subfadeno kiel legitaj"
 
-#: ../src/mail/e-mail-reader.c:2570 ../src/mail/e-mail-reader.c:2986
+#: ../src/mail/e-mail-reader.c:2603 ../src/mail/e-mail-reader.c:3019
 msgid "_Ignore Thread"
 msgstr "Malatent_i fadenon"
 
-#: ../src/mail/e-mail-reader.c:2572
+#: ../src/mail/e-mail-reader.c:2605
 msgid "Mark new mails in this thread as read automatically"
 msgstr "Aŭtomate marki novajn retmesaĝojn en ĉi tiu fadeno kiel legitaj"
 
-#: ../src/mail/e-mail-reader.c:2577
+#: ../src/mail/e-mail-reader.c:2610
 msgid "_Important"
 msgstr "_Grava"
 
-#: ../src/mail/e-mail-reader.c:2579
+#: ../src/mail/e-mail-reader.c:2612
 msgid "Mark the selected messages as important"
 msgstr "Marki la elektitajn mesaĝojn kiel gravaj"
 
-#: ../src/mail/e-mail-reader.c:2584
+#: ../src/mail/e-mail-reader.c:2617
 msgid "_Junk"
 msgstr "_Spamo"
 
-#: ../src/mail/e-mail-reader.c:2586
+#: ../src/mail/e-mail-reader.c:2619
 msgid "Mark the selected messages as junk"
 msgstr "Marki la elektitajn mesaĝojn kiel spamaj"
 
-#: ../src/mail/e-mail-reader.c:2591
+#: ../src/mail/e-mail-reader.c:2624
 msgid "_Not Junk"
 msgstr "_Ne spamo"
 
-#: ../src/mail/e-mail-reader.c:2593
+#: ../src/mail/e-mail-reader.c:2626
 msgid "Mark the selected messages as not being junk"
 msgstr "Marki la elektitajn mesaĝojn kiel nespamaj"
 
-#: ../src/mail/e-mail-reader.c:2598
+#: ../src/mail/e-mail-reader.c:2631
 msgid "_Read"
 msgstr "_Legi"
 
-#: ../src/mail/e-mail-reader.c:2600
+#: ../src/mail/e-mail-reader.c:2633
 msgid "Mark the selected messages as having been read"
 msgstr "Marki la elektitajn mesaĝojn kiel legitaj"
 
-#: ../src/mail/e-mail-reader.c:2605 ../src/mail/e-mail-reader.c:3006
+#: ../src/mail/e-mail-reader.c:2638 ../src/mail/e-mail-reader.c:3039
 msgid "Do not _Ignore Subthread"
 msgstr "Ne malatent_i subfadenon"
 
-#: ../src/mail/e-mail-reader.c:2607
+#: ../src/mail/e-mail-reader.c:2640
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr "Ne aŭtomate marki novajn retmesaĝojn en subfadeno kiel legitaj"
 
-#: ../src/mail/e-mail-reader.c:2612 ../src/mail/e-mail-reader.c:3010
+#: ../src/mail/e-mail-reader.c:2645 ../src/mail/e-mail-reader.c:3043
 msgid "Do not _Ignore Thread"
 msgstr "Ne malatent_i fadenon"
 
-#: ../src/mail/e-mail-reader.c:2614
+#: ../src/mail/e-mail-reader.c:2647
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr "Ne aŭtomate marki novajn retmesaĝojn en ĉi tiu fadeno kiel legitaj"
 
-#: ../src/mail/e-mail-reader.c:2619
+#: ../src/mail/e-mail-reader.c:2652
 msgid "Uni_mportant"
 msgstr "_Malgrava"
 
-#: ../src/mail/e-mail-reader.c:2621
+#: ../src/mail/e-mail-reader.c:2654
 msgid "Mark the selected messages as unimportant"
 msgstr "Marki la elektitajn mesaĝojn kiel malgravaj"
 
-#: ../src/mail/e-mail-reader.c:2626
+#: ../src/mail/e-mail-reader.c:2659
 msgid "_Unread"
 msgstr "_Nelegita"
 
-#: ../src/mail/e-mail-reader.c:2628
+#: ../src/mail/e-mail-reader.c:2661
 msgid "Mark the selected messages as not having been read"
 msgstr "Marki la elektitajn mesaĝojn kiel nelegitaj"
 
-#: ../src/mail/e-mail-reader.c:2633
+#: ../src/mail/e-mail-reader.c:2666
 #: ../src/modules/mail/e-mail-attachment-handler.c:417
 msgid "_Edit as New Message..."
 msgstr "_Redakti kiel nova mesaĝo..."
 
-#: ../src/mail/e-mail-reader.c:2635
+#: ../src/mail/e-mail-reader.c:2668
 #: ../src/modules/mail/e-mail-attachment-handler.c:419
 msgid "Open the selected messages in the composer for editing"
 msgstr "Malfermi la elektitajn mesaĝojn en la komponilo por redakti"
 
-#: ../src/mail/e-mail-reader.c:2640
+#: ../src/mail/e-mail-reader.c:2673
 msgid "Compose _New Message"
 msgstr "Krei _novan mesaĝon"
 
-#: ../src/mail/e-mail-reader.c:2642
+#: ../src/mail/e-mail-reader.c:2675
 msgid "Open a window for composing a mail message"
 msgstr "Malfermi fenestron por krei novan retmesaĝon"
 
-#: ../src/mail/e-mail-reader.c:2647
+#: ../src/mail/e-mail-reader.c:2680
 msgid "_Open in New Window"
 msgstr "_Malfermi en nova fenestro"
 
-#: ../src/mail/e-mail-reader.c:2649
+#: ../src/mail/e-mail-reader.c:2682
 msgid "Open the selected messages in a new window"
 msgstr "Malfermi la elektitajn mesaĝojn en nova fenestro"
 
-#: ../src/mail/e-mail-reader.c:2654
+#: ../src/mail/e-mail-reader.c:2687
 msgid "_Move to Folder..."
 msgstr "_Movi al dosierujo..."
 
-#: ../src/mail/e-mail-reader.c:2656
+#: ../src/mail/e-mail-reader.c:2689
 msgid "Move selected messages to another folder"
 msgstr "Movi elektitajn mesaĝojn al alia dosierujo"
 
-#: ../src/mail/e-mail-reader.c:2661
+#: ../src/mail/e-mail-reader.c:2694
 msgid "_Next Message"
 msgstr "_Sekva mesaĝo"
 
-#: ../src/mail/e-mail-reader.c:2663
+#: ../src/mail/e-mail-reader.c:2696
 msgid "Display the next message"
 msgstr "Montri la sekvan mesaĝon"
 
-#: ../src/mail/e-mail-reader.c:2668
+#: ../src/mail/e-mail-reader.c:2701
 msgid "Next _Important Message"
 msgstr "Sekva _grava mesaĝo"
 
-#: ../src/mail/e-mail-reader.c:2670
+#: ../src/mail/e-mail-reader.c:2703
 msgid "Display the next important message"
 msgstr "Montri la sekvan gravan mesaĝon"
 
-#: ../src/mail/e-mail-reader.c:2675
+#: ../src/mail/e-mail-reader.c:2708
 msgid "Next _Thread"
 msgstr "Sekva _fadeno"
 
-#: ../src/mail/e-mail-reader.c:2677
+#: ../src/mail/e-mail-reader.c:2710
 msgid "Display the next thread"
 msgstr "Montri la sekvan fadenon"
 
-#: ../src/mail/e-mail-reader.c:2682
+#: ../src/mail/e-mail-reader.c:2715
 msgid "Next _Unread Message"
 msgstr "Sekva _nelegita mesaĝo"
 
-#: ../src/mail/e-mail-reader.c:2684
+#: ../src/mail/e-mail-reader.c:2717
 msgid "Display the next unread message"
 msgstr "Montri la sekvan nelegitan mesaĝon"
 
-#: ../src/mail/e-mail-reader.c:2689
+#: ../src/mail/e-mail-reader.c:2722
 msgid "_Previous Message"
 msgstr "_Antaŭa mesaĝo"
 
-#: ../src/mail/e-mail-reader.c:2691
+#: ../src/mail/e-mail-reader.c:2724
 msgid "Display the previous message"
 msgstr "Montri la antaŭan mesaĝon"
 
-#: ../src/mail/e-mail-reader.c:2696
+#: ../src/mail/e-mail-reader.c:2729
 msgid "Pr_evious Important Message"
 msgstr "_Antaŭa grava mesaĝo"
 
-#: ../src/mail/e-mail-reader.c:2698
+#: ../src/mail/e-mail-reader.c:2731
 msgid "Display the previous important message"
 msgstr "Montri la antaŭan gravan mesaĝon"
 
-#: ../src/mail/e-mail-reader.c:2703
+#: ../src/mail/e-mail-reader.c:2736
 msgid "Previous T_hread"
 msgstr "_Antaŭa fadeno"
 
-#: ../src/mail/e-mail-reader.c:2705
+#: ../src/mail/e-mail-reader.c:2738
 msgid "Display the previous thread"
 msgstr "Montri la antaŭan fadenon"
 
-#: ../src/mail/e-mail-reader.c:2710
+#: ../src/mail/e-mail-reader.c:2743
 msgid "P_revious Unread Message"
 msgstr "A_ntaŭa nelegita mesaĝo"
 
-#: ../src/mail/e-mail-reader.c:2712
+#: ../src/mail/e-mail-reader.c:2745
 msgid "Display the previous unread message"
 msgstr "Montri la antaŭan nelegitan mesaĝon"
 
-#: ../src/mail/e-mail-reader.c:2719
+#: ../src/mail/e-mail-reader.c:2752
 msgid "Print this message"
 msgstr "Presi tiun mesaĝon"
 
-#: ../src/mail/e-mail-reader.c:2726
+#: ../src/mail/e-mail-reader.c:2759
 msgid "Preview the message to be printed"
 msgstr "Antaŭrigardi la presendan mesaĝon"
 
-#: ../src/mail/e-mail-reader.c:2731
+#: ../src/mail/e-mail-reader.c:2764
 #: ../src/modules/mail/e-mail-attachment-handler.c:452
 msgid "Re_direct"
 msgstr "Ali_direkti"
 
-#: ../src/mail/e-mail-reader.c:2733
+#: ../src/mail/e-mail-reader.c:2766
 #: ../src/modules/mail/e-mail-attachment-handler.c:454
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Alidirektas la elektitan mesaĝon al iu"
 
-#: ../src/mail/e-mail-reader.c:2738
+#: ../src/mail/e-mail-reader.c:2771
 msgid "Remo_ve Attachments"
 msgstr "_Forigi aldonaĵon"
 
-#: ../src/mail/e-mail-reader.c:2740
+#: ../src/mail/e-mail-reader.c:2773
 msgid "Remove attachments"
 msgstr "Forigi aldonaĵojn"
 
-#: ../src/mail/e-mail-reader.c:2745
+#: ../src/mail/e-mail-reader.c:2778
 msgid "Remove Du_plicate Messages"
 msgstr "Forigi duo_bligitajn mesaĝojn"
 
-#: ../src/mail/e-mail-reader.c:2747
+#: ../src/mail/e-mail-reader.c:2780
 msgid "Checks selected messages for duplicates"
 msgstr "Kontroli elektitajn mesaĝojn pri duobligitoj"
 
-#: ../src/mail/e-mail-reader.c:2752 ../src/mail/em-composer-utils.c:4227
+#: ../src/mail/e-mail-reader.c:2785 ../src/mail/em-composer-utils.c:4071
 #: ../src/mail/mail.error.xml.h:28
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1500
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1491
 #: ../src/modules/mail/e-mail-attachment-handler.c:396
 msgid "Reply to _All"
 msgstr "Respondi al ĉi_uj"
 
-#: ../src/mail/e-mail-reader.c:2754
+#: ../src/mail/e-mail-reader.c:2787
 #: ../src/modules/mail/e-mail-attachment-handler.c:398
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Krei respondon al ĉiuj ricevantoj de la elektita mesaĝo"
 
-#: ../src/mail/e-mail-reader.c:2759
+#: ../src/mail/e-mail-reader.c:2792
 msgid "Al_ternative Reply…"
 msgstr "Al_ternative respondi…"
 
-#: ../src/mail/e-mail-reader.c:2761
+#: ../src/mail/e-mail-reader.c:2794
 msgid "Choose reply options for the selected message"
 msgstr "Elekti respond-alternativojn por la elektita mesaĝo"
 
-#: ../src/mail/e-mail-reader.c:2766 ../src/mail/em-composer-utils.c:4222
+#: ../src/mail/e-mail-reader.c:2799 ../src/mail/em-composer-utils.c:4066
 #: ../src/mail/mail.error.xml.h:26
 #: ../src/modules/mail/e-mail-attachment-handler.c:403
 msgid "Reply to _List"
 msgstr "Respondi al la _listo"
 
-#: ../src/mail/e-mail-reader.c:2768
+#: ../src/mail/e-mail-reader.c:2801
 #: ../src/modules/mail/e-mail-attachment-handler.c:405
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Krei respondon por la dissendolisto de la elektita mesaĝo"
 
-#: ../src/mail/e-mail-reader.c:2773
+#: ../src/mail/e-mail-reader.c:2806
 #: ../src/modules/mail/e-mail-attachment-handler.c:410
 msgid "_Reply to Sender"
 msgstr "_Respondi al sendinto"
 
-#: ../src/mail/e-mail-reader.c:2775
+#: ../src/mail/e-mail-reader.c:2808
 #: ../src/modules/mail/e-mail-attachment-handler.c:412
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Krei respondon al la sendinto de la elektita mesaĝo"
 
-#: ../src/mail/e-mail-reader.c:2780
+#: ../src/mail/e-mail-reader.c:2813
 msgid "_Save as mbox..."
 msgstr "_Konservi kiel mbox..."
 
-#: ../src/mail/e-mail-reader.c:2782
+#: ../src/mail/e-mail-reader.c:2815
 msgid "Save selected messages as an mbox file"
 msgstr "Konservi la elektitajn mesaĝojn kiel mbox-dosiero"
 
-#: ../src/mail/e-mail-reader.c:2794
+#: ../src/mail/e-mail-reader.c:2827
 msgid "_Message Source"
 msgstr "_Mesaĝa fonto"
 
-#: ../src/mail/e-mail-reader.c:2796
+#: ../src/mail/e-mail-reader.c:2829
 msgid "Show the raw email source of the message"
 msgstr "Montri la fonton de la mesaĝo"
 
-#: ../src/mail/e-mail-reader.c:2808
+#: ../src/mail/e-mail-reader.c:2841
 msgid "_Undelete Message"
 msgstr "M_alforigi mesaĝon"
 
-#: ../src/mail/e-mail-reader.c:2810
+#: ../src/mail/e-mail-reader.c:2843
 msgid "Undelete the selected messages"
 msgstr "Malforigi la elektitajn mesaĝojn"
 
-#: ../src/mail/e-mail-reader.c:2815
+#: ../src/mail/e-mail-reader.c:2848
 msgid "_Normal Size"
 msgstr "_Norma grando"
 
-#: ../src/mail/e-mail-reader.c:2817
+#: ../src/mail/e-mail-reader.c:2850
 msgid "Reset the text to its original size"
 msgstr "Reagordi la tekston al ĝia origina grando"
 
-#: ../src/mail/e-mail-reader.c:2822
+#: ../src/mail/e-mail-reader.c:2855
 msgid "_Zoom In"
 msgstr "_Zomi"
 
-#: ../src/mail/e-mail-reader.c:2824
+#: ../src/mail/e-mail-reader.c:2857
 msgid "Increase the text size"
 msgstr "Pligrandigi la tekston"
 
-#: ../src/mail/e-mail-reader.c:2831
+#: ../src/mail/e-mail-reader.c:2864
 msgid "Decrease the text size"
 msgstr "Plimalgrandigi la tekston"
 
-#: ../src/mail/e-mail-reader.c:2838
+#: ../src/mail/e-mail-reader.c:2871
 msgid "Cre_ate"
 msgstr "Kre_i"
 
-#: ../src/mail/e-mail-reader.c:2845
+#: ../src/mail/e-mail-reader.c:2878
 msgid "Ch_aracter Encoding"
 msgstr "Sign_ara kodoprezento"
 
-#: ../src/mail/e-mail-reader.c:2852
+#: ../src/mail/e-mail-reader.c:2885
 #: ../src/modules/mail/e-mail-attachment-handler.c:424
 msgid "F_orward As"
 msgstr "Pl_usendi kiel"
 
-#: ../src/mail/e-mail-reader.c:2859
+#: ../src/mail/e-mail-reader.c:2892
 msgid "_Label"
 msgstr "_Etikedo"
 
-#: ../src/mail/e-mail-reader.c:2866
+#: ../src/mail/e-mail-reader.c:2899
 msgid "_Group Reply"
 msgstr "_Gruprespondi"
 
-#: ../src/mail/e-mail-reader.c:2873
+#: ../src/mail/e-mail-reader.c:2906
 msgid "_Go To"
 msgstr "_Iri al"
 
-#: ../src/mail/e-mail-reader.c:2880
+#: ../src/mail/e-mail-reader.c:2913
 msgid "Mar_k As"
 msgstr "Mar_ki kiel"
 
-#: ../src/mail/e-mail-reader.c:2887
+#: ../src/mail/e-mail-reader.c:2920
 msgid "_Message"
 msgstr "_Mesaĝo"
 
-#: ../src/mail/e-mail-reader.c:2894
+#: ../src/mail/e-mail-reader.c:2927
 msgid "_Zoom"
 msgstr "_Zomo"
 
-#: ../src/mail/e-mail-reader.c:2904
+#: ../src/mail/e-mail-reader.c:2937
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Krei serĉdosierujon el dissendo_listo..."
 
-#: ../src/mail/e-mail-reader.c:2906
+#: ../src/mail/e-mail-reader.c:2939
 msgid "Create a search folder for this mailing list"
 msgstr "Krei serĉdosierujon por ĉi tiu dissendolisto"
 
-#: ../src/mail/e-mail-reader.c:2911
+#: ../src/mail/e-mail-reader.c:2944
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Krei serĉdosierujon el ricevan_toj..."
 
-#: ../src/mail/e-mail-reader.c:2913
+#: ../src/mail/e-mail-reader.c:2946
 msgid "Create a search folder for these recipients"
 msgstr "Krei serĉdosierujon por ĉi tiuj ricevantoj"
 
-#: ../src/mail/e-mail-reader.c:2918
+#: ../src/mail/e-mail-reader.c:2951
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Krei serĉdosierujon el sen_dinto..."
 
-#: ../src/mail/e-mail-reader.c:2920
+#: ../src/mail/e-mail-reader.c:2953
 msgid "Create a search folder for this sender"
 msgstr "Krei serĉdosierujon por ĉi tiu sendinto"
 
-#: ../src/mail/e-mail-reader.c:2925
+#: ../src/mail/e-mail-reader.c:2958
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Krei serĉdosierujon el _temo..."
 
-#: ../src/mail/e-mail-reader.c:2927
+#: ../src/mail/e-mail-reader.c:2960
 msgid "Create a search folder for this subject"
 msgstr "Krei serĉdosierujon por ci tiu temo"
 
-#: ../src/mail/e-mail-reader.c:2974
+#: ../src/mail/e-mail-reader.c:3007
 msgid "Mark for Follo_w Up..."
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2990
+#: ../src/mail/e-mail-reader.c:3023
 msgid "Mark as _Important"
 msgstr "Marki kiel _grava"
 
-#: ../src/mail/e-mail-reader.c:2994
+#: ../src/mail/e-mail-reader.c:3027
 msgid "Mark as _Junk"
 msgstr "Marki kiel _rubaĵo"
 
-#: ../src/mail/e-mail-reader.c:2998
+#: ../src/mail/e-mail-reader.c:3031
 msgid "Mark as _Not Junk"
 msgstr "Marki kiel _nerubaĵo"
 
-#: ../src/mail/e-mail-reader.c:3002
+#: ../src/mail/e-mail-reader.c:3035
 msgid "Mar_k as Read"
 msgstr "Marki kiel _legita"
 
-#: ../src/mail/e-mail-reader.c:3014
+#: ../src/mail/e-mail-reader.c:3047
 msgid "Mark as Uni_mportant"
 msgstr "Marki kiel n_egrava"
 
-#: ../src/mail/e-mail-reader.c:3018
+#: ../src/mail/e-mail-reader.c:3051
 msgid "Mark as _Unread"
 msgstr "Marki kiel neleg_ita"
 
-#: ../src/mail/e-mail-reader.c:3066
+#: ../src/mail/e-mail-reader.c:3099
 msgid "_Caret Mode"
 msgstr "T_ajpmontrila reĝimo"
 
-#: ../src/mail/e-mail-reader.c:3068
+#: ../src/mail/e-mail-reader.c:3101
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Montri pulsantan tajpmontrilo en la korpo de montritaj mesaĝoj"
 
-#: ../src/mail/e-mail-reader.c:3074
+#: ../src/mail/e-mail-reader.c:3107
 msgid "All Message _Headers"
 msgstr "Ĉiuj mesaĝ-_kapoj"
 
-#: ../src/mail/e-mail-reader.c:3076
+#: ../src/mail/e-mail-reader.c:3109
 msgid "Show messages with all email headers"
 msgstr "Montri ĉiujn retpoŝtkapojn de mesaĝoj"
 
-#: ../src/mail/e-mail-reader.c:3647
+#: ../src/mail/e-mail-reader.c:3680
 msgid "Retrieving message"
 msgstr "Ricevante mesaĝon"
 
-#: ../src/mail/e-mail-reader.c:5008
+#: ../src/mail/e-mail-reader.c:5041
 #: ../src/modules/mail/e-mail-attachment-handler.c:389
 msgid "_Forward"
 msgstr "_Plusendi"
 
-#: ../src/mail/e-mail-reader.c:5009
+#: ../src/mail/e-mail-reader.c:5042
 #: ../src/modules/mail/e-mail-attachment-handler.c:391
 msgid "Forward the selected message to someone"
 msgstr "Plusendi la elektitan mesaĝon al iu"
@@ -16274,52 +16393,52 @@ msgstr "Plusendi la elektitan mesaĝon al iu"
 #. * (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:5028
+#: ../src/mail/e-mail-reader.c:5061
 msgid "Group Reply"
 msgstr "Gruprespondi"
 
-#: ../src/mail/e-mail-reader.c:5029
+#: ../src/mail/e-mail-reader.c:5062
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Respondi al dissendolisto, aŭ ĉiuj ricevantoj"
 
-#: ../src/mail/e-mail-reader.c:5095 ../src/mail/filtertypes.xml.in.h:67
+#: ../src/mail/e-mail-reader.c:5128 ../src/mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Forigi"
 
-#: ../src/mail/e-mail-reader.c:5107
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1297
+#: ../src/mail/e-mail-reader.c:5140
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1288
 msgid "Next"
 msgstr "Sekva"
 
-#: ../src/mail/e-mail-reader.c:5111
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1290
+#: ../src/mail/e-mail-reader.c:5144
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1281
 msgid "Previous"
 msgstr "Antaŭa"
 
-#: ../src/mail/e-mail-reader.c:5120 ../src/mail/mail-dialogs.ui.h:9
+#: ../src/mail/e-mail-reader.c:5153 ../src/mail/mail-dialogs.ui.h:9
 msgid "Reply"
 msgstr "Respondi"
 
-#: ../src/mail/e-mail-reader.c:6275
+#: ../src/mail/e-mail-reader.c:6308
 #, c-format
 msgid "Allow remote content for anyone from %s"
 msgstr "Permesi deforan enhavon por iu ajn el %s"
 
-#: ../src/mail/e-mail-reader.c:6277
+#: ../src/mail/e-mail-reader.c:6310
 #, c-format
 msgid "Allow remote content for %s"
 msgstr "Permesi deforan enhavon por %s"
 
-#: ../src/mail/e-mail-reader.c:6294
+#: ../src/mail/e-mail-reader.c:6327
 #, c-format
 msgid "Allow remote content from %s"
 msgstr "Permesi deforan enhavon el %s"
 
-#: ../src/mail/e-mail-reader.c:6311
+#: ../src/mail/e-mail-reader.c:6344
 msgid "Do not show this message again"
 msgstr "Ne plu montri ĉi tiun mesaĝon"
 
-#: ../src/mail/e-mail-reader.c:6363
+#: ../src/mail/e-mail-reader.c:6396
 msgid "Load remote content"
 msgstr "Ŝargi deforan enhavon"
 
@@ -16466,7 +16585,7 @@ msgstr "Atendante por ŝargado de aldonaĵoj..."
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../src/mail/em-composer-utils.c:2176
+#: ../src/mail/em-composer-utils.c:2027
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -16474,79 +16593,79 @@ msgstr ""
 "Je ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} je ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} skribis:"
 
-#: ../src/mail/em-composer-utils.c:2182
+#: ../src/mail/em-composer-utils.c:2033
 msgid "-------- Forwarded Message --------"
 msgstr "-------- plusendita mesaĝo --------"
 
-#: ../src/mail/em-composer-utils.c:2187
+#: ../src/mail/em-composer-utils.c:2038
 msgid "-----Original Message-----"
 msgstr "-----Origina mesaĝo-----"
 
 #. Translators: This is a reply attribution in the message reply subject. The %s is replaced with the 
subject of the original message. Both 'Re'-s in the 'reply-attribution' translation context should translate 
into the same string, the same as the ':' separator.
-#: ../src/mail/em-composer-utils.c:2919
+#: ../src/mail/em-composer-utils.c:2777
 #, c-format
 msgctxt "reply-attribution"
 msgid "Re: %s"
 msgstr "Re: %s"
 
-#: ../src/mail/em-composer-utils.c:3529
+#: ../src/mail/em-composer-utils.c:3387
 msgid "an unknown sender"
 msgstr "nekonata sendinto"
 
-#: ../src/mail/em-composer-utils.c:4173
+#: ../src/mail/em-composer-utils.c:4017
 msgid "Alternative Reply"
 msgstr "Alternative respondi"
 
-#: ../src/mail/em-composer-utils.c:4176
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../src/mail/em-composer-utils.c:4020
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "_Reply"
 msgstr "_Respondi"
 
-#: ../src/mail/em-composer-utils.c:4189
+#: ../src/mail/em-composer-utils.c:4033
 msgid "Recipients:"
 msgstr "Ricevantoj:"
 
-#: ../src/mail/em-composer-utils.c:4217
+#: ../src/mail/em-composer-utils.c:4061
 msgid "Reply to _Sender"
 msgstr "Respondi al _sendinto"
 
-#: ../src/mail/em-composer-utils.c:4239
+#: ../src/mail/em-composer-utils.c:4083
 msgid "Reply style:"
 msgstr "Responda stilo:"
 
-#: ../src/mail/em-composer-utils.c:4247
+#: ../src/mail/em-composer-utils.c:4091
 msgid "_Default"
 msgstr "_Implicita"
 
-#: ../src/mail/em-composer-utils.c:4251
+#: ../src/mail/em-composer-utils.c:4095
 msgid "Attach_ment"
 msgstr "Al_donaĵo"
 
-#: ../src/mail/em-composer-utils.c:4255
+#: ../src/mail/em-composer-utils.c:4099
 msgid "Inline (_Outlook style)"
 msgstr "Enteksta (_Outlook-stilo)"
 
-#: ../src/mail/em-composer-utils.c:4259
+#: ../src/mail/em-composer-utils.c:4103
 msgid "_Quote"
 msgstr "_Citi"
 
-#: ../src/mail/em-composer-utils.c:4263
+#: ../src/mail/em-composer-utils.c:4107
 msgid "Do _Not Quote"
 msgstr "_Ne citi"
 
-#: ../src/mail/em-composer-utils.c:4270
+#: ../src/mail/em-composer-utils.c:4114
 msgid "_Format message in HTML"
 msgstr "_Aranĝi mesaĝon kiel HTML"
 
-#: ../src/mail/em-composer-utils.c:4280
+#: ../src/mail/em-composer-utils.c:4124
 msgid "Apply t_emplate"
 msgstr "Apliki ŝablo_non"
 
-#: ../src/mail/em-composer-utils.c:4292
+#: ../src/mail/em-composer-utils.c:4136
 msgid "Preserve original message S_ubject"
 msgstr "_Teni originan mesaĝan temon"
 
-#: ../src/mail/em-composer-utils.c:4358
+#: ../src/mail/em-composer-utils.c:4202
 #, c-format
 msgid "one recipient"
 msgid_plural "%d recipients"
@@ -16554,19 +16673,18 @@ msgstr[0] "unu ricevanto"
 msgstr[1] "%d ricevantoj"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../src/mail/em-composer-utils.c:4776
+#: ../src/mail/em-composer-utils.c:4611
 msgid "Posting destination"
 msgstr "Poŝtcelo"
 
-#: ../src/mail/em-composer-utils.c:4781
+#: ../src/mail/em-composer-utils.c:4616
 msgid "Choose folders to post the message to."
-msgstr ""
+msgstr "Elekti dosierujojn al kiuj poŝti la mesaĝo."
 
 #: ../src/mail/em-filter-editor.c:43
-#, fuzzy
 #| msgid "Description List"
 msgid "Description of Filters"
-msgstr "Priskribolisto"
+msgstr "Priskribo de filtriloj"
 
 #. Translators: The first '%s' is replaced with the rule name;
 #. the second '%s' with 'enabled' or 'disabled' word;
@@ -16581,7 +16699,6 @@ msgid "enabled"
 msgstr "ŝaltita"
 
 #: ../src/mail/em-filter-editor.c:167 ../src/mail/em-filter-editor.c:171
-#| msgid "_Disable"
 msgid "disabled"
 msgstr "malŝaltita"
 
@@ -16631,108 +16748,127 @@ msgstr "_Por konto:"
 msgid "Add Ac_tion"
 msgstr "Aldoni _agon"
 
-#: ../src/mail/em-folder-properties.c:241
+#: ../src/mail/em-folder-properties.c:170
+#| msgid "Select a location"
+msgid "Select Custom Icon"
+msgstr "Elekti propran bildsimbolon"
+
+#: ../src/mail/em-folder-properties.c:219
+#| msgid "Use custom fonts"
+msgid "_Use custom icon"
+msgstr "_Uzi propran bildsimbolon"
+
+#: ../src/mail/em-folder-properties.c:312
+#| msgid "Unse_t Color"
+msgid "Use te_xt color"
+msgstr "Uzi _tekstkoloron"
+
+#: ../src/mail/em-folder-properties.c:494
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Nelegitaj mesaĝoj:"
 msgstr[1] "Nelegitaj mesaĝoj:"
 
-#: ../src/mail/em-folder-properties.c:252
+#: ../src/mail/em-folder-properties.c:505
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Totalaj mesaĝoj:"
 msgstr[1] "Totalaj mesaĝoj:"
 
-#: ../src/mail/em-folder-properties.c:273
+#: ../src/mail/em-folder-properties.c:526
 #, c-format
 msgid "Quota usage (%s):"
 msgstr ""
 
-#: ../src/mail/em-folder-properties.c:275
+#: ../src/mail/em-folder-properties.c:528
 #, 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
-#: ../src/mail/em-folder-properties.c:419
+#: ../src/mail/em-folder-properties.c:672
 msgid "_Send Account Override:"
 msgstr "_Sendkonta transpaso:"
 
-#: ../src/mail/em-folder-properties.c:626
+#: ../src/mail/em-folder-properties.c:912
 msgid "Archive this folder using these settings:"
 msgstr "Arĥivigi ĉi tiun dosierujon uzante ĉi tiujn agordojn:"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:638
+#: ../src/mail/em-folder-properties.c:924
 msgctxt "autoarchive"
 msgid "Auto-_cleanup messages older than"
 msgstr "Aŭtomate _purigi mesaĝojn pli malnovaj ol"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:651
+#: ../src/mail/em-folder-properties.c:937
 msgctxt "autoarchive"
 msgid "days"
 msgstr "tagoj"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:653
+#: ../src/mail/em-folder-properties.c:939
 msgctxt "autoarchive"
 msgid "weeks"
 msgstr "semajnoj"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:655
+#: ../src/mail/em-folder-properties.c:941
 msgctxt "autoarchive"
 msgid "months"
 msgstr "monatoj"
 
-#: ../src/mail/em-folder-properties.c:661
+#: ../src/mail/em-folder-properties.c:947
 msgid "Move messages to the default archive _folder"
 msgstr "Movi mesaĝojn al la implicita _arĥiv-dosierujo"
 
-#: ../src/mail/em-folder-properties.c:668
+#: ../src/mail/em-folder-properties.c:954
 msgid "_Move messages to:"
 msgstr "_Movi mesaĝojn al:"
 
-#: ../src/mail/em-folder-properties.c:672
+#: ../src/mail/em-folder-properties.c:958
 msgid "Archive folder"
 msgstr "Arĥiv-dosierujo"
 
-#: ../src/mail/em-folder-properties.c:672
+#: ../src/mail/em-folder-properties.c:958
 msgid "Select folder to use for Archive"
 msgstr "Elektu dosierujon, kiun vi volas uzi kiel arĥiv-dosierujo"
 
-#: ../src/mail/em-folder-properties.c:676
+#: ../src/mail/em-folder-properties.c:962
 msgid "_Delete messages"
 msgstr "_Forigi mesaĝojn"
 
-#: ../src/mail/em-folder-properties.c:1031
+#: ../src/mail/em-folder-properties.c:1317
 #, fuzzy
 #| msgid "Server"
 msgid "Server Tag"
 msgstr "Servilo"
 
-#: ../src/mail/em-folder-properties.c:1035 ../src/mail/filtertypes.xml.in.h:29
+#: ../src/mail/em-folder-properties.c:1321 ../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:1370
+msgid "Appearance"
+msgstr "Aspekto"
+
 #. Translators: "Archive" is a noun (This is a tab heading in the mail folder properties)
-#: ../src/mail/em-folder-properties.c:1087
+#: ../src/mail/em-folder-properties.c:1374
 msgid "Archive"
 msgstr "Arĥivo"
 
-#: ../src/mail/em-folder-properties.c:1090 ../src/mail/mail-config.ui.h:123
+#: ../src/mail/em-folder-properties.c:1377 ../src/mail/mail-config.ui.h:123
 #: ../src/mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Etikedoj"
 
-#: ../src/mail/em-folder-properties.c:1169
+#: ../src/mail/em-folder-properties.c:1455
 msgid "Folder Properties"
 msgstr "Dosierujo-ecoj"
 
-#: ../src/mail/em-folder-properties.c:1408
+#: ../src/mail/em-folder-properties.c:1694
 msgid "Gathering folder properties"
 msgstr ""
 
@@ -16772,43 +16908,43 @@ msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../src/mail/em-folder-tree.c:1731
+#: ../src/mail/em-folder-tree.c:1738
 msgid "Mail Folder Tree"
 msgstr ""
 
-#: ../src/mail/em-folder-tree.c:2280
+#: ../src/mail/em-folder-tree.c:2287
 #, c-format
 msgid "Moving folder %s"
 msgstr "Movi dosierujon %s"
 
-#: ../src/mail/em-folder-tree.c:2283
+#: ../src/mail/em-folder-tree.c:2290
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopii dosierujon %s"
 
-#: ../src/mail/em-folder-tree.c:2290 ../src/mail/message-list.c:2632
+#: ../src/mail/em-folder-tree.c:2297 ../src/mail/message-list.c:2634
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movante mesaĝojn al dosierujo %s"
 
-#: ../src/mail/em-folder-tree.c:2294 ../src/mail/message-list.c:2634
+#: ../src/mail/em-folder-tree.c:2301 ../src/mail/message-list.c:2636
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopiante mesaĝojn al dosierujo %s"
 
-#: ../src/mail/em-folder-tree.c:2313
+#: ../src/mail/em-folder-tree.c:2320
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
 #. UNMATCHED is always last.
-#: ../src/mail/em-folder-tree-model.c:445
-#: ../src/mail/em-folder-tree-model.c:447
+#: ../src/mail/em-folder-tree-model.c:457
+#: ../src/mail/em-folder-tree-model.c:459
 msgid "UNMATCHED"
 msgstr ""
 
-#: ../src/mail/em-folder-tree-model.c:1326
-#: ../src/mail/em-folder-tree-model.c:1703
+#: ../src/mail/em-folder-tree-model.c:1547
+#: ../src/mail/em-folder-tree-model.c:1924
 msgid "Loading..."
 msgstr "Ŝargante..."
 
@@ -16840,33 +16976,33 @@ msgstr "Movi dosierujon al"
 msgid "Copy Folder To"
 msgstr "Kopii dosierujon al"
 
-#: ../src/mail/em-subscription-editor.c:813
+#: ../src/mail/em-subscription-editor.c:814
 msgid "_Subscribe"
 msgstr "_Aboni"
 
-#: ../src/mail/em-subscription-editor.c:822
+#: ../src/mail/em-subscription-editor.c:823
 msgid "Su_bscribe To Shown"
 msgstr "A_boni montratajn"
 
-#: ../src/mail/em-subscription-editor.c:830
+#: ../src/mail/em-subscription-editor.c:831
 msgid "Subscribe To _All"
 msgstr "Aboni ĉ_iujn"
 
-#: ../src/mail/em-subscription-editor.c:936
-#: ../src/mail/em-subscription-editor.c:1888 ../src/mail/mail.error.xml.h:73
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1660
+#: ../src/mail/em-subscription-editor.c:937
+#: ../src/mail/em-subscription-editor.c:1891 ../src/mail/mail.error.xml.h:73
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1706
 msgid "_Unsubscribe"
 msgstr "_Malaboni"
 
-#: ../src/mail/em-subscription-editor.c:945
+#: ../src/mail/em-subscription-editor.c:946
 msgid "Unsu_bscribe From Hidden"
 msgstr "Mala_boni kaŝitajn"
 
-#: ../src/mail/em-subscription-editor.c:953
+#: ../src/mail/em-subscription-editor.c:954
 msgid "Unsubscribe From _All"
 msgstr "Malaboni ĉ_iujn"
 
-#: ../src/mail/em-subscription-editor.c:1313
+#: ../src/mail/em-subscription-editor.c:1316
 #: ../src/modules/mail/e-mail-shell-view-private.c:933
 #: ../src/modules/mail/e-mail-shell-view-private.c:965
 #: ../src/modules/mail/e-mail-shell-view-private.c:1009
@@ -16876,7 +17012,7 @@ msgid_plural "%d unread, "
 msgstr[0] "%d nelegita, "
 msgstr[1] "%d nelegitaj, "
 
-#: ../src/mail/em-subscription-editor.c:1317
+#: ../src/mail/em-subscription-editor.c:1320
 #: ../src/modules/mail/e-mail-shell-view-private.c:1019
 #, c-format
 msgid "%d total"
@@ -16884,60 +17020,60 @@ msgid_plural "%d total"
 msgstr[0] "%d totala"
 msgstr[1] "%d totalaj"
 
-#: ../src/mail/em-subscription-editor.c:1729
+#: ../src/mail/em-subscription-editor.c:1732
 msgid "Folder Subscriptions"
 msgstr "Dosierujaj abonoj"
 
-#: ../src/mail/em-subscription-editor.c:1764
+#: ../src/mail/em-subscription-editor.c:1767
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../src/mail/em-subscription-editor.c:1777
+#: ../src/mail/em-subscription-editor.c:1780
 msgid "Clear Search"
 msgstr "Vakigi serĉon"
 
-#: ../src/mail/em-subscription-editor.c:1794
+#: ../src/mail/em-subscription-editor.c:1797
 msgid "Sho_w items that contain:"
 msgstr "_Montri erojn kiuj entenas:"
 
-#: ../src/mail/em-subscription-editor.c:1841
+#: ../src/mail/em-subscription-editor.c:1844
 msgid "Subscribe to the selected folder"
 msgstr "Aboni la elektitan dosierujon"
 
-#: ../src/mail/em-subscription-editor.c:1842
+#: ../src/mail/em-subscription-editor.c:1845
 msgid "Su_bscribe"
 msgstr "_Aboni"
 
-#: ../src/mail/em-subscription-editor.c:1887
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1662
+#: ../src/mail/em-subscription-editor.c:1890
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1708
 msgid "Unsubscribe from the selected folder"
 msgstr "Malaboni de la elektita dosierujo"
 
-#: ../src/mail/em-subscription-editor.c:1927
+#: ../src/mail/em-subscription-editor.c:1930
 msgid "Collapse all folders"
 msgstr "Maletendi ĉiujn dosierujon"
 
-#: ../src/mail/em-subscription-editor.c:1928
+#: ../src/mail/em-subscription-editor.c:1931
 msgid "C_ollapse All"
 msgstr "_Maletendi ĉiujn"
 
-#: ../src/mail/em-subscription-editor.c:1938
+#: ../src/mail/em-subscription-editor.c:1941
 msgid "Expand all folders"
 msgstr "Maletendi ĉiujn dosierujon"
 
-#: ../src/mail/em-subscription-editor.c:1939
+#: ../src/mail/em-subscription-editor.c:1942
 msgid "E_xpand All"
 msgstr "_Etendi ĉiujn"
 
-#: ../src/mail/em-subscription-editor.c:1949
+#: ../src/mail/em-subscription-editor.c:1952
 msgid "Refresh the folder list"
 msgstr "Aktualigi la dosierujoliston"
 
-#: ../src/mail/em-subscription-editor.c:1961
+#: ../src/mail/em-subscription-editor.c:1964
 msgid "Stop the current operation"
 msgstr "Haltigi la aktualan agon"
 
-#: ../src/mail/em-subscription-editor.c:1962
+#: ../src/mail/em-subscription-editor.c:1965
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1085
 msgid "_Stop"
 msgstr "_Haltigi"
@@ -17178,12 +17314,12 @@ msgstr ""
 #: ../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 ""
+msgstr "estas flagita"
 
 #: ../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 ""
+msgstr "ne estas flagita"
 
 #: ../src/mail/filtertypes.xml.in.h:45 ../src/mail/searchtypes.xml.in.h:47
 #: ../src/mail/vfoldertypes.xml.in.h:48
@@ -18188,7 +18324,7 @@ msgstr ""
 "Ĉu vi certe volas daŭre forigi ĉiujn forigitaj mesaĝoj en ĉiuj dosierujoj?"
 
 #: ../src/mail/mail.error.xml.h:42
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1540
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1579
 msgid "_Empty Trash"
 msgstr "_Malplenigi rubujon"
 
@@ -18606,10 +18742,9 @@ msgid "In Current _Folder Only"
 msgstr "Nur en nuna _dosierujo"
 
 #: ../src/mail/mail.error.xml.h:141
-#, fuzzy
 #| msgid "In Current _Folder Only"
 msgid "_Always In Current Folder Only"
-msgstr "Nur en nuna _dosierujo"
+msgstr "Ĉ_iam nur en nuna dosierujo"
 
 #: ../src/mail/mail.error.xml.h:142
 msgid "Should Evolution close this window when replying or forwarding?"
@@ -18938,7 +19073,7 @@ msgstr "Malfermi elirkestan dosierujon"
 
 #: ../src/mail/mail-send-recv.c:768
 msgid "Send & Receive Mail"
-msgstr "Sendi & ricevji retpoŝton"
+msgstr "Sendi & ricevi retpoŝton"
 
 #: ../src/mail/mail-send-recv.c:782
 msgid "Cancel _All"
@@ -18985,88 +19120,88 @@ msgstr "Redakti serĉdosierujo"
 msgid "New Search Folder"
 msgstr "Nova serĉdosierujo"
 
-#: ../src/mail/message-list.c:306
+#: ../src/mail/message-list.c:308
 msgid "Unseen"
 msgstr "Nevidita"
 
-#: ../src/mail/message-list.c:307
+#: ../src/mail/message-list.c:309
 msgid "Seen"
 msgstr "Vidita"
 
-#: ../src/mail/message-list.c:308
+#: ../src/mail/message-list.c:310
 msgid "Answered"
 msgstr "Respondita"
 
-#: ../src/mail/message-list.c:309
+#: ../src/mail/message-list.c:311
 msgid "Forwarded"
 msgstr "Plusendita"
 
-#: ../src/mail/message-list.c:310
+#: ../src/mail/message-list.c:312
 msgid "Multiple Unseen Messages"
 msgstr "Multaj neviditaj mesaĝoj"
 
-#: ../src/mail/message-list.c:311
+#: ../src/mail/message-list.c:313
 msgid "Multiple Messages"
 msgstr "Multaj mesaĝoj"
 
-#: ../src/mail/message-list.c:324
+#: ../src/mail/message-list.c:326
 msgid "Lowest"
 msgstr "Plej malalta"
 
-#: ../src/mail/message-list.c:325
+#: ../src/mail/message-list.c:327
 msgid "Lower"
 msgstr "Pli malalta"
 
-#: ../src/mail/message-list.c:329
+#: ../src/mail/message-list.c:331
 msgid "Higher"
 msgstr "Pli alta"
 
-#: ../src/mail/message-list.c:330
+#: ../src/mail/message-list.c:332
 msgid "Highest"
 msgstr "Plej alta"
 
-#: ../src/mail/message-list.c:479 ../src/mail/message-list.c:6690
+#: ../src/mail/message-list.c:481 ../src/mail/message-list.c:6738
 msgid "Generating message list"
 msgstr "Generante mesaĝan liston"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/mail/message-list.c:2154
+#: ../src/mail/message-list.c:2156
 #: ../src/modules/itip-formatter/itip-view.c:269
 msgid "Today %l:%M %p"
 msgstr "Hodiaŭ %l:%M %p"
 
-#: ../src/mail/message-list.c:2163
+#: ../src/mail/message-list.c:2165
 msgid "Yesterday %l:%M %p"
 msgstr "Hieraŭ %l:%M %p"
 
-#: ../src/mail/message-list.c:2175
+#: ../src/mail/message-list.c:2177
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../src/mail/message-list.c:2183
+#: ../src/mail/message-list.c:2185
 msgid "%b %d %l:%M %p"
 msgstr "%-d-a de %b %l:%M %p"
 
-#: ../src/mail/message-list.c:2185
+#: ../src/mail/message-list.c:2187
 msgid "%b %d %Y"
 msgstr "%d-a de %b %Y"
 
-#: ../src/mail/message-list.c:3265
+#: ../src/mail/message-list.c:3267
 msgid "Select all visible messages"
 msgstr "Elekti ĉiujn videblajn mesaĝojn"
 
-#: ../src/mail/message-list.c:4010 ../src/mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:4012 ../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
-#: ../src/mail/message-list.c:5559
+#: ../src/mail/message-list.c:5581
 msgid "Follow-up"
 msgstr ""
 
 # Ne tradukis tute, ĉar la frazo jam ege longas. --Carmen
-#: ../src/mail/message-list.c:6629
+#: ../src/mail/message-list.c:6651
 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 "
@@ -19077,9 +19212,9 @@ msgstr ""
 "elektante novan “Montri”-mesaĝfiltrilon el la supra fallisto aŭ per provante "
 "novan serĉon."
 
-#: ../src/mail/message-list.c:6637
+#: ../src/mail/message-list.c:6659
 msgid "There are no messages in this folder."
-msgstr "Estas neniun mesaĝoj en ĉi tiu dosierujo."
+msgstr "Estas neniu mesaĝo en ĉi tiu dosierujo."
 
 #: ../src/mail/message-list.etspec.h:2
 msgid "Flagged"
@@ -19131,32 +19266,32 @@ msgid "Subject or Addresses contains"
 msgstr "Temo aŭ adresoj enhavas"
 
 #: ../src/mail/searchtypes.xml.in.h:58
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2065
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2111
 msgid "Recipients contain"
 msgstr "Ricevantoj enhavas"
 
 #: ../src/mail/searchtypes.xml.in.h:59
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2058
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2104
 msgid "Message contains"
 msgstr "Mesaĝo enhavas"
 
 #: ../src/mail/searchtypes.xml.in.h:60
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2079
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2125
 msgid "Subject contains"
 msgstr "Temo enhavas"
 
 #: ../src/mail/searchtypes.xml.in.h:61
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2072
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2118
 msgid "Sender contains"
 msgstr "Sendinto enhavas"
 
 #: ../src/mail/searchtypes.xml.in.h:62
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2044
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2090
 msgid "Body contains"
 msgstr "Korpo enhavas"
 
 #: ../src/mail/searchtypes.xml.in.h:63
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2051
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2097
 msgid "Free form expression"
 msgstr "Libera esprimo"
 
@@ -19365,7 +19500,7 @@ msgid "Show properties of the selected address book"
 msgstr "Montri ecojn de la elektita adresaro"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1057
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1346
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1337
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:628
 #: ../src/modules/calendar/e-task-shell-view-actions.c:754
 msgid "Re_fresh"
@@ -19388,10 +19523,10 @@ msgid "Show map with all contacts from selected address book"
 msgstr "Montri mapon kun ĉiuj kontaktoj de la elektita adresaro"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1078
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1360
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1351
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:642
 #: ../src/modules/calendar/e-task-shell-view-actions.c:768
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1639
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1685
 msgid "_Rename..."
 msgstr "_Alinomi..."
 
@@ -19464,7 +19599,7 @@ msgid "Send a message to the selected contacts"
 msgstr "Sendi mesaĝon al la elektitaj kontaktoj"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1157
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1530
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1521
 #: ../src/modules/calendar/e-task-shell-view-actions.c:833
 msgid "_Actions"
 msgstr "_Agoj"
@@ -19472,12 +19607,12 @@ msgstr "_Agoj"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1164
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:686
 #: ../src/modules/calendar/e-task-shell-view-actions.c:840
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1788
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1834
 msgid "_Preview"
 msgstr "_Antaŭrigardi"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1177
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1550
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:703
 #: ../src/modules/calendar/e-task-shell-view-actions.c:857
 msgid "_Manage groups..."
@@ -19506,7 +19641,7 @@ msgstr "Montri mapojn en kontaktajn antaŭrigardan fenestron"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1254
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:768
 #: ../src/modules/calendar/e-task-shell-view-actions.c:934
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1946
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1992
 msgid "_Classic View"
 msgstr "_Klasika vido"
 
@@ -19517,7 +19652,7 @@ msgstr "Montri kontaktan antaŭrigardon sub la kontaktolisto"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1261
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:775
 #: ../src/modules/calendar/e-task-shell-view-actions.c:941
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1953
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1999
 msgid "_Vertical View"
 msgstr "_Vertikala vido"
 
@@ -19526,17 +19661,17 @@ msgid "Show contact preview alongside the contact list"
 msgstr "Montri kontaktan antaŭrigardon flanke de la kontaktolisto"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1278
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1723
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1714
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:792
 #: ../src/modules/calendar/e-task-shell-view-actions.c:1000
 msgid "Unmatched"
 msgstr "Nekongrua"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1288
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1733
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1724
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:802
 #: ../src/modules/calendar/e-task-shell-view-actions.c:1010
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2037
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2083
 #: ../src/shell/e-shell-content.c:639
 msgid "Advanced Search"
 msgstr "Detala sercô"
@@ -20225,41 +20360,47 @@ msgstr "Memolist-elektilo"
 msgid "Task List Selector"
 msgstr "Tasklist-elektilo"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:524
+#: ../src/modules/calendar/e-calendar-preferences.c:522
 msgid "Selected Calendars for Notifications of Reminders"
 msgstr "Elektitaj kalendaroj por sciigoj de memorigiloj"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:531
+#: ../src/modules/calendar/e-calendar-preferences.c:529
 msgid "Selected Memo Lists for Notifications of Reminders"
 msgstr "Elektitaj notolistoj por sciigoj de memorigiloj"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:538
+#: ../src/modules/calendar/e-calendar-preferences.c:536
 msgid "Selected Task Lists for Notifications of Reminders"
 msgstr "Elektitaj taskolistoj por sciigoj de memorigiloj"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:634
+#: ../src/modules/calendar/e-calendar-preferences.c:620
 msgid "Meeting Invitations"
 msgstr "Kunsid-invitoj"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:660
+#: ../src/modules/calendar/e-calendar-preferences.c:646
 msgid "_Delete message after acting"
 msgstr "_Forigi mesaĝon post ago"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:674
-#: ../src/modules/calendar/e-calendar-preferences.c:705
+#: ../src/modules/calendar/e-calendar-preferences.c:653
+#, fuzzy
+#| msgid "_Preserve my reminder"
+msgid "_Preserve existing reminder by default"
+msgstr "_Konservi mian memorigilon"
+
+#: ../src/modules/calendar/e-calendar-preferences.c:667
+#: ../src/modules/calendar/e-calendar-preferences.c:698
 msgid "Conflict Search"
 msgstr "Serĉo de malakordoj"
 
 #. Source selector
-#: ../src/modules/calendar/e-calendar-preferences.c:689
+#: ../src/modules/calendar/e-calendar-preferences.c:682
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Elekti kalendarojn, kiujn oni serĉos por kunsidaj malakordoj"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1129
+#: ../src/modules/calendar/e-calendar-preferences.c:1122
 msgid "Ti_me and date:"
 msgstr "T_empo kaj dato:"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1130
+#: ../src/modules/calendar/e-calendar-preferences.c:1123
 msgid "_Date only:"
 msgstr "Nur _dato:"
 
@@ -20324,7 +20465,7 @@ msgid "_24 hour"
 msgstr "_24 hore"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:18
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1685
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1676
 msgid "Work Week"
 msgstr "Laborsemajno"
 
@@ -20493,7 +20634,9 @@ msgid "Show Tasks without _Due date"
 msgstr "Montri taskojn sen lim_daton"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:73
-msgid "Display reminders in _notification area only"
+#, fuzzy
+#| msgid "Display reminders in _notification area only"
+msgid "Display Reminders window with _notifications"
 msgstr "Montri memorigilojn nur en la _sciiga areo"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:74
@@ -20552,45 +20695,45 @@ msgstr ""
 msgid "Publishing Information"
 msgstr "Publikiga informo"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:115
+#: ../src/modules/calendar/e-cal-shell-backend.c:118
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Rendevuo"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:117
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1474
+#: ../src/modules/calendar/e-cal-shell-backend.c:120
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1465
 msgid "Create a new appointment"
 msgstr "Krei novan rendevuon"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:122
+#: ../src/modules/calendar/e-cal-shell-backend.c:125
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Tuttaga _rendevuo"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:124
+#: ../src/modules/calendar/e-cal-shell-backend.c:127
 msgid "Create a new all-day appointment"
 msgstr "Krei novan tuttagan rendevuon"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:129
+#: ../src/modules/calendar/e-cal-shell-backend.c:132
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Kunsido"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:131
+#: ../src/modules/calendar/e-cal-shell-backend.c:134
 msgid "Create a new meeting request"
 msgstr "Krei novan kunsidpeton"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:139
+#: ../src/modules/calendar/e-cal-shell-backend.c:142
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_ndaro"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:141
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1327
+#: ../src/modules/calendar/e-cal-shell-backend.c:144
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1318
 msgid "Create a new calendar"
 msgstr "Krei novan kalendaron"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:258
+#: ../src/modules/calendar/e-cal-shell-backend.c:261
 msgid "Calendar and Tasks"
 msgstr "Kalendaro kaj taskoj"
 
@@ -20613,17 +20756,17 @@ msgstr ""
 msgid "Purge events older than"
 msgstr "Senrubigi eventojn pli malnovaj ol"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:940
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:931
 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.
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1140
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1131
 msgid "event"
 msgstr "evento"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1142
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1133
 #: ../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:512
@@ -20631,154 +20774,154 @@ msgstr "evento"
 msgid "Save as iCalendar"
 msgstr "Konservi kiel iCalendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1276
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1267
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:593
 #: ../src/modules/calendar/e-task-shell-view-actions.c:719
 msgid "_Copy..."
 msgstr "_Kopii..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1283
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1274
 msgid "D_elete Calendar"
 msgstr "_Forigi kalendaron"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1285
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1276
 msgid "Delete the selected calendar"
 msgstr "Forigi la elektitan kalendaron"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1283
 msgid "Go Back"
 msgstr "Reen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1290
 msgid "Go Forward"
 msgstr "Antaŭen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1297
 msgid "Select today"
 msgstr "Elekti hodiaŭ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1311
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1302
 msgid "Select _Date"
 msgstr "Elekti _daton"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1304
 msgid "Select a specific date"
 msgstr "Elekti specifan daton"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1318
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1309
 msgid "_Manage Calendar groups..."
 msgstr "_Mastrumi kalendargrupojn..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1311
 msgid "Manage Calendar groups order and visibility"
 msgstr "Mastrumi kalendaran grupordon kaj videblecon"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1316
 msgid "_New Calendar"
 msgstr "_Nova kalendaro"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1339
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1330
 #: ../src/modules/calendar/e-task-shell-view-actions.c:824
 msgid "Purg_e"
 msgstr "S_enrubigi"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1341
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1332
 msgid "Purge old appointments and meetings"
 msgstr "Senrubigi malnovajn rendevuojn kaj kunsidojn"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1339
 msgid "Refresh the selected calendar"
 msgstr "Aktualigi la elektitan kalendaron"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1353
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1344
 msgid "Re_fresh list of account calendars"
 msgstr "A_ktualigi liston de kontaj kalendaroj"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1353
 msgid "Rename the selected calendar"
 msgstr "Alinomi la elektitan kalendaron"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1358
 msgid "Find _Next"
 msgstr "Serĉi _sekvan"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1369
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1360
 msgid "Find next occurrence of the current search string"
 msgstr "Serĉi sekvan okazon de la nuna serĉĉeno"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1365
 msgid "Find _Previous"
 msgstr "Serĉi _antaŭan"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1376
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1367
 msgid "Find previous occurrence of the current search string"
 msgstr "Serĉi antaŭan okazon de la nuna serĉĉeno"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1381
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1372
 msgid "Stop _Running Search"
 msgstr "Haltigi _plenumado de serĉo"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1383
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1374
 msgid "Stop currently running search"
 msgstr "Haltigi nunan serĉon"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1388
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Sho_w All Calendars"
 msgstr "_Montri ĉiujn kalendarojn"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "Show _Only This Calendar"
 msgstr "Montri _nur ĉi tiun kalendaron"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1402
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "Cop_y to Calendar..."
 msgstr "Kopi_i al kalendaro..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "_Delegate Meeting..."
 msgstr "_Delegi kunsidon..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1416
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "_Delete Appointment"
 msgstr "_Forigi rendevuon"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1418
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1409
 msgid "Delete selected appointments"
 msgstr "Forigi elektitajn rendevuojn"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1414
 msgid "Delete This _Occurrence"
 msgstr "Forigi tiun _okazon"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1416
 msgid "Delete this occurrence"
 msgstr "Forigi tiun okazon"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1430
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1421
 msgid "Delete All Occ_urrences"
 msgstr "Forigi ĉi_ujn okazojn"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1432
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1423
 msgid "Delete all occurrences"
 msgstr "Forigi ĉiujn okazojn"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1428
 msgid "Edit as Ne_w..."
 msgstr "R_edakti kiel nova..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1439
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1430
 msgid "Edit the current appointment as new"
 msgstr "Redakti la nunan rendevuon kiel nova"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1444
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1435
 msgid "New All Day _Event..."
 msgstr "Nova tuttaga _evento..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1446
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1437
 msgid "Create a new all day event"
 msgstr "Kreii novan tuttagan eventon"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1442
 #: ../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:586
@@ -20786,108 +20929,108 @@ msgstr "Kreii novan tuttagan eventon"
 msgid "_Forward as iCalendar..."
 msgstr "_Plusendi kiel iCalendar..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1460
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1451
 msgid "Create a new meeting"
 msgstr "Kreii novan kunsidon"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1465
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_vi al kalendaro..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1470
 msgid "Make this Occurrence _Movable"
 msgstr "Igi tiun okazon _movebla"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1477
 msgid "_Open Appointment"
 msgstr "_Malfermi rendevuon"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1488
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1479
 msgid "View the current appointment"
 msgstr "Montri la aktualan rendevuon"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1507
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1498
 msgid "_Schedule Meeting..."
 msgstr "_Tempoplani kunsidon..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1509
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1500
 msgid "Converts an appointment to a meeting"
 msgstr "Ŝanĝas rendevuon al kunsido"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1514
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1505
 msgid "Conv_ert to Appointment..."
 msgstr "Ŝanĝi al r_endevuo..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1516
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1507
 msgid "Converts a meeting to an appointment"
 msgstr "Ŝanĝas kunsidon al rendevuo"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1521
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1512
 msgid "Quit"
 msgstr "Ĉesi"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1657
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1648
 msgid "Day"
 msgstr "Tago"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1650
 msgid "Show one day"
 msgstr "Montri unu tagon"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1664
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1655
 msgid "List"
 msgstr "Listo"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1666
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1657
 msgid "Show as list"
 msgstr "Montri kiel listo"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1671
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1662
 msgid "Month"
 msgstr "Monato"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1673
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1664
 msgid "Show one month"
 msgstr "Montri unu monaton"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1678
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1669
 msgid "Week"
 msgstr "Semajno"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1680
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1671
 msgid "Show one week"
 msgstr "Montri unu semajnon"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1678
 msgid "Show one work week"
 msgstr "Montri unu laborsemajnon"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1686
 msgid "Active Appointments"
 msgstr "Aktivaj rendevuoj"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1709
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1700
 msgid "Next 7 Days’ Appointments"
 msgstr "Rendevuoj dum la sekvaj 7 tagoj"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1716
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1707
 msgid "Occurs Less Than 5 Times"
 msgstr "Okazas malpli ol 5 fojoj"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1747
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1738
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:816
 #: ../src/modules/calendar/e-task-shell-view-actions.c:1024
 msgid "Description contains"
 msgstr "Priskripo enhavas"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1754
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1745
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:823
 #: ../src/modules/calendar/e-task-shell-view-actions.c:1031
 msgid "Summary contains"
 msgstr "Resumo enhavas"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1764
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1778
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1755
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1769
 #: ../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:833
@@ -20897,15 +21040,15 @@ msgstr "Resumo enhavas"
 msgid "Print..."
 msgstr "Presi..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1766
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1757
 msgid "Print this calendar"
 msgstr "Presi tiun kalendaron"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1773
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1764
 msgid "Preview the calendar to be printed"
 msgstr "Presenda antaŭrigardo de la kalendaro"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1795
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1786
 #: ../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:864
@@ -20913,7 +21056,7 @@ msgstr "Presenda antaŭrigardo de la kalendaro"
 msgid "_Save as iCalendar..."
 msgstr "_Konservi kiel iCalendar..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1872
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1863
 msgid "Go To"
 msgstr "Iri al"
 
@@ -21398,7 +21541,7 @@ msgstr "LDAP-servilo"
 msgid "Looking up LDAP server…"
 msgstr "Serĉante LDAP-servilon…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:240
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:242
 msgid "Look up in SRV records"
 msgstr "Serĉante en SRC-rikordoj"
 
@@ -21892,21 +22035,33 @@ msgstr "_Taskoj:"
 msgid "_Memos:"
 msgstr "_Notoj:"
 
-#: ../src/modules/itip-formatter/itip-view.c:3139
+#: ../src/modules/itip-formatter/itip-view.c:3150
 msgid "Sa_ve"
 msgstr "Kons_ervi"
 
-#: ../src/modules/itip-formatter/itip-view.c:3661
-#: ../src/modules/itip-formatter/itip-view.c:5227
+#: ../src/modules/itip-formatter/itip-view.c:3672
+#: ../src/modules/itip-formatter/itip-view.c:5395
 msgid "Attendee status updated"
 msgstr "Alestanta stato ĝisdatigita"
 
-#: ../src/modules/itip-formatter/itip-view.c:3876
+#: ../src/modules/itip-formatter/itip-view.c:3890
 #, c-format
 msgid "An appointment “%s” in the calendar “%s” conflicts with this meeting"
 msgstr "Rendevuo “%s” en la kalendaro “%s” malkongruas kun ĉi tiu kunsido"
 
-#: ../src/modules/itip-formatter/itip-view.c:3882
+#: ../src/modules/itip-formatter/itip-view.c:3897
+#, c-format
+#| msgid "An appointment “%s” in the calendar “%s” conflicts with this meeting"
+msgid "A task “%s” in the task list “%s” conflicts with this task"
+msgstr "Tasko “%s” en la taskolisto “%s” malkongruas kun ĉi tiu tasko"
+
+#: ../src/modules/itip-formatter/itip-view.c:3904
+#, c-format
+#| msgid "An appointment “%s” in the calendar “%s” conflicts with this meeting"
+msgid "A memo “%s” in the memo list “%s” conflicts with this memo"
+msgstr "Noto “%s” en la notolisto “%s” malkongruas kun ĉi tiu noto"
+
+#: ../src/modules/itip-formatter/itip-view.c:3915
 #, c-format
 msgid ""
 "The calendar “%s” contains an appointment which conflicts with this meeting"
@@ -21917,145 +22072,267 @@ msgstr[0] ""
 msgstr[1] ""
 "La kalendaro “%s” enhavas %d rendevuojn, kiuj malkongruas kun ĉi tiu kunsido"
 
-#: ../src/modules/itip-formatter/itip-view.c:3915
+#: ../src/modules/itip-formatter/itip-view.c:3924
+#, c-format
+#| 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"
+msgid "The task list “%s” contains a task which conflicts with this task"
+msgid_plural ""
+"The task list “%s” contains %d tasks which conflict with this task"
+msgstr[0] "La taskolisto “%s” enhavas taskon, kiu malkongruas kun ĉi tiu tasko"
+msgstr[1] ""
+"La taskolisto “%s” enhavas %d taskojn, kiuj malkongruas kun ĉi tiu tasko"
+
+#: ../src/modules/itip-formatter/itip-view.c:3933
+#, c-format
+#| 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"
+msgid "The memo list “%s” contains a memo which conflicts with this memo"
+msgid_plural ""
+"The memo list “%s” contains %d memos which conflict with this memo"
+msgstr[0] "La notolisto “%s” enhavas noton, kiu malkongruas kun ĉi tiu noto"
+msgstr[1] ""
+"La notolisto “%s” enhavas %d notojn, kiuj malkongruas kun ĉi tiu noto"
+
+#: ../src/modules/itip-formatter/itip-view.c:3971
 #, c-format
 msgid "Found the appointment in the calendar “%s”"
 msgstr "Trovis rendevuon en la kalendaro “%s”"
 
-#: ../src/modules/itip-formatter/itip-view.c:3924
+#: ../src/modules/itip-formatter/itip-view.c:3976
+#, c-format
+#| msgid "Moving a task into the task list “%s”"
+msgid "Found the task in the task list “%s”"
+msgstr "Trovis la taskon en la taskolist “%s”"
+
+#: ../src/modules/itip-formatter/itip-view.c:3981
+#, c-format
+#| msgid "Moving a memo into the memo list “%s”"
+msgid "Found the memo in the memo list “%s”"
+msgstr "Trovis la noton en la notolisto “%s”"
+
+#: ../src/modules/itip-formatter/itip-view.c:3992
 msgid "This meeting invitation is obsolete. It had been updated."
 msgstr "Ĉi tiu kunsidinvito estas ekstempa. Ĝi ĝisdatiĝis."
 
-#: ../src/modules/itip-formatter/itip-view.c:4066
+#: ../src/modules/itip-formatter/itip-view.c:4134
 msgid "Unable to find any calendars"
 msgstr "Ne eblas trovi iujn ajn kalendarojn"
 
-#: ../src/modules/itip-formatter/itip-view.c:4074
+#: ../src/modules/itip-formatter/itip-view.c:4142
 msgid "Unable to find this meeting in any calendar"
 msgstr "Ne eblas trovi ĉi tiun kunsidon en iu ajn kalendaro"
 
-#: ../src/modules/itip-formatter/itip-view.c:4079
+#: ../src/modules/itip-formatter/itip-view.c:4147
 msgid "Unable to find this task in any task list"
 msgstr "Ne eblas trovi ĉi tiun taskon en iu ajn taskolisto"
 
-#: ../src/modules/itip-formatter/itip-view.c:4084
+#: ../src/modules/itip-formatter/itip-view.c:4152
 msgid "Unable to find this memo in any memo list"
 msgstr "Ne eblas trovi ĉi tiun noton en iu ajn notolisto"
 
-#: ../src/modules/itip-formatter/itip-view.c:4425
+#: ../src/modules/itip-formatter/itip-view.c:4431
+msgid "Searching for an existing version of this appointment"
+msgstr "Serĉante jam-ekzistan version de ĉi tiu rendevuo"
+
+#: ../src/modules/itip-formatter/itip-view.c:4435
+#| msgid "Searching for an existing version of this appointment"
+msgid "Searching for an existing version of this task"
+msgstr "Serĉante jam-ekzistan version de ĉi tiu tasko"
+
+#: ../src/modules/itip-formatter/itip-view.c:4439
+#| msgid "Searching for an existing version of this appointment"
+msgid "Searching for an existing version of this memo"
+msgstr "Serĉante jam-ekzistan version de ĉi tiu noto"
+
+#: ../src/modules/itip-formatter/itip-view.c:4497
 msgid "Opening the calendar. Please wait..."
 msgstr "Malfermante la kalendaron. Bonvolu atendi..."
 
-#: ../src/modules/itip-formatter/itip-view.c:4430
-msgid "Searching for an existing version of this appointment"
-msgstr "Serĉante jam-ekzistan version de ĉi tiu rendevuo"
+#: ../src/modules/itip-formatter/itip-view.c:4913
+#, c-format
+#| msgid "Unable to send item to calendar “%s”.  %s"
+msgid "Unable to send item to calendar “%s”. %s"
+msgstr "Ne eblas sendi eron al kalendaro “%s”. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4838
+#: ../src/modules/itip-formatter/itip-view.c:4921
 #, c-format
-msgid "Unable to send item to calendar “%s”.  %s"
-msgstr "Ne eblas sendi eron al kalendaro “%s”.  %s"
+#| msgid "Unable to send item to calendar “%s”.  %s"
+msgid "Unable to send item to task list “%s”. %s"
+msgstr "Ne eblas sendi eron al taskolisto “%s”. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4853
+#: ../src/modules/itip-formatter/itip-view.c:4929
+#, c-format
+#| msgid "Unable to send item to calendar “%s”.  %s"
+msgid "Unable to send item to memo list “%s”. %s"
+msgstr "Ne eblas sendi eron al notolisto “%s”. %s"
+
+#: ../src/modules/itip-formatter/itip-view.c:4949
 #, c-format
 msgid "Sent to calendar “%s” as accepted"
 msgstr "Sendita al kalendaro “%s” kiel akceptita"
 
-#: ../src/modules/itip-formatter/itip-view.c:4858
+#: ../src/modules/itip-formatter/itip-view.c:4954
+#, c-format
+#| msgid "Sent to calendar “%s” as accepted"
+msgid "Sent to task list “%s” as accepted"
+msgstr "Sendita al taskolisto “%s” kiel akceptita"
+
+#: ../src/modules/itip-formatter/itip-view.c:4959
+#, c-format
+#| msgid "Sent to calendar “%s” as accepted"
+msgid "Sent to memo list “%s” as accepted"
+msgstr "Sendita al notolisto “%s” kiel akceptita"
+
+#: ../src/modules/itip-formatter/itip-view.c:4969
 #, c-format
 msgid "Sent to calendar “%s” as tentative"
 msgstr "Sendita al kalendaro “%s” kiel provizora"
 
-#: ../src/modules/itip-formatter/itip-view.c:4864
+#: ../src/modules/itip-formatter/itip-view.c:4974
+#, c-format
+#| msgid "Sent to calendar “%s” as tentative"
+msgid "Sent to task list “%s” as tentative"
+msgstr "Sendita al taskolisto “%s” kiel provizora"
+
+#: ../src/modules/itip-formatter/itip-view.c:4979
+#, c-format
+#| msgid "Sent to calendar “%s” as tentative"
+msgid "Sent to memo list “%s” as tentative"
+msgstr "Sendita al notolisto “%s” kiel provizora"
+
+#: ../src/modules/itip-formatter/itip-view.c:4989
 #, c-format
 msgid "Sent to calendar “%s” as declined"
 msgstr "Sendita al kalendaro “%s” kiel rifuzita"
 
-#: ../src/modules/itip-formatter/itip-view.c:4870
+#: ../src/modules/itip-formatter/itip-view.c:4994
+#, c-format
+#| msgid "Sent to calendar “%s” as declined"
+msgid "Sent to task list “%s” as declined"
+msgstr "Sendita al taskolisto “%s” kiel rifuzita"
+
+#: ../src/modules/itip-formatter/itip-view.c:4999
+#, c-format
+#| msgid "Sent to calendar “%s” as declined"
+msgid "Sent to memo list “%s” as declined"
+msgstr "Sendita al notolisto “%s” kiel rifuzita"
+
+#: ../src/modules/itip-formatter/itip-view.c:5009
 #, c-format
 msgid "Sent to calendar “%s” as cancelled"
 msgstr "Sendita al kalendaro “%s” kiel nuligita"
 
-#: ../src/modules/itip-formatter/itip-view.c:4905
-#: ../src/modules/itip-formatter/itip-view.c:5364
-#: ../src/modules/itip-formatter/itip-view.c:5467
-msgid "Saving changes to the calendar. Please wait..."
-msgstr "Konservante ŝanĝojn al kalendaro. Bonvolu atendi..."
+#: ../src/modules/itip-formatter/itip-view.c:5014
+#, c-format
+#| msgid "Sent to calendar “%s” as cancelled"
+msgid "Sent to task list “%s” as cancelled"
+msgstr "Sendita al taskolisto “%s” kiel nuligita"
 
-#: ../src/modules/itip-formatter/itip-view.c:4959
+#: ../src/modules/itip-formatter/itip-view.c:5019
+#, c-format
+#| msgid "Sent to calendar “%s” as cancelled"
+msgid "Sent to memo list “%s” as cancelled"
+msgstr "Sendita al notolisto “%s” kiel nuligita"
+
+#: ../src/modules/itip-formatter/itip-view.c:5052
+#| msgid "Saving changes to the calendar. Please wait..."
+msgid "Saving changes to the calendar. Please wait…"
+msgstr "Konservante ŝanĝojn al kalendaro. Bonvolu atendi…"
+
+#: ../src/modules/itip-formatter/itip-view.c:5055
+#| msgid "Saving changes to the calendar. Please wait..."
+msgid "Saving changes to the task list. Please wait…"
+msgstr "Konservante ŝanĝojn al taskolisto. Bonvolu atendi…"
+
+#: ../src/modules/itip-formatter/itip-view.c:5058
+#| msgid "Saving changes to the calendar. Please wait..."
+msgid "Saving changes to the memo list. Please wait…"
+msgstr "Konservante ŝanĝojn al notolisto. Bonvolu atendi…"
+
+#: ../src/modules/itip-formatter/itip-view.c:5127
 msgid "Unable to parse item"
 msgstr "Ne eblas analizi eron"
 
-#: ../src/modules/itip-formatter/itip-view.c:5151
+#: ../src/modules/itip-formatter/itip-view.c:5319
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizulo forigis la delegiton %s "
 
-#: ../src/modules/itip-formatter/itip-view.c:5168
+#: ../src/modules/itip-formatter/itip-view.c:5336
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Sendis nuligan sciigon al la delegito"
 
-#: ../src/modules/itip-formatter/itip-view.c:5172
+#: ../src/modules/itip-formatter/itip-view.c:5340
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Ne eblis sendi nuligan sciigon al la delegito"
 
-#: ../src/modules/itip-formatter/itip-view.c:5219
+#: ../src/modules/itip-formatter/itip-view.c:5387
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Ne eblas ĝisdatigi alestanton. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:5254
+#: ../src/modules/itip-formatter/itip-view.c:5422
 msgid "The meeting is invalid and cannot be updated"
 msgstr "La kunsido ne validas kaj oni ne povas ĝisdatigi ĝin"
 
-#: ../src/modules/itip-formatter/itip-view.c:5329
+#: ../src/modules/itip-formatter/itip-view.c:5497
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Alestanta stato ne povis ĝisdatiĝi ĉar la stato ne validas"
 
-#: ../src/modules/itip-formatter/itip-view.c:5400
-#: ../src/modules/itip-formatter/itip-view.c:5438
+#: ../src/modules/itip-formatter/itip-view.c:5568
+#: ../src/modules/itip-formatter/itip-view.c:5606
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Alestanta stato ne povis ĝisdatiĝi ĉar la ero ne plu ekzistas"
 
-#: ../src/modules/itip-formatter/itip-view.c:5499
+#: ../src/modules/itip-formatter/itip-view.c:5667
 msgid "Meeting information sent"
 msgstr "Kunsid-informoj sendita"
 
-#: ../src/modules/itip-formatter/itip-view.c:5504
+#: ../src/modules/itip-formatter/itip-view.c:5672
 msgid "Task information sent"
 msgstr "Taskinformoj sendita"
 
-#: ../src/modules/itip-formatter/itip-view.c:5509
+#: ../src/modules/itip-formatter/itip-view.c:5677
 msgid "Memo information sent"
 msgstr "Noto-informoj sendita"
 
-#: ../src/modules/itip-formatter/itip-view.c:5520
+#: ../src/modules/itip-formatter/itip-view.c:5688
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Ne eblas sendi kunsid-informojn, la kunsido ne ekzistas"
 
-#: ../src/modules/itip-formatter/itip-view.c:5525
+#: ../src/modules/itip-formatter/itip-view.c:5693
 msgid "Unable to send task information, the task does not exist"
 msgstr "Ne eblas sendi taskinformojn, la tasko ne ekzistas"
 
-#: ../src/modules/itip-formatter/itip-view.c:5530
+#: ../src/modules/itip-formatter/itip-view.c:5698
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Ne eblas sendi noto-informojn, la noto ne ekzistas"
 
 #. Translators: This is a default filename for a calendar.
-#: ../src/modules/itip-formatter/itip-view.c:5595
+#: ../src/modules/itip-formatter/itip-view.c:5763
 msgid "calendar.ics"
 msgstr "kalendaro.ics"
 
-#: ../src/modules/itip-formatter/itip-view.c:5600
+#: ../src/modules/itip-formatter/itip-view.c:5768
 msgid "Save Calendar"
 msgstr "Konservi kalendaron"
 
-#: ../src/modules/itip-formatter/itip-view.c:5649
-#: ../src/modules/itip-formatter/itip-view.c:5662
+#: ../src/modules/itip-formatter/itip-view.c:5817
+#: ../src/modules/itip-formatter/itip-view.c:5830
 msgid "The calendar attached is not valid"
 msgstr "La aldonita kalendaro ne estas valida"
 
-#: ../src/modules/itip-formatter/itip-view.c:5650
-#: ../src/modules/itip-formatter/itip-view.c:5663
+#: ../src/modules/itip-formatter/itip-view.c:5818
+#: ../src/modules/itip-formatter/itip-view.c:5831
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -22063,15 +22340,15 @@ msgstr ""
 "La mesaĝo asertas, ke ĝi enhavas kalendaron, sed la kalendaro ne estas "
 "valida iCalendar."
 
-#: ../src/modules/itip-formatter/itip-view.c:5725
-#: ../src/modules/itip-formatter/itip-view.c:5806
-#: ../src/modules/itip-formatter/itip-view.c:5902
+#: ../src/modules/itip-formatter/itip-view.c:5893
+#: ../src/modules/itip-formatter/itip-view.c:5974
+#: ../src/modules/itip-formatter/itip-view.c:6070
 msgid "The item in the calendar is not valid"
 msgstr "La ero en la kalendaro ne estas valida"
 
-#: ../src/modules/itip-formatter/itip-view.c:5726
-#: ../src/modules/itip-formatter/itip-view.c:5807
-#: ../src/modules/itip-formatter/itip-view.c:5903
+#: ../src/modules/itip-formatter/itip-view.c:5894
+#: ../src/modules/itip-formatter/itip-view.c:5975
+#: ../src/modules/itip-formatter/itip-view.c:6071
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -22079,11 +22356,11 @@ msgstr ""
 "La mesaĝo enhavas kalendaron, sed la kalendaro enhavas neniun eventon, "
 "taskon aŭ liberajn/okupajn informojn"
 
-#: ../src/modules/itip-formatter/itip-view.c:5816
+#: ../src/modules/itip-formatter/itip-view.c:5984
 msgid "The calendar attached contains multiple items"
 msgstr "La aldonita kalendaro enhavas plurajn erojn"
 
-#: ../src/modules/itip-formatter/itip-view.c:5817
+#: ../src/modules/itip-formatter/itip-view.c:5985
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -22091,12 +22368,12 @@ msgstr ""
 "Por trakti ĉiujn tiujn erojn, oni devas konservi la dosieron kaj enporti la "
 "kalendaron"
 
-#: ../src/modules/itip-formatter/itip-view.c:6384
+#: ../src/modules/itip-formatter/itip-view.c:6552
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Nenio"
 
-#: ../src/modules/itip-formatter/itip-view.c:6400
+#: ../src/modules/itip-formatter/itip-view.c:6568
 msgid "Tentatively Accepted"
 msgstr "Provizore akceptita"
 
@@ -22155,14 +22432,13 @@ msgid "Mail _Directory:"
 msgstr "Retpoŝta _dosierujo:"
 
 #: ../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"
+msgstr "Elekti MH-retpoŝtdosierujon"
 
 #: ../src/modules/mail-config/e-mail-config-local-accounts.c:271
 msgid "MH mail directory cannot be empty"
-msgstr ""
+msgstr "MH-retpoŝtdosierujo ne povas esti malplena"
 
 #: ../src/modules/mail-config/e-mail-config-local-accounts.c:292
 msgid "Local Delivery _File:"
@@ -22397,248 +22673,257 @@ msgctxt "label"
 msgid "None"
 msgstr "Neniu"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:821
+#: ../src/modules/mail/e-mail-shell-view-actions.c:853
 msgid "Marking messages as read..."
 msgstr "Marki mesaĝojn kiel legitaj..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1226
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1258
 msgid "Go to Folder"
 msgstr "Iri al dosierujo"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1230
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1262
 msgid "_Select"
 msgstr "_Elekti"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1533
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1572
 msgid "_Disable Account"
 msgstr "_Malŝalti konton"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1535
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1574
 msgid "Disable this account"
 msgstr "Malŝalti tiun konton"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1542
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1581
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Daŭre forigi ĉiujn forigitajn mesaĝojn el ĉiuj dosierujoj"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1547
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1586
 msgid "Empty _Junk"
 msgstr "Malplenigi _spamon"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1549
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1588
 msgid "Delete all Junk messages from all folders"
 msgstr "Forigi ĉiujn spammesaĝojn el ĉiuj dosierujoj"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1556
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1595
 msgid "Edit properties of this account"
 msgstr "Redakti ecojn de tiu ĉi konto"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1563
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1602
 msgid "Refresh list of folders of this account"
 msgstr "Aktualigi la dosierujoliston de tiu konto"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1568
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1607
 msgid "_Download Messages for Offline Usage"
 msgstr "_Elŝuti mesaĝojn por senreta uzado"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1570
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1609
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "Elŝuti mesaĝojn de la markitaj kontoj kaj dosierujoj por senreta uzado"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1575
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Fl_ush Outbox"
 msgstr ""
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1582
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1621
 msgid "_Copy Folder To..."
 msgstr "_Kopii dosierujon al..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1584
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1623
 msgid "Copy the selected folder into another folder"
 msgstr "Kopii la elektitan dosierujon al alia dosierujo"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1591
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1630
 msgid "Permanently remove this folder"
 msgstr "Daŭre forigi tiun dosierujon"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1596
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1635
+msgid "Edit Sort _Order…"
+msgstr "Redakti ordiga _ordon…"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1637
+#| msgid "Move folder in folder tree."
+msgid "Change sort order of the folders in the folder tree"
+msgstr "Ŝanĝi ordiga ordon de la dosierujoj en la dosierujan arbon"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1642
 msgid "E_xpunge"
 msgstr "_Rubigi"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1598
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1644
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Daŭre forigi ĉiujn forigitajn mesaĝojn de tiu dosierujo"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1603
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1695
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1649
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1741
 msgid "Mar_k All Messages as Read"
 msgstr "Mar_ki ĉiujn mesaĝojn kiel legitaj"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1605
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1697
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1651
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1743
 msgid "Mark all messages in the folder as read"
 msgstr "Marki ĉiujn mesaĝojn en la dosierujo kiel legitaj"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1610
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1656
 msgid "_Move Folder To..."
 msgstr "_Movi dosierujon al..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1612
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1658
 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
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1618
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1664
 msgid "_New..."
 msgstr "_Nova..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1620
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Create a new folder for storing mail"
 msgstr "Krei novan dosierujon por konservi retpoŝton"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1627
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
 msgid "Change the properties of this folder"
 msgstr "Ŝanĝi la ecojn de tiu dosierujo"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1634
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
 msgid "Refresh the folder"
 msgstr "Aktualigi la dosierujon"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1641
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1687
 msgid "Change the name of this folder"
 msgstr "Ŝanĝi la nomon de la dosierujo"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1646
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1692
 msgid "Select Message _Thread"
 msgstr "Elekti mesaĝan _fadenon"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1648
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Elekti ĉiujn mesaĝojn en la sama fadeno kiel la elektita mesaĝo"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1653
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1699
 msgid "Select Message S_ubthread"
 msgstr "Elekti mesaĝan s_ubfadenon"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1655
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
 msgid "Select all replies to the currently selected message"
 msgstr "Elekti ĉiujn respondojn al la nuna elektita mesaĝo"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1667
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1713
 msgid "Empty _Trash"
 msgstr "Malplenigi _rubujon"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1669
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1715
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Daŭre forigi ĉiujn forigitajn mesaĝojn el ĉiuj kontoj"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1674
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1720
 msgid "Go to _Folder"
 msgstr "Iri al _dosierujo"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1676
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1722
 msgid "Opens a dialog to select a folder to go to"
 msgstr "Malfermas dialogon por elekti la dosierujon al kiu vi volas iri"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1688
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1734
 msgid "_Manage Subscriptions"
 msgstr "_Mastrumi abonojn"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1690
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1774
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1736
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1820
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Aboni aŭ malaboni al dosierujoj en deforaj serviloj"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1702
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1723
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1748
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1769
 msgid "Send / _Receive"
 msgstr "Sendi / _Ricevi"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1704
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1750
 msgid "Send queued items and retrieve new items"
 msgstr "Sendi atendajn erojn kaj ricevi novajn"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1709
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1755
 msgid "R_eceive All"
 msgstr "R_icevi ĉiujn"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1711
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1757
 msgid "Receive new items from all accounts"
 msgstr "Ricivi novajn erojn el ĉiuj kontoj"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1716
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1762
 msgid "_Send All"
 msgstr "_Sendi ĉiujn"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1718
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1764
 msgid "Send queued items in all accounts"
 msgstr "Sendi atendajn erojn en ĉiuj kontoj"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1746
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1792
 msgid "Cancel the current mail operation"
 msgstr "Nuligi la nunan retpoŝtoperacion"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1797
 msgid "Collapse All _Threads"
 msgstr "Maletendi ĉiujn _fadenojn"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1753
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1799
 msgid "Collapse all message threads"
 msgstr "Malatendi ĉiujn mesaĝajn fadenojn"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1804
 msgid "E_xpand All Threads"
 msgstr "_Etendi ĉiujn fadenojn"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1760
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1806
 msgid "Expand all message threads"
 msgstr "Etendi ĉiujn mesaĝajn fadenojn"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1765
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1811
 msgid "_Message Filters"
 msgstr "_Mesaĝfiltriloj"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1767
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1813
 msgid "Create or edit rules for filtering new mail"
 msgstr "Krei aŭ redakti regulojn por filtrado de nova retpoŝto"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1772
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1818
 msgid "_Subscriptions..."
 msgstr "_Abonoj..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1781
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1827
 msgid "F_older"
 msgstr "D_osierujo"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1798
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1844
 msgid "C_reate Search Folder From Search..."
 msgstr "K_rei serĉdosierujon el serĉo..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1805
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1851
 msgid "Search F_olders"
 msgstr "Serĉ_dosierujoj"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1807
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1853
 msgid "Create or edit search folder definitions"
 msgstr "Krei aŭ redakti serĉdosierujon"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1850
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1896
 msgid "_New Folder..."
 msgstr "_Nova dosierujo..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1878
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1924
 msgid "Show Message _Preview"
 msgstr "Montri mesaĝan _antaŭrigardon"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1880
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
 msgid "Show message preview pane"
 msgstr "Montri mesaĝan antaŭrigardan fenestron"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1886
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1932
 msgid "Show _Attachment Bar"
 msgstr "Montri _aldonaĵ-breton"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1888
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1934
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments"
@@ -22646,111 +22931,111 @@ msgstr ""
 "Montri aldonaĵ-breton sub la mesaĝa antaŭrigarda fenestro kiam la mesaĝo "
 "havas aldonaĵojn"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1894
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1940
 msgid "Show _Deleted Messages"
 msgstr "Montri _forigitajn mesaĝojn"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1896
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1942
 msgid "Show deleted messages with a line through them"
 msgstr "Montri forigitajn mesaĝojn kun streko tra ili"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1902
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1948
 msgid "Show _Junk Messages"
 msgstr "Montri _spammesaĝojn"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1904
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1950
 msgid "Show junk messages with a red line through them"
 msgstr "Montri spammesaĝojn kun ruĝa streko tra ili"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1910
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1956
 msgid "_Group By Threads"
 msgstr "_Grupigi laŭ fadenoj"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1912
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1958
 msgid "Threaded message list"
 msgstr "Fadenigita mesaĝolisto"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1918
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1964
 msgid "Show To _Do Bar"
 msgstr "Montri e_ndaĵo-breton"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1920
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1966
 msgid "Show To Do bar with appointments and tasks"
 msgstr "Montri endaĵo-breton kun rendevuoj kaj taskoj"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1972
 msgid "_Unmatched Folder Enabled"
 msgstr "Ne_kongrua dosierujo ŝaltita"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1928
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1974
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Baskuligas ĉu la nekongrua serĉdosierujo estas ŝaltita"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1948
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1994
 msgid "Show message preview below the message list"
 msgstr "Montri mesaĝan antaŭrigardon sub la mesaĝolisto"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1955
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2001
 msgid "Show message preview alongside the message list"
 msgstr "Montri mesaĝan antaŭrigardon flanke de la mesaĝolisto"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1963
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2009
 msgid "All Messages"
 msgstr "Ĉiuj mesaĝoj"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1970
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2016
 msgid "Important Messages"
 msgstr "Gravaj mesaĝoj"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1977
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2023
 msgid "Last 5 Days’ Messages"
 msgstr "Mesaĝoj dum la lastaj 5 tagoj"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1984
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2030
 msgid "Messages Not Junk"
 msgstr "Nespamaj mesaĝoj"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1991
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2037
 msgid "Messages with Attachments"
 msgstr "Mesaĝoj kun aldonaĵoj"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1998
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2044
 msgid "Messages with Notes"
 msgstr "Mesaĝoj kun notoj"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2005
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2051
 msgid "No Label"
 msgstr "Neniu etikedo"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2012
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2058
 msgid "Read Messages"
 msgstr "Legitaj mesaĝoj"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2019
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2065
 msgid "Unread Messages"
 msgstr "Nelegitaj mesaĝoj"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2026
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2072
 msgid "Message Thread"
 msgstr "Mesaĝa fadeno"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2086
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2132
 msgid "Subject or Addresses contain"
 msgstr "Temo aŭ adresoj enhavas"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2096
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2142
 msgid "All Accounts"
 msgstr "Ĉiuj kontoj"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2103
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2149
 msgid "Current Account"
 msgstr "Nuna konto"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2110
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2156
 msgid "Current Folder"
 msgstr "Nuna dosierujo"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2117
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2163
 msgid "Current Folder and Subfolders"
 msgstr "Nuna dosierujo kaj subdosierujoj"
 
@@ -23078,15 +23363,15 @@ msgstr ""
 #: ../src/modules/spamassassin/evolution-spamassassin.c:230
 #, c-format
 msgid "Failed to write “%s” to SpamAssassin: "
-msgstr ""
+msgstr "Malsukcesis skribi “%s” al SpamAssassin: "
 
 #: ../src/modules/spamassassin/evolution-spamassassin.c:258
 msgid "Failed to read output from SpamAssassin: "
-msgstr ""
+msgstr "Malsukcesis legi eliron de SpamAssassin: "
 
 #: ../src/modules/spamassassin/evolution-spamassassin.c:313
 msgid "SpamAssassin either crashed or failed to process a mail message"
-msgstr ""
+msgstr "SpamAssassin aŭ kraŝis aŭ malsukcesis trakti retmesaĝon"
 
 #: ../src/modules/spamassassin/evolution-spamassassin.c:536
 msgid "SpamAssassin Options"
@@ -23098,7 +23383,7 @@ msgstr "I_nkluzivi deforajn testojn"
 
 #: ../src/modules/spamassassin/evolution-spamassassin.c:565
 msgid "This will make SpamAssassin more reliable, but slower."
-msgstr ""
+msgstr "Ĉi tiu plifidebligas SpamAssassin, sed malrapidigas ĝin."
 
 #: ../src/modules/spamassassin/evolution-spamassassin.c:740
 #: ../src/modules/spamassassin/org.gnome.Evolution-spamassassin.metainfo.xml.in.h:1
@@ -23142,11 +23427,10 @@ msgstr "Ne _plu montri ĉi tiun asistanton"
 
 #. Translators: This is part of "Alternatively, you can %s (email, contacts and calendaring) instead." 
sentence from the same translation context.
 #: ../src/modules/startup-wizard/e-startup-assistant.c:206
-#, fuzzy
 #| msgid "Create a new mail account"
 msgctxt "wizard-ca-note"
 msgid "create a collection account"
-msgstr "Krei novan retpoŝtkonton"
+msgstr "krei kolektokonton"
 
 #. Translators: The '%s' is replaced with "create a collection account" from the same translation context.
 #: ../src/modules/startup-wizard/e-startup-assistant.c:208
@@ -23154,6 +23438,7 @@ msgstr "Krei novan retpoŝtkonton"
 msgctxt "wizard-ca-note"
 msgid "Alternatively, you can %s (email, contacts and calendaring) instead."
 msgstr ""
+"Alternative, vi povas anstataŭe %s (retpoŝto, kontaktaro kaj kalendaro)."
 
 #: ../src/modules/startup-wizard/evolution-startup-wizard.c:212
 msgid "Loading accounts..."
@@ -23467,7 +23752,8 @@ msgstr "Krei _adresarajn erojn kiam sendante retmesaĝojn"
 #. File Under setting
 #: ../src/plugins/bbdb/bbdb.c:782
 msgid "Set File _under as “First Last”, instead of “Last, First”"
-msgstr "Agordi “Klasi _sub” kiel “Persona Familia” antstataŭ “Familia, Persona”"
+msgstr ""
+"Agordi “Klasi _sub” kiel “Persona Familia” antstataŭ “Familia, Persona”"
 
 #: ../src/plugins/bbdb/bbdb.c:793
 msgid "Select Address book for Automatic Contacts"
@@ -24590,23 +24876,21 @@ msgstr "Kategoria redaktilo"
 
 #: ../src/shell/e-shell-window-actions.c:596
 msgid "Bug Buddy is not installed."
-msgstr ""
+msgstr "Big Buddy ne estas instalita."
 
 #: ../src/shell/e-shell-window-actions.c:597
 msgid "Bug Buddy could not be run."
 msgstr ""
 
 #: ../src/shell/e-shell-window-actions.c:793
-#, fuzzy
 #| msgid "Collection _Account"
 msgid "Collect_ion Account"
-msgstr "Riceva _konto"
+msgstr "Kolekto_konto"
 
 #: ../src/shell/e-shell-window-actions.c:795
-#, fuzzy
 #| msgid "Create a new mail account"
 msgid "Create a new collection account"
-msgstr "Krei novan retpoŝtkonton"
+msgstr "Krei novan kolektokonton"
 
 #: ../src/shell/e-shell-window-actions.c:805
 msgid "Show information about Evolution"
@@ -24920,8 +25204,8 @@ msgid ""
 "“mail”, “calendar”, “contacts”, “tasks”, and “memos”"
 msgstr ""
 "Startigi Evolucion montrante la specifan modulon. Disponeblaj elektoj estas "
-"“mail” (retpoŝto), “calendar” (kalendaro), “contacts” (kontaktoj), "
-"“tasks” (taskoj), kaj “memos” (notoj)"
+"“mail” (retpoŝto), “calendar” (kalendaro), “contacts” (kontaktoj), “tasks” "
+"(taskoj), kaj “memos” (notoj)"
 
 #: ../src/shell/main.c:316
 msgid "Apply the given geometry to the main window"
@@ -25086,8 +25370,9 @@ msgid "Failed to prompt for credentials for “{0}”"
 msgstr "Malsukcesis informpeti por salutiloj de “{0}”"
 
 #: ../src/shell/shell.error.xml.h:25
+#, fuzzy
 msgid "Failed to finish trust prompt for “{0}”"
-msgstr ""
+msgstr "Malsukcesis fini “{0}”"
 
 #: ../src/shell/shell.error.xml.h:26
 msgid "SSL certificate for “{0}” is not trusted."
@@ -25431,10 +25716,10 @@ msgstr ""
 "vidas la aŭtentecon de tiu atestilo krom se alie indikite ĉi tie"
 
 #: ../src/smime/gui/component.c:53
-#, fuzzy, c-format
+#, c-format
 #| msgid "Enter the password for “%s”"
 msgid "Enter the password for “%s”, token “%s”"
-msgstr "Enigu la pasvorton por “%s”, *token* “%s”"
+msgstr "Enigu la pasvorton por “%s”, token*“%s”"
 
 #: ../src/smime/gui/component.c:55
 #, c-format
@@ -25481,7 +25766,7 @@ msgstr ""
 
 #: ../src/smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
-msgstr ""
+msgstr "Kontaktatestiloj"
 
 #: ../src/smime/gui/smime-ui.ui.h:13
 msgid ""
@@ -26542,9 +26827,6 @@ msgstr "Enportita atestilo"
 #~ msgid "Weather: Thunderstorms"
 #~ msgstr "Vetero: fulmotondroj"
 
-#~ msgid "Select a location"
-#~ msgstr "Elekti lokon"
-
 #~ msgctxt "weather-cal-location"
 #~ msgid "None"
 #~ msgstr "Neniu"
@@ -26900,9 +27182,6 @@ msgstr "Enportita atestilo"
 #~ msgid "Loading calendar..."
 #~ msgstr "Ŝagante kalendaron..."
 
-#~ msgid "Organizer:"
-#~ msgstr "Organizilo:"
-
 #~ msgid "Server Message:"
 #~ msgstr "Servil-mesaĝo:"
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]