[evolution/wip/webkit2] Updated Esperanto translation



commit a99ab4faade7e0889d75685e3ccce1aef6fc775a
Author: Kristjan SCHMIDT <kristjan schmidt googlemail com>
Date:   Fri Mar 27 23:04:03 2015 +0100

    Updated Esperanto translation

 po/eo.po |25999 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 14562 insertions(+), 11437 deletions(-)
---
diff --git a/po/eo.po b/po/eo.po
index c240cac..7b10b09 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -2,147 +2,157 @@
 # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
 # 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.
-# Kristjan SCHMIDT <kristjan schmidt googlemail com>, 2011, 2012.
-#
+# Daniel PUENTES <blatberk openmailbox org>, 2015.
+# Kristjan SCHMIDT <kristjan schmidt googlemail com>, 2011, 2012, 2015.
+#: ../shell/main.c:506
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2012-01-05 21:42+0000\n"
-"PO-Revision-Date: 2012-01-06 15:21+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolut";
+"ion&keywords=I18N+L10N&component=Miscellaneous\n"
+"POT-Creation-Date: 2015-03-26 12:20+0000\n"
+"PO-Revision-Date: 2015-03-27 23:03+0200\n"
 "Last-Translator: Kristjan SCHMIDT <kristjan schmidt googlemail com>\n"
 "Language-Team: Esperanto <gnome-l10n-eo lists launchpad net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Launchpad-Export-Date: 2012-01-05 22:21+0000\n"
-"X-Generator: Launchpad (build 14625)\n"
+"X-Project-Style: gnome\n"
+
+#: ../addressbook/addressbook.error.xml.h:1
+msgid "This address book could not be opened."
+msgstr "Ĉi tiu adresaro povus ne malfermiĝi."
 
-#. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
-"'{0}' is a read-only address book and cannot be modified. Please select a "
-"different address book from the side bar in the Contacts view."
+"This address book server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
 msgstr ""
-"'{0}' estas nurlega adresaro kaj ne estas modifebla. Bonvolu elekti alian "
-"adresaron de la flankbreto en la kontaktvido."
+"Ĉi tiu adresarservilo povas esti neatingebla aŭ la servilnomo estis "
+"mistajpita aŭ via retkonekto faliĝis."
 
 #: ../addressbook/addressbook.error.xml.h:3
-msgid ""
-"A contact already exists with this address. Would you like to add a new card "
-"with the same address anyway?"
-msgstr ""
-"Jam ekzistas kontakto kun tiu adreso. Ĉu vi volas aldoni novan karton kun "
-"sama adreso?"
+msgid "Failed to authenticate with LDAP server."
+msgstr "Aŭtentigo al LDAP-servilo malsukcesis."
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid ""
-"A contact list named '{0}' is already in this contact list. Would you like "
-"to add it anyway?"
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
 msgstr ""
-"Kontaktlisto nomata '{0}' jam estas en tiu kontaktlisto. Ĉu vi tamen volas "
-"aldoni ĝin?"
+"Kontrolu, ĉu via pasvorto estas ĝuste klavita kaj ĉu vi uzas akceptatan "
+"ensalut-metodon. Memoru, ke pasvortoj distingas usklecon; eble vi aktivigis "
+"la majuskligan klavon."
 
 #: ../addressbook/addressbook.error.xml.h:5
-msgid "Add with duplicates"
-msgstr "Aldoni kun duplikatoj"
+msgid "This address book server does not have any suggested search bases."
+msgstr "Ĉi tiu adresarservilo ne havas iajn proponatajn serĉbazojn."
 
 #: ../addressbook/addressbook.error.xml.h:6
-msgid "Address '{0}' already exists."
-msgstr "Adreso '{0}' jam ekzistas."
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+"Tiu ĉi LDAP-servilo eble uzas malnovan version de LDAP, kiu ne subtenas tiun "
+"ĉi funkcion, aŭ eble ĝi estas mise agordita. Demandu vian administranton, "
+"kiuj serĉbazoj estas subtenataj."
 
 #: ../addressbook/addressbook.error.xml.h:7
-msgid "Cannot add new contact"
-msgstr "Ne eblas aldoni novan kontakton"
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Ĉi tiu servilo ne subtenas informskemon por LDAPv3."
 
 #: ../addressbook/addressbook.error.xml.h:8
-msgid "Cannot move contact."
-msgstr "Ne eblas movi kontakton."
+msgid "Could not get schema information for LDAP server."
+msgstr "Ne eblas ricevi skemo-informojn pri LDAP-servilo."
 
 #: ../addressbook/addressbook.error.xml.h:9
-msgid "Category editor not available."
-msgstr "Ne disponeblas redaktilo por la kategorio."
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Bild-akirilo ne respondis per valida skeminformo."
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
-msgstr ""
-"Kontrolu, ĉu via pasvorto estas ĝuste klavita kaj ĉu vi uzas akceptatan "
-"ensalut-metodon. Memoru, ke pasvortoj distingas usklecon; eble vi aktivigis "
-"la majuskligan klavon."
+msgid "Could not remove address book."
+msgstr "Ne eblis forigi adresaron."
 
 #: ../addressbook/addressbook.error.xml.h:11
-msgid "Could not get schema information for LDAP server."
-msgstr "Ne eblas ricevi skemo-informojn pri LDAP-servilo."
+msgid "Delete address book '{0}'?"
+msgstr "Ĉu forigi adresaron '{0}'?"
 
 #: ../addressbook/addressbook.error.xml.h:12
-msgid "Could not remove address book."
-msgstr "Ne eblis forigi adresaron."
+msgid "This address book will be removed permanently."
+msgstr "Ĉi tiu adresaro estos por ĉiam viŝita."
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid ""
-"Currently you can only access the GroupWise System Address Book from "
-"Evolution. Please use some other GroupWise mail client once to get your "
-"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
-msgstr ""
-"Nuntempe vi nur povas aliri la sisteman adresaron de GroupWise de Evolucio. "
-"Por aliri viajn GroupWise-dosierujojn pri oftaj kontaktoj kaj personaj "
-"kontaktoj bonvolu unufoje uzi alian GroupWise-poŝto-klienton."
+#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:66
+msgid "Do _Not Delete"
+msgstr "_Ne forigi"
 
 #: ../addressbook/addressbook.error.xml.h:14
-msgid "Delete address book '{0}'?"
-msgstr "Forigi adresaron '{0}'?"
+#| msgid "Delete address book '{0}'?"
+msgid "Delete remote address book &quot;{0}&quot;?"
+msgstr "Ĉu forigi foran adresaron &quot;{0}&quot;?"
 
 #: ../addressbook/addressbook.error.xml.h:15
-#: ../calendar/calendar.error.xml.h:37 ../mail/mail.error.xml.h:44
-msgid "Do _Not Delete"
-msgstr "_Ne forigi"
+msgid ""
+"This will permanently remove the address book &quot;{0}&quot; from the "
+"server. Are you sure you want to proceed?"
+msgstr ""
+"La adresaro &quot;{0}&quot; estos daŭre forigita el la servilo. Ĉu vi vere "
+"volas daŭrigi?"
 
 #: ../addressbook/addressbook.error.xml.h:16
-msgid "Error saving {0} to {1}: {2}"
-msgstr "Eraro je konservo de {0} al {1}: {2}"
+#: ../calendar/calendar.error.xml.h:61
+msgid "_Delete From Server"
+msgstr "_Forigi de servilo"
 
 #: ../addressbook/addressbook.error.xml.h:17
-msgid "Failed to authenticate with LDAP server."
-msgstr "Aŭtentigo al LDAP-servilo fiaskis."
+msgid "Category editor not available."
+msgstr "Ne disponeblas redaktilo por la kategorio."
 
 #: ../addressbook/addressbook.error.xml.h:18
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
-msgid "Failed to delete contact"
-msgstr "Forigo de kontakto malsukcesis."
+#| msgid "Unable to open address book"
+msgid "Unable to open address book '{0}'"
+msgstr "Ne eblas malfermi adresaron '{0}'"
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "GroupWise Address book creation:"
-msgstr "Kreado de GroupWise-adresaro:"
+msgid "Unable to perform search."
+msgstr "Ne ebliĝas efektivigi serĉon."
 
 #: ../addressbook/addressbook.error.xml.h:20
-msgid "LDAP server did not respond with valid schema information."
-msgstr "Bild-akirilo ne respondis per valida skeminformo."
+#| msgid "Delete address book '{0}'?"
+msgid "Failed to refresh address book '{0}'"
+msgstr "Malsukcesis aktualigi adresaron '{0}'"
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "List '{0}' is already in this contact list."
-msgstr "Listo '{0}' jam troviĝas en ĉi tiu kontaktlisto."
+msgid "Would you like to save your changes?"
+msgstr "Ĉu vi deziras konservi viajn ŝanĝojn ?"
 
 #: ../addressbook/addressbook.error.xml.h:22
-msgid "Skip duplicates"
-msgstr ""
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr "Vi modifis tiun ĉi kontakton. Ĉu vi volas konservi la modifojn?"
 
 #: ../addressbook/addressbook.error.xml.h:23
-msgid "Some addresses already exist in this contact list."
-msgstr "Iuj adresoj jam troviĝas en ĉi tiu kontaktlisto."
+msgid "_Discard"
+msgstr "_Rifuzi"
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "Some features may not work properly with your current server"
-msgstr "Iuj trajtoj eble ne funkcios bone kun via nuna servilo."
+msgid "Cannot move contact."
+msgstr "Ne eblas movi kontakton."
 
 #: ../addressbook/addressbook.error.xml.h:25
-msgid "The Evolution address book has quit unexpectedly."
-msgstr "La adresaro de Evolucio ĉesigitis neatendite."
+msgid ""
+"You are attempting to move a contact from one address book to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"Vi provas transmovi kontakton de unu adresaro al alia, sed ne eblas forigi "
+"ĝin el la fonta adresaro. Ĉu anstataŭe vi volas konservi kopion?"
 
 #: ../addressbook/addressbook.error.xml.h:26
 msgid ""
@@ -152,429 +162,565 @@ msgstr ""
 "konservi ĝin?"
 
 #: ../addressbook/addressbook.error.xml.h:27
-msgid ""
-"This LDAP server may use an older version of LDAP, which does not support "
-"this functionality or it may be misconfigured. Ask your administrator for "
-"supported search bases."
-msgstr ""
-"Tiu ĉi LDAP-servilo eble uzas malnovan version de LDAP, kiu ne subtenas tiun "
-"ĉi funkcion, aŭ eble ĝi estas mise agordita. Demandu vian administranton, "
-"kiuj serĉbazoj estas subtenataj."
+msgid "_Resize"
+msgstr "_Aligrandigi"
 
 #: ../addressbook/addressbook.error.xml.h:28
-msgid "This address book could not be opened."
-msgstr "Ĉi tiu adresaro povus ne malfermiĝi."
+msgid "_Use as it is"
+msgstr "_Uzi laŭ ĝi estas"
 
 #: ../addressbook/addressbook.error.xml.h:29
-msgid "This address book server does not have any suggested search bases."
-msgstr "Ĉi tiu adresarservilo ne havas iajn proponatajn serĉbazojn."
+msgid "_Do not save"
+msgstr "_Ne konservi"
 
 #: ../addressbook/addressbook.error.xml.h:30
-msgid ""
-"This address book server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
-msgstr ""
-"Ĉi tiu adresarservilo povas esti neatingebla aŭ la servilnomo estis "
-"mistajpita aŭ via retkonekto faliĝis."
+msgid "Unable to save {0}."
+msgstr "Ne eblas konservi {0}."
 
 #: ../addressbook/addressbook.error.xml.h:31
-msgid "This address book will be removed permanently."
-msgstr "Ĉi tiu adresaro estos por ĉiam viŝita."
+msgid "Error saving {0} to {1}: {2}"
+msgstr "Eraro je konservo de {0} al {1}: {2}"
 
 #: ../addressbook/addressbook.error.xml.h:32
-msgid "This server does not support LDAPv3 schema information."
-msgstr "Ĉi tiu servilo ne subtenas informskemon por LDAPv3."
+msgid "Address '{0}' already exists."
+msgstr "Adreso '{0}' jam ekzistas."
 
 #: ../addressbook/addressbook.error.xml.h:33
-msgid "Unable to open address book"
-msgstr "Ne eblas malfermi adresaron"
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
+msgstr ""
+"Jam ekzistas kontakto kun tiu adreso. Ĉu vi volas aldoni novan karton kun "
+"sama adreso?"
 
 #: ../addressbook/addressbook.error.xml.h:34
-msgid "Unable to perform search."
-msgstr "Ne ebliĝas efektivigi serĉon."
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
+#: ../addressbook/gui/widgets/eab-contact-merging.c:723
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:19
+#: ../calendar/gui/dialogs/task-page.ui.h:30
+#: ../e-util/e-mail-signature-manager.c:327
+#: ../e-util/e-name-selector-dialog.c:995 ../e-util/filter.ui.h:16
+#: ../mail/e-mail-account-manager.c:718 ../mail/e-mail-label-manager.c:373
+#: ../mail/em-vfolder-editor-rule.c:396 ../mail/em-vfolder-editor-rule.c:625
+#: ../mail/mail-config.ui.h:54 ../modules/mail/em-composer-prefs.c:416
+#: ../plugins/attachment-reminder/attachment-reminder.c:557
+#: ../plugins/email-custom-header/email-custom-header.c:839
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
+#: ../plugins/templates/templates.c:453
+msgid "_Add"
+msgstr "_Aldoni"
 
 #: ../addressbook/addressbook.error.xml.h:35
-msgid "Unable to save {0}."
-msgstr "Ne eblas konservi {0}."
+msgid "Some addresses already exist in this contact list."
+msgstr "Iuj adresoj jam troviĝas en ĉi tiu kontaktlisto."
 
 #: ../addressbook/addressbook.error.xml.h:36
-msgid "Would you like to save your changes?"
-msgstr "Ĉu vi deziras konservi viajn ŝanĝojn ?"
-
-#: ../addressbook/addressbook.error.xml.h:37
 msgid ""
-"You are attempting to move a contact from one address book to another but it "
-"cannot be removed from the source. Do you want to save a copy instead?"
+"You are trying to add addresses that are part of this list already. Would "
+"you like to add them anyway?"
 msgstr ""
-"Vi provas transmovi kontakton de unu adresaro al alia, sed ne eblas forigi "
-"ĝin el la fonta adresaro. Ĉu anstataŭe vi volas konservi kopion?"
+"Vi provis aldoni adresojn kiuj jam apartenas al tiu listo. Ĉu vi volas "
+"aldoni ĝin malgraŭ tio?"
+
+#: ../addressbook/addressbook.error.xml.h:37
+msgid "Skip duplicates"
+msgstr "Transsalti duoblaĵojn"
 
 #: ../addressbook/addressbook.error.xml.h:38
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results the server should be upgraded to "
-"a supported version"
-msgstr ""
-"Vi konektas al nesubtenata Groupwise-servilo kaj vi povus sperti problemojn "
-"uzante Evolucion. Por la plej bonaj rezultoj necesas promocii la servilon al "
-"subtenata versio."
+msgid "Add with duplicates"
+msgstr "Aldoni kun duplikatoj"
 
 #: ../addressbook/addressbook.error.xml.h:39
+msgid "List '{0}' is already in this contact list."
+msgstr "Listo '{0}' jam troviĝas en ĉi tiu kontaktlisto."
+
+#: ../addressbook/addressbook.error.xml.h:40
 msgid ""
-"You are trying to add addresses that are part of this list already. Would "
-"you like to add them anyway?"
+"A contact list named '{0}' is already in this contact list. Would you like "
+"to add it anyway?"
 msgstr ""
-"Vi provis aldoni adresojn kiuj jam apartenas al tiu listo. Ĉu vi volas "
-"aldoni ĝin malgraŭ tio?"
+"Kontaktlisto nomata '{0}' jam estas en tiu kontaktlisto. Ĉu vi tamen volas "
+"aldoni ĝin?"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1250
+msgid "Failed to delete contact"
+msgstr "Forigo de kontakto malsukcesis."
+
+#: ../addressbook/addressbook.error.xml.h:42
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "Vi ne havas rajton por forigi kontaktojn en ĉi tiu adresaro."
 
-#: ../addressbook/addressbook.error.xml.h:41
-msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
-msgstr "Vi modifis tiun ĉi kontakton. Ĉu vi volas konservi la modifojn?"
-
-#. Translators: {0} is replaced with an address book name which will not be available
 #: ../addressbook/addressbook.error.xml.h:43
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
-msgstr ""
-"Via kontaktoj por {0} estos disponeblaj nur post restartigo de Evolucio."
-
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:595
-#: ../widgets/table/e-table-config.ui.h:18
-msgid "_Add"
-msgstr "_Aldoni"
+msgid "Cannot add new contact"
+msgstr "Ne eblas aldoni novan kontakton"
 
+#. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:45
-msgid "_Discard"
-msgstr "_Rifuzi"
+msgid ""
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
+msgstr ""
+"'{0}' estas nurlega adresaro kaj ne estas modifebla. Bonvolu elekti alian "
+"adresaron de la flankbreto en la kontaktvido."
 
 #: ../addressbook/addressbook.error.xml.h:46
-msgid "_Do not save"
-msgstr "_Ne konservi"
-
-#: ../addressbook/addressbook.error.xml.h:47
-msgid "_Resize"
-msgstr "_Aligrandigi"
+#, fuzzy
+msgid "Cannot save a contact, address book is still opening"
+msgstr "Ne eblas konservi kontakton, adresaro ankoraŭ malfermas"
 
+#. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:48
-msgid "_Use as it is"
-msgstr "_Uzi laŭ ĝi estas"
+#, fuzzy
+msgid ""
+"Cannot save a contact to the address book '{0}', because it is still "
+"opening. Either wait till it's opened, or select a different address book."
+msgstr ""
+"Ne eblas konservi kontakton en adresaro '{0}', ĉar ĝi ankoraŭ estas "
+"malfermanta. Aŭ atendu ĝis ĝi estas malfermita, aŭ elektu alian adresaron-"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:720
-#: ../calendar/gui/e-calendar-view.c:2068
-msgid "Anniversary"
-msgstr "Datreveno"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:722
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:744
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
+msgid "Contact Editor"
+msgstr "Kontaktredaktilo"
 
-#. XXX Allow the category icons to be referenced as named
-#. *     icons, since GtkAction does not support GdkPixbufs.
-#. Get the icon file for some default category.  Doesn't matter
-#. * which, so long as it has an icon.  We're just interested in
-#. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:719
-#: ../calendar/gui/e-calendar-view.c:2067 ../capplet/anjal-settings-main.c:78
-#: ../shell/main.c:134
-msgid "Birthday"
-msgstr "Naskiĝtago"
+msgid "Image"
+msgstr "Bildo"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+msgid "Nic_kname:"
+msgstr "_Kromnomo:"
 
-#. Translators: an accessibility name
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
-msgid "Blog:"
-msgstr "Blogo:"
+msgid "_File under:"
+msgstr "_Klasi sub:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+msgid "_Where:"
+msgstr "_En:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../calendar/gui/dialogs/event-page.ui.h:16
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:27
 msgid "Ca_tegories..."
 msgstr "Ka_tegorioj..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-msgid "Calendar:"
-msgstr "Kalendaro:"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:990
-msgid "Contact"
-msgstr "Kontakto"
+msgid "Full _Name..."
+msgstr "Tuta _nomo..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:654
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:676
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2937
-msgid "Contact Editor"
-msgstr "Kontaktredaktilo"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:392
-#: ../addressbook/gui/widgets/eab-contact-display.c:638
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
-#: ../addressbook/gui/widgets/eab-contact-display.c:1046
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../smime/lib/e-cert.c:833
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:749
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1163
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Email"
 msgstr "Retpoŝto"
 
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+msgid "_Wants to receive HTML mail"
+msgstr "_Volas recevi HTML-poŝton"
+
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
-msgid "Free/Busy:"
-msgstr "Libere/okupite:"
+msgid "Telephone"
+msgstr "Telefono"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
-msgid "Full _Name..."
-msgstr "Tuta _nomo..."
+#| msgid "Address"
+msgid "SIP Address"
+msgstr "SIP-adreso"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
-#: ../addressbook/gui/widgets/eab-contact-display.c:78
-#: ../addressbook/gui/widgets/eab-contact-display.c:1351
-#: ../widgets/misc/e-contact-map.c:297
-msgid "Home"
-msgstr "Hejmo"
+msgid "Instant Messaging"
+msgstr "Tujmesaĝilo"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
-msgid "Home Page:"
-msgstr "Startpaĝo:"
+#: ../addressbook/importers/evolution-vcard-importer.c:971
+msgid "Contact"
+msgstr "Kontakto"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
-msgid "Image"
-msgstr "Bildo"
+msgid "_Home Page:"
+msgstr "_Hejmpago:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
-msgid "Instant Messaging"
-msgstr "Tujmesaĝilo"
+#: ../calendar/gui/dialogs/event-page.c:709
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+#: ../modules/itip-formatter/itip-view.c:1908
+msgid "_Calendar:"
+msgstr "_Kalendaro:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
-msgid "Job"
-msgstr "Tasko"
+msgid "_Free/Busy:"
+msgstr "_Libera/okupita:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
-msgid "Mailing Address"
-msgstr "Poŝtadreso"
+msgid "_Video Chat:"
+msgstr "_Videobabilado:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../calendar/gui/dialogs/task-details-page.ui.h:11
-msgid "Miscellaneous"
-msgstr "Diverse"
+msgid "Home Page:"
+msgstr "Startpaĝo:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-msgid "Nic_kname:"
-msgstr "_Kromnomo:"
+#: ../modules/cal-config-google/e-cal-config-google.c:92
+msgid "Calendar:"
+msgstr "Kalendaro:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-msgid "Notes"
-msgstr "Notoj"
+msgid "Free/Busy:"
+msgstr "Libere/okupite:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
-#: ../addressbook/gui/widgets/eab-contact-display.c:79
-#: ../addressbook/gui/widgets/eab-contact-display.c:412
-#: ../calendar/gui/e-cal-model.c:3445
-msgid "Other"
-msgstr "Aliaj"
+msgid "Video Chat:"
+msgstr "Video-retbabilo:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
-msgid "Personal Information"
-msgstr "Personaj informoj"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
-msgid "Telephone"
-msgstr "Telefono"
+msgid "_Blog:"
+msgstr "_Blogo:"
 
+#. Translators: an accessibility name
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Video Chat:"
-msgstr "Video-retbabilo:"
+msgid "Blog:"
+msgstr "Blogo:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "TTT-adresoj"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
-msgid "Web addresses"
-msgstr "TTT-adresoj"
+msgid "_Profession:"
+msgstr "_Profesio:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
-#: ../addressbook/gui/widgets/eab-contact-display.c:77
-#: ../addressbook/gui/widgets/eab-contact-display.c:699
-#: ../addressbook/gui/widgets/eab-contact-display.c:1348
-#: ../widgets/misc/e-contact-map.c:305
-msgid "Work"
-msgstr "Laborejo"
+#| msgid "_Title:"
+msgctxt "Job"
+msgid "_Title:"
+msgstr "_Titolo:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
-msgid "_Address:"
-msgstr "_Adreso:"
+msgid "_Company:"
+msgstr "_Firmao:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
-msgid "_Anniversary:"
-msgstr "_Datreveno:"
+msgid "_Department:"
+msgstr "_Sekcio:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
-msgid "_Assistant:"
-msgstr "_Asistanto:"
+msgid "_Office:"
+msgstr "_Oficejo:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
-msgid "_Birthday:"
-msgstr "_Naskiĝtago:"
+msgid "_Manager:"
+msgstr "_Estro:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
-msgid "_Blog:"
-msgstr "_Blogo:"
+msgid "_Assistant:"
+msgstr "_Asistanto:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:710
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-#: ../plugins/itip-formatter/itip-view.c:1971
-msgid "_Calendar:"
-msgstr "_Kalendaro:"
+msgid "Job"
+msgstr "Tasko"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
-msgid "_City:"
-msgstr "_Urbo:"
+msgid "_Spouse:"
+msgstr "Ed_z(in)o:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
-msgid "_Company:"
-msgstr "_Firmao:"
+msgid "_Birthday:"
+msgstr "_Naskiĝtago:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
-msgid "_Country:"
-msgstr "_Lando:"
+msgid "_Anniversary:"
+msgstr "_Datreveno:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-msgid "_Department:"
-msgstr "_Sekcio:"
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:875
+#: ../calendar/gui/e-calendar-view.c:1996
+msgid "Anniversary"
+msgstr "Datreveno"
 
+#. XXX Allow the category icons to be referenced as named
+#. *     icons, since GtkAction does not support GdkPixbufs.
+#. Get the icon file for some default category.  Doesn't matter
+#. * which, so long as it has an icon.  We're just interested in
+#. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-msgid "_File under:"
-msgstr "_Klasi sub:"
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:874
+#: ../calendar/gui/e-calendar-view.c:1995 ../shell/main.c:127
+msgid "Birthday"
+msgstr "Naskiĝtago"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
-msgid "_Free/Busy:"
-msgstr "Libera/okupita:"
+msgid "Miscellaneous"
+msgstr "Diverse"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
-msgid "_Home Page:"
-msgstr "Startpaĝo"
+msgid "Personal Information"
+msgstr "Personaj informoj"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
-msgid "_Manager:"
-msgstr "_Estro:"
+msgid "_City:"
+msgstr "_Urbo:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
-msgid "_Office:"
-msgstr "_Oficejo:"
+msgid "_Zip/Postal Code:"
+msgstr "Poŝt_kodo:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
-msgid "_PO Box:"
-msgstr "_Poŝtfako:"
+msgid "_State/Province:"
+msgstr "_Subŝtato/provinco:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
-msgid "_Profession:"
-msgstr "_Profesio:"
+msgid "_Country:"
+msgstr "_Lando:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
-msgid "_Spouse:"
-msgstr "Ed_z(in)o:"
+msgid "_PO Box:"
+msgstr "_Poŝtfako:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
-msgid "_State/Province:"
-msgstr "_Subŝtato/provinco:"
+#: ../composer/e-composer-from-header.c:123
+msgid "_Address:"
+msgstr "_Adreso:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/fullname.ui.h:17
-msgid "_Title:"
-msgstr "_Titolo:"
+#: ../addressbook/gui/widgets/eab-contact-display.c:356
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
+#: ../addressbook/gui/widgets/e-contact-map.c:369
+msgid "Home"
+msgstr "Hejmo"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-msgid "_Video Chat:"
-msgstr "Videobabilado:"
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:842
+#: ../addressbook/gui/widgets/e-contact-map.c:382
+msgid "Work"
+msgstr "Laborejo"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-msgid "_Wants to receive HTML mail"
-msgstr "_Volas recevi HTML-poŝton"
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:83
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:512
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:909
+#: ../calendar/gui/e-cal-model.c:3034
+msgid "Other"
+msgstr "Aliaj"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
-msgid "_Where:"
-msgstr "_En:"
+msgid "Mailing Address"
+msgstr "Poŝtadreso"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
-msgid "_Zip/Postal Code:"
-msgstr "Poŝt_kodo:"
+msgid "Notes"
+msgstr "Notoj"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
-msgid "AIM"
-msgstr "AIM"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
+#: ../calendar/gui/dialogs/comp-editor.c:1249
+#: ../calendar/gui/dialogs/comp-editor.c:1335
+#: ../e-util/e-preferences-window.c:379 ../e-util/e-send-options.ui.h:41
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
+#: ../shell/e-shell-window-actions.c:1085
+msgid "_Help"
+msgstr "_Helpo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:663
-msgid "Jabber"
-msgstr "Jabber"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:35
+msgid "Options"
+msgstr "Agordoj"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:665
-msgid "Yahoo"
-msgstr "Yahoo"
+#. This is only shown if the EActivity has a GCancellable.
+#. no flags
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3683
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:222
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
+#: ../addressbook/gui/widgets/eab-contact-merging.c:474
+#: ../addressbook/gui/widgets/eab-contact-merging.c:718
+#: ../addressbook/gui/widgets/eab-gui-util.c:318
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:15
+#: ../calendar/gui/dialogs/recurrence-page.c:2322
+#: ../composer/e-composer-actions.c:214 ../e-util/e-activity-bar.c:340
+#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:491
+#: ../e-util/e-attachment-store.c:635 ../e-util/e-attachment-view.c:406
+#: ../e-util/e-categories-dialog.c:82 ../e-util/e-category-editor.c:138
+#: ../e-util/e-category-editor.c:208 ../e-util/e-charset-combo-box.c:101
+#: ../e-util/e-color-chooser-widget.c:127 ../e-util/e-filter-datespec.c:291
+#: ../e-util/e-html-editor-actions.c:614 ../e-util/e-html-editor-actions.c:708
+#: ../e-util/e-image-chooser-dialog.c:171
+#: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:470
+#: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
+#: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:776
+#: ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
+#: ../e-util/e-source-selector-dialog.c:350 ../e-util/e-table-config.c:548
+#: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3136
+#: ../e-util/gal-view-instance-save-as-dialog.c:269
+#: ../mail/e-mail-config-window.c:330 ../mail/e-mail-label-dialog.c:196
+#: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:317
+#: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:738
+#: ../mail/mail-send-recv.c:820 ../mail/mail-vfolder-ui.c:148
+#: ../mail/mail-vfolder-ui.c:270
+#: ../modules/backup-restore/evolution-backup-tool.c:900
+#: ../modules/calendar/e-cal-attachment-handler.c:285
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
+#: ../plugins/face/face.c:291
+#: ../plugins/publish-calendar/publish-calendar.c:806
+#: ../plugins/publish-calendar/url-editor-dialog.c:421
+#: ../plugins/save-calendar/save-calendar.c:187 ../shell/e-shell-content.c:659
+#: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:70
+#: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:652
+#: ../smime/gui/certificate-manager.c:729
+#: ../smime/gui/certificate-manager.c:953
+#: ../smime/gui/certificate-manager.c:1335 ../smime/gui/e-cert-selector.c:237
+#: ../smime/gui/smime-ui.ui.h:23
+#| msgid "Cancel"
+msgid "_Cancel"
+msgstr "_Nuligi"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:55
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
+#: ../addressbook/gui/widgets/eab-contact-merging.c:721
+#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/gui/dialogs/comp-editor.c:1277
+#: ../composer/e-composer-actions.c:215 ../composer/e-composer-actions.c:355
+#: ../e-util/e-attachment-store.c:636
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3137
+#: ../e-util/gal-view-instance-save-as-dialog.c:270
+#: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:135
+#: ../smime/gui/certificate-manager.c:653
+#: ../smime/gui/certificate-manager.c:730
+msgid "_Save"
+msgstr "Kon_servi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:666
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
+#| msgid "Telephone"
+msgid "Show Telephone"
+msgstr "Montri telefonon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:664
-msgid "MSN"
-msgstr "MSN"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:57
+#| msgid "_To This Address"
+msgid "Show SIP Address"
+msgstr "Montri SIP-adreson"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:662
-msgid "ICQ"
-msgstr "ICQ"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
+#, fuzzy
+#| msgid "Instant Messaging"
+msgid "Show Instant Messaging"
+msgstr "Tujmesaĝilo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:661
-msgid "GroupWise"
-msgstr "GroupWise"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
+#, fuzzy
+#| msgid "Web Addresses"
+msgid "Show Web Addresses"
+msgstr "TTT-adresoj"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:667
-msgid "Skype"
-msgstr "Skype"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
+#, fuzzy
+#| msgid "Show the second time zone"
+msgid "Show Job section"
+msgstr "Montri la duan horzonon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:220
-#: ../addressbook/gui/widgets/eab-gui-util.c:481
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:61
+#, fuzzy
+#| msgid "Miscellaneous"
+msgid "Show Miscellaneous"
+msgstr "Diverse"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
+#, fuzzy
+#| msgid "Mailing Address"
+msgid "Show Home Mailing Address"
+msgstr "Poŝtadreso"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
+#, fuzzy
+#| msgid "Mailing Address"
+msgid "Show Work Mailing Address"
+msgstr "Poŝtadreso"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
+#, fuzzy
+#| msgid "Mailing Address"
+msgid "Show Other Mailing Address"
+msgstr "Poŝtadreso"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
+#| msgid "Show %s"
+msgid "Show Notes"
+msgstr "Montri notojn"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
+#: ../calendar/gui/dialogs/comp-editor.c:1298
+#: ../e-util/e-html-editor-actions.c:1129
+msgid "_Undo"
+msgstr "_Malfari"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../calendar/gui/dialogs/comp-editor.c:1300 ../e-util/e-focus-tracker.c:122
+msgid "Undo"
+msgstr "Malfari"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
+#: ../calendar/gui/dialogs/comp-editor.c:1305
+#: ../e-util/e-html-editor-actions.c:1115
+msgid "_Redo"
+msgstr "_Refari"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../calendar/gui/dialogs/comp-editor.c:1307 ../e-util/e-focus-tracker.c:138
+msgid "Redo"
+msgstr "Refari"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/widgets/eab-gui-util.c:503
 msgid "Error adding contact"
 msgstr "Eraro aldonante kontakton"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:318
 msgid "Error modifying contact"
 msgstr "Eraro dum modifado de kontaktulo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
 msgid "Error removing contact"
 msgstr "Eraro dum forigo de kontaktulo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:670
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2931
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:738
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3081
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktula redaktilo – %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3411
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3680
 msgid "Please select an image for this contact"
 msgstr "Bonvolu elekti bildon por tiu ĉi kontaktulo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3412
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3684
+#: ../e-util/e-attachment-store.c:489 ../e-util/e-category-editor.c:146
+#: ../e-util/e-html-editor-actions.c:615 ../e-util/e-html-editor-actions.c:709
+#: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:292
+#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:954
+#| msgid "Open"
+msgid "_Open"
+msgstr "_Malfermi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3685
 msgid "_No image"
 msgstr "_Neniu bildo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3739
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4034
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -582,394 +728,524 @@ msgstr ""
 "La kontaktulaj informoj ne estas validaj:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3745
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4040
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' havas nevalidan strukturon."
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3752
-#, c-format
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4048
+#, fuzzy, c-format
 msgid "'%s' cannot be a future date"
-msgstr ""
+msgstr "'%s' ne povas esti estonta dato"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3760
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4056
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' havas nevalidan strukturon."
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3773
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3787
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4069
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4083
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' estas malplena"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3802
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4098
 msgid "Invalid contact."
 msgstr "Nevalida kontakto."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:438
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:223
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:456
+#: ../addressbook/gui/contact-editor/fullname.ui.h:13
+#: ../addressbook/gui/widgets/eab-gui-util.c:319
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
+#: ../calendar/gui/dialogs/recurrence-page.c:2323
+#: ../e-util/e-attachment-dialog.c:313 ../e-util/e-categories-dialog.c:83
+#: ../e-util/e-category-editor.c:209 ../e-util/e-charset-combo-box.c:102
+#: ../e-util/e-color-chooser-widget.c:128 ../e-util/e-filter-datespec.c:292
+#: ../e-util/e-html-editor-link-dialog.c:388 ../e-util/e-passwords.c:471
+#: ../e-util/e-rule-context.c:816 ../e-util/e-rule-editor.c:181
+#: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:777
+#: ../e-util/e-send-options.ui.h:43 ../e-util/e-source-config-dialog.c:380
+#: ../e-util/e-source-selector-dialog.c:351 ../e-util/e-table-config.c:549
+#: ../e-util/e-table-config.ui.h:3 ../e-util/e-timezone-dialog.ui.h:3
+#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-tag-editor.c:243
+#: ../mail/em-folder-selector.c:43 ../mail/mail-config.ui.h:3
+#: ../mail/mail-dialogs.ui.h:26 ../mail/mail-vfolder-ui.c:149
+#: ../mail/mail-vfolder-ui.c:271
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
+#: ../plugins/publish-calendar/url-editor-dialog.c:422
+#: ../shell/e-shell-content.c:661 ../shell/e-shell-content.c:767
+#: ../shell/main.c:168 ../smime/gui/certificate-manager.c:1336
+#: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
+msgid "_OK"
+msgstr "_Bone"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:451
 msgid "Contact Quick-Add"
 msgstr "Rapida aldono de kontaktulo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
 msgid "_Edit Full"
 msgstr "R_edakti plene"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:490
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:505
 msgid "_Full name"
 msgstr "_Tuta nomo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:501
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:518
 msgid "E_mail"
 msgstr "Ret_poŝto"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:512
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:531
 msgid "_Select Address Book"
 msgstr "E_ekti adresaron"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
-msgid "Dr."
-msgstr "D-ro"
+msgid "Mr."
+msgstr "S-ro"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:2
-msgid "Esq."
-msgstr "Est."
+msgid "Mrs."
+msgstr "S-ino"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Full Name"
-msgstr "Tuta nomo"
+msgid "Ms."
+msgstr "F-ino"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:4
-msgid "I"
-msgstr "I"
+msgid "Miss"
+msgstr "Sinjorino"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:5
-msgid "II"
-msgstr "II"
+msgid "Dr."
+msgstr "D-ro"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:6
-msgid "III"
-msgstr "III"
+msgid "Sr."
+msgstr "S-ro"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:7
 msgid "Jr."
 msgstr "Jr."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:8
-msgid "Miss"
-msgstr "Sinjorino"
+msgid "I"
+msgstr "I"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:9
-msgid "Mr."
-msgstr "S-ro"
+msgid "II"
+msgstr "II"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:10
-msgid "Mrs."
-msgstr "S-ino"
+msgid "III"
+msgstr "III"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:11
-msgid "Ms."
-msgstr "F-ino"
+msgid "Esq."
+msgstr "Est."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:12
-msgid "Sr."
-msgstr "S-ro"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Full Name"
+msgstr "Tuta nomo"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:13
+#: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_First:"
 msgstr "_Unua:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:14
-msgid "_Last:"
-msgstr "_Lasta:"
+#: ../addressbook/gui/contact-editor/fullname.ui.h:16
+#| msgid "_Title:"
+msgctxt "FullName"
+msgid "_Title:"
+msgstr "_Titolo:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:15
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Middle:"
 msgstr "_Meza:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:16
+#: ../addressbook/gui/contact-editor/fullname.ui.h:18
+msgid "_Last:"
+msgstr "_Lasta:"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:19
 msgid "_Suffix:"
 msgstr "_Sufikso:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:817
 msgid "Contact List Editor"
 msgstr "Kontaktlist-redaktilo"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+msgid "_List name:"
+msgstr "_Listnomo:"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "Members"
 msgstr "Membroj"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+msgid "_Type an email address or drag a contact into the list below:"
+msgstr "_Tajpu retpoŝtadreson aŭ treni kontakton al la suba listo:"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Kaŝu adresojn kiam poŝt estas sendata al tiu listo"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
-msgid "_List name:"
-msgstr "_Listnomo:"
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
+msgid "Add an email to the List"
+msgstr "Aldoni retpoŝtadreson al la listo"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:175
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
+#, fuzzy
+#| msgid "Copy the email address to the clipboard"
+msgid "Remove an email address from the List"
+msgstr "Kopii la retpoŝtadreson en la tondujon"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:23
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:21
+#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/e-attachment-view.c:460
+#: ../e-util/e-filter-rule.c:225 ../e-util/e-mail-signature-manager.c:367
+#: ../e-util/e-name-selector-dialog.c:999 ../e-util/filter.ui.h:18
+#: ../mail/e-mail-label-manager.c:391 ../mail/em-filter-rule.c:440
+#: ../mail/em-vfolder-editor-rule.c:630 ../mail/mail-config.ui.h:55
+#: ../plugins/attachment-reminder/attachment-reminder.c:567
+#: ../plugins/email-custom-header/email-custom-header.c:849
+#: ../plugins/publish-calendar/publish-calendar.c:807
+#: ../plugins/publish-calendar/publish-calendar.ui.h:34
+#: ../plugins/templates/templates.c:463
+msgid "_Remove"
+msgstr "Fo_rigi"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
+msgid "Insert email addresses from Address Book"
+msgstr "Enmeti retpoŝtadreson el Adresaro"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:12
 msgid "_Select..."
 msgstr "_Elekti..."
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
-msgid "_Type an email address or drag a contact into the list below:"
-msgstr "_Tajpu retpoŝtadreson aŭ treni kontakton al la suba listo:"
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:13
+#: ../e-util/filter.ui.h:19
+msgid "_Top"
+msgstr "_Supro"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14
+#: ../e-util/filter.ui.h:20
+#, fuzzy
+#| msgid "_Update"
+msgid "_Up"
+msgstr "Ĝ_isdatigi"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:885
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
+#: ../e-util/filter.ui.h:21
+#, fuzzy
+#| msgid "Move _Down"
+msgid "_Down"
+msgstr "Movi _malsupren"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
+#: ../e-util/filter.ui.h:22
+msgid "_Bottom"
+msgstr "_Malsupro"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:942
 msgid "Contact List Members"
 msgstr "Kontaktlist-membroj"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1402
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1487
 msgid "_Members"
 msgstr "_Membroj"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1516
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1627
 msgid "Error adding list"
 msgstr "Eraro dum aldono de listo"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1531
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1647
 msgid "Error modifying list"
 msgstr "Eraro dum ŝangô de listo"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1546
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1667
 msgid "Error removing list"
 msgstr "Eraro dum forigo de listo"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
-msgid "Changed Contact:"
-msgstr "Ŝanĝita kontakto:"
-
-#. Translators: Heading of the contact which has same name or email address in this folder already.
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
-msgid "Conflicting Contact:"
-msgstr "Konflikta kontakto:"
-
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
-msgid "Duplicate Contact Detected"
-msgstr "Trovis duoblan kontaktulon"
-
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
-msgid ""
-"The name or email of this contact already exists in this folder. Would you "
-"like to save the changes anyway?"
-msgstr ""
-"La nomo aŭ la retpoŝtadreso de tiu ĉi kontaktulo jam ekzistas en tiu "
-"dosierujo. Ĉu vi tamen volas konservi la ŝanĝojn ĝin?"
-
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-msgid "New Contact:"
-msgstr "Nova kontakto:"
-
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
-msgid "Original Contact:"
-msgstr "Origina kontaktulo:"
-
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:4
-msgid ""
-"The name or email address of this contact already exists\n"
-"in this folder.  Would you like to add it anyway?"
-msgstr ""
-"La nomo aŭ retpoŝtadreso de tiu kontakto jam ekzistas\n"
-"en ĉi tiu dosierujo. Ĉu vi volas aldoni ĝin malgraŭ tio?"
-
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:338
-msgid "_Merge"
-msgstr "_Kunigi"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:320
-msgid "Merge Contact"
-msgstr "Kunigi kontakton"
-
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:1063
-#: ../modules/calendar/e-cal-shell-view-actions.c:1734
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:987
-msgid "Any field contains"
-msgstr "Iu ajn kampo enhavas"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1195
+msgid "Name contains"
+msgstr "La nomo entenas"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1070
+#: ../modules/addressbook/e-book-shell-view-actions.c:1188
 msgid "Email begins with"
 msgstr "Retpoŝto komencas kun"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:1077
-msgid "Name contains"
-msgstr "La nomo entenas"
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30
+#: ../modules/addressbook/e-book-shell-view-actions.c:1181
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
+#: ../modules/calendar/e-memo-shell-view-actions.c:733
+#: ../modules/calendar/e-task-shell-view-actions.c:933
+msgid "Any field contains"
+msgstr "Iu ajn kampo enhavas"
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:97
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:106
-#: ../addressbook/gui/widgets/ea-minicard-view.c:189
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
+#: ../addressbook/gui/widgets/ea-minicard-view.c:193
 msgid "evolution address book"
 msgstr "adresaro de Evolucio"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:149
 msgid "Copy _Email Address"
 msgstr "Kopiu _Retpoŝtadreson"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:184
-#: ../widgets/misc/e-web-view.c:432
+#: ../addressbook/gui/widgets/eab-contact-display.c:151
+#: ../e-util/e-web-view.c:307
 msgid "Copy the email address to the clipboard"
 msgstr "Kopii la retpoŝtadreson en la tondujon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:189
-#: ../widgets/misc/e-web-view.c:437
+#: ../addressbook/gui/widgets/eab-contact-display.c:156
+#: ../e-util/e-web-view.c:312
 msgid "_Send New Message To..."
 msgstr "_Sendi novan mesaĝon al..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:191
-#: ../widgets/misc/e-web-view.c:439
+#: ../addressbook/gui/widgets/eab-contact-display.c:158
+#: ../e-util/e-web-view.c:314
 msgid "Send a mail message to this address"
 msgstr "Sendi retmesaĝon al tiu ĉi adreso"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:218
+#: ../addressbook/gui/widgets/eab-contact-display.c:290
+#: ../e-util/e-web-view.c:999
+#, c-format
+msgid "Click to mail %s"
+msgstr "Klaku por sendi retpoŝton al %s"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:141
 msgid "Open map"
 msgstr "Malfermi mapon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:533
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:437
+msgid "SIP"
+msgstr "SIP"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
 msgid "List Members:"
 msgstr "Listanoj:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:653
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:753
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "Kromnomo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:685
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:754
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:755
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:756
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:757
+msgid "Jabber"
+msgstr "Jabber"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:758
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:759
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:760
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:761
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:762
+msgid "Twitter"
+msgstr "Tvitero"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:819
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "Firmao"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:686
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:820
 msgid "Department"
 msgstr "Distrikto"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:687
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:821
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Office"
+msgstr "Oficejo"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:822
 msgid "Profession"
 msgstr "Profesio"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:688
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:823
 msgid "Position"
 msgstr "Pozicio"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:689
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:824
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "Estro"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:690
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:825
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "Asistanto"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:691
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:826
 msgid "Video Chat"
 msgstr "Video-babilado"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:692
-#: ../calendar/gui/dialogs/calendar-setup.c:463
-#: ../modules/calendar/e-cal-shell-view-actions.c:232
-#: ../modules/calendar/e-cal-shell-view-actions.c:261
-#: ../modules/calendar/e-cal-shell-view.c:528
-#: ../modules/online-accounts/e-online-accounts-google.c:302
-#: ../plugins/publish-calendar/publish-calendar.ui.h:1
-#: ../widgets/misc/e-send-options.c:528
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:827
+#: ../e-util/e-send-options.c:546
+#: ../modules/calendar/e-cal-shell-view-actions.c:181
+#: ../modules/calendar/e-cal-shell-view.c:570
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Calendar"
 msgstr "Kalendaro"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:693
-#: ../calendar/gui/dialogs/event-editor.c:123
-#: ../calendar/gui/dialogs/event-editor.c:350
-#: ../plugins/publish-calendar/publish-calendar.ui.h:6
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:828
+#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:342
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Libere/okupite"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:694
-#: ../addressbook/gui/widgets/eab-contact-display.c:716
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:829
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:870
 msgid "Phone"
 msgstr "Telefono"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:695
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:830
 msgid "Fax"
 msgstr "Faksilo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:696
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:832
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:873
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:899
 msgid "Address"
 msgstr "Adreso"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:713
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:868
 msgid "Home Page"
 msgstr "Hejmpaĝo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:714
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:869
 msgid "Web Log"
 msgstr "Blogo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:717
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:871
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Mobile Phone"
 msgstr "Poŝtelefono"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:721
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:876
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "Edz(in)o"
 
-#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person memo list
-#. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:723
-#: ../capplet/settings/mail-capplet-shell.c:379
-#: ../modules/addressbook/e-book-shell-backend.c:126
-#: ../modules/addressbook/e-book-shell-migrate.c:144
-#: ../modules/calendar/e-cal-shell-backend.c:144
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-memo-shell-backend.c:128
-#: ../modules/calendar/e-memo-shell-migrate.c:120
-#: ../modules/calendar/e-task-shell-backend.c:128
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:886
 msgid "Personal"
 msgstr "Persona"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:744
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:931
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "Noto"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1013
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1127
 msgid "List Members"
 msgstr "Listanoj"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1148
 msgid "Job Title"
 msgstr "Postena titolo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1068
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1189
 msgid "Home page"
 msgstr "Hejmpaĝo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1077
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1199
 msgid "Blog"
 msgstr "Blogo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1276
-#: ../widgets/misc/e-web-view.c:980
-#, c-format
-msgid "Click to mail %s"
-msgstr "Klaku por sendi retpoŝton al %s"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:261
+#: ../calendar/gui/tasktypes.xml.h:14
+msgid "Cancelled"
+msgstr "Nuligite"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:457
+msgid "Merge Contact"
+msgstr "Kunigi kontakton"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:475
+#: ../addressbook/gui/widgets/eab-contact-merging.c:724
+msgid "_Merge"
+msgstr "_Kunigi"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:713
+msgid "Duplicate Contact Detected"
+msgstr "Trovis duoblan kontaktulon"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:771
+#, fuzzy
+#| msgid ""
+#| "The name or email of this contact already exists in this folder. Would "
+#| "you like to save the changes anyway?"
+msgid ""
+"The name or email address of this contact already exists\n"
+"in this folder. Would you like to save the changes anyway?"
+msgstr ""
+"La nomo aŭ la retpoŝtadreso de tiu ĉi kontaktulo jam\n"
+"ekzistas en tiu dosierujo. Ĉu vi tamen volas konservi la ŝanĝojn ĝin?"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:774
+#, fuzzy
+#| msgid ""
+#| "The name or email address of this contact already exists\n"
+#| "in this folder.  Would you like to add it anyway?"
+msgid ""
+"The name or email address of this contact already exists\n"
+"in this folder. Would you like to add it anyway?"
+msgstr ""
+"La nomo aŭ retpoŝtadreso de tiu kontakto jam ekzistas\n"
+"en ĉi tiu dosierujo. Ĉu vi volas aldoni ĝin malgraŭ tio?"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:789
+msgid "Changed Contact:"
+msgstr "Ŝanĝita kontakto:"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:791
+msgid "New Contact:"
+msgstr "Nova kontakto:"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:830
+msgid "Conflicting Contact:"
+msgstr "Konflikta kontakto:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:120
+#: ../addressbook/gui/widgets/eab-contact-merging.c:832
+#| msgid "Contact: "
+msgid "Old Contact:"
+msgstr "Malnova kontakto:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:121
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -979,36 +1255,36 @@ msgstr ""
 "uzo, aŭ ĝi ankoraŭ neniam estis elŝutita por senkonekta uzo. Bonvolu unufoje "
 "ŝargi la adresaron en konektita reĝimo por elŝuti ĝian enhavon."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
 "and that permissions are set to access it."
 msgstr ""
-"Ne eblis malfermi tiun adresaron. Bonvolu kontroli ĉu la vojo %s ekzistas "
+"Ne eblis malfermi tiun adresaron.  Bonvolu kontroli ĉu la vojo %s ekzistas "
 "kaj ĉu la permesagordoj permesas atingi ĝin al vi."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:161
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 msgstr ""
-"Tiu ĉi versio de Evolucio ne estis tradukita kun subteno de LDAP. Por uzi "
+"Tiu ĉi versio de Evolucio ne estis tradukita kun subteno de LDAP.  Por uzi "
 "LDAP necesas instali alian version de Evolucio, kiu subtenas LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
 msgstr ""
-"Ne eblis malfermi tiun adresaron. Tio signifas ke vi enigis malĝustan URI-"
+"Ne eblis malfermi tiun adresaron.  Tio signifas ke vi enigis malĝustan URI-"
 "on, aŭ la servilo ne atingeblas."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid "Detailed error message:"
 msgstr "Detala erar-mesaĝo:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:209
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1020,7 +1296,7 @@ msgstr ""
 "serĉon pli strikta aŭ pligrandigi la maksimuman nombron\n"
 "de rezultoj en la adresara servilo por tiu ĉi adresaro."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:216
+#: ../addressbook/gui/widgets/eab-gui-util.c:218
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1028,12 +1304,12 @@ msgid ""
 "preferences for this address book."
 msgstr ""
 "La tempo bezonata por tiu ĉi serĉado estas pli longa ol\n"
-"la limo de la servilo aŭ la limo agordita por tiu ĉi adresaro.\n"
-"Bonvolu igi vian serĉon pli strikta aŭ pligrandigi la maksimuman\n"
-"tempon de la adresara servilo por tiu ĉi adresaro."
+"la limo de la servilo aŭ la limo agordita por tiu ĉi adresaro.  \n"
+"Bonvolu igi vian serĉon pli strikta aŭ pligrandigi la\n"
+"maksimuman tempon de la adresara servilo por tiu ĉi adresaro."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#: ../addressbook/gui/widgets/eab-gui-util.c:226
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr ""
@@ -1041,120 +1317,134 @@ msgstr ""
 "informpeton. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#: ../addressbook/gui/widgets/eab-gui-util.c:231
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr ""
 "La interna interfaco por tiu adresaro rifuzis efektivigi tiun informpeton. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:235
-#: ../addressbook/gui/widgets/eab-gui-util.c:241
+#: ../addressbook/gui/widgets/eab-gui-util.c:237
+#: ../addressbook/gui/widgets/eab-gui-util.c:243
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "Tiu informpeto ne sukcese finiĝis. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:263
+#: ../addressbook/gui/widgets/eab-gui-util.c:265
 msgid "card.vcf"
 msgstr "karto.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:309
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
 msgid "Select Address Book"
 msgstr "Elekti adresaron"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:383
+#: ../addressbook/gui/widgets/eab-gui-util.c:398
 msgid "list"
 msgstr "listo"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:568
+#: ../addressbook/gui/widgets/eab-gui-util.c:587
 msgid "Move contact to"
 msgstr "Movi kontakton al"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:570
+#: ../addressbook/gui/widgets/eab-gui-util.c:589
 msgid "Copy contact to"
 msgstr "Kopii kontakton al"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:573
+#: ../addressbook/gui/widgets/eab-gui-util.c:592
 msgid "Move contacts to"
 msgstr "Movi kontaktojn al"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:575
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
 msgid "Copy contacts to"
 msgstr "Kopii kontaktojn al"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:157
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
 msgstr "Neniuj kontaktoj"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:161
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d kontakto"
 msgstr[1] "%d kontaktoj"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:357
+#: ../addressbook/gui/widgets/e-addressbook-model.c:372
 msgid "Error getting book view"
 msgstr "Eraro dum akiro de libro-aspekton"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:774
+#: ../addressbook/gui/widgets/e-addressbook-model.c:819
 msgid "Search Interrupted"
 msgstr "Serĉado interrompita"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:158
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:203
 msgid "Error modifying card"
 msgstr "Eraro dum modifado de karto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:624
+#: ../addressbook/gui/widgets/e-addressbook-view.c:648
 msgid "Cut selected contacts to the clipboard"
 msgstr "Eltondi la elektitajn kontaktulojn en la tondujon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:630
+#: ../addressbook/gui/widgets/e-addressbook-view.c:654
 msgid "Copy selected contacts to the clipboard"
-msgstr "Kopii la elektitajn kontaktulojn  en la tondujon"
+msgstr "Kopii la elektitajn kontaktulojn en la tondujon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:636
+#: ../addressbook/gui/widgets/e-addressbook-view.c:660
 msgid "Paste contacts from the clipboard"
 msgstr "Alglui la kontaktulojn el la tondujo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:642
-#: ../modules/addressbook/e-book-shell-view-actions.c:881
+#: ../addressbook/gui/widgets/e-addressbook-view.c:666
+#: ../modules/addressbook/e-book-shell-view-actions.c:995
 msgid "Delete selected contacts"
 msgstr "Forigi la elektitajn kontaktulojn"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:648
+#: ../addressbook/gui/widgets/e-addressbook-view.c:672
 msgid "Select all visible contacts"
 msgstr "Elektu ĉiujn videblajn kontaktulojn"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1326
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Ĉu certe vi volas forigi tiun ĉi liston de kontaktuloj?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Ĉu certe vi volas forigi tiun ĉi liston de kontaktuloj?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1334
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Ĉu certe vi volas forigi tiun ĉi liston de kontaktuloj (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1340
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Ĉu certe vi volas forigi tiujn ĉi kontaktulojn?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1344
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
 msgid "Are you sure you want to delete this contact?"
 msgstr "Ĉu certe vi volas forigi tiun ĉi kontaktulon?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1348
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Ĉu certe vi volas forigi tiun ĉi kontaktulon (%s)?"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1331
+#: ../calendar/gui/dialogs/comp-editor.c:1242 ../e-util/e-focus-tracker.c:785
+#: ../e-util/evolution-source-viewer.c:805
+#: ../mail/e-mail-account-manager.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:1067
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/mail/e-mail-shell-view-actions.c:1622
+#: ../shell/e-shell-window-actions.c:943
+#: ../smime/gui/certificate-manager.c:1659 ../smime/gui/smime-ui.ui.h:10
+msgid "_Delete"
+msgstr "_Forigi"
+
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1504
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1476
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1169,119 +1459,101 @@ msgstr[1] ""
 "Malfermado de %d kontaktoj malfermos ankaŭ %d novajn fenestrojn.\n"
 "Ĉu certe vi volas montri ĉiujn ĉi kontaktulojn?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1512
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
 msgid "_Don't Display"
 msgstr "_Ne montru"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
 msgid "Display _All Contacts"
 msgstr "_Montru ĉiujn kontaktulojn"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "Telefono de asistanto"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "File As"
+msgstr "Klasi kiel"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "Deĵora telekopiilo"
+msgid "Given Name"
+msgstr "Donita nomo"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Family Name"
+msgstr "Familia nomo"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Email 2"
+msgstr "Retpoŝto 2"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Email 3"
+msgstr "Retpoŝto 3"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Assistant Phone"
+msgstr "Telefono de asistanto"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 msgid "Business Phone"
 msgstr "Deĵora telefono"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Business Phone 2"
 msgstr "Deĵora telefono 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Business Fax"
+msgstr "Deĵora telekopiilo"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Callback Phone"
 msgstr "Responda telefono"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Car Phone"
 msgstr "Aŭta telefono"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:4
-#: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-cal-list-view.etspec.h:1
-#: ../calendar/gui/e-memo-table.etspec.h:1
-msgid "Categories"
-msgstr "Kategorioj"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Company Phone"
 msgstr "Kompania telefono"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 2"
-msgstr "Retpoŝto 2"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
-msgid "Email 3"
-msgstr "Retpoŝto 3"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-msgid "Family Name"
-msgstr "Familia nomo"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
-msgid "File As"
-msgstr "Klasi kiel"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Home Phone"
+msgstr "Hejma telefono"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Given Name"
-msgstr "Donita nomo"
+msgid "Home Phone 2"
+msgstr "Hejma telfono 2"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
 msgstr "Hejma telekopiilo"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Phone"
-msgstr "Hejma telefono"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "Home Phone 2"
-msgstr "Hejma telfono 2"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "ISDN Phone"
 msgstr "ISDN-a telefono"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "Journal"
-msgstr "Ĵurnalo"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Oficejo"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Other Phone"
+msgstr "Alia telefono"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Other Fax"
 msgstr "Plia telekopiilo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "Alia telefono"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Pager"
 msgstr "Televokilo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Primary Phone"
 msgstr "Ĉefa telefono"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Radio"
 msgstr "Radio"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:610
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Rolo"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Telex"
+msgstr "Telekso"
 
 #. Translators: This is a vcard standard and stands for the type of
 #. phone used by the hearing impaired. TTY stands for "teletype"
@@ -1289,71 +1561,98 @@ msgstr "Rolo"
 #. Device for Deaf". However, you probably want to leave this
 #. abbreviation unchanged unless you know that there is actually a
 #. different and established translation for this in your language.
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
-msgid "Telex"
-msgstr "Telekso"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+msgid "Unit"
+msgstr "Unuo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Titolo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-msgid "Unit"
-msgstr "Unuo"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: ../calendar/gui/e-meeting-list-view.c:666
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Role"
+msgstr "Rolo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "Retpaĝo"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:34
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+msgid "Journal"
+msgstr "Ĵurnalo"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../calendar/gui/dialogs/event-page.ui.h:20
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../e-util/e-categories-dialog.c:87
+msgid "Categories"
+msgstr "Kategorioj"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:33
 msgid "Open"
 msgstr "Malfermi"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:156
+#: ../addressbook/gui/widgets/ea-minicard.c:159
 msgid "Contact List: "
 msgstr "Kontaklisto: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:157
+#: ../addressbook/gui/widgets/ea-minicard.c:160
 msgid "Contact: "
 msgstr "Kontakto: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:183
+#: ../addressbook/gui/widgets/ea-minicard.c:187
 msgid "evolution minicard"
 msgstr "karteto de Evolucio"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+#: ../addressbook/gui/widgets/ea-minicard-view.c:35
 msgid "New Contact"
 msgstr "Nova kontakto"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:37
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
 msgid "New Contact List"
 msgstr "Nova kontaktaro"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:172
+#: ../addressbook/gui/widgets/ea-minicard-view.c:176
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "nuna adresara dosierujo %s havas %d karton"
 msgstr[1] "nuna adresara dosierujo %s havas %d kartojn"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
-msgid "Work Email"
-msgstr "Labora Retpoŝto"
+#: ../addressbook/gui/widgets/e-contact-map-window.c:377
+msgid "Contacts Map"
+msgstr "Kontakt-mapo"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-msgid "Home Email"
-msgstr "Hejma Retpoŝto"
+#. Zoom-in button
+#: ../addressbook/gui/widgets/e-contact-map-window.c:412
+#, fuzzy
+#| msgid "_Zoom In"
+msgid "Zoom _In"
+msgstr "E_nzomi"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
-#: ../addressbook/gui/widgets/e-minicard.c:819
-msgid "Other Email"
-msgstr "Alia Retpoŝto"
+#. Zoom-out button
+#: ../addressbook/gui/widgets/e-contact-map-window.c:420
+#: ../mail/e-mail-reader.c:2360
+msgid "Zoom _Out"
+msgstr "E_lzomi"
+
+#. Search button
+#: ../addressbook/gui/widgets/e-contact-map-window.c:450
+#: ../e-util/e-html-editor-actions.c:2108
+#: ../e-util/e-html-editor-find-dialog.c:195
+#: ../shell/e-shell-window-actions.c:1020
+#| msgid "_Find Now"
+msgid "_Find"
+msgstr "_Serĉi"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:192
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -1363,7 +1662,7 @@ msgstr ""
 "\n"
 "Serĉante kontakulojn..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:195
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1377,7 +1676,7 @@ msgstr ""
 "\n"
 "Du-klaku tie ĉi por krei novan kontaktulon."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:198
+#: ../addressbook/gui/widgets/e-minicard-view.c:196
 msgid ""
 "\n"
 "\n"
@@ -1391,7 +1690,7 @@ msgstr ""
 "\n"
 "Du-klaku tie ĉi por krei novan kontaktulon."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:202
+#: ../addressbook/gui/widgets/e-minicard-view.c:200
 msgid ""
 "\n"
 "\n"
@@ -1401,7 +1700,7 @@ msgstr ""
 "\n"
 "Serĉado de la kontaktulo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:204
+#: ../addressbook/gui/widgets/e-minicard-view.c:202
 msgid ""
 "\n"
 "\n"
@@ -1411,160 +1710,266 @@ msgstr ""
 "\n"
 "Ne estas eroj montreblaj en tiu ĉi vido."
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
-msgid "Card View"
-msgstr "Kartvido"
-
-#: ../addressbook/importers/evolution-csv-importer.c:748
-#: ../addressbook/importers/evolution-ldif-importer.c:546
-#: ../addressbook/importers/evolution-vcard-importer.c:280
-#: ../calendar/importers/icalendar-importer.c:413
-#: ../calendar/importers/icalendar-importer.c:903
-#: ../calendar/importers/icalendar-importer.c:942 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-csv-importer.c:746
+#: ../addressbook/importers/evolution-ldif-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:249
+#: ../calendar/importers/icalendar-importer.c:430
+#: ../calendar/importers/icalendar-importer.c:925
+#: ../calendar/importers/icalendar-importer.c:964 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Enportante..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1075
-msgid "Outlook CSV or Tab (.csv, .tab)"
+#: ../addressbook/importers/evolution-csv-importer.c:1081
+#, fuzzy
+#| msgid "Outlook CSV or Tab (.csv, .tab)"
+msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Outlook-CSV aŭ -Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1076
-msgid "Outlook CSV and Tab Importer"
+#: ../addressbook/importers/evolution-csv-importer.c:1082
+#, fuzzy
+#| msgid "Outlook CSV and Tab Importer"
+msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Outlook-CSV kaj -Tab-Enportilo"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1084
-msgid "Mozilla CSV or Tab (.csv, .tab)"
+#: ../addressbook/importers/evolution-csv-importer.c:1090
+#, fuzzy
+#| msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozilla-CSV aŭ -Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1085
-msgid "Mozilla CSV and Tab Importer"
+#: ../addressbook/importers/evolution-csv-importer.c:1091
+#, fuzzy
+#| msgid "Mozilla CSV and Tab Importer"
+msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozilla-CSV kaj -Tab-Enportilo"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1093
-msgid "Evolution CSV or Tab (.csv, .tab)"
+#: ../addressbook/importers/evolution-csv-importer.c:1099
+#, fuzzy
+#| msgid "Evolution CSV or Tab (.csv, .tab)"
+msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolucio-CSV aŭ -Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1094
-msgid "Evolution CSV and Tab Importer"
+#: ../addressbook/importers/evolution-csv-importer.c:1100
+#, fuzzy
+#| msgid "Evolution CSV and Tab Importer"
+msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolucio-CSV kaj -Tab-Enportilo"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:796
+#: ../addressbook/importers/evolution-ldif-importer.c:806
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Datum-Interŝanĝ-Formato (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:797
+#: ../addressbook/importers/evolution-ldif-importer.c:807
 msgid "Evolution LDIF importer"
 msgstr "Evolucio-LDIF-enportilo"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:657
+#: ../addressbook/importers/evolution-vcard-importer.c:634
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:658
+#: ../addressbook/importers/evolution-vcard-importer.c:635
 msgid "Evolution vCard Importer"
 msgstr "Evolucio-vCard-enportilo"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:721
+#: ../addressbook/printing/e-contact-print.c:874
 #, c-format
 msgid "Page %d"
 msgstr "Paĝo %d"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:54
 msgid "Specify the output file instead of standard output"
 msgstr "Uzi la eligitan dosieron anstataŭ la defaŭltan eligon"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "OUTPUTFILE"
 msgstr "ELIGDOSIERO"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:64
+#: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "List local address book folders"
 msgstr "Listigi lokajn adresar-dosierujojn"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:67
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "Show cards as vcard or csv file"
 msgstr "Montri kartojn kiel vcard- aŭ csv-dosiero"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:68
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:71
-msgid "Export in asynchronous mode"
-msgstr "Elporti per nesinkrona reĝimo"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:74
-msgid ""
-"The number of cards in one output file in asynchronous mode, default size "
-"100."
-msgstr ""
-"Nombro de kartoj en unu eliga dosiero dum malsamtempa modo, apriora grando: "
-"100."
-
-#: ../addressbook/tools/evolution-addressbook-export.c:76
-msgid "NUMBER"
-msgstr "NOMBRO"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:139
+#: ../addressbook/tools/evolution-addressbook-export.c:111
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Eraro de komandliniaj argumentoj, bonvolu uzi opcion --help por vidi la "
 "uzadon."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:153
+#: ../addressbook/tools/evolution-addressbook-export.c:125
 msgid "Only support csv or vcard format."
 msgstr "Nur subteni CSV- aŭ vcard- aranĝonjn."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:162
-msgid "In async mode, output must be file."
-msgstr "En nesinkrona reĝimo eligo estu dosiero."
-
-#: ../addressbook/tools/evolution-addressbook-export.c:170
-msgid "In normal mode, there is no need for the size option."
-msgstr "En normala reĝimo, ne necesas la grandopcion."
-
-#: ../addressbook/tools/evolution-addressbook-export.c:201
+#: ../addressbook/tools/evolution-addressbook-export.c:156
 msgid "Unhandled error"
 msgstr "Netraktita eraro"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:654
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:689
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:635
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
 msgid "Can not open file"
 msgstr "Ne eblis malfermi dosieron"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-#, c-format
-msgid "Couldn't get list of address books: %s"
-msgstr "Ne eblis ricevi liston de adresaroj: %s"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
-#: ../calendar/gui/dialogs/memo-page.c:946 ../em-format/em-format.c:2321
-#: ../mail/em-folder-tree.c:673 ../mail/mail-ops.c:636
-#: ../plugins/caldav/caldav-browse-server.c:220
-#: ../plugins/caldav/caldav-browse-server.c:1469 ../plugins/face/face.c:174
-#: ../plugins/itip-formatter/itip-formatter.c:1474
-#: ../plugins/itip-formatter/itip-formatter.c:1844
-#: ../smime/gui/certificate-manager.c:313
-msgid "Unknown error"
-msgstr "Nekonata eraro"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:75
 #, c-format
 msgid "Failed to open client '%s': %s"
 msgstr "Ne eblis malfermi la klienton '%s': %s"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:109
+#: ../addressbook/util/eab-book-util.c:36
+#, fuzzy
+#| msgid "Work Email"
+msgctxt "addressbook-label"
+msgid "Work Email"
+msgstr "Labora Retpoŝto"
+
+#: ../addressbook/util/eab-book-util.c:37
+#, fuzzy
+#| msgid "Home Email"
+msgctxt "addressbook-label"
+msgid "Home Email"
+msgstr "Hejma Retpoŝto"
+
+#: ../addressbook/util/eab-book-util.c:38
+#, fuzzy
+#| msgid "Other Email"
+msgctxt "addressbook-label"
+msgid "Other Email"
+msgstr "Alia Retpoŝto"
+
+#: ../addressbook/util/eab-book-util.c:44
+#| msgid "Work"
+msgctxt "addressbook-label"
+msgid "Work SIP"
+msgstr "Laboreja SIP"
+
+#: ../addressbook/util/eab-book-util.c:45
+#, fuzzy
+#| msgid "Home Page"
+msgctxt "addressbook-label"
+msgid "Home SIP"
+msgstr "Hejma SIP"
+
+#: ../addressbook/util/eab-book-util.c:46
+#| msgid "Other"
+msgctxt "addressbook-label"
+msgid "Other SIP"
+msgstr "Alia SIP"
+
+#: ../addressbook/util/eab-book-util.c:74
+#| msgid "AIM"
+msgctxt "addressbook-label"
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/util/eab-book-util.c:75
+#| msgid "Jabber"
+msgctxt "addressbook-label"
+msgid "Jabber"
+msgstr "Jabero"
+
+#: ../addressbook/util/eab-book-util.c:76
+#| msgid "Yahoo"
+msgctxt "addressbook-label"
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: ../addressbook/util/eab-book-util.c:77
+#| msgid "Gadu-Gadu"
+msgctxt "addressbook-label"
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/util/eab-book-util.c:78
+#| msgid "MSN"
+msgctxt "addressbook-label"
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/util/eab-book-util.c:79
+#| msgid "ICQ"
+msgctxt "addressbook-label"
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/util/eab-book-util.c:80
+#| msgid "GroupWise"
+msgctxt "addressbook-label"
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/util/eab-book-util.c:81
+#| msgid "Skype"
+msgctxt "addressbook-label"
+msgid "Skype"
+msgstr "Skajpo"
+
+#: ../addressbook/util/eab-book-util.c:82
+msgctxt "addressbook-label"
+msgid "Twitter"
+msgstr "Tvitero"
+
+#: ../addressbook/util/eab-book-util.c:83
+#| msgid "Google"
+msgctxt "addressbook-label"
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#. To Translators:
+#. * if an email address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#.
+#: ../addressbook/util/eab-book-util.c:126
+#| msgid "Email"
+msgctxt "addressbook-label"
+msgid "Email"
+msgstr "Retpoŝtadreso"
+
+#. To Translators:
+#. * if a SIP address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#. * SIP=Session Initiation Protocol, used for voice over IP
+#.
+#: ../addressbook/util/eab-book-util.c:173
+msgctxt "addressbook-label"
+msgid "SIP"
+msgstr "SIP"
+
+#. To Translators:
+#. * if an IM address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#. * IM=Instant Messaging
+#.
+#: ../addressbook/util/eab-book-util.c:216
+#| msgid "AIM"
+msgctxt "addressbook-label"
+msgid "IM"
+msgstr "TM"
+
+#. To Translators:
+#. * if a phone number type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#.
+#: ../addressbook/util/eab-book-util.c:271
+#| msgid "Phone"
+msgctxt "addressbook-label"
+msgid "Phone"
+msgstr "Telefono"
+
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutoj"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:122
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:118
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "horo"
@@ -1573,14 +1978,14 @@ msgstr[1] "horoj"
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:135
-#: ../calendar/gui/dialogs/recurrence-page.c:1188
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/dialogs/recurrence-page.c:1249
 msgid "day"
 msgid_plural "days"
 msgstr[0] "tago"
 msgstr[1] "tagoj"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:331
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:343
 msgid "Start time"
 msgstr "Strarttempo"
 
@@ -1592,96 +1997,124 @@ msgstr "Rendevuoj"
 msgid "Dismiss _All"
 msgstr "Malakcepi ĉi_on"
 
-#. Location
 #: ../calendar/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/alarm-notify/alarm-queue.c:1756
-#: ../calendar/alarm-notify/alarm-queue.c:1766
-#: ../plugins/itip-formatter/itip-view.c:1052
-msgid "Location:"
-msgstr "Loko:"
+msgid "_Snooze"
+msgstr "_Dormeti"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:4
-msgid "Snooze _time:"
-msgstr "Dormet_tempo:"
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:6
+#: ../calendar/gui/dialogs/comp-editor.c:1321
+#: ../calendar/gui/dialogs/event-page.ui.h:24
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
+#: ../calendar/gui/dialogs/task-page.ui.h:32
+#: ../e-util/e-html-editor-actions.c:1138
+#: ../e-util/e-mail-signature-manager.c:357 ../e-util/filter.ui.h:17
+#: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:170
+#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:59
+#: ../plugins/attachment-reminder/attachment-reminder.c:562
+#: ../plugins/email-custom-header/email-custom-header.c:844
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1071
+#: ../smime/gui/smime-ui.ui.h:13
+msgid "_Edit"
+msgstr "R_edakti"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#| msgid "Print"
+msgid "_Print"
+msgstr "_Presi"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert-dialog.c:160
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:164
 msgid "_Dismiss"
 msgstr "_Malakcepti"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6
-msgid "_Snooze"
-msgstr "_Dormeti"
+#: ../calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/alarm-notify/alarm-queue.c:1844
+#: ../calendar/alarm-notify/alarm-queue.c:1854
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:248
+#: ../modules/itip-formatter/itip-view.c:1516
+#: ../modules/itip-formatter/itip-view.c:1627
+msgid "Location:"
+msgstr "Loko:"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:8
+msgid "location of appointment"
+msgstr "loko de rendevuo"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:9
+msgid "Snooze _time:"
+msgstr "Dormet_tempo:"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:454
-#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:350
-#: ../plugins/google-account-setup/google-contacts-source.c:387
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+#: ../calendar/alarm-notify/alarm-notify.ui.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../e-util/e-interval-chooser.c:143 ../e-util/filter.ui.h:8
+#: ../modules/calendar/e-cal-shell-view-actions.c:326
+#: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "days"
 msgstr "tagoj"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:453
-#: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:386
+#: ../calendar/alarm-notify/alarm-notify.ui.h:11
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../e-util/e-interval-chooser.c:141 ../e-util/filter.ui.h:7
 msgid "hours"
 msgstr "horoj"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:9
-msgid "location of appointment"
-msgstr "loko de rendevuo"
-
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:452
-#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:385
+#: ../calendar/alarm-notify/alarm-notify.ui.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../e-util/e-interval-chooser.c:139 ../e-util/filter.ui.h:6
+#: ../mail/e-mail-config-provider-page.c:526
 msgid "minutes"
 msgstr "minutoj"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1605
-#: ../calendar/alarm-notify/alarm-queue.c:1737
+#: ../calendar/alarm-notify/alarm-queue.c:1687
+#: ../calendar/alarm-notify/alarm-queue.c:1824
 msgid "No summary available."
 msgstr "Neniu resumo disponeblas."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1614
-#: ../calendar/alarm-notify/alarm-queue.c:1616
+#: ../calendar/alarm-notify/alarm-queue.c:1696
+#: ../calendar/alarm-notify/alarm-queue.c:1698
 msgid "No description available."
 msgstr "Neniu priskribo disponebla."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1624
+#: ../calendar/alarm-notify/alarm-queue.c:1706
 msgid "No location information available."
 msgstr "Neniu lokinformo disponeblas."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1670
+#: ../calendar/alarm-notify/alarm-queue.c:1711
+#: ../calendar/alarm-notify/alarm-queue.c:1815
+#: ../calendar/alarm-notify/alarm-queue.c:2156
+#, fuzzy
+#| msgid "Evolution Website"
+msgid "Evolution Reminders"
+msgstr "Retpaĝaro de Evolucio"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1755
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "Vi havas %d memorigaĵon"
 msgstr[1] "Vi havas %d memorigaĵojn"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1870
-#: ../calendar/alarm-notify/alarm-queue.c:1905
+#: ../calendar/alarm-notify/alarm-queue.c:1974
 msgid "Warning"
 msgstr "Averto"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1874
-msgid ""
-"Evolution does not support calendar reminders with\n"
-"email notifications yet, but this reminder was\n"
-"configured to send an email.  Evolution will display\n"
-"a normal reminder dialog box instead."
-msgstr ""
-"Evolucio ankoraŭ ne subtenas kalendarmemorilojn kun\n"
-"retpoŝtaj atentigoj sed ĉi tiu memorilo estis\n"
-"agordita por sendi retpoŝton.  Evolucio anstataŭe montros\n"
-"normalan memorilan dialogkeston."
+#: ../calendar/alarm-notify/alarm-queue.c:1975 ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail.error.xml.h:139
+#: ../modules/mailto-handler/evolution-mailto-handler.c:114
+msgid "_No"
+msgstr "_Ne"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1976 ../mail/mail.error.xml.h:138
+#: ../modules/mailto-handler/evolution-mailto-handler.c:115
+msgid "_Yes"
+msgstr "_Jes"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1911
+#: ../calendar/alarm-notify/alarm-queue.c:1980
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1698,17 +2131,17 @@ msgstr ""
 "\n"
 "Ĉu vi certe volas lanĉi ĉi tiun programaron?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1926
+#: ../calendar/alarm-notify/alarm-queue.c:1995
 msgid "Do not ask me about this program again."
 msgstr "Ne demandu min denove pri tiu programo."
 
-#: ../calendar/alarm-notify/util.c:45
+#: ../calendar/alarm-notify/util.c:43
 msgid "invalid time"
 msgstr "nevalida tempo"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:405
-#: ../calendar/gui/misc.c:116
+#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:382
+#: ../calendar/gui/misc.c:103
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1716,8 +2149,8 @@ msgstr[0] "%d horo"
 msgstr[1] "%d horoj"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:411
-#: ../calendar/gui/misc.c:122
+#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:388
+#: ../calendar/gui/misc.c:109
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1727,261 +2160,254 @@ msgstr[1] "%d minutoj"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/alarm-notify/util.c:81 ../calendar/gui/e-alarm-list.c:417
-#: ../calendar/gui/misc.c:126
+#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:394
+#: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekundo"
 msgstr[1] "%d sekundoj"
 
-#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:1
+msgid "Would you like to send all the participants a cancelation notice?"
+msgstr "Ĉu vi volas sendi al ĉiuj partoprenantoj nuligpeton?"
+
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' does not support assigned tasks, please select a different task list."
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
 msgstr ""
+"Se vi ne sendas nulig-mesaĝon, la aliaj partoprenantoj eble ne scias, ke la "
+"kunsido estas nuligite."
+
+#: ../calendar/calendar.error.xml.h:3
+msgid "Do _not Send"
+msgstr "_Ne sendi"
 
-#. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar from the side bar in the Calendar view."
-msgstr ""
-"'{0}' estas nurlega kalendaro kaj ne estas modifebla. Bonvolu elekti alian "
-"kalendaron de la flankbreto en la kalendarvido."
+msgid "_Send Notice"
+msgstr "_Sendi rimarkon"
 
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:6
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar that can accept appointments."
-msgstr ""
-"'{0}' estas nurlega kalendaro kaj ne estas modifebla. Bonvolu elekti alian "
-"kalendaron kiu povas akcepti rendevuojn."
+#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/gui/dialogs/delete-comp.c:192
+#, c-format
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Ĉe vi certe volas forigi tiun kunsidon?"
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:6
 msgid ""
-"Adding a meaningful summary to your appointment will give you an idea of "
-"what your appointment is about."
-msgstr ""
-"Aldoni signifan resumon al via rendevuo donos al vi ideon pri kio via "
-"rendevuo temas pri."
+"All information on this meeting will be deleted and can not be restored."
+msgstr "Ĉiuj informoj de tiu kunsido estos forigotaj kaj ne restaŭrigeblaj."
 
 #: ../calendar/calendar.error.xml.h:8
 msgid ""
-"Adding a meaningful summary to your task will give you an idea of what your "
-"task is about."
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
 msgstr ""
-"Aldoni signifan resumon al via tasko donos al vi ideon pri kio via tasko "
-"temas pri."
+"Se vi ne sendas nulig-mesaĝon, la aliaj partoprenantoj eble ne scias, ke la "
+"tasko estas forigite."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid "All information in these memos will be deleted and can not be restored."
-msgstr ""
-"Ĉiuj infromoj en tiuj notoj estos forigitaj kaj ne plu eblas restaŭri ilin."
+#: ../calendar/gui/dialogs/delete-comp.c:195
+#, c-format
+msgid "Are you sure you want to delete this task?"
+msgstr "Ĉu vi certe volas forigi tiun taskon?"
 
 #: ../calendar/calendar.error.xml.h:10
-msgid "All information in this memo will be deleted and can not be restored."
-msgstr ""
-"Ĉiuj infromoj en tiu noto estos forigitaj kaj ne plu eblas restaŭri ilin."
+msgid "All information on this task will be deleted and can not be restored."
+msgstr "Ĉiuj informoj de tiu tasko estos forigotaj kaj ne restaŭrigeblaj."
 
 #: ../calendar/calendar.error.xml.h:11
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
-msgstr "Ĉiuj informoj de tiu rendevuoj estos forigotaj kaj ne restaŭrigeblaj."
+msgid "Would you like to send a cancelation notice for this memo?"
+msgstr "Ĉu vi volas sendi nulig-mesaĝon por tiu noto?"
 
 #: ../calendar/calendar.error.xml.h:12
-msgid "All information on these tasks will be deleted and can not be restored."
-msgstr "Ĉiuj informoj de tiu taskoj estos forigotaj kaj ne restaŭrigeblaj."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
+msgstr ""
+"Se vi ne sendas nulig-mesaĝon, la aliaj partoprenantoj eble ne scias, ke la "
+"noto estas forigite."
 
 #: ../calendar/calendar.error.xml.h:13
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
-msgstr "Ĉiuj informoj de tiu rendevuo estos forigotaj kaj ne restaŭrigeblaj."
+#: ../calendar/gui/dialogs/delete-comp.c:198
+#, c-format
+msgid "Are you sure you want to delete this memo?"
+msgstr "Ĉu vi certe volas forigi tiun noton?"
 
 #: ../calendar/calendar.error.xml.h:14
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
-msgstr "Ĉiuj informoj de tiu kunsido estos forigotaj kaj ne restaŭrigeblaj."
-
-#: ../calendar/calendar.error.xml.h:15
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr ""
 "Ĉiuj infromoj de tiu noto estos forigitaj kaj ne plu eblas restaŭri ilin."
 
+#: ../calendar/calendar.error.xml.h:15
+msgid "Are you sure you want to delete the meeting titled '{0}'?"
+msgstr "Ĉu vi certe volas forigi tiun kunsidon nomite '{0}'?"
+
 #: ../calendar/calendar.error.xml.h:16
-msgid "All information on this task will be deleted and can not be restored."
-msgstr "Ĉiuj informoj de tiu tasko estos forigotaj kaj ne restaŭrigeblaj."
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Ĉu vi certe volas forigi tiun rendevuon nomite '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:17
-msgid "Are you sure you want to delete the '{0}' task?"
-msgstr "Ĉu vi certe volas forigi la taskon '{0}'?"
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr "Ĉiuj informoj de tiu rendevuo estos forigotaj kaj ne restaŭrigeblaj."
 
 #: ../calendar/calendar.error.xml.h:18
-msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr "Ĉu vi certe volas forigi tiun rendevuon nomite '{0}'?"
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Ĉe vi certe volas forigi tiun rendevuon?"
 
 #: ../calendar/calendar.error.xml.h:19
-msgid "Are you sure you want to delete the meeting titled '{0}'?"
-msgstr "Ĉu vi certe volas forigi tiun kunsidon nomite '{0}'?"
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Ĉu vi certe volas forigi la taskon '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "Ĉu vi certe volas forigi tiun noton '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:21
-msgid "Are you sure you want to delete these {0} appointments?"
-msgstr "Ĉu vi certe volas forigi tiujn {0} rendevuojn?"
+msgid "All information in this memo will be deleted and can not be restored."
+msgstr ""
+"Ĉiuj infromoj en tiu noto estos forigitaj kaj ne plu eblas restaŭri ilin."
 
 #: ../calendar/calendar.error.xml.h:22
-msgid "Are you sure you want to delete these {0} memos?"
-msgstr "Ĉu vi certe volas forigi tiujn '{0}' notojn?"
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Ĉu vi certe volas forigi tiujn {0} rendevuojn?"
 
 #: ../calendar/calendar.error.xml.h:23
-msgid "Are you sure you want to delete these {0} tasks?"
-msgstr "Ĉu vi certe volas forigi tiujn taskojn {0}?"
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr "Ĉiuj informoj de tiu rendevuoj estos forigotaj kaj ne restaŭrigeblaj."
 
 #: ../calendar/calendar.error.xml.h:24
-msgid "Are you sure you want to delete this appointment?"
-msgstr "Ĉe vi certe volas forigi tiun rendevuon?"
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Ĉu vi certe volas forigi tiujn taskojn {0}?"
 
 #: ../calendar/calendar.error.xml.h:25
-#: ../calendar/gui/dialogs/delete-comp.c:189
-#, c-format
-msgid "Are you sure you want to delete this meeting?"
-msgstr "Ĉe vi certe volas forigi tiun kunsidon?"
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr "Ĉiuj informoj de tiu taskoj estos forigotaj kaj ne restaŭrigeblaj."
 
 #: ../calendar/calendar.error.xml.h:26
-#: ../calendar/gui/dialogs/delete-comp.c:195
-#, c-format
-msgid "Are you sure you want to delete this memo?"
-msgstr "Ĉu vi certe volas forigi tiun noton?"
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr "Ĉu vi certe volas forigi tiujn {0} notojn?"
 
 #: ../calendar/calendar.error.xml.h:27
-#: ../calendar/gui/dialogs/delete-comp.c:192
-#, c-format
-msgid "Are you sure you want to delete this task?"
-msgstr "Ĉu vi certe volas forigi tiun taskon?"
+msgid "All information in these memos will be deleted and can not be restored."
+msgstr ""
+"Ĉiuj infromoj en tiuj notoj estos forigitaj kaj ne plu eblas restaŭri ilin."
 
 #: ../calendar/calendar.error.xml.h:28
-msgid "Are you sure you want to save the appointment without a summary?"
-msgstr "Ĉu vi certe volas konservi la rendevuon sen resumo?"
+msgid "Would you like to save your changes to this meeting?"
+msgstr "Ĉu vi volas konservi viajn ŝanĝojn al tiu kunsido?"
 
 #: ../calendar/calendar.error.xml.h:29
-msgid "Are you sure you want to save the memo without a summary?"
-msgstr "Ĉu vi certe volas konservi tiun noton sen iu resumo?"
+msgid "You have changed this meeting, but not yet saved it."
+msgstr "Vi ŝanĝis tiun kunsidon, sed ja ne konservis ĝin."
 
 #: ../calendar/calendar.error.xml.h:30
-msgid "Are you sure you want to save the task without a summary?"
-msgstr "Ĉu vi certe volas konservi la taskon sen resumo?"
+msgid "_Save Changes"
+msgstr "Kon_servi ŝanĝojn"
 
 #: ../calendar/calendar.error.xml.h:31
-msgid "Cannot create a new event"
-msgstr "Ne eblas krei novan eventon"
+#: ../composer/mail-composer.error.xml.h:16
+msgid "_Discard Changes"
+msgstr "_Ignori ŝanĝojn"
 
 #: ../calendar/calendar.error.xml.h:32
-msgid "Cannot save event"
-msgstr "Ne eblas konservi eventon"
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Ĉu vi volas konservi viajn ŝanĝojn al tiu rendevuo?"
 
 #: ../calendar/calendar.error.xml.h:33
-msgid "Cannot save task"
-msgstr "Ne eblas konservi taskon"
+msgid "You have changed this appointment, but not yet saved it."
+msgstr "Vi ŝanĝis tiun rendevuon, sed ja ne konservis ĝin."
 
 #: ../calendar/calendar.error.xml.h:34
-msgid "Delete calendar '{0}'?"
-msgstr "Ĉu forigi kalendaron '{0}'?"
+msgid "Would you like to save your changes to this task?"
+msgstr "Ĉu vi volas konservi viajn ŝanĝojn al tiu taskon?"
 
 #: ../calendar/calendar.error.xml.h:35
-msgid "Delete memo list '{0}'?"
-msgstr "Ĉu forigi notoliston '{0}'?"
+msgid "You have changed this task, but not yet saved it."
+msgstr "Vi ŝanĝis tiun taskon, sed ja ne konservis ĝin."
 
 #: ../calendar/calendar.error.xml.h:36
-msgid "Delete task list '{0}'?"
-msgstr "Ĉu forigi taskliston '{0}'?"
+msgid "Would you like to save your changes to this memo?"
+msgstr "Ĉu vi volas konservi viajn ŝanĝoj je tiu noto?"
+
+#: ../calendar/calendar.error.xml.h:37
+msgid "You have made changes to this memo, but not yet saved them."
+msgstr "Vi faris ŝanĝojn je tiu noto, sed ankoraŭ ne konservis ilin."
 
 #: ../calendar/calendar.error.xml.h:38
-msgid "Do _not Send"
-msgstr "_Ne sendi"
+msgid "Would you like to send meeting invitations to participants?"
+msgstr "Ĉu vi volas sendi kunsidinvitoj al partoprenantoj?"
 
 #: ../calendar/calendar.error.xml.h:39
-msgid "Download in progress. Do you want to save the appointment?"
-msgstr "Elŝuto progresas. Ĉu vi volas konservi la rendevuon?"
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
+msgstr ""
+"Retpoŝtaj invitoj estos senditaj al ĉiuj partoprenantoj kaj ĝi permesas ilin "
+"respondi."
 
 #: ../calendar/calendar.error.xml.h:40
-msgid "Download in progress. Do you want to save the task?"
-msgstr "Elŝuto progresas. Ĉu vi volas konservi la taskon?"
+#: ../composer/mail-composer.error.xml.h:13 ../mail/mail.error.xml.h:8
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Send"
+msgstr "_Sendi"
 
 #: ../calendar/calendar.error.xml.h:41
-msgid "Editor could not be loaded."
-msgstr "Ne eblis ŝargi redaktilon."
+msgid "Would you like to send updated meeting information to participants?"
+msgstr "Ĉu vi volas sendi ĝisdatigitaj kunsidinformoj al partoprenantoj?"
 
 #: ../calendar/calendar.error.xml.h:42
 msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
 msgstr ""
-"Retpoŝtaj invitoj estos senditaj al ĉiuj partoprenantoj kaj ĝi permesas ilin "
-"akcepti ĉi tiun taskon."
+"Sendi ĝidatigatajn informojn permesas aliajn partoprenantojn manteni iliajn "
+"kalendarojn ĝisdatigitajn"
 
 #: ../calendar/calendar.error.xml.h:43
+msgid "Would you like to send this task to participants?"
+msgstr "Ĉu vi volas sendi tiun taskon al partoprenantoj?"
+
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
 msgstr ""
 "Retpoŝtaj invitoj estos senditaj al ĉiuj partoprenantoj kaj ĝi permesas ilin "
-"respondi."
-
-#: ../calendar/calendar.error.xml.h:44
-msgid "Error loading calendar"
-msgstr "Eraro ŝargante kalendaron"
+"akcepti ĉi tiun taskon."
 
 #: ../calendar/calendar.error.xml.h:45
-msgid "Error loading memo list"
-msgstr "Eraro dum ŝargo de notolisto"
+msgid "Download in progress. Do you want to save the task?"
+msgstr "Elŝuto progresas. Ĉu vi volas konservi la taskon?"
 
 #: ../calendar/calendar.error.xml.h:46
-msgid "Error loading task list"
-msgstr "Eraro ŝargante taskliston"
-
-#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
-#. {1} is replaced with a calendar/task/memo list name, where the error happened
-#: ../calendar/calendar.error.xml.h:49
-msgid "Error on {0}: {1}"
-msgstr "Eraro ĉe {0}: {1}"
-
-#: ../calendar/calendar.error.xml.h:50
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the meeting is canceled."
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
 msgstr ""
-"Se vi ne sendas nulig-mesaĝon, la aliaj partoprenantoj eble ne scias, ke la "
-"kunsido estas nuligite."
+"Kelkaj kunsendaĵoj estas elŝutotaj. Konservi la taskon perdigos ĉi tiujn "
+"kunsendaĵojn."
 
-#: ../calendar/calendar.error.xml.h:51
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the memo has been deleted."
-msgstr ""
-"Se vi ne sendas nulig-mesaĝon, la aliaj partoprenantoj eble ne scias, ke la "
-"noto estas forigite."
+#: ../calendar/calendar.error.xml.h:48
+msgid "Download in progress. Do you want to save the appointment?"
+msgstr "Elŝuto progresas. Ĉu vi volas konservi la rendevuon?"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the task has been deleted."
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
 msgstr ""
-"Se vi ne sendas nulig-mesaĝon, la aliaj partoprenantoj eble ne scias, ke la "
-"tasko estas forigite."
+"Kelkaj kunsendaĵoj estas elŝutotaj. Konservi la rendevuon perdigos ĉi tiujn "
+"kunsendaĵojn."
 
-#: ../calendar/calendar.error.xml.h:53
-msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
-msgstr ""
-"Sendi ĝidatigatajn informojn permesas aliajn partoprenantojn manteni iliajn "
-"kalendarojn ĝisdatigitajn"
+#: ../calendar/calendar.error.xml.h:50
+msgid "Would you like to send updated task information to participants?"
+msgstr "Ĉu vi volas sendi ĝisdatigitaj taskinformoj al partoprenantoj?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:51
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -1989,535 +2415,656 @@ msgstr ""
 "Sendi ĝidatigatajn informojn permesas aliajn partoprenantojn manteni iliajn "
 "taskojn ĝisdatigitajn"
 
+#: ../calendar/calendar.error.xml.h:52
+msgid "Editor could not be loaded."
+msgstr "Ne eblis ŝargi redaktilon."
+
+#: ../calendar/calendar.error.xml.h:53
+msgid "Delete calendar '{0}'?"
+msgstr "Ĉu forigi kalendaron '{0}'?"
+
+#: ../calendar/calendar.error.xml.h:54
+msgid "This calendar will be removed permanently."
+msgstr "La kalendaro estos daŭre forigta."
+
 #: ../calendar/calendar.error.xml.h:55
-msgid ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
-msgstr ""
-"Kelkaj kunsendaĵoj estas elŝutotaj. Konservi la rendevuon perdigos ĉi tiujn "
-"kunsendaĵojn."
+msgid "Delete task list '{0}'?"
+msgstr "Ĉu forigi taskliston '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:56
-msgid ""
-"Some attachments are being downloaded. Saving the task would result in the "
-"loss of these attachments."
-msgstr ""
-"Kelkaj kunsendaĵoj estas elŝutotaj. Konservi la taskon perdigos ĉi tiujn "
-"kunsendaĵojn."
+msgid "This task list will be removed permanently."
+msgstr "La tasklisto estos daŭre forigta."
 
 #: ../calendar/calendar.error.xml.h:57
-msgid "Some features may not work properly with your current server."
-msgstr "Klekaj trajtoj ne korekte funkcius en via aktuala servilo."
+msgid "Delete memo list '{0}'?"
+msgstr "Ĉu forigi notoliston '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:58
-msgid "The Evolution calendar has quit unexpectedly."
-msgstr "La Evolucio-kalendaro ĉesigitis neatendite."
+msgid "This memo list will be removed permanently."
+msgstr "Tiu notolisto forigitos por ĉiam."
 
 #: ../calendar/calendar.error.xml.h:59
-msgid "The Evolution calendars have quit unexpectedly."
-msgstr "La Evolucio-kalendaroj ĉesigitis neatendite."
+#, fuzzy
+#| msgid "Delete calendar '{0}'?"
+msgid "Delete remote calendar '{0}'?"
+msgstr "Ĉu forigi kalendaron '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:60
-msgid "The Evolution memo has quit unexpectedly."
-msgstr "La Evolucio-notoj ĉesigitis neatendite."
-
-#: ../calendar/calendar.error.xml.h:61
-msgid "The Evolution tasks have quit unexpectedly."
-msgstr "La Evolucio-taskoj ĉesigitis neatendite."
+msgid ""
+"This will permanently remove the calendar '{0}' from the server. Are you "
+"sure you want to proceed?"
+msgstr ""
+"La kalendaro '{0}' estos daŭre forigita el la servilo. Ĉu vi vere volas "
+"daŭrigi?"
 
 #: ../calendar/calendar.error.xml.h:62
-msgid "The calendar is not marked for offline usage."
-msgstr "La kalendaro ne estas markite por senkonekta uzado."
+#, fuzzy
+#| msgid "Delete task list '{0}'?"
+msgid "Delete remote task list '{0}'?"
+msgstr "Ĉu forigi taskliston '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:63
-msgid "The memo list is not marked for offline usage."
-msgstr "La notolisto ne estas markite por senreta uzo."
+msgid ""
+"This will permanently remove the task list '{0}' from the server. Are you "
+"sure you want to proceed?"
+msgstr ""
+"La taskolisto '{0}' estos daŭre forigita el la servilo. Ĉu vi vere volas "
+"daŭrigi?"
 
 #: ../calendar/calendar.error.xml.h:64
-msgid "The task list is not marked for offline usage."
-msgstr "La tasklisto ne estas markite por senkonekta uzado."
+#, fuzzy
+#| msgid "Delete memo list '{0}'?"
+msgid "Delete remote memo list '{0}'?"
+msgstr "Ĉu forigi notoliston '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:65
-msgid "This calendar will be removed permanently."
-msgstr "La kalendaro estos daŭre forigta."
+msgid ""
+"This will permanently remove the memo list '{0}' from the server. Are you "
+"sure you want to proceed?"
+msgstr ""
+"La notlisto '{0}' estos daŭre forigita el la servilo. Ĉu vi vere volas "
+"daŭrigi?"
 
 #: ../calendar/calendar.error.xml.h:66
-msgid "This memo list will be removed permanently."
-msgstr "Tiu notolisto forigitos por ĉiam."
+msgid "Are you sure you want to save the appointment without a summary?"
+msgstr "Ĉu vi certe volas konservi la rendevuon sen resumo?"
 
 #: ../calendar/calendar.error.xml.h:67
-msgid "This task list will be removed permanently."
-msgstr "La tasklisto estos daŭre forigta."
+msgid ""
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
+msgstr ""
+"Aldoni signifan resumon al via rendevuo donos al vi ideon pri kio via "
+"rendevuo temas pri."
 
 #: ../calendar/calendar.error.xml.h:68
-msgid "Would you like to save your changes to this appointment?"
-msgstr "Ĉu vi volas konservi viajn ŝanĝojn al tiu rendevuo?"
+msgid "Are you sure you want to save the task without a summary?"
+msgstr "Ĉu vi certe volas konservi la taskon sen resumo?"
 
 #: ../calendar/calendar.error.xml.h:69
-msgid "Would you like to save your changes to this meeting?"
-msgstr "Ĉu vi volas konservi viajn ŝanĝojn al tiu kunsido?"
+msgid ""
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
+msgstr ""
+"Aldoni signifan resumon al via tasko donos al vi ideon pri kio via tasko "
+"temas pri."
 
 #: ../calendar/calendar.error.xml.h:70
-msgid "Would you like to save your changes to this memo?"
-msgstr "Ĉu vi volas konservi viajn ŝanĝoj je tiu noto?"
-
-#: ../calendar/calendar.error.xml.h:71
-msgid "Would you like to save your changes to this task?"
-msgstr "Ĉu vi volas konservi viajn ŝanĝojn al tiu taskon?"
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "Ĉu vi certe volas konservi tiun noton sen iu resumo?"
 
+#. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:72
-msgid "Would you like to send a cancelation notice for this memo?"
-msgstr "Ĉu vi volas sendi nulig-mesaĝon por tiu noto?"
+#| msgid "Error loading calendar"
+msgid "Error loading calendar '{0}'"
+msgstr "Eraro ŝargante kalendaron '{0}'"
 
 #: ../calendar/calendar.error.xml.h:73
-msgid "Would you like to send all the participants a cancelation notice?"
-msgstr "Ĉu vi volas sendi al ĉiuj partoprenantoj nuligpeton?"
+msgid "The calendar is not marked for offline usage."
+msgstr "La kalendaro ne estas markite por senkonekta uzado."
 
 #: ../calendar/calendar.error.xml.h:74
-msgid "Would you like to send meeting invitations to participants?"
-msgstr "Ĉu vi volas sendi kunsidinvitoj al partoprenantoj?"
-
-#: ../calendar/calendar.error.xml.h:75
-msgid "Would you like to send this task to participants?"
-msgstr "Ĉu vi volas sendi tiun taskon al partoprenantoj?"
+msgid "Cannot save event"
+msgstr "Ne eblas konservi eventon"
 
+#. Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:76
-msgid "Would you like to send updated meeting information to participants?"
-msgstr "Ĉu vi volas sendi ĝisdatigitaj kunsidinformoj al partoprenantoj?"
-
-#: ../calendar/calendar.error.xml.h:77
-msgid "Would you like to send updated task information to participants?"
-msgstr "Ĉu vi volas sendi ĝisdatigitaj taskinformoj al partoprenantoj?"
-
-#: ../calendar/calendar.error.xml.h:78
 msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results, the server should be upgraded to "
-"a supported version."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 msgstr ""
-"Vi estas konektanta al nesubtenata GroupWise-servilon kaj vi eble renkontus "
-"problemojn uzante Evolution. Por plejbonaj rezultoj, la servilo estus "
-"ĝisdatigita al subtenata versio."
+"'{0}' estas nurlega kalendaro kaj ne estas modifebla. Bonvolu elekti alian "
+"kalendaron kiu povas akcepti rendevuojn."
 
-#: ../calendar/calendar.error.xml.h:79
-msgid "You have changed this appointment, but not yet saved it."
-msgstr "Vi ŝanĝis tiun rendevuon, sed ja ne konservis ĝin."
+#: ../calendar/calendar.error.xml.h:77
+msgid "Cannot save task"
+msgstr "Ne eblas konservi taskon"
 
-#: ../calendar/calendar.error.xml.h:80
-msgid "You have changed this meeting, but not yet saved it."
-msgstr "Vi ŝanĝis tiun kunsidon, sed ja ne konservis ĝin."
+#. Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:79
+msgid ""
+"'{0}' does not support assigned tasks, please select a different task list."
+msgstr "'{0}' ne subtenas asignitaj taskoj, bonvolu elekti alian taskoliston."
 
+#. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:81
-msgid "You have changed this task, but not yet saved it."
-msgstr "Vi ŝanĝis tiun taskon, sed ja ne konservis ĝin."
+#| msgid "Error loading task list"
+msgid "Error loading task list '{0}'"
+msgstr "Eraro ŝargante taskliston '{0}'"
 
 #: ../calendar/calendar.error.xml.h:82
-msgid "You have made changes to this memo, but not yet saved them."
-msgstr "Vi faris ŝanĝojn je tiu noto, sed ankoraŭ ne konservis ilin."
-
-#: ../calendar/calendar.error.xml.h:83
-msgid "Your calendars will not be available until Evolution is restarted."
-msgstr "Viaj kalendaroj ne estas disponeblaj ĝis restarto de Evolucio."
+msgid "The task list is not marked for offline usage."
+msgstr "La tasklisto ne estas markite por senkonekta uzado."
 
+#. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:84
-msgid "Your memos will not be available until Evolution is restarted."
-msgstr "Viaj notoj ne disponeblas ĝis restarto de Evolucio."
+#| msgid "Error loading memo list"
+msgid "Error loading memo list '{0}'"
+msgstr "Eraro dum ŝargo de notolisto '{0}'"
 
 #: ../calendar/calendar.error.xml.h:85
-msgid "Your tasks will not be available until Evolution is restarted."
-msgstr "Viaj taskoj ne estas disponeblaj ĝis restarto de Evolucio."
+msgid "The memo list is not marked for offline usage."
+msgstr "La notolisto ne estas markite por senreta uzo."
 
-#: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:29
-msgid "_Discard Changes"
-msgstr "_Ignori ŝanĝojn"
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:87
+#| msgid "Failed to open client '%s': %s"
+msgid "Failed to open calendar '{0}'"
+msgstr "Malsukcesis malfermi kalendaron '{0}'"
 
-#: ../calendar/calendar.error.xml.h:87 ../composer/e-composer-actions.c:316
-msgid "_Save"
-msgstr "Kon_servi"
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:89
+#, fuzzy
+#| msgid "Delete memo list '{0}'?"
+msgid "Failed to open memo list '{0}'"
+msgstr "Ĉu forigi notoliston '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:88
-msgid "_Save Changes"
-msgstr "Kon_servi ŝanĝojn"
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:91
+#, fuzzy
+#| msgid "Delete task list '{0}'?"
+msgid "Failed to open task list '{0}'"
+msgstr "Ĉu forigi taskliston '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:89
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:164
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
-msgid "_Send"
-msgstr "_Sendi"
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:93
+#, fuzzy
+#| msgid "Failed to create an event in a calendar '{0}'"
+msgid "Failed to create an event in the calendar '{0}'"
+msgstr "Malsukcesis krei eventon en la kalendaro '{0}'"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:95
+msgid "Failed to create a memo in the memo list '{0}'"
+msgstr "Malsukcesis krei noton en la notlisto '{0}'"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:97
+msgid "Failed to create a task in the task list '{0}'"
+msgstr "Malsukcesis krei taskon en la taskolisto '{0}'"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:99
+#, fuzzy
+#| msgid "Failed to modify an event in a calendar '{0}'"
+msgid "Failed to modify an event in the calendar '{0}'"
+msgstr "Malsukcesis modifi eventon en la kalendaro '{0}'"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:101
+msgid "Failed to modify a memo in the memo list '{0}'"
+msgstr "Malsukcesis modifi noton en la notlisto '{0}'"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:103
+msgid "Failed to modify a task in the task list '{0}'"
+msgstr "Malsukcesis modifi taskon en la taskolisto '{0}'"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:105
+#| msgid "Failed to delete contact"
+msgid "Failed to delete an event in the calendar '{0}'"
+msgstr "Malsukcesis forigi eventon en kalendaro '{0}'"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:107
+#, fuzzy
+#| msgid "Delete memo list '{0}'?"
+msgid "Failed to delete a memo in the memo list '{0}'"
+msgstr "Ĉu forigi notoliston '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:90
-msgid "_Send Notice"
-msgstr "_Sendi rimarkon"
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:109
+#, fuzzy
+#| msgid "Delete task list '{0}'?"
+msgid "Failed to delete a task in the task list '{0}'"
+msgstr "Ĉu forigi taskliston '{0}'?"
 
-#: ../calendar/gui/calendar-view-factory.c:110
-msgid "Day View"
-msgstr "Tagvido"
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:111
+msgid "Failed to update an event in the calendar '{0}'"
+msgstr "Malsukcesis ĝisdatigi eventon en la kalendaro '{0}'"
 
-#: ../calendar/gui/calendar-view-factory.c:113
-msgid "Work Week View"
-msgstr "Laborsemajn-vido"
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:113
+msgid "Failed to update a memo in the memo list '{0}'"
+msgstr "Malsukcesis ĝisdatigi noton en la notlisto '{0}'"
 
-#: ../calendar/gui/calendar-view-factory.c:116
-msgid "Week View"
-msgstr "Semajnvido"
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:115
+msgid "Failed to update a task in the task list '{0}'"
+msgstr "Malsukcesis ĝisdatigi taskon en la taskolisto '{0}'"
 
-#: ../calendar/gui/calendar-view-factory.c:119
-msgid "Month View"
-msgstr "Monatvido"
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:117
+msgid "Failed to send an event to the calendar '{0}'"
+msgstr "Malsukcesis sendi eventon al la kalendaro '{0}'"
 
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:3
-msgid "Any Field"
-msgstr "Iu kampo"
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:119
+#, fuzzy
+#| msgid "Delete memo list '{0}'?"
+msgid "Failed to send a memo to the memo list '{0}'"
+msgstr "Ĉu forigi notoliston '{0}'?"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:121
+#, fuzzy
+#| msgid "Delete task list '{0}'?"
+msgid "Failed to send a task to the task list '{0}'"
+msgstr "Ĉu forigi taskliston '{0}'?"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:123
+#| msgid "Error loading calendar"
+msgid "Error creating view for the calendar '{0}'"
+msgstr "Eraro krei vidon por la kalendaro '{0}'"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:125
+#| msgid "Error loading task list"
+msgid "Error creating view for the task list '{0}'"
+msgstr "Eraro krei vidon por la taskolisto '{0}'"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:127
+#| msgid "Error loading memo list"
+msgid "Error creating view for the memo list '{0}'"
+msgstr "Eraro krei vidon por la notolisto '{0}'"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:129
+#, fuzzy
+#| msgid "Unable to open the calendar '%s': %s"
+msgid "Failed to copy an event into the calendar '{0}'"
+msgstr "Ne eblis malfermi la kalendaron '{0}'"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:131
+msgid "Failed to copy a task into the task list '{0}'"
+msgstr "Malsukcesis kopii taskon en la taskoliston '{0}'"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:133
+msgid "Failed to copy a memo into the memo list '{0}'"
+msgstr "Malsukcesis kopii noton en la notliston '{0}'"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:135
+#, fuzzy
+#| msgid "Unable to open the calendar '%s': %s"
+msgid "Failed to move an event into the calendar '{0}'"
+msgstr "Ne eblis malfermi la kalendaron '{0}'"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:137
+msgid "Failed to move a task into the task list '{0}'"
+msgstr "Malsukcesis movi taskon en la taskoliston '{0}'"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:139
+msgid "Failed to move a memo into the memo list '{0}'"
+msgstr "Malsukcesis movi noton en la notliston '{0}'"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:141
+#, fuzzy
+#| msgid "Delete calendar '{0}'?"
+msgid "Copying an event into the calendar '{0}'"
+msgstr "Ĉu forigi kalendaron '{0}'?"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:143
+msgid "Copying a task into the task list '{0}'"
+msgstr "Kopiante taskon en la taskoliston '{0}'"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:145
+#, fuzzy
+#| msgid "Delete memo list '{0}'?"
+msgid "Copying a memo into the memo list '{0}'"
+msgstr "Ĉu forigi notoliston '{0}'?"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:147
+#, fuzzy
+#| msgid "Delete calendar '{0}'?"
+msgid "Moving an event into the calendar '{0}'"
+msgstr "Ĉu forigi kalendaron '{0}'?"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:149
+msgid "Moving a task into the task list '{0}'"
+msgstr "Movante taskon al la taskolisto '{0}'"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:151
+#, fuzzy
+#| msgid "Delete memo list '{0}'?"
+msgid "Moving a memo into the memo list '{0}'"
+msgstr "Ĉu forigi notoliston '{0}'?"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:153
+#, fuzzy
+#| msgid "Delete calendar '{0}'?"
+msgid "Failed to refresh calendar '{0}'"
+msgstr "Ĉu forigi kalendaron '{0}'?"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:155
+#, fuzzy
+#| msgid "Delete task list '{0}'?"
+msgid "Failed to refresh task list '{0}'"
+msgstr "Ĉu forigi taskliston '{0}'?"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:157
+#, fuzzy
+#| msgid "Delete memo list '{0}'?"
+msgid "Failed to refresh memo list '{0}'"
+msgstr "Ĉu forigi notoliston '{0}'?"
+
+#: ../calendar/calendar.error.xml.h:158
+#, fuzzy
+#| msgid "Make this Occurrence _Movable"
+msgid "Failed to make an occurrence movable"
+msgstr "Malsukcesis igi tiun okazon movebla"
+
+#: ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:375
+msgid "Summary"
+msgstr "Resumo"
+
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/filtertypes.xml.in.h:2
+#: ../mail/searchtypes.xml.in.h:2 ../mail/vfoldertypes.xml.in.h:2
+msgid "contains"
+msgstr "entenas"
 
 #: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Aldonaĵoj"
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/filtertypes.xml.in.h:3
+#: ../mail/searchtypes.xml.in.h:3 ../mail/vfoldertypes.xml.in.h:3
+msgid "does not contain"
+msgstr "ne entenas"
 
-#: ../calendar/gui/caltypes.xml.h:4
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-#: ../calendar/gui/tasktypes.xml.h:6
-msgid "Attendee"
-msgstr "Partoprenantoj"
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
+#: ../e-util/e-attachment-tree-view.c:527 ../e-util/e-table-config.ui.h:7
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
+msgid "Description"
+msgstr "Priskribo"
 
-#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:8
-msgid "Category"
-msgstr "Kategorio"
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:5
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Any Field"
+msgstr "Iu kampo"
 
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:7
 msgid "Classification"
 msgstr "Kategoriado"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:243
-#: ../calendar/gui/e-cal-model.c:795 ../calendar/gui/e-task-table.c:544
-#: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
-msgid "Confidential"
-msgstr "Konfidence"
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/filtertypes.xml.in.h:4
+#: ../mail/searchtypes.xml.in.h:4 ../mail/vfoldertypes.xml.in.h:4
+msgid "is"
+msgstr "estas"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
-#: ../modules/plugin-manager/evolution-plugin-manager.c:70
-#: ../widgets/misc/e-attachment-tree-view.c:526
-#: ../widgets/table/e-table-config.ui.h:6
-msgid "Description"
-msgstr "Priskribo"
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/filtertypes.xml.in.h:5
+#: ../mail/searchtypes.xml.in.h:5 ../mail/vfoldertypes.xml.in.h:5
+msgid "is not"
+msgstr "ne estas"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:11
-msgid "Description Contains"
-msgstr "Description entenas"
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
+#: ../calendar/gui/e-cal-list-view.c:246 ../calendar/gui/e-cal-model.c:278
+#: ../calendar/gui/e-cal-model.c:285 ../calendar/gui/e-task-table.c:498
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Public"
+msgstr "Publike"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "Ne ekzistas"
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4
+#: ../calendar/gui/e-cal-list-view.c:247 ../calendar/gui/e-cal-model.c:287
+#: ../calendar/gui/e-task-table.c:499 ../calendar/gui/memotypes.xml.h:11
+msgid "Private"
+msgstr "Private"
 
-#: ../calendar/gui/caltypes.xml.h:11
-msgid "Exactly"
-msgstr ""
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
+#: ../calendar/gui/e-cal-list-view.c:248 ../calendar/gui/e-cal-model.c:289
+#: ../calendar/gui/e-task-table.c:500 ../calendar/gui/memotypes.xml.h:12
+#: ../e-util/e-html-editor-page-dialog.c:116 ../e-util/e-send-options.ui.h:7
+msgid "Confidential"
+msgstr "Konfidence"
 
-#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:10
-#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "Ekzistas"
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:5
+msgid "Organizer"
+msgstr "Organizilo"
 
 #: ../calendar/gui/caltypes.xml.h:13
-msgid "Less Than"
-msgstr "malpli ol"
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+#: ../calendar/gui/tasktypes.xml.h:6
+msgid "Attendee"
+msgstr "Partoprenantoj"
 
 #: ../calendar/gui/caltypes.xml.h:14
-#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:855
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
+#: ../plugins/publish-calendar/publish-calendar.c:903
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22
+#: ../plugins/save-calendar/csv-format.c:389
 msgid "Location"
 msgstr "Loko"
 
-#: ../calendar/gui/caltypes.xml.h:15
-msgid "More Than"
-msgstr "Pli ol"
-
-#: ../calendar/gui/caltypes.xml.h:16
-msgid "Occurs"
-msgstr ""
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:327
+msgid "Category"
+msgstr "Kategorio"
 
-#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:11
-#: ../calendar/gui/tasktypes.xml.h:19
-msgid "Organizer"
-msgstr "Organizilo"
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
+#: ../em-format/e-mail-formatter-print-headers.c:157
+#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
+#: ../mail/vfoldertypes.xml.in.h:48
+msgid "Attachments"
+msgstr "Aldonaĵoj"
 
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:793 ../calendar/gui/e-task-table.c:543
-#: ../calendar/gui/memotypes.xml.h:12
-msgid "Private"
-msgstr "Private"
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:46
+#: ../mail/searchtypes.xml.in.h:48 ../mail/vfoldertypes.xml.in.h:49
+msgid "Exist"
+msgstr "Ekzistas"
 
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:784 ../calendar/gui/e-cal-model.c:791
-#: ../calendar/gui/e-task-table.c:542 ../calendar/gui/memotypes.xml.h:13
-msgid "Public"
-msgstr "Publike"
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:47
+#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
+msgid "Do Not Exist"
+msgstr "Ne ekzistas"
 
-#: ../calendar/gui/caltypes.xml.h:20
-#: ../calendar/gui/dialogs/event-editor.c:317
-#: ../calendar/gui/dialogs/event-editor.c:338
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
+#: ../calendar/gui/caltypes.xml.h:19
+#: ../calendar/gui/dialogs/event-editor.c:309
+#: ../calendar/gui/dialogs/event-editor.c:330
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:15
 msgid "Recurrence"
 msgstr "Rikuro"
 
+#: ../calendar/gui/caltypes.xml.h:20
+#, fuzzy
+msgid "Occurs"
+msgstr "Okazas"
+
 #: ../calendar/gui/caltypes.xml.h:21
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-cal-list-view.etspec.h:8
-#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:383
-msgid "Summary"
-msgstr "Resumo"
+msgid "Less Than"
+msgstr "Malpli ol"
 
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:23
-msgid "Summary Contains"
-msgstr "Resumo entenas"
+#: ../calendar/gui/caltypes.xml.h:22
+msgid "Exactly"
+msgstr "Ekzakte"
 
-#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "entenas"
+#: ../calendar/gui/caltypes.xml.h:23
+msgid "More Than"
+msgstr "Pli ol"
 
 #: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "ne entenas"
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Summary Contains"
+msgstr "Resumo entenas"
 
 #: ../calendar/gui/caltypes.xml.h:25 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
-msgid "is"
-msgstr "estas"
-
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
-msgid "is not"
-msgstr "ne estas"
+#: ../calendar/gui/tasktypes.xml.h:29
+msgid "Description Contains"
+msgstr "Description entenas"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:632
+#: ../calendar/gui/dialogs/alarm-dialog.c:668
 msgid "Edit Reminder"
 msgstr "Redakti memorigaĵon"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:823
-#: ../calendar/gui/e-alarm-list.c:447
+#: ../calendar/gui/dialogs/alarm-dialog.c:896
+#: ../calendar/gui/e-alarm-list.c:424
 msgid "Pop up an alert"
 msgstr "Ŝpruci averton"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:824
-#: ../calendar/gui/e-alarm-list.c:443
+#: ../calendar/gui/dialogs/alarm-dialog.c:897
+#: ../calendar/gui/e-alarm-list.c:420
 msgid "Play a sound"
 msgstr "Ludi sonon"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:825
-#: ../calendar/gui/e-alarm-list.c:455
+#: ../calendar/gui/dialogs/alarm-dialog.c:898
+#: ../calendar/gui/e-alarm-list.c:432
 msgid "Run a program"
 msgstr "Lanĉi programon"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:826
-#: ../calendar/gui/e-alarm-list.c:451
+#: ../calendar/gui/dialogs/alarm-dialog.c:899
+#: ../calendar/gui/e-alarm-list.c:428
 msgid "Send an email"
 msgstr "Sundu retpoŝton"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:908
+msgid "before"
+msgstr "antaŭ"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:909
+msgid "after"
+msgstr "post"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:918
+msgid "start of appointment"
+msgstr "komenco de rendevuo"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:919
+msgid "end of appointment"
+msgstr "fino de rendevuo"
+
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "Add Reminder"
-msgstr "Aldoni memorigaĵon"
+msgid "minute(s)"
+msgstr "minuto(j)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-msgid "Custom _message"
-msgstr "Propra _mesaĝo"
+msgid "hour(s)"
+msgstr "horo(j)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
-msgid "Custom reminder sound"
-msgstr "Propra memorigsono"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "Mes_sage:"
-msgstr "Me_saĝo:"
+msgid "day(s)"
+msgstr "tago(j)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:80
-msgid "Options"
-msgstr "Agordoj"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
+msgid "Add Reminder"
+msgstr "Aldoni memorigaĵon"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
-#: ../calendar/gui/dialogs/event-editor.c:360
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
+#: ../calendar/gui/dialogs/event-editor.c:352
 msgid "Reminder"
 msgstr "Memorigilo"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "Repeat"
 msgstr "Ripeti"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-msgid "Select A File"
-msgstr "Elekti dosieron"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
-msgid "Send To:"
-msgstr "Sendi al:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
-msgid "_Arguments:"
-msgstr "_Argumentoj:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
-msgid "_Program:"
-msgstr "_Programo:"
-
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "_Repeat the reminder"
 msgstr "_Ripeti la memorigilaĵon"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
-msgid "_Sound:"
-msgstr "_Sono:"
-
+#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
-msgid "after"
-msgstr "post"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
-msgid "before"
-msgstr "antaŭ"
+msgid "extra times every"
+msgstr "aldona tempo ĉiuj"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-msgid "day(s)"
-msgstr "tago(j)"
+msgid "Custom _message"
+msgstr "Propra _mesaĝo"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
+msgid "Mes_sage:"
+msgstr "Me_saĝo:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
-msgid "end of appointment"
-msgstr "fino de rendevuo"
+msgid "Custom reminder sound"
+msgstr "Propra memorigsono"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+msgid "_Sound:"
+msgstr "_Sono:"
 
-#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
-msgid "extra times every"
-msgstr "aldona tempo ĉiuj"
+msgid "Select A File"
+msgstr "Elekti dosieron"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-msgid "hour(s)"
-msgstr "horo(j)"
+msgid "_Program:"
+msgstr "_Programo:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-msgid "minute(s)"
-msgstr "minuto(j)"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+msgid "_Arguments:"
+msgstr "_Argumentoj:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
-msgid "start of appointment"
-msgstr "komenco de rendevuo"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
+msgid "Send To:"
+msgstr "Sendi al:"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:239
 msgid "Action/Trigger"
 msgstr "Ago/Ekagigo"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
-msgid "A_dd"
-msgstr "_Aldoni"
-
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-page.ui.h:8
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
+#: ../calendar/gui/dialogs/event-page.ui.h:28
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Reminders"
 msgstr "Memorigaĵoj"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:169
-msgid "Type:"
-msgstr "Tipo:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:185
-#: ../modules/addressbook/addressbook-config.c:527
-msgid "_Type:"
-msgstr "_Tipo:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:262 ../mail/mail-config.ui.h:167
-#: ../modules/addressbook/ldap-config.ui.h:28
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:284
-msgid "_Name:"
-msgstr "_Nomo:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:314
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "Loke kop_ii kalendaran enhavon por nekonektitaj agoj"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:316
-msgid "Cop_y task list contents locally for offline operation"
-msgstr "Loke kop_ii tasklistan enhavon por nekonektitaj agoj"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:318
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr "Loke kop_ii notlistan enhavon por nekonektitaj agoj"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:364
-#, fuzzy
-msgid "Sh_ow reminder notifications"
-msgstr "M_ontri memorigilon"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:439
-msgid "Colo_r:"
-msgstr "Kolo_ro:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:462
-#: ../calendar/gui/dialogs/calendar-setup.c:474
-#: ../calendar/gui/dialogs/calendar-setup.c:485
-#: ../mail/em-folder-properties.c:232 ../mail/mail-config.ui.h:56
-#: ../modules/addressbook/addressbook-config.c:1082
-#: ../modules/addressbook/autocompletion-config.c:240
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
-#: ../plugins/itip-formatter/itip-formatter.c:3225
-#: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:21
-msgid "General"
-msgstr "Ĝenerale"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:475
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
-msgid "Task List"
-msgstr "Tasklisto"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:486
-msgid "Memo List"
-msgstr "Notolisto"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:578
-msgid "Calendar Properties"
-msgstr "Kalendar-ecoj"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:578
-msgid "New Calendar"
-msgstr "Nova kalendaro"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:638
-msgid "Task List Properties"
-msgstr "Tasklist-ecoj"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:638
-msgid "New Task List"
-msgstr "Nova tasklisto"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:698
-msgid "Memo List Properties"
-msgstr "Ecoj de notlisto"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:698
-msgid "New Memo List"
-msgstr "Nova notolisto"
-
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Tiu evento estas forigita."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Tiu tasko estas forigita."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:67
 msgid "This memo has been deleted."
 msgstr "Tiu noto estas forigite."
 
@@ -2544,772 +3091,770 @@ msgstr "Tiu tasko estas ŝanĝita."
 msgid "This memo has been changed."
 msgstr "Tiu noto estas ŝanĝite."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Vi faris ŝanĝojn. Ĉu forgesi tiajn ŝanĝojn kaj ĝisdatigi la redaktilon?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:104
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Vi ne faris ŝanĝojn, ĉu aktualigi la redaktilon?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:276
+#: ../calendar/gui/dialogs/comp-editor.c:271
 msgid "Could not save attachments"
 msgstr "Ne eblis konservi aldonaĵojn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:622
+#: ../calendar/gui/dialogs/comp-editor.c:625
 msgid "Could not update object"
 msgstr "Ne eblis aktualigi onjekton"
 
-#: ../calendar/gui/dialogs/comp-editor.c:750
+#: ../calendar/gui/dialogs/comp-editor.c:759
 msgid "Edit Appointment"
 msgstr "Redakti rendevuon"
 
-#: ../calendar/gui/dialogs/comp-editor.c:757
+#: ../calendar/gui/dialogs/comp-editor.c:766
 #, c-format
 msgid "Meeting - %s"
 msgstr "Kunsido - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:759
+#: ../calendar/gui/dialogs/comp-editor.c:768
 #, c-format
 msgid "Appointment - %s"
 msgstr "Rendevuo - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:765
+#: ../calendar/gui/dialogs/comp-editor.c:774
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Asignitaj taskoj - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:767
+#: ../calendar/gui/dialogs/comp-editor.c:776
 #, c-format
 msgid "Task - %s"
 msgstr "Tasko - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:772
+#: ../calendar/gui/dialogs/comp-editor.c:781
 #, c-format
 msgid "Memo - %s"
 msgstr "Noto - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:788
+#: ../calendar/gui/dialogs/comp-editor.c:797
 msgid "No Summary"
 msgstr "Neniu resumo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:909
+#: ../calendar/gui/dialogs/comp-editor.c:918
 msgid "Keep original item?"
 msgstr "Ĉu manteni originan eron?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1109
+#, fuzzy
+#| msgid "Failed to authenticate with LDAP server."
+msgid "Unable to synchronize with the server"
+msgstr "Aŭtentigo al LDAP-servilo malsukcesis."
+
+#. == Button box ==
+#: ../calendar/gui/dialogs/comp-editor.c:1221
+#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../calendar/gui/dialogs/event-editor.c:310
+#: ../calendar/gui/dialogs/event-page.ui.h:29
+#: ../composer/e-composer-actions.c:334 ../e-util/e-html-editor-dialog.c:196
+#: ../e-util/e-mail-signature-editor.c:295
+#: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:388
+#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:126
+#: ../mail/em-folder-properties.c:418 ../mail/em-subscription-editor.c:1714
+#: ../modules/plugin-manager/evolution-plugin-manager.c:256
+#: ../shell/e-shell-window-actions.c:342 ../shell/e-shell-window-actions.c:908
+#: ../smime/gui/certificate-manager.c:2064
+msgid "_Close"
+msgstr "_Fermi"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1223
 msgid "Close the current window"
 msgstr "Fermi la aktualan fenestron"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129 ../mail/e-mail-browser.c:137
-#: ../shell/e-shell-window-actions.c:1467
-#: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
+#. copy menu item
+#: ../calendar/gui/dialogs/comp-editor.c:1228 ../e-util/e-focus-tracker.c:775
+#: ../e-util/e-html-editor-actions.c:1094 ../e-util/e-text.c:2089
+#: ../e-util/e-web-view.c:339 ../mail/e-mail-browser.c:133
+#: ../shell/e-shell-window-actions.c:929
+#| msgid "_Copy..."
+msgid "_Copy"
+msgstr "_Kopii"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1230 ../e-util/e-focus-tracker.c:175
+#: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284
+#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:341
+#: ../e-util/e-web-view.c:1328 ../mail/e-mail-browser.c:135
+#: ../shell/e-shell-window-actions.c:931
 msgid "Copy the selection"
 msgstr "Kopii la elektaĵon"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136 ../mail/e-mail-browser.c:144
-#: ../shell/e-shell-window-actions.c:1474
-#: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:1300
+#. cut menu item
+#: ../calendar/gui/dialogs/comp-editor.c:1235 ../e-util/e-focus-tracker.c:770
+#: ../e-util/e-html-editor-actions.c:1101 ../e-util/e-text.c:2075
+#: ../mail/e-mail-browser.c:140 ../shell/e-shell-window-actions.c:936
+msgid "Cu_t"
+msgstr "El_tondi"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1237 ../e-util/e-focus-tracker.c:168
+#: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278
+#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1322
+#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:938
 msgid "Cut the selection"
 msgstr "Eltondi la elektaĵon"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
-#: ../shell/e-shell-window-actions.c:1481
-#: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
+#: ../calendar/gui/dialogs/comp-editor.c:1244 ../e-util/e-focus-tracker.c:189
+#: ../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786
+#: ../shell/e-shell-window-actions.c:945
 msgid "Delete the selection"
 msgstr "Forigi la elektitaĵon"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1150
+#: ../calendar/gui/dialogs/comp-editor.c:1251
 msgid "View help"
 msgstr "Montri helpon"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1157 ../mail/e-mail-browser.c:151
-#: ../shell/e-shell-window-actions.c:1509
-#: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
-#: ../widgets/misc/e-web-view.c:1312
+#. paste menu item
+#: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:780
+#: ../e-util/e-html-editor-actions.c:1108 ../e-util/e-text.c:2101
+#: ../mail/e-mail-browser.c:147 ../shell/e-shell-window-actions.c:964
+msgid "_Paste"
+msgstr "_Alglui"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1258 ../e-util/e-focus-tracker.c:182
+#: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290
+#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1334
+#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:966
 msgid "Paste the clipboard"
 msgstr "Enmeti la tondujon"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1178
+#: ../calendar/gui/dialogs/comp-editor.c:1263
+#: ../composer/e-composer-actions.c:388 ../mail/e-mail-reader.c:2262
+#: ../modules/addressbook/e-book-shell-view-actions.c:1205
+#: ../modules/addressbook/e-book-shell-view-actions.c:1219
+msgid "_Print..."
+msgstr "_Presi..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1270 ../mail/e-mail-reader.c:2269
+#: ../modules/addressbook/e-book-shell-view-actions.c:1212
+#: ../modules/calendar/e-cal-shell-view-actions.c:1642
+#: ../modules/calendar/e-memo-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:964
+#| msgid "Preview"
+msgid "Pre_view..."
+msgstr "Antaŭ_rigardo..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1279
 msgid "Save current changes"
 msgstr "Konservi aktualajn ŝanĝojn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1185 ../mail/e-mail-browser.c:158
-#: ../shell/e-shell-window-actions.c:1586
-#: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
+#: ../calendar/gui/dialogs/comp-editor.c:1284
+#: ../e-util/e-mail-signature-editor.c:304
+#| msgid "_Save and Close"
+msgid "Save and Close"
+msgstr "Konservi kaj fermi"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1286
+#, fuzzy
+#| msgid "Save current changes"
+msgid "Save current changes and close editor"
+msgstr "Konservi aktualajn ŝanĝojn"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1291 ../e-util/e-focus-tracker.c:790
+#: ../e-util/e-html-editor-actions.c:1122 ../e-util/e-web-view.c:349
+#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1041
+#| msgid "Select All"
+msgid "Select _All"
+msgstr "Elekti ĉi_ujn"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1293 ../e-util/e-focus-tracker.c:196
+#: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791
+#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:1043
 msgid "Select all text"
 msgstr "Elekti tutan tekston"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1192
+#: ../calendar/gui/dialogs/comp-editor.c:1314
 msgid "_Classification"
 msgstr "_Kategoriado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1199
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:172
-#: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1614
-#: ../widgets/menus/gal-define-views.ui.h:5
-msgid "_Edit"
-msgstr "R_edakti"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1206 ../mail/e-mail-browser.c:165
-#: ../shell/e-shell-window-actions.c:1621
-#: ../widgets/misc/e-signature-editor.c:221
+#: ../calendar/gui/dialogs/comp-editor.c:1328
+#: ../e-util/e-html-editor-actions.c:1145
+#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:163
+#: ../shell/e-shell-window-actions.c:1078
 msgid "_File"
 msgstr "_Dosiero"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1213
-#: ../shell/e-shell-window-actions.c:1628
-msgid "_Help"
-msgstr "_Helpo"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1220
+#: ../calendar/gui/dialogs/comp-editor.c:1342
+#: ../e-util/e-html-editor-actions.c:1166
 msgid "_Insert"
 msgstr "_Enmeti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1227
-#: ../composer/e-composer-actions.c:339
+#: ../calendar/gui/dialogs/comp-editor.c:1349
+#: ../composer/e-composer-actions.c:378
 msgid "_Options"
 msgstr "_Agordoj"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1234 ../mail/e-mail-browser.c:179
-#: ../shell/e-shell-window-actions.c:1663 ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1356
+#: ../e-util/e-html-editor-actions.c:1187 ../mail/e-mail-browser.c:177
+#: ../shell/e-shell-window-actions.c:1121
+#: ../smime/gui/certificate-manager.c:1649 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "_Vido"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1244
-#: ../composer/e-composer-actions.c:288
+#: ../calendar/gui/dialogs/comp-editor.c:1366
+#: ../composer/e-composer-actions.c:327
 msgid "_Attachment..."
 msgstr "_Aldonaĵo..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1246
-#: ../composer/e-composer-actions.c:290
-#: ../widgets/misc/e-attachment-view.c:439
+#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../composer/e-composer-actions.c:329 ../e-util/e-attachment-view.c:448
 msgid "Attach a file"
 msgstr "Aldoni dosieron"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1254
+#: ../calendar/gui/dialogs/comp-editor.c:1376
 msgid "_Categories"
 msgstr "_Kategorioj"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1256
+#: ../calendar/gui/dialogs/comp-editor.c:1378
+#, fuzzy
 msgid "Toggles whether to display categories"
-msgstr ""
+msgstr "Tio ĉi baskulas montron de kategorioj"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1384
 msgid "Time _Zone"
 msgstr "Hor_zono"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1264
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+#, fuzzy
 msgid "Toggles whether the time zone is displayed"
-msgstr ""
+msgstr "Tio ĉi baskulas montron de horzono"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1273
+#: ../calendar/gui/dialogs/comp-editor.c:1395
 msgid "Pu_blic"
 msgstr "Pu_blike"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1275
+#: ../calendar/gui/dialogs/comp-editor.c:1397
 msgid "Classify as public"
 msgstr "Kategoriigi kiel publike"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1280
+#: ../calendar/gui/dialogs/comp-editor.c:1402
 msgid "_Private"
 msgstr "_Private"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1282
+#: ../calendar/gui/dialogs/comp-editor.c:1404
 msgid "Classify as private"
 msgstr "Kategoriigi kiel private"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1287
+#: ../calendar/gui/dialogs/comp-editor.c:1409
 msgid "_Confidential"
 msgstr "_Konfidence"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1289
+#: ../calendar/gui/dialogs/comp-editor.c:1411
 msgid "Classify as confidential"
 msgstr "Kategoriigi kiel konfidence"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1297
+#: ../calendar/gui/dialogs/comp-editor.c:1419
 msgid "R_ole Field"
-msgstr ""
+msgstr "R_ola kampo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1299
+#: ../calendar/gui/dialogs/comp-editor.c:1421
+#, fuzzy
 msgid "Toggles whether the Role field is displayed"
-msgstr ""
+msgstr "Tio ĉi baskulas montron de rola kampo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1305
+#: ../calendar/gui/dialogs/comp-editor.c:1427
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1307
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+#, fuzzy
 msgid "Toggles whether the RSVP field is displayed"
-msgstr ""
+msgstr "Tio ĉi baskulas montron de RSVP-kampo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1313
+#: ../calendar/gui/dialogs/comp-editor.c:1435
 msgid "_Status Field"
 msgstr "_Statokampo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1315
+#: ../calendar/gui/dialogs/comp-editor.c:1437
+#, fuzzy
 msgid "Toggles whether the Status field is displayed"
-msgstr ""
+msgstr "Tio ĉi baskulas montron de Stato-kampo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1321
+#: ../calendar/gui/dialogs/comp-editor.c:1443
 msgid "_Type Field"
 msgstr "_Tipokampo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1323
+#: ../calendar/gui/dialogs/comp-editor.c:1445
+#, fuzzy
 msgid "Toggles whether the Attendee Type is displayed"
-msgstr ""
-
-#: ../calendar/gui/dialogs/comp-editor.c:1347
-#: ../composer/e-composer-private.c:77
-msgid "Recent _Documents"
-msgstr "Freŝaj _dokumentoj"
+msgstr "Tio ĉi baskulas montron de tipo de alestanto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2079
-#: ../composer/e-composer-actions.c:507
+#: ../calendar/gui/dialogs/comp-editor.c:2232
+#: ../composer/e-composer-actions.c:612
 msgid "Attach"
 msgstr "Aldoni"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2427
-#: ../calendar/gui/dialogs/comp-editor.c:2590
-#: ../calendar/gui/dialogs/comp-editor.c:3582
+#: ../calendar/gui/dialogs/comp-editor.c:2563
+#: ../calendar/gui/dialogs/comp-editor.c:2773
+#: ../calendar/gui/dialogs/comp-editor.c:3786
+#, fuzzy
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr ""
+msgstr "Ŝanĝoj de tiu ĉi ero povus ne esti konservitaj, se ĝisdatigo alvenas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3546
-#: ../plugins/prefer-plain/prefer-plain.c:66
+#: ../calendar/gui/dialogs/comp-editor.c:3748
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
 msgid "attachment"
 msgstr "aldonaĵo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3614
+#: ../calendar/gui/dialogs/comp-editor.c:3818
 msgid "Unable to use current version!"
 msgstr "Ne eblas uzi aktualan version!"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:461
+#: ../calendar/gui/dialogs/comp-editor-page.c:440
 #, c-format
 msgid "Validation error: %s"
 msgstr "Validig-eraro: %s"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:114
-msgid "Could not open destination"
-msgstr "Ne eblis malfermi celon"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:130
+#: ../calendar/gui/dialogs/copy-source-dialog.c:129
+#: ../calendar/gui/e-cal-ops.c:1940
 msgid "Destination is read only"
 msgstr "Celo estas nur legebla"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:164
-msgid "Cannot create object"
-msgstr "Ne eblas krei objekton"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:193
-msgid "Could not open source"
-msgstr "Ne eblis malfermi fonton"
+#: ../calendar/gui/dialogs/copy-source-dialog.c:209
+#, fuzzy, c-format
+#| msgid "Unable to open the calendar '%s': %s"
+msgid "Copying events to the calendar '%s'"
+msgstr "Ne eblis malfermi la kalendaron '%s'"
 
-#: ../calendar/gui/dialogs/delete-comp.c:212
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr ""
-
-#: ../calendar/gui/dialogs/delete-comp.c:215
-msgid "_Retract comment"
-msgstr ""
+#: ../calendar/gui/dialogs/copy-source-dialog.c:215
+#, fuzzy, c-format
+msgid "Copying memos to the memo list '%s'"
+msgstr "Kopiante notojn al notlisto '%s'"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:55
+#: ../calendar/gui/dialogs/copy-source-dialog.c:221
 #, c-format
-msgid "The event could not be deleted due to a dbus error: %s"
-msgstr ""
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:59
-#, c-format
-msgid "The task could not be deleted due to a dbus error: %s"
-msgstr ""
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:63
-#, c-format
-msgid "The memo could not be deleted due to a dbus error: %s"
-msgstr ""
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:67
-#, c-format
-msgid "The item could not be deleted due to a dbus error: %s"
-msgstr ""
-
-#: ../calendar/gui/dialogs/delete-error.c:74
-msgid "The event could not be deleted because permission was denied"
-msgstr ""
-
-#: ../calendar/gui/dialogs/delete-error.c:77
-msgid "The task could not be deleted because permission was denied"
-msgstr ""
-
-#: ../calendar/gui/dialogs/delete-error.c:80
-msgid "The memo could not be deleted because permission was denied"
-msgstr ""
+msgid "Copying tasks to the task list '%s'"
+msgstr "Kopiante taskojn al la taskolisto '%s'"
 
-#: ../calendar/gui/dialogs/delete-error.c:83
-msgid "The item could not be deleted because permission was denied"
-msgstr ""
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:91
-#, c-format
-msgid "The event could not be deleted due to an error: %s"
-msgstr ""
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:95
-#, c-format
-msgid "The task could not be deleted due to an error: %s"
-msgstr ""
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:99
-#, c-format
-msgid "The memo could not be deleted due to an error: %s"
-msgstr ""
+#: ../calendar/gui/dialogs/delete-comp.c:215
+#, fuzzy
+msgid "_Delete this item from all other recipient's mailboxes?"
+msgstr "Ĉu _forigi tiun ĉi eron el aliaj ricevantaj retkestoj?"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:103
-#, c-format
-msgid "The item could not be deleted due to an error: %s"
+#: ../calendar/gui/dialogs/delete-comp.c:218
+msgid "_Retract comment"
 msgstr ""
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
-msgid "Contacts..."
-msgstr "Kantaktoj..."
+msgid "Enter Delegate"
+msgstr ""
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:4
 msgid "Delegate To:"
 msgstr "Deligi al:"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
-msgid "Enter Delegate"
-msgstr ""
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:5
+msgid "Contacts..."
+msgstr "Kantaktoj..."
 
-#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/event-editor.c:204
 msgid "_Reminders"
 msgstr "Momo_rigaĵoj"
 
-#: ../calendar/gui/dialogs/event-editor.c:214
+#: ../calendar/gui/dialogs/event-editor.c:206
 msgid "Set or unset reminders for this event"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:222
+#: ../calendar/gui/dialogs/event-editor.c:214
 msgid "Show Time as _Busy"
-msgstr ""
+msgstr "Montri tempon kiel _Okupata"
 
-#: ../calendar/gui/dialogs/event-editor.c:224
+#: ../calendar/gui/dialogs/event-editor.c:216
 msgid "Toggles whether to show time as busy"
-msgstr ""
+msgstr "Baskuli montron de tempo kiel okupata"
 
-#: ../calendar/gui/dialogs/event-editor.c:233
+#: ../calendar/gui/dialogs/event-editor.c:225
+#, fuzzy
 msgid "_Recurrence"
-msgstr ""
+msgstr "_Rikuro"
 
-#: ../calendar/gui/dialogs/event-editor.c:235
+#: ../calendar/gui/dialogs/event-editor.c:227
 msgid "Make this a recurring event"
-msgstr ""
+msgstr "Farigi tiun ĉi eventon rikura"
 
-#: ../calendar/gui/dialogs/event-editor.c:240
-#: ../widgets/misc/e-send-options.ui.h:22
+#: ../calendar/gui/dialogs/event-editor.c:232 ../e-util/e-send-options.ui.h:14
 msgid "Send Options"
 msgstr "Send-agordoj"
 
-#: ../calendar/gui/dialogs/event-editor.c:242
-#: ../calendar/gui/dialogs/task-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:234
+#: ../calendar/gui/dialogs/task-editor.c:95
 msgid "Insert advanced send options"
-msgstr ""
+msgstr "Enmeti specialajn opciojn de sendo"
 
-#: ../calendar/gui/dialogs/event-editor.c:250
+#: ../calendar/gui/dialogs/event-editor.c:242
 msgid "All _Day Event"
 msgstr "Tut_taga evento"
 
-#: ../calendar/gui/dialogs/event-editor.c:252
+#: ../calendar/gui/dialogs/event-editor.c:244
 msgid "Toggles whether to have All Day Event"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:261
+#: ../calendar/gui/dialogs/event-editor.c:253
 msgid "_Free/Busy"
 msgstr "_Libere/okupite"
 
-#: ../calendar/gui/dialogs/event-editor.c:263
+#: ../calendar/gui/dialogs/event-editor.c:255
 msgid "Query free / busy information for the attendees"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3327
+#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3486
 msgid "Appointment"
 msgstr "Rendevuo"
 
-#: ../calendar/gui/dialogs/event-editor.c:384
-#: ../calendar/gui/dialogs/event-page.ui.h:2
-#: ../calendar/gui/e-meeting-list-view.c:161
+#: ../calendar/gui/dialogs/event-editor.c:376
+#: ../calendar/gui/dialogs/event-page.ui.h:27
+#: ../calendar/gui/e-meeting-list-view.c:164
 msgid "Attendees"
-msgstr ""
+msgstr "Alestantoj"
 
-#: ../calendar/gui/dialogs/event-editor.c:582
+#: ../calendar/gui/dialogs/event-editor.c:573
 msgid "Print this event"
 msgstr "Presi tiun eventon"
 
-#: ../calendar/gui/dialogs/event-page.c:558
+#: ../calendar/gui/dialogs/event-page.c:557
 msgid "Event's start time is in the past"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:635
+#: ../calendar/gui/dialogs/event-page.c:634
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:639
+#: ../calendar/gui/dialogs/event-page.c:638
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:651
-#: ../calendar/gui/dialogs/event-page.c:3093
+#: ../calendar/gui/dialogs/event-page.c:650
+#: ../calendar/gui/dialogs/event-page.c:3178
 msgid "This event has reminders"
 msgstr "Tiu evento havas memorigaĵojn"
 
-#: ../calendar/gui/dialogs/event-page.c:718
-#: ../calendar/gui/dialogs/event-page.ui.h:7
-#: ../calendar/gui/dialogs/memo-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.c:717
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Or_ganizer:"
 msgstr "Or_ganizilo:"
 
-#: ../calendar/gui/dialogs/event-page.c:1277
+#: ../calendar/gui/dialogs/event-page.c:1309
 msgid "Event with no start date"
 msgstr "Evento sen komencdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1280
+#: ../calendar/gui/dialogs/event-page.c:1312
 msgid "Event with no end date"
 msgstr "Evento sen findato"
 
-#: ../calendar/gui/dialogs/event-page.c:1453
-#: ../calendar/gui/dialogs/memo-page.c:718
-#: ../calendar/gui/dialogs/task-page.c:836
+#: ../calendar/gui/dialogs/event-page.c:1490
+#: ../calendar/gui/dialogs/memo-page.c:732
+#: ../calendar/gui/dialogs/task-page.c:1032
 msgid "Start date is wrong"
 msgstr "Komencdato estas neĝusta"
 
-#: ../calendar/gui/dialogs/event-page.c:1463
+#: ../calendar/gui/dialogs/event-page.c:1501
 msgid "End date is wrong"
 msgstr "Findato estas neĝusta"
 
-#: ../calendar/gui/dialogs/event-page.c:1486
+#: ../calendar/gui/dialogs/event-page.c:1525
 msgid "Start time is wrong"
 msgstr "Komenctempo estas neĝusta"
 
-#: ../calendar/gui/dialogs/event-page.c:1493
+#: ../calendar/gui/dialogs/event-page.c:1533
 msgid "End time is wrong"
 msgstr "Fintempo estas neĝusta"
 
-#: ../calendar/gui/dialogs/event-page.c:1656
-#: ../calendar/gui/dialogs/memo-page.c:757
-#: ../calendar/gui/dialogs/task-page.c:889
+#: ../calendar/gui/dialogs/event-page.c:1697
+#: ../calendar/gui/dialogs/memo-page.c:771
+#: ../calendar/gui/dialogs/task-page.c:1086
 msgid "An organizer is required."
 msgstr "Organizilo estas bezonata."
 
-#: ../calendar/gui/dialogs/event-page.c:1690
-#: ../calendar/gui/dialogs/task-page.c:923
+#: ../calendar/gui/dialogs/event-page.c:1732
+#: ../calendar/gui/dialogs/task-page.c:1121
 msgid "At least one attendee is required."
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1897
+#: ../calendar/gui/dialogs/event-page.c:1938
 msgid "_Delegatees"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1899
+#: ../calendar/gui/dialogs/event-page.c:1940
+#, fuzzy
 msgid "Atte_ndees"
-msgstr ""
+msgstr "Alesta_ntoj"
 
-#: ../calendar/gui/dialogs/event-page.c:2933
-#, c-format
-msgid "Unable to open the calendar '%s': %s"
-msgstr "Ne eblis malfermi la kalendaron '%s': %s"
-
-#. Translators: This string is used when we are creating an Event
-#. * (meeting or appointment)  on behalf of some other user
-#. Translators: This string is used when we are creating a Memo
-#. * on behalf of some other user
-#. Translators: This string is used when we are creating a Task
-#. * on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:3011
-#: ../calendar/gui/dialogs/memo-page.c:1020
-#: ../calendar/gui/dialogs/task-page.c:1854
-#, c-format
-msgid "You are acting on behalf of %s"
-msgstr ""
-
-#: ../calendar/gui/dialogs/event-page.c:3338
+#: ../calendar/gui/dialogs/event-page.c:3458
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d tago antaŭ la rendevuo"
 msgstr[1] "%d tagoj antaŭ la rendevuo"
 
-#: ../calendar/gui/dialogs/event-page.c:3344
+#: ../calendar/gui/dialogs/event-page.c:3464
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d horo antaŭ la rendevuo"
 msgstr[1] "%d horoj antaŭ la rendevuo"
 
-#: ../calendar/gui/dialogs/event-page.c:3350
+#: ../calendar/gui/dialogs/event-page.c:3470
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto antaŭ la rendevuo"
 msgstr[1] "%d minutoj antaŭ la rendevuo"
 
-#: ../calendar/gui/dialogs/event-page.c:3369
-msgid "Customize"
-msgstr "Adapti"
+#: ../calendar/gui/dialogs/event-page.c:3491
+#| msgid "_Custom"
+msgid "Custom"
+msgstr "Propre"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3375
+#: ../calendar/gui/dialogs/event-page.c:3498
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Neniu"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:565
-msgid "Atte_ndees..."
-msgstr ""
+#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] 
minutes
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+msgctxt "eventpage"
+msgid "for"
+msgstr "por"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Custom Reminder:"
-msgstr "Adapti memorigaĵon:"
+#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#: ../calendar/gui/dialogs/event-page.ui.h:4
+msgctxt "eventpage"
+msgid "until"
+msgstr "ĝis"
 
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "Event Description"
-msgstr "Event-priskribo"
+msgctxt "eventpage"
+msgid "15 minutes before appointment"
+msgstr "15 minutoj antaŭ la rendevuo"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:9
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
-msgid "Time _zone:"
-msgstr "Hor_zono:"
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+msgctxt "eventpage"
+msgid "1 hour before appointment"
+msgstr "1 horo antaŭ la rendevuo"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:347
-msgid "_Description:"
-msgstr "_Priskribo:"
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:10
+msgctxt "eventpage"
+msgid "1 day before appointment"
+msgstr "1 tago antaŭ la rendevuo"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../plugins/calendar-weather/calendar-weather.c:381
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 msgid "_Location:"
 msgstr "_Loko:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
-msgid "_Reminder"
-msgstr "_Memo_rigaĵo"
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/memo-page.ui.h:2
+#: ../calendar/gui/dialogs/task-page.ui.h:29
+#: ../e-util/e-attachment-dialog.c:356
+#: ../e-util/e-html-editor-image-dialog.c:558
+#: ../e-util/e-html-editor-link-dialog.c:374
+msgid "_Description:"
+msgstr "_Priskribo:"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:14
-msgid "_Summary:"
-msgstr "_Resumo:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:15
 msgid "_Time:"
 msgstr "_Tempo:"
 
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-msgctxt "eventpage"
-msgid "1 day before appointment"
-msgstr "1 tago antaŭ la rendevuo"
+#: ../calendar/gui/dialogs/event-page.ui.h:15
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
+msgid "Time _zone:"
+msgstr "Hor_zono:"
 
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:19
-msgctxt "eventpage"
-msgid "1 hour before appointment"
-msgstr "1 horo antaŭ la rendevuo"
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgid "_Summary:"
+msgstr "_Resumo:"
 
-#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
-msgctxt "eventpage"
-msgid "15 minutes before appointment"
-msgstr "15 minutoj antaŭ la rendevuo"
+msgid "Event Description"
+msgstr "Event-priskribo"
 
-#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] 
minutes
-#: ../calendar/gui/dialogs/event-page.ui.h:23
-msgctxt "eventpage"
-msgid "for"
-msgstr "por"
+#: ../calendar/gui/dialogs/event-page.ui.h:26
+#: ../calendar/gui/dialogs/task-page.ui.h:33
+#: ../calendar/gui/e-meeting-time-sel.c:549
+msgid "Atte_ndees..."
+msgstr "Alesta_ntoj..."
 
-#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
-#: ../calendar/gui/dialogs/event-page.ui.h:25
-msgctxt "eventpage"
-msgid "until"
-msgstr "ĝis"
+#: ../calendar/gui/dialogs/event-page.ui.h:30
+msgid "_Reminder"
+msgstr "_Memorigaĵo"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:1
-msgid "April"
-msgstr "Aprilo"
+msgid "January"
+msgstr "Januaro"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:2
-msgid "August"
-msgstr "Aŭgusto"
+msgid "February"
+msgstr "Februaro"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:3
-msgid "December"
-msgstr "Decembro"
+msgid "March"
+msgstr "Marto"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:4
-msgid "February"
-msgstr "Februaro"
+msgid "April"
+msgstr "Aprilo"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:5
-msgid "January"
-msgstr "Januaro"
+msgid "May"
+msgstr "Majo"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:6
-msgid "July"
-msgstr "Julio"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
 msgid "June"
 msgstr "Junio"
 
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
+msgid "July"
+msgstr "Julio"
+
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:8
-msgid "March"
-msgstr "Marto"
+msgid "August"
+msgstr "Aŭgusto"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:9
-msgid "May"
-msgstr "Majo"
+msgid "September"
+msgstr "Septembro"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:10
-msgid "November"
-msgstr "Novembro"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
 msgid "October"
 msgstr "Oktobro"
 
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
+msgid "November"
+msgstr "Novembro"
+
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:12
+msgid "December"
+msgstr "Decembro"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
 msgid "Select Date"
 msgstr "Elekti daton"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
+#: ../modules/calendar/e-cal-shell-view-actions.c:1219
 msgid "Select _Today"
 msgstr "Elekti _hodiaŭ"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-msgid "September"
-msgstr "Septembro"
-
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3331
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3490
 msgid "Memo"
 msgstr "Noto"
 
-#: ../calendar/gui/dialogs/memo-editor.c:156
+#: ../calendar/gui/dialogs/memo-editor.c:155
 msgid "Print this memo"
 msgstr "Presi tiun noton"
 
-#: ../calendar/gui/dialogs/memo-page.c:418
+#: ../calendar/gui/dialogs/memo-page.c:424
 msgid "Memo's start date is in the past"
 msgstr "La startdato de la noto estas en la pasinteco"
 
-#: ../calendar/gui/dialogs/memo-page.c:455
+#: ../calendar/gui/dialogs/memo-page.c:460
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr ""
 
-#: ../calendar/gui/dialogs/memo-page.c:459
+#: ../calendar/gui/dialogs/memo-page.c:464
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr ""
 
-#: ../calendar/gui/dialogs/memo-page.c:944
-#, c-format
-msgid "Unable to open memos in '%s': %s"
-msgstr "Ne eblis malfermi notoj en '%s': %s"
-
-#: ../calendar/gui/dialogs/memo-page.c:1151 ../em-format/em-format.c:1062
-#: ../em-format/em-format-quote.c:318 ../mail/em-format-html.c:2663
-#: ../mail/em-format-html.c:2728 ../mail/em-format-html.c:2752
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:72
+#: ../calendar/gui/dialogs/memo-page.c:1166
+#: ../em-format/e-mail-formatter-utils.c:202
+#: ../em-format/e-mail-formatter-utils.c:219
+#: ../em-format/e-mail-part-headers.c:48 ../mail/message-list.etspec.h:9
+#: ../mail/searchtypes.xml.in.h:11 ../mail/vfoldertypes.xml.in.h:11
+#: ../modules/mail/em-mailer-prefs.c:64
 msgid "To"
 msgstr "Al"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.ui.h:5
-msgid "Sta_rt date:"
-msgstr "_Komecdato:"
+#: ../calendar/gui/dialogs/task-page.c:426
+#: ../calendar/gui/dialogs/task-page.ui.h:34
+msgid "_List:"
+msgstr "_Listo:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "_Resumo:"
+#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.ui.h:24
+msgid "Organi_zer:"
+msgstr "Organi_zilo:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "_Al:"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:26
+msgid "Sta_rt date:"
+msgstr "_Komecdato:"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:338
-#: ../calendar/gui/dialogs/task-page.ui.h:9
-msgid "_List:"
-msgstr "_Listo:"
+#: ../calendar/gui/dialogs/task-page.ui.h:23
+msgid "Su_mmary:"
+msgstr "_Resumo:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:58
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:62
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:93
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:99
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
-msgstr ""
+msgstr "Tiu ĉi kaj estontaj instancoj"
 
-#: ../calendar/gui/dialogs/recur-comp.c:104
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
-msgstr ""
+msgstr "Ĉiuj instancoj"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:573
+#: ../calendar/gui/dialogs/recurrence-page.c:574
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:962
+#: ../calendar/gui/dialogs/recurrence-page.c:1001
 msgid "Recurrence date is invalid"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1002
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
 msgid "End time of the recurrence was before event's start"
 msgstr ""
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1032
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "on"
 msgstr "je"
 
@@ -3317,7 +3862,7 @@ msgstr "je"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
+#: ../calendar/gui/dialogs/recurrence-page.c:1155
 msgid "first"
 msgstr "unua"
 
@@ -3326,7 +3871,7 @@ msgstr "unua"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1101
+#: ../calendar/gui/dialogs/recurrence-page.c:1161
 msgid "second"
 msgstr "dua"
 
@@ -3334,7 +3879,7 @@ msgstr "dua"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1106
+#: ../calendar/gui/dialogs/recurrence-page.c:1166
 msgid "third"
 msgstr "tria"
 
@@ -3342,7 +3887,7 @@ msgstr "tria"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1111
+#: ../calendar/gui/dialogs/recurrence-page.c:1171
 msgid "fourth"
 msgstr "kvara"
 
@@ -3350,7 +3895,7 @@ msgstr "kvara"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/recurrence-page.c:1176
 msgid "fifth"
 msgstr "kvina"
 
@@ -3358,13 +3903,13 @@ msgstr "kvina"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/dialogs/recurrence-page.c:1181
 msgid "last"
 msgstr "lasta"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1145
+#: ../calendar/gui/dialogs/recurrence-page.c:1205
 msgid "Other Date"
 msgstr "Alia dato"
 
@@ -3372,7 +3917,7 @@ msgstr "Alia dato"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1151
+#: ../calendar/gui/dialogs/recurrence-page.c:1211
 msgid "1st to 10th"
 msgstr "1a ĝis 10a"
 
@@ -3380,7 +3925,7 @@ msgstr "1a ĝis 10a"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1157
+#: ../calendar/gui/dialogs/recurrence-page.c:1217
 msgid "11th to 20th"
 msgstr "11a ĝis 20a"
 
@@ -3388,97 +3933,99 @@ msgstr "11a ĝis 20a"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1163
+#: ../calendar/gui/dialogs/recurrence-page.c:1223
 msgid "21st to 31st"
 msgstr "21a ĝis 31a"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1189
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1250
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "Monday"
 msgstr "Lundo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1190
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1251
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Tuesday"
 msgstr "Mardo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1191
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../calendar/gui/dialogs/recurrence-page.c:1252
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
 msgid "Wednesday"
 msgstr "Merkredo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1192
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1253
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Thursday"
 msgstr "Ĵaŭdo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1193
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Friday"
 msgstr "Vendredo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1194
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../calendar/gui/dialogs/recurrence-page.c:1255
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Saturday"
 msgstr "Sabato"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1195
-#: ../modules/calendar/e-calendar-preferences.ui.h:38
+#: ../calendar/gui/dialogs/recurrence-page.c:1256
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Sunday"
 msgstr "Dimanĉo"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1319
+#: ../calendar/gui/dialogs/recurrence-page.c:1387
 msgid "on the"
 msgstr "je"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1494
+#: ../calendar/gui/dialogs/recurrence-page.c:1572
 msgid "occurrences"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2342
 msgid "Add exception"
 msgstr "Aldoni escepton"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2251
+#: ../calendar/gui/dialogs/recurrence-page.c:2384
 msgid "Could not get a selection to modify."
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2257
+#: ../calendar/gui/dialogs/recurrence-page.c:2390
 msgid "Modify exception"
 msgstr "Modifi escepton"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2301
+#: ../calendar/gui/dialogs/recurrence-page.c:2436
 msgid "Could not get a selection to delete."
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2435
+#: ../calendar/gui/dialogs/recurrence-page.c:2577
 msgid "Date/Time"
 msgstr "Dato/tempo"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:1
-msgid "Every"
-msgstr "Ĉiun"
-
+#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:2
-msgid "Exceptions"
-msgstr "Esceptoj"
+msgctxt "recurrpage"
+msgid "day(s)"
+msgstr "tago(j)"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:88
-msgid "Preview"
-msgstr "Antaŭrigardo"
+#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
+msgctxt "recurrpage"
+msgid "week(s)"
+msgstr "semajno(j)"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:5
-msgid "This appointment rec_urs"
-msgstr ""
+#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6
+msgctxt "recurrpage"
+msgid "month(s)"
+msgstr "monato(j)"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:8
 msgctxt "recurrpage"
-msgid "day(s)"
-msgstr "tago(j)"
+msgid "year(s)"
+msgstr "jaro(j)"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:10
@@ -3489,283 +4036,249 @@ msgstr "por"
 #. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:12
 msgctxt "recurrpage"
-msgid "forever"
-msgstr "ĉiam"
+msgid "until"
+msgstr "ĝis"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:14
 msgctxt "recurrpage"
-msgid "month(s)"
-msgstr "monato(j)"
+msgid "forever"
+msgstr "ĉiam"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:16
-msgctxt "recurrpage"
-msgid "until"
-msgstr "ĝis"
+msgid "This appointment rec_urs"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:17
+msgid "Every"
+msgstr "Ĉiun"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:18
-msgctxt "recurrpage"
-msgid "week(s)"
-msgstr "semajno(j)"
+msgid "Exceptions"
+msgstr "Esceptoj"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
-msgctxt "recurrpage"
-msgid "year(s)"
-msgstr "jaro(j)"
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:22
+msgid "Preview"
+msgstr "Antaŭrigardo"
 
-#: ../calendar/gui/dialogs/send-comp.c:196
+#: ../calendar/gui/dialogs/send-comp.c:172
+#: ../calendar/gui/dialogs/send-comp.c:254
 msgid "Send my reminders with this event"
 msgstr ""
 
-#: ../calendar/gui/dialogs/send-comp.c:198
+#: ../calendar/gui/dialogs/send-comp.c:174
+#: ../calendar/gui/dialogs/send-comp.c:256
 msgid "Notify new attendees _only"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-details-page.c:351
-#: ../calendar/gui/dialogs/task-details-page.c:373
-msgid "Completed date is wrong"
-msgstr ""
-
-#: ../calendar/gui/dialogs/task-details-page.c:486
-msgid "Web Page"
-msgstr "Retpaĝo"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:300
-#: ../calendar/gui/e-cal-model-tasks.c:493
-#: ../calendar/gui/e-cal-model-tasks.c:778 ../calendar/gui/e-task-table.c:220
-#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:646
-#: ../calendar/gui/print.c:3417 ../mail/em-sync-stream.c:152
-#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
-#, c-format
-msgid "Canceled"
-msgstr "Nuligite"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:297
-#: ../calendar/gui/e-cal-model-tasks.c:491
-#: ../calendar/gui/e-cal-model-tasks.c:776
-#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
-#: ../calendar/gui/e-task-table.c:218 ../calendar/gui/e-task-table.c:233
-#: ../calendar/gui/e-task-table.c:645 ../calendar/gui/print.c:3414
-#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:387
-msgid "Completed"
-msgstr "Plenumite"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:319
-#: ../calendar/gui/e-task-table.c:566 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1282 ../widgets/misc/e-send-options.ui.h:13
-msgid "High"
-msgstr "Alta"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:294
-#: ../calendar/gui/e-cal-model-tasks.c:489
-#: ../calendar/gui/e-cal-model-tasks.c:774
-#: ../calendar/gui/e-cal-model-tasks.c:852 ../calendar/gui/e-task-table.c:216
-#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:644
-#: ../calendar/gui/print.c:3411
-msgid "In Progress"
-msgstr "Progresante"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:323
-#: ../calendar/gui/e-task-table.c:568 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1280 ../widgets/misc/e-send-options.ui.h:14
-msgid "Low"
-msgstr "Malalta"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:321
-#: ../calendar/gui/e-cal-model.c:1607 ../calendar/gui/e-task-table.c:567
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1281
-#: ../widgets/misc/e-send-options.ui.h:16
-msgid "Normal"
-msgstr "Normala"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:304
-#: ../calendar/gui/e-cal-model-tasks.c:487
-#: ../calendar/gui/e-cal-model-tasks.c:772 ../calendar/gui/e-task-table.c:214
-#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:643
-#: ../calendar/gui/print.c:3408 ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr ""
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:16
-msgid "P_ercent complete:"
-msgstr ""
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:17
-msgid "Stat_us:"
-msgstr "Stat_o:"
-
-#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. * Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/dialogs/task-details-page.ui.h:18
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-cal-model.c:3496
-#: ../calendar/gui/e-meeting-list-view.c:635
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Stato"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:569 ../calendar/gui/tasktypes.xml.h:24
-#: ../widgets/misc/e-send-options.ui.h:27
-msgid "Undefined"
-msgstr "Nedifinite"
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:21
-msgid "_Date completed:"
-msgstr ""
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:35
-msgid "_Priority:"
-msgstr "_Prioritato:"
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:23
-msgid "_Web Page:"
-msgstr "_Retpaĝo:"
-
-#: ../calendar/gui/dialogs/task-editor.c:116
-msgid "_Status Details"
-msgstr ""
-
-#: ../calendar/gui/dialogs/task-editor.c:118
-msgid "Click to change or view the status details of the task"
-msgstr ""
-
-#: ../calendar/gui/dialogs/task-editor.c:126
+#: ../calendar/gui/dialogs/task-editor.c:93
 msgid "_Send Options"
 msgstr "_Send-agordoj"
 
-#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3329
-#: ../widgets/misc/e-send-options.c:535
+#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3488
+#: ../e-util/e-send-options.c:553
 msgid "Task"
 msgstr "Tasko"
 
-#: ../calendar/gui/dialogs/task-editor.c:324
-msgid "Task Details"
-msgstr "Taskdetaloj"
-
-#: ../calendar/gui/dialogs/task-editor.c:366
+#: ../calendar/gui/dialogs/task-editor.c:285
 msgid "Print this task"
 msgstr "Presi la taskon"
 
-#: ../calendar/gui/dialogs/task-page.c:250
+#: ../calendar/gui/dialogs/task-page.c:330
 msgid "Task's start date is in the past"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-page.c:251
+#: ../calendar/gui/dialogs/task-page.c:331
 msgid "Task's due date is in the past"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-page.c:285
+#: ../calendar/gui/dialogs/task-page.c:364
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-page.c:289
+#: ../calendar/gui/dialogs/task-page.c:368
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-page.c:293
+#: ../calendar/gui/dialogs/task-page.c:372
 msgid ""
 "Task cannot be edited, because the selected task list does not support "
 "assigned tasks"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-page.c:346
-#: ../calendar/gui/dialogs/task-page.ui.h:4
-msgid "Organi_zer:"
-msgstr "Organi_zilo:"
-
-#: ../calendar/gui/dialogs/task-page.c:818
+#: ../calendar/gui/dialogs/task-page.c:1013
 msgid "Due date is wrong"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-page.c:1773
-#, c-format
-msgid "Unable to open tasks in '%s': %s"
-msgstr "Ne eblis malfermi la taskojn en '%s': %s"
+#: ../calendar/gui/dialogs/task-page.c:1181
+#: ../calendar/gui/dialogs/task-page.c:1206
+msgid "Completed date is wrong"
+msgstr ""
+
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-page.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:338
+#: ../calendar/gui/e-task-table.c:524 ../calendar/gui/tasktypes.xml.h:19
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:313
+msgid "High"
+msgstr "Alta"
+
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-page.ui.h:10
+#: ../calendar/gui/e-cal-component-preview.c:340
+#: ../calendar/gui/e-cal-model.c:1643 ../calendar/gui/e-task-table.c:525
+#: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
+#: ../mail/message-list.c:312
+msgid "Normal"
+msgstr "Normala"
+
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-page.ui.h:12
+#: ../calendar/gui/e-cal-component-preview.c:342
+#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:21
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:311
+msgid "Low"
+msgstr "Malalta"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:2
-msgid "Categor_ies..."
-msgstr "Kategor_ioj..."
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-page.ui.h:14
+#: ../calendar/gui/e-task-table.c:527 ../calendar/gui/tasktypes.xml.h:22
+#: ../e-util/e-send-options.ui.h:1
+msgid "Undefined"
+msgstr "Nedifinite"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:3
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-page.ui.h:16
+#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-cal-model-tasks.c:310
+#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:207
+#: ../calendar/gui/e-task-table.c:222 ../calendar/gui/e-task-table.c:607
+#: ../calendar/gui/print.c:3573 ../calendar/gui/tasktypes.xml.h:11
+msgid "Not Started"
+msgstr ""
+
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-page.ui.h:18
+#: ../calendar/gui/e-cal-component-preview.c:313
+#: ../calendar/gui/e-cal-model-tasks.c:312
+#: ../calendar/gui/e-cal-model-tasks.c:554
+#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:608
+#: ../calendar/gui/print.c:3576
+msgid "In Progress"
+msgstr "Progresante"
+
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-page.ui.h:20
+#: ../calendar/gui/e-cal-component-preview.c:316
+#: ../calendar/gui/e-cal-model-tasks.c:314
+#: ../calendar/gui/e-cal-model-tasks.c:556
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../calendar/gui/e-task-table.c:211 ../calendar/gui/e-task-table.c:226
+#: ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3579
+#: ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:379
+msgid "Completed"
+msgstr "Plenumite"
+
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-page.ui.h:22
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../calendar/gui/e-cal-model-tasks.c:316
+#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
+#: ../calendar/gui/print.c:3582 ../mail/mail-send-recv.c:958
+msgid "Canceled"
+msgstr "Nuligite"
+
+#: ../calendar/gui/dialogs/task-page.ui.h:25
 msgid "D_ue date:"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-page.ui.h:7
+#: ../calendar/gui/dialogs/task-page.ui.h:28
 msgid "Time zone:"
 msgstr "Horzono:"
 
-#: ../calendar/gui/ea-cal-view.c:315
+#: ../calendar/gui/dialogs/task-page.ui.h:35
+#| msgid "Status:"
+msgid "_Status:"
+msgstr "_Stato:"
+
+#: ../calendar/gui/dialogs/task-page.ui.h:36
+#| msgid "Delete completed tasks"
+msgid "Date _completed:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.ui.h:37
+#| msgid "Delete completed tasks"
+msgid "_Percent complete:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.ui.h:38
+#| msgid "Priority:"
+msgid "Priorit_y:"
+msgstr "Prior_itato:"
+
+#: ../calendar/gui/dialogs/task-page.ui.h:39
+#, fuzzy
+#| msgid "Classification"
+msgid "C_lassification:"
+msgstr "_Kategoriado:"
+
+#: ../calendar/gui/dialogs/task-page.ui.h:40
+msgid "_Web Page:"
+msgstr "_Retpaĝo:"
+
+#: ../calendar/gui/ea-cal-view.c:284
 msgid "New Appointment"
 msgstr "Nova rendevuo"
 
-#: ../calendar/gui/ea-cal-view.c:316
+#: ../calendar/gui/ea-cal-view.c:285
 msgid "New All Day Event"
 msgstr "Nova tuttaga evento"
 
-#: ../calendar/gui/ea-cal-view.c:317
+#: ../calendar/gui/ea-cal-view.c:286
 msgid "New Meeting"
 msgstr "Nova Kunsido"
 
-#: ../calendar/gui/ea-cal-view.c:318
+#: ../calendar/gui/ea-cal-view.c:287
 msgid "Go to Today"
 msgstr "Iri al hodiaŭ"
 
-#: ../calendar/gui/ea-cal-view.c:319
+#: ../calendar/gui/ea-cal-view.c:288
 msgid "Go to Date"
 msgstr "Iri al dato"
 
-#: ../calendar/gui/ea-cal-view-event.c:290
+#: ../calendar/gui/ea-cal-view-event.c:234
 msgid "It has reminders."
 msgstr "Ĝi havas memorigaĵojn."
 
-#: ../calendar/gui/ea-cal-view-event.c:293
+#: ../calendar/gui/ea-cal-view-event.c:237
 msgid "It has recurrences."
 msgstr "Ĝi havas rikurojn."
 
-#: ../calendar/gui/ea-cal-view-event.c:296
+#: ../calendar/gui/ea-cal-view-event.c:240
 msgid "It is a meeting."
 msgstr "Ĝi estas kunsido."
 
-#: ../calendar/gui/ea-cal-view-event.c:303
+#: ../calendar/gui/ea-cal-view-event.c:247
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalendara evento: resumo estas %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:306
+#: ../calendar/gui/ea-cal-view-event.c:250
 msgid "Calendar Event: It has no summary."
 msgstr "Kalendara evento: ne havas resumon."
 
-#: ../calendar/gui/ea-cal-view-event.c:328
+#: ../calendar/gui/ea-cal-view-event.c:273
 msgid "calendar view event"
 msgstr "kalendare vidi eventon"
 
-#: ../calendar/gui/ea-cal-view-event.c:557
+#: ../calendar/gui/ea-cal-view-event.c:505
 msgid "Grab Focus"
 msgstr "Kapti fokuson"
 
-#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
+#: ../calendar/gui/ea-day-view.c:107 ../calendar/gui/ea-week-view.c:107
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -3774,95 +4287,33 @@ msgstr[1] "Ĝi havas %d eventojn."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:154
+#: ../calendar/gui/ea-day-view.c:114 ../calendar/gui/ea-week-view.c:110
 msgid "It has no events."
 msgstr "Ĝi ne havas eventojn."
 
-#. To translators: First %s is the week, for example "July 10th -
-#. July 14th, 2006". Second %s is the number of events in this work
-#. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:163
+#: ../calendar/gui/ea-day-view.c:121
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Labora semanjo vido: %s. %s"
 
-#. To translators: First %s is the day, for example "Thursday July
-#. 13th, 2006". Second %s is the number of events on this day, for
-#. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:169
+#: ../calendar/gui/ea-day-view.c:128
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Taga vido: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:157
 msgid "calendar view for a work week"
 msgstr "kalendara vido por labora semanjo"
 
-#: ../calendar/gui/ea-day-view.c:205
+#: ../calendar/gui/ea-day-view.c:159
 msgid "calendar view for one or more days"
 msgstr "kalendara vido por unu aŭ plu tagoj"
 
-#: ../calendar/gui/ea-day-view-main-item.c:318
-#: ../calendar/gui/ea-week-view-main-item.c:344
+#: ../calendar/gui/ea-day-view-main-item.c:266
+#: ../calendar/gui/ea-week-view-main-item.c:295
 msgid "a table to view and select the current time range"
 msgstr "tabelo por vidi kaj elekti la tempintervalon"
 
-#: ../calendar/gui/ea-gnome-calendar.c:50
-#: ../calendar/gui/ea-gnome-calendar.c:58
-#: ../calendar/importers/icalendar-importer.c:1078
-msgid "Gnome Calendar"
-msgstr "Gnomo Kalendaro"
-
-#: ../calendar/gui/ea-gnome-calendar.c:201
-#: ../modules/calendar/e-cal-shell-view-private.c:1050
-msgid "%A %d %b %Y"
-msgstr "%A %d %b %Y"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. * %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. * %d = day of month, %b = abbreviated month name.
-#. * You can change the order but don't change the
-#. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:204 ../calendar/gui/e-day-view.c:1838
-#: ../calendar/gui/e-day-view-top-item.c:852
-#: ../calendar/gui/e-week-view-main-item.c:224
-#: ../modules/calendar/e-cal-shell-view-private.c:1054
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#: ../calendar/gui/ea-gnome-calendar.c:206
-#: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../modules/calendar/e-cal-shell-view-private.c:1057
-#: ../modules/calendar/e-cal-shell-view-private.c:1063
-#: ../modules/calendar/e-cal-shell-view-private.c:1066
-msgid "%a %d %b %Y"
-msgstr "%a %d %b %Y"
-
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../calendar/gui/ea-gnome-calendar.c:236
-#: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../calendar/gui/ea-gnome-calendar.c:244
-#: ../modules/calendar/e-cal-shell-view-private.c:1083
-#: ../modules/calendar/e-cal-shell-view-private.c:1094
-#: ../modules/calendar/e-cal-shell-view-private.c:1101
-#: ../modules/calendar/e-cal-shell-view-private.c:1104
-msgid "%d %b %Y"
-msgstr "%d %b %Y"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. * Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. * month name. You can change the order but don't
-#. * change the specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:234 ../calendar/gui/e-day-view.c:1854
-#: ../calendar/gui/e-day-view-top-item.c:856
-#: ../calendar/gui/e-week-view-main-item.c:238
-#: ../modules/calendar/e-cal-shell-view-private.c:1090
-msgid "%d %b"
-msgstr "%d %b"
-
 #: ../calendar/gui/ea-jump-button.c:150
 msgid "Jump button"
 msgstr "Salt-butono"
@@ -3872,7 +4323,7 @@ msgid "Click here, you can find more events."
 msgstr "Klaku ĉi tien, vi povas trovi pluajn eventojn."
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:393
+#: ../calendar/gui/e-alarm-list.c:370 ../calendar/gui/misc.c:97
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -3880,214 +4331,262 @@ msgstr[0] "%d tago"
 msgstr[1] "%d tagoj"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:399
+#: ../calendar/gui/e-alarm-list.c:376
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semajno"
 msgstr[1] "%d semajnoj"
 
-#: ../calendar/gui/e-alarm-list.c:461
+#: ../calendar/gui/e-alarm-list.c:438
 msgid "Unknown action to be performed"
 msgstr ""
 
-#. Translator: The first %s refers to the base, which would be actions like
-#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:475
+#: ../calendar/gui/e-alarm-list.c:453
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr ""
 
-#. Translator: The first %s refers to the base, which would be actions like
-#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:480
+#: ../calendar/gui/e-alarm-list.c:459
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr ""
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:487
+#: ../calendar/gui/e-alarm-list.c:466
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr ""
 
-#. Translator: The first %s refers to the base, which would be actions like
-#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:498
+#: ../calendar/gui/e-alarm-list.c:478
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr ""
 
-#. Translator: The first %s refers to the base, which would be actions like
-#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:503
+#: ../calendar/gui/e-alarm-list.c:484
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr ""
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:510
+#: ../calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr ""
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:534
+#: ../calendar/gui/e-alarm-list.c:515
 #, c-format
 msgid "%s at %s"
 msgstr ""
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:542
+#: ../calendar/gui/e-alarm-list.c:523
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: ../calendar/gui/ea-week-view.c:159
+#: ../calendar/gui/ea-week-view.c:114
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Monata Vido: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:163
+#: ../calendar/gui/ea-week-view.c:119
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Semanja Vido: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:197
+#: ../calendar/gui/ea-week-view.c:148
 msgid "calendar view for a month"
 msgstr "kalendara vido por monato"
 
-#: ../calendar/gui/ea-week-view.c:199
+#: ../calendar/gui/ea-week-view.c:150
 msgid "calendar view for one or more weeks"
 msgstr "kalendara vido por unu aŭ plu semanjoj"
 
-#: ../calendar/gui/e-cal-component-preview.c:194 ../filter/e-filter-rule.c:680
+#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:758
+#: ../mail/e-mail-config-page.c:125
 msgid "Untitled"
 msgstr "Sentitole"
 
-#: ../calendar/gui/e-cal-component-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:230
 msgid "Categories:"
 msgstr "Kategorioj:"
 
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Summary:"
 msgstr "Resumo:"
 
-#: ../calendar/gui/e-cal-component-preview.c:249
-#: ../calendar/gui/e-cal-component-preview.c:263
+#: ../calendar/gui/e-cal-component-preview.c:273
 msgid "Start Date:"
 msgstr ""
 
-#: ../calendar/gui/e-cal-component-preview.c:277
+#: ../calendar/gui/e-cal-component-preview.c:285
+#, fuzzy
+#| msgid "End Date"
+msgid "End Date:"
+msgstr "Findato"
+
+#: ../calendar/gui/e-cal-component-preview.c:297
 msgid "Due Date:"
 msgstr "Limdato:"
 
-#. Status
-#: ../calendar/gui/e-cal-component-preview.c:290
-#: ../plugins/itip-formatter/itip-view.c:1083
+#: ../calendar/gui/e-cal-component-preview.c:309
+#: ../modules/itip-formatter/itip-view.c:1519
+#: ../modules/itip-formatter/itip-view.c:1636
 msgid "Status:"
 msgstr "Stato:"
 
-#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-cal-component-preview.c:336
 msgid "Priority:"
 msgstr "Prioritato:"
 
-#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
+#: ../calendar/gui/e-cal-component-preview.c:361
+#: ../mail/e-mail-config-service-page.c:670
 msgid "Description:"
 msgstr "Priskribo:"
 
-#: ../calendar/gui/e-cal-component-preview.c:373
+#: ../calendar/gui/e-cal-component-preview.c:392
 msgid "Web Page:"
 msgstr "Retpaĝo:"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
-msgstr "% plenumite"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:4
+#: ../calendar/gui/e-cal-data-model.c:1608
+#, fuzzy, c-format
+#| msgid "Creating folder '%s'"
+msgid "Creating view for calendar '%s'"
+msgstr "Kreante dosierujon '%s'"
+
+#: ../calendar/gui/e-cal-data-model.c:1612
+#, fuzzy, c-format
+#| msgid "Create a new task list"
+msgid "Creating view for task list '%s'"
+msgstr "Kreante vidon por taskolisto '%s'"
+
+#: ../calendar/gui/e-cal-data-model.c:1616
+#, fuzzy, c-format
+#| msgid "Create a new memo list"
+msgid "Creating view for memo list '%s'"
+msgstr "Kreante vidon por notolisto '%s'"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:1
 msgid "Click to add a task"
 msgstr "Klaku por aldoni taskon"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5
-msgid "Complete"
-msgstr "Plenumite"
+#: ../calendar/gui/e-calendar-table.etspec.h:2
+msgid "Start date"
+msgstr "Komencdato"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:3
+#: ../calendar/gui/e-meeting-list-view.c:652
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../e-util/e-attachment-tree-view.c:585
+#: ../mail/e-mail-account-tree-view.c:157
+msgid "Type"
+msgstr "Tipo"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6
+#: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Completion date"
 msgstr "Plenumdato"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
-#: ../calendar/gui/e-cal-list-view.etspec.h:2
-#: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:388
-msgid "Created"
-msgstr "Kreite"
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:960
+msgid "Complete"
+msgstr "Plenumite"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Limdato"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:9
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-memo-table.etspec.h:4
-msgid "Last modified"
-msgstr "Laste modifite"
+#, no-c-format
+msgid "% Complete"
+msgstr "% plenumite"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../calendar/gui/tasktypes.xml.h:18
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Priority"
 msgstr "Prioritato"
 
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-msgid "Start date"
-msgstr "Komencdato"
+#: ../calendar/gui/e-cal-model.c:3088
+#: ../calendar/gui/e-meeting-list-view.c:695
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/filtertypes.xml.in.h:34
+#: ../mail/message-list.etspec.h:1 ../mail/searchtypes.xml.in.h:36
+#: ../mail/vfoldertypes.xml.in.h:36
+msgid "Status"
+msgstr "Stato"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../plugins/save-calendar/csv-format.c:380
+msgid "Created"
+msgstr "Kreite"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:598
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../mail/e-mail-account-tree-view.c:139
-#: ../widgets/misc/e-attachment-tree-view.c:584
-msgid "Type"
-msgstr "Tipo"
+msgid "Last modified"
+msgstr "Laste modifite"
 
-#: ../calendar/gui/e-calendar-view.c:423
+#: ../calendar/gui/e-calendar-view.c:411
 msgid "Cut selected events to the clipboard"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:429
+#: ../calendar/gui/e-calendar-view.c:417
 msgid "Copy selected events to the clipboard"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:435
+#: ../calendar/gui/e-calendar-view.c:423
 msgid "Paste events from the clipboard"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:441
+#: ../calendar/gui/e-calendar-view.c:429
 msgid "Delete selected events"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:460 ../calendar/gui/e-memo-table.c:182
-#: ../calendar/gui/e-task-table.c:270
-msgid "Deleting selected objects"
+#: ../calendar/gui/e-calendar-view.c:810
+msgid "Pasted text doesn't contain valid iCalendar data"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:656 ../calendar/gui/e-memo-table.c:862
-#: ../calendar/gui/e-task-table.c:1145
-msgid "Updating objects"
+#: ../calendar/gui/e-calendar-view.c:821 ../calendar/gui/e-cal-ops.c:1540
+msgid "Default calendar not found"
 msgstr ""
 
+#: ../calendar/gui/e-calendar-view.c:826 ../calendar/gui/e-cal-ops.c:1543
+#| msgid "Delete memo list '{0}'?"
+msgid "Default memo list not found"
+msgstr "Ne trovis defaŭltan notoliston"
+
+#: ../calendar/gui/e-calendar-view.c:831 ../calendar/gui/e-cal-ops.c:1546
+#, fuzzy
+#| msgid "Mark as _default task list"
+msgid "Default task list not found"
+msgstr "Marki kiel defaŭlta tasklisto"
+
+#: ../calendar/gui/e-calendar-view.c:918
+msgid "No suitable component found"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:988
+#, fuzzy
+#| msgid "Loading Calendar"
+msgid "Pasting iCalendar data"
+msgstr "Ŝagante kalendaron"
+
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1912 ../calendar/gui/e-memo-table.c:539
-#: ../calendar/gui/e-task-table.c:811
+#: ../calendar/gui/e-calendar-view.c:1791 ../calendar/gui/e-memo-table.c:495
+#: ../calendar/gui/e-task-table.c:796
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizilo: %s <%s>"
@@ -4095,113 +4594,175 @@ msgstr "Organizilo: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1916 ../calendar/gui/e-memo-table.c:544
-#: ../calendar/gui/e-task-table.c:815
+#: ../calendar/gui/e-calendar-view.c:1795 ../calendar/gui/e-memo-table.c:500
+#: ../calendar/gui/e-task-table.c:800
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizilo: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1932 ../calendar/gui/print.c:3363
+#: ../calendar/gui/e-calendar-view.c:1811
+#: ../calendar/gui/e-meeting-time-sel.c:2663 ../calendar/gui/print.c:3527
 #, c-format
 msgid "Location: %s"
 msgstr "Loko: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1963
+#: ../calendar/gui/e-calendar-view.c:1851
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tempo: %s %s"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
-msgid "End Date"
-msgstr "Findato"
+#: ../calendar/gui/e-calendar-view.c:2228
+#: ../calendar/gui/e-calendar-view.c:2235
+#: ../calendar/gui/e-calendar-view.c:2242
+#: ../calendar/gui/e-calendar-view.c:2245
+msgid "%d %b %Y"
+msgstr "%d %b %Y"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. * Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../calendar/gui/e-calendar-view.c:2233 ../calendar/gui/e-day-view.c:2943
+#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-week-view-main-item.c:230
+msgid "%d %b"
+msgstr "%d %b"
+
+#: ../calendar/gui/e-calendar-view.c:2255
+msgid "%A %d %b %Y"
+msgstr "%A %d %b %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. * %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. * %d = day of month, %b = abbreviated month name.
+#. * You can change the order but don't change the
+#. * specifiers or add anything.
+#: ../calendar/gui/e-calendar-view.c:2259 ../calendar/gui/e-day-view.c:2927
+#: ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-week-view-main-item.c:216
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: ../calendar/gui/e-calendar-view.c:2262
+#: ../calendar/gui/e-calendar-view.c:2268
+#: ../calendar/gui/e-calendar-view.c:2271
+msgid "%a %d %b %Y"
+msgstr "%a %d %b %Y"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model.c:797 ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
-#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1162
-#: ../calendar/gui/print.c:1179 ../e-util/e-charset.c:52
-#: ../modules/plugin-manager/evolution-plugin-manager.c:101
-#: ../plugins/itip-formatter/itip-formatter.c:466
-#: ../plugins/itip-formatter/itip-formatter.c:2872
+#: ../calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Findato"
+
+#: ../calendar/gui/e-cal-model.c:291 ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1250
+#: ../calendar/gui/print.c:1267 ../e-util/e-charset.c:51
+#: ../modules/itip-formatter/itip-view.c:3607
+#: ../modules/itip-formatter/itip-view.c:6197
+#: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Nekonate"
 
-#: ../calendar/gui/e-cal-model.c:1609
+#: ../calendar/gui/e-cal-model.c:1183 ../calendar/gui/e-cal-ops.c:586
+#: ../calendar/gui/e-cal-ops.c:1209
+#: ../modules/calendar/e-cal-base-shell-backend.c:361
+#, c-format
+msgid "Source with UID '%s' not found"
+msgstr ""
+
+#: ../calendar/gui/e-cal-model.c:1267 ../calendar/gui/e-cal-ops.c:184
+#: ../calendar/gui/e-cal-ops.c:1325
+#| msgid "Create an _Event"
+msgid "Creating an event"
+msgstr "Krei eventon"
+
+#: ../calendar/gui/e-cal-model.c:1271 ../calendar/gui/e-cal-ops.c:188
+#: ../calendar/gui/e-cal-ops.c:1329
+#, fuzzy
+#| msgid "Create a new memo"
+msgid "Creating a memo"
+msgstr "Krei novan noton"
+
+#: ../calendar/gui/e-cal-model.c:1275 ../calendar/gui/e-cal-ops.c:192
+#: ../calendar/gui/e-cal-ops.c:1333
+#| msgid "Create a _Task"
+msgid "Creating a task"
+msgstr "Krei taskon"
+
+#: ../calendar/gui/e-cal-model.c:1645
 msgid "Recurring"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model.c:1611
+#: ../calendar/gui/e-cal-model.c:1647
 msgid "Assigned"
-msgstr ""
+msgstr "Atribuita"
 
-#: ../calendar/gui/e-cal-model.c:1613 ../calendar/gui/e-cal-model-tasks.c:1143
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
-#: ../calendar/gui/e-meeting-store.c:1053
+#: ../calendar/gui/e-cal-model.c:1649 ../calendar/gui/e-cal-model-tasks.c:1139
+#: ../calendar/gui/e-meeting-list-view.c:208
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:186
+#: ../calendar/gui/e-meeting-store.c:1023
 msgid "Yes"
 msgstr "Jes"
 
-#: ../calendar/gui/e-cal-model.c:1613 ../calendar/gui/e-cal-model-tasks.c:1143
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:190
+#: ../calendar/gui/e-cal-model.c:1649 ../calendar/gui/e-cal-model-tasks.c:1139
+#: ../calendar/gui/e-meeting-list-view.c:209
+#: ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "Ne"
 
-#: ../calendar/gui/e-cal-model.c:2995
-#, c-format
-msgid "Opening %s"
-msgstr "Malfermante %s"
-
-#: ../calendar/gui/e-cal-model.c:3440
-#: ../calendar/gui/e-meeting-list-view.c:214
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../plugins/itip-formatter/itip-formatter.c:2860
+#: ../calendar/gui/e-cal-model.c:3029
+#: ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../modules/itip-formatter/itip-view.c:6185
 msgid "Accepted"
 msgstr "Akceptite"
 
-#: ../calendar/gui/e-cal-model.c:3441
-#: ../calendar/gui/e-meeting-list-view.c:215
-#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../plugins/itip-formatter/itip-formatter.c:2866
+#: ../calendar/gui/e-cal-model.c:3030
+#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../modules/itip-formatter/itip-view.c:6191
 msgid "Declined"
 msgstr "Malakceptite"
 
-#: ../calendar/gui/e-cal-model.c:3442
-#: ../calendar/gui/e-meeting-list-view.c:216
-#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../calendar/gui/e-meeting-time-sel.c:547
+#: ../calendar/gui/e-cal-model.c:3031
+#: ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
+#: ../calendar/gui/e-meeting-time-sel.c:529
 msgid "Tentative"
 msgstr "Provizore"
 
-#: ../calendar/gui/e-cal-model.c:3443
-#: ../calendar/gui/e-meeting-list-view.c:217
-#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../plugins/itip-formatter/itip-formatter.c:2869
+#: ../calendar/gui/e-cal-model.c:3032
+#: ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
+#: ../modules/itip-formatter/itip-view.c:6194
 msgid "Delegated"
 msgstr "Delegite"
 
-#: ../calendar/gui/e-cal-model.c:3444
+#: ../calendar/gui/e-cal-model.c:3033
 msgid "Needs action"
 msgstr "Bezonas agon"
 
-#: ../calendar/gui/e-cal-model-calendar.c:188
-#: ../calendar/gui/e-task-table.c:620
+#: ../calendar/gui/e-cal-model-calendar.c:123
+#: ../calendar/gui/e-task-table.c:582
 msgid "Free"
 msgstr "Libere"
 
-#: ../calendar/gui/e-cal-model-calendar.c:191
-#: ../calendar/gui/e-meeting-time-sel.c:548 ../calendar/gui/e-task-table.c:621
+#: ../calendar/gui/e-cal-model-calendar.c:126
+#: ../calendar/gui/e-meeting-time-sel.c:530 ../calendar/gui/e-task-table.c:583
 msgid "Busy"
 msgstr "Okupite"
 
-#: ../calendar/gui/e-cal-model-tasks.c:718
+#: ../calendar/gui/e-cal-model-tasks.c:498
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4209,39 +4770,243 @@ msgid ""
 msgstr ""
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:770
+#: ../calendar/gui/e-cal-model-tasks.c:550
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Nenio"
 
+#: ../calendar/gui/e-cal-ops.c:283
+msgid "Modifying an event"
+msgstr "Modifante eventon"
+
+#: ../calendar/gui/e-cal-ops.c:287
+#, fuzzy
+#| msgid "Loading memos"
+msgid "Modifying a memo"
+msgstr "Ŝargante notojn"
+
+#: ../calendar/gui/e-cal-ops.c:291
+#, fuzzy
+#| msgid "Loading tasks"
+msgid "Modifying a task"
+msgstr "Ŝargante taskojn"
+
+#: ../calendar/gui/e-cal-ops.c:387
+#, fuzzy
+#| msgid "Removing attachments"
+msgid "Removing an event"
+msgstr "Forigante aldonaĵon"
+
+#: ../calendar/gui/e-cal-ops.c:391
+#, fuzzy
+#| msgid "Removing attachments"
+msgid "Removing a memo"
+msgstr "Forigante aldonaĵon"
+
+#: ../calendar/gui/e-cal-ops.c:395
+#, fuzzy
+#| msgid "Removing attachments"
+msgid "Removing a task"
+msgstr "Forigante aldonaĵon"
+
+#: ../calendar/gui/e-cal-ops.c:484
+#, c-format
+#| msgid "Create an _Event"
+msgid "Deleting an event"
+msgid_plural "Deleting %d events"
+msgstr[0] "Krei eventon"
+msgstr[1] "Krei %d eventojn"
+
+#: ../calendar/gui/e-cal-ops.c:488
+#, c-format
+#| msgid "Delete Memo"
+msgid "Deleting a memo"
+msgid_plural "Deleting %d memos"
+msgstr[0] "Forigi noton"
+msgstr[1] "Forigi %d notojn"
+
+#: ../calendar/gui/e-cal-ops.c:492
+#, c-format
+#| msgid "Delete Task"
+msgid "Deleting a task"
+msgid_plural "Deleting %d tasks"
+msgstr[0] "Forigi taskon"
+msgstr[1] "Forigi %d taskojn"
+
+#: ../calendar/gui/e-cal-ops.c:692
+#, fuzzy, c-format
+#| msgid "Print this event"
+msgid "Pasting an event"
+msgid_plural "Pasting %d events"
+msgstr[0] "Presi tiun eventon"
+msgstr[1] "Presi tiun eventon"
+
+#: ../calendar/gui/e-cal-ops.c:707
+#, fuzzy, c-format
+#| msgid "Loading memos"
+msgid "Pasting a memo"
+msgid_plural "Pasting %d memos"
+msgstr[0] "Ŝargante notojn"
+msgstr[1] "Ŝargante notojn"
+
+#: ../calendar/gui/e-cal-ops.c:722
+#, fuzzy, c-format
+#| msgid "Loading tasks"
+msgid "Pasting a task"
+msgid_plural "Pasting %d tasks"
+msgstr[0] "Ŝargante taskojn"
+msgstr[1] "Ŝargante taskojn"
+
+#: ../calendar/gui/e-cal-ops.c:820
+#| msgid "Create an _Event"
+msgid "Updating an event"
+msgstr "Ĝisdatigante eventon"
+
+#: ../calendar/gui/e-cal-ops.c:824
+#, fuzzy
+#| msgid "Loading memos"
+msgid "Updating a memo"
+msgstr "Ŝargante notojn"
+
+#: ../calendar/gui/e-cal-ops.c:828
+#, fuzzy
+#| msgid "Loading tasks"
+msgid "Updating a task"
+msgstr "Ŝargante taskojn"
+
+#: ../calendar/gui/e-cal-ops.c:933
+#, fuzzy, c-format
+#| msgid "Unable to open the calendar '%s': %s"
+msgid "Getting events to purge in the calendar '%s'"
+msgstr "Ne eblis malfermi la kalendaron '%s'"
+
+#: ../calendar/gui/e-cal-ops.c:937
+#, c-format
+msgid "Getting memos to purge in the memo list '%s'"
+msgstr ""
+
+#: ../calendar/gui/e-cal-ops.c:941
+#, c-format
+msgid "Getting tasks to purge in the task list '%s'"
+msgstr ""
+
+#: ../calendar/gui/e-cal-ops.c:962
+#, fuzzy, c-format
+#| msgid "Unable to open the calendar '%s': %s"
+msgid "Purging events in the calendar '%s'"
+msgstr "Ne eblis malfermi la kalendaron '%s'"
+
+#: ../calendar/gui/e-cal-ops.c:966
+#, c-format
+msgid "Purging memos in the memo list '%s'"
+msgstr ""
+
+#: ../calendar/gui/e-cal-ops.c:970
+#, c-format
+msgid "Purging tasks in the task list '%s'"
+msgstr ""
+
+#: ../calendar/gui/e-cal-ops.c:1068
+#, fuzzy
+#| msgid "Print this event"
+msgid "Purging events"
+msgstr "Presi tiun eventon"
+
+#: ../calendar/gui/e-cal-ops.c:1072
+#, fuzzy
+#| msgid "Print Memos"
+msgid "Purging memos"
+msgstr "Presi notojn"
+
+#: ../calendar/gui/e-cal-ops.c:1076
+#, fuzzy
+#| msgid "Print Tasks"
+msgid "Purging tasks"
+msgstr "Presi taskojn"
+
+#: ../calendar/gui/e-cal-ops.c:1178
+#, fuzzy
+#| msgid "Hide completed tasks"
+msgid "Expunging completed tasks"
+msgstr "Kaŝi plenumigitajn taskojn"
+
+#: ../calendar/gui/e-cal-ops.c:2034
+#, c-format
+msgid "Moving an event"
+msgid_plural "Moving %d events"
+msgstr[0] "Movante eventon"
+msgstr[1] "Movante %d eventojn"
+
+#: ../calendar/gui/e-cal-ops.c:2035
+#, fuzzy, c-format
+#| msgid "Cannot save event"
+msgid "Copying an event"
+msgid_plural "Copying %d events"
+msgstr[0] "Ne eblas konservi eventon"
+msgstr[1] "Ne eblas konservi eventon"
+
+#: ../calendar/gui/e-cal-ops.c:2041
+#, fuzzy, c-format
+#| msgid "Loading memos"
+msgid "Moving a memo"
+msgid_plural "Moving %d memos"
+msgstr[0] "Ŝargante notojn"
+msgstr[1] "Ŝargante notojn"
+
+#: ../calendar/gui/e-cal-ops.c:2042
+#, fuzzy, c-format
+#| msgid "Loading memos"
+msgid "Copying a memo"
+msgid_plural "Copying %d memos"
+msgstr[0] "Ŝargante notojn"
+msgstr[1] "Ŝargante notojn"
+
+#: ../calendar/gui/e-cal-ops.c:2048
+#, fuzzy, c-format
+#| msgid "Loading tasks"
+msgid "Moving a task"
+msgid_plural "Moving %d tasks"
+msgstr[0] "Ŝargante taskojn"
+msgstr[1] "Ŝargante taskojn"
+
+#: ../calendar/gui/e-cal-ops.c:2049
+#, fuzzy, c-format
+#| msgid "Loading tasks"
+msgid "Copying a task"
+msgid_plural "Copying %d tasks"
+msgstr[0] "Ŝargante taskojn"
+msgstr[1] "Ŝargante taskojn"
+
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:156
+#: ../calendar/gui/e-cell-date-edit-text.c:165
 msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr ""
+msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:159
+#: ../calendar/gui/e-cell-date-edit-text.c:168
 msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr ""
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:167
+#: ../calendar/gui/e-cell-date-edit-text.c:176
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
 "%s"
 msgstr ""
+"Oni devas enigi la daton tiamaniere: \n"
+"%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1021 ../calendar/gui/e-week-view.c:773
-#: ../calendar/gui/print.c:988 ../calendar/gui/print.c:1007
-#: ../calendar/gui/print.c:2498 ../calendar/gui/print.c:2518
+#: ../calendar/gui/e-day-view.c:2061 ../calendar/gui/e-week-view.c:1692
+#: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
+#: ../calendar/gui/print.c:2622 ../calendar/gui/print.c:2642
 msgid "am"
 msgstr "atm"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1024 ../calendar/gui/e-week-view.c:776
-#: ../calendar/gui/print.c:993 ../calendar/gui/print.c:1009
-#: ../calendar/gui/print.c:2503 ../calendar/gui/print.c:2520
+#: ../calendar/gui/e-day-view.c:2064 ../calendar/gui/e-week-view.c:1695
+#: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
+#: ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
 msgid "pm"
 msgstr "ptm"
 
@@ -4251,278 +5016,290 @@ msgstr "ptm"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:1821 ../calendar/gui/e-day-view-top-item.c:848
-#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1982
+#: ../calendar/gui/e-day-view.c:2910 ../calendar/gui/e-day-view-top-item.c:851
+#: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2089
 msgid "%A %d %B"
-msgstr ""
+msgstr "%A %d %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2638
+#: ../calendar/gui/e-day-view.c:3574
 #, c-format
 msgid "Week %d"
 msgstr "Semajno %d"
 
-#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
-#. * to change the length of the time division in the calendar day view, e.g.
-#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
-#.
-#: ../calendar/gui/e-day-view-time-item.c:804
+#. Translators: %02i is the number of minutes;
+#. * this is a context menu entry to change the
+#. * length of the time division in the calendar
+#. * day view, e.g. a day is displayed in
+#. * 24 "60 minute divisions" or
+#. * 48 "30 minute divisions".
+#: ../calendar/gui/e-day-view-time-item.c:802
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
-#: ../calendar/gui/e-day-view-time-item.c:825
+#: ../calendar/gui/e-day-view-time-item.c:827
 msgid "Show the second time zone"
 msgstr "Montri la duan horzonon"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:842
-#: ../modules/calendar/e-calendar-preferences.c:179
-#: ../modules/calendar/e-calendar-preferences.c:231
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../calendar/gui/e-day-view-time-item.c:844
+#: ../modules/calendar/e-calendar-preferences.c:305
+#: ../modules/calendar/e-calendar-preferences.c:357
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Nenio"
 
-#: ../calendar/gui/e-day-view-time-item.c:874
-#: ../calendar/gui/e-timezone-entry.c:319
-#: ../modules/calendar/e-calendar-preferences.c:258
+#: ../calendar/gui/e-day-view-time-item.c:878
+#: ../calendar/gui/e-timezone-entry.c:323
+#: ../modules/calendar/e-calendar-preferences.c:388
 msgid "Select..."
 msgstr "Elekti..."
 
-#: ../calendar/gui/e-meeting-list-view.c:64
+#: ../calendar/gui/e-meeting-list-view.c:63
 msgid "Chair Persons"
-msgstr ""
+msgstr "Prezidaj personoj"
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Required Participants"
-msgstr ""
+msgstr "Nepraj partoprenantoj"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Optional Participants"
-msgstr ""
+msgstr "Malnepraj partoprenantoj"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Resources"
 msgstr "Risurcoj"
 
-#: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/e-meeting-store.c:1047 ../calendar/gui/print.c:1158
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:126
+#: ../calendar/gui/e-meeting-store.c:1017 ../calendar/gui/print.c:1246
 msgid "Individual"
 msgstr "Individue"
 
-#: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/print.c:1159 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
+#: ../calendar/gui/print.c:1247 ../e-util/e-table-config.ui.h:8
 msgid "Group"
 msgstr "Grupo"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1160
+#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
+#: ../calendar/gui/print.c:1248
 msgid "Resource"
 msgstr "Risurco"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/print.c:1161
+#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
+#: ../calendar/gui/print.c:1249
 msgid "Room"
 msgstr "Ĉambro"
 
-#: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/print.c:1175
+#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:161
+#: ../calendar/gui/print.c:1263
 msgid "Chair"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:189
-#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/e-meeting-store.c:1050 ../calendar/gui/print.c:1176
+#: ../calendar/gui/e-meeting-list-view.c:195
+#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1264
 msgid "Required Participant"
-msgstr ""
+msgstr "Nepra partoprenanto"
 
-#: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/print.c:1177
+#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/print.c:1265
 msgid "Optional Participant"
-msgstr ""
+msgstr "Malnepra partoprenanto"
 
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/print.c:1178
+#: ../calendar/gui/e-meeting-list-view.c:197
+#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
+#: ../calendar/gui/print.c:1266
 msgid "Non-Participant"
-msgstr ""
+msgstr "Ne partoprenanta"
 
-#: ../calendar/gui/e-meeting-list-view.c:213
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/e-meeting-store.c:1060
+#: ../calendar/gui/e-meeting-list-view.c:219
+#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:1030
 msgid "Needs Action"
 msgstr "Necesas agon"
 
-#. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:626
 msgid "Attendee                          "
-msgstr ""
+msgstr "Alestanto                          "
 
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:623
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+#: ../calendar/gui/e-meeting-list-view.c:681
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
-msgstr ""
+msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
 msgid "In Process"
-msgstr ""
+msgstr "Procezate"
 
-#: ../calendar/gui/e-meeting-store.c:1876
+#: ../calendar/gui/e-meeting-store.c:1909
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "Enigu pasvorton por aliri libera-okipita-informo ĉe servilo %s kiel uzanto %s"
 
-#: ../calendar/gui/e-meeting-store.c:1886
+#: ../calendar/gui/e-meeting-store.c:1919
 #, c-format
 msgid "Failure reason: %s"
-msgstr ""
+msgstr "Malsukcesa kialo: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1891
-#: ../plugins/caldav/caldav-browse-server.c:957
-#: ../plugins/google-account-setup/google-source.c:458
-#: ../plugins/publish-calendar/publish-calendar.c:337
-#: ../smime/gui/component.c:54
+#: ../calendar/gui/e-meeting-store.c:1924
+#: ../plugins/publish-calendar/publish-calendar.c:351
+#: ../smime/gui/component.c:63
 msgid "Enter password"
 msgstr "Enigi pasvorton"
 
-#: ../calendar/gui/e-meeting-time-sel.c:549
+#: ../calendar/gui/e-meeting-time-sel.c:531
 msgid "Out of Office"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:550
+#: ../calendar/gui/e-meeting-time-sel.c:533
 msgid "No Information"
-msgstr ""
+msgstr "Nenia informo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:586
+#: ../calendar/gui/e-meeting-time-sel.c:568
 msgid "O_ptions"
 msgstr "_Agordoj"
 
-#: ../calendar/gui/e-meeting-time-sel.c:604
+#: ../calendar/gui/e-meeting-time-sel.c:588
 msgid "Show _only working hours"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:601
 msgid "Show _zoomed out"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:631
+#: ../calendar/gui/e-meeting-time-sel.c:619
 msgid "_Update free/busy"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:646
+#: ../calendar/gui/e-meeting-time-sel.c:636
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:664
+#: ../calendar/gui/e-meeting-time-sel.c:656
 msgid "_Autopick"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:679
+#: ../calendar/gui/e-meeting-time-sel.c:673
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:694
 msgid "_All people and resources"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:707
+#: ../calendar/gui/e-meeting-time-sel.c:705
 msgid "All _people and one resource"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:717
+#: ../calendar/gui/e-meeting-time-sel.c:716
 msgid "_Required people"
-msgstr ""
+msgstr "Ne_praj personoj"
 
 #: ../calendar/gui/e-meeting-time-sel.c:726
 msgid "Required people and _one resource"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:775
+#: ../calendar/gui/e-meeting-time-sel.c:765
 msgid "_Start time:"
 msgstr "_Komenctempo:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:815
+#: ../calendar/gui/e-meeting-time-sel.c:794
 msgid "_End time:"
 msgstr "_Fintempo:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+#: ../calendar/gui/e-meeting-time-sel.c:2659
+#, c-format
+#| msgid "Location: %s"
+msgid ""
+"Summary: %s\n"
+"Location: %s"
+msgstr ""
+"Resumo: %s\n"
+"Loko: %s"
+
+#: ../calendar/gui/e-meeting-time-sel.c:2661 ../calendar/gui/print.c:3516
+#, c-format
+msgid "Summary: %s"
+msgstr "Resumo: %s"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Click here to add an attendee"
 msgstr ""
 
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Komuna nomo"
+msgid "Member"
+msgstr "Membro"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Delegated To"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "Delegated From"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+msgid "Common Name"
+msgstr "Komuna nomo"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Language"
 msgstr "Lingvo"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Membro"
-
-#: ../calendar/gui/e-memo-table.c:420
-#: ../modules/calendar/e-cal-shell-content.c:474
-#: ../modules/calendar/e-memo-shell-view-actions.c:231
-#: ../modules/calendar/e-memo-shell-view-actions.c:246
-#: ../modules/calendar/e-memo-shell-view.c:293
-#: ../plugins/caldav/caldav-browse-server.c:458
+#: ../calendar/gui/e-memo-table.c:371
+#: ../modules/calendar/e-cal-shell-content.c:1602
+#: ../modules/calendar/e-memo-shell-view-actions.c:180
+#: ../modules/calendar/e-memo-shell-view-actions.c:195
+#: ../modules/calendar/e-memo-shell-view.c:308
 msgid "Memos"
 msgstr "Notoj"
 
-#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:774
+#: ../calendar/gui/e-memo-table.c:457 ../calendar/gui/e-task-table.c:759
 msgid "* No Summary *"
-msgstr ""
+msgstr "* Neniu resumo *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:588 ../calendar/gui/e-task-table.c:858
+#: ../calendar/gui/e-memo-table.c:544 ../calendar/gui/e-task-table.c:843
 msgid "Start: "
 msgstr "Komenco: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:607 ../calendar/gui/e-task-table.c:876
+#: ../calendar/gui/e-memo-table.c:563 ../calendar/gui/e-task-table.c:861
 msgid "Due: "
 msgstr "Limdato: "
 
-#: ../calendar/gui/e-memo-table.c:726
+#: ../calendar/gui/e-memo-table.c:684
 msgid "Cut selected memos to the clipboard"
 msgstr "Eltondi la elektitajn notojn al la tondujo"
 
-#: ../calendar/gui/e-memo-table.c:732
+#: ../calendar/gui/e-memo-table.c:690
 msgid "Copy selected memos to the clipboard"
 msgstr "Kopii la elektitajn notojn en la tondujon"
 
-#: ../calendar/gui/e-memo-table.c:738
+#: ../calendar/gui/e-memo-table.c:696
 msgid "Paste memos from the clipboard"
 msgstr "Enmeti notojn de la tondujo"
 
-#: ../calendar/gui/e-memo-table.c:744
-#: ../modules/calendar/e-memo-shell-view-actions.c:586
+#: ../calendar/gui/e-memo-table.c:702
+#: ../modules/calendar/e-memo-shell-view-actions.c:531
 msgid "Delete selected memos"
 msgstr "Forigi la elektitajn notojn"
 
-#: ../calendar/gui/e-memo-table.c:750
+#: ../calendar/gui/e-memo-table.c:708
 msgid "Select all visible memos"
 msgstr "Elekti ĉiujn videblajn notojn"
 
-#: ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.etspec.h:1
 msgid "Click to add a memo"
 msgstr "Klaku por aldoni noton"
 
@@ -4530,85 +5307,80 @@ msgstr "Klaku por aldoni noton"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:595
+#: ../calendar/gui/e-task-table.c:555
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:692 ../calendar/gui/print.c:2287
-#: ../calendar/importers/icalendar-importer.c:85
-#: ../calendar/importers/icalendar-importer.c:1044
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
-#: ../modules/calendar/e-cal-shell-content.c:435
-#: ../modules/calendar/e-task-shell-view-actions.c:254
-#: ../modules/calendar/e-task-shell-view-actions.c:269
-#: ../modules/calendar/e-task-shell-view.c:448
-#: ../plugins/caldav/caldav-browse-server.c:456
+#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2404
+#: ../calendar/importers/icalendar-importer.c:78
+#: ../calendar/importers/icalendar-importer.c:1062
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-cal-shell-content.c:1560
+#: ../modules/calendar/e-task-shell-view-actions.c:203
+#: ../modules/calendar/e-task-shell-view-actions.c:218
+#: ../modules/calendar/e-task-shell-view.c:466
 msgid "Tasks"
 msgstr "Taskoj"
 
-#: ../calendar/gui/e-task-table.c:1009
+#: ../calendar/gui/e-task-table.c:999
 msgid "Cut selected tasks to the clipboard"
 msgstr "Eltondi elektitajn taskojn al la tondujo"
 
-#: ../calendar/gui/e-task-table.c:1015
+#: ../calendar/gui/e-task-table.c:1005
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopii elektitajn taskojn al la tondujo"
 
-#: ../calendar/gui/e-task-table.c:1021
+#: ../calendar/gui/e-task-table.c:1011
 msgid "Paste tasks from the clipboard"
 msgstr "Enmeti taskojn de la tondujo"
 
-#: ../calendar/gui/e-task-table.c:1027
-#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../calendar/gui/e-task-table.c:1017
+#: ../modules/calendar/e-task-shell-view-actions.c:656
 msgid "Delete selected tasks"
 msgstr "Forigi elektitajn taskojn"
 
-#: ../calendar/gui/e-task-table.c:1033
+#: ../calendar/gui/e-task-table.c:1023
 msgid "Select all visible tasks"
 msgstr "Elekti ĉiujn videblajn taskojn"
 
-#: ../calendar/gui/e-timezone-entry.c:330
+#: ../calendar/gui/e-timezone-entry.c:334
 msgid "Select Timezone"
 msgstr "Elekti horzonon"
 
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:232 ../calendar/gui/print.c:1963
+#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2068
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2255
-msgid "Purging"
-msgstr ""
-
-#: ../calendar/gui/itip-utils.c:513 ../calendar/gui/itip-utils.c:568
-#: ../calendar/gui/itip-utils.c:681
+#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
+#: ../calendar/gui/itip-utils.c:841
 msgid "An organizer must be set."
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:560
+#: ../calendar/gui/itip-utils.c:698
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:767 ../calendar/gui/itip-utils.c:928
+#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
 msgid "Event information"
 msgstr "Event-informo"
 
-#: ../calendar/gui/itip-utils.c:770 ../calendar/gui/itip-utils.c:931
+#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
 msgid "Task information"
 msgstr "Task-informo"
 
-#: ../calendar/gui/itip-utils.c:773 ../calendar/gui/itip-utils.c:934
+#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1096
 msgid "Memo information"
 msgstr "Noto-informo"
 
-#: ../calendar/gui/itip-utils.c:776 ../calendar/gui/itip-utils.c:952
+#: ../calendar/gui/itip-utils.c:938 ../calendar/gui/itip-utils.c:1114
 msgid "Free/Busy information"
-msgstr ""
+msgstr "Malokupata/Okupata informo"
 
-#: ../calendar/gui/itip-utils.c:779
+#: ../calendar/gui/itip-utils.c:941
 msgid "Calendar information"
 msgstr "Kalendar-informo"
 
@@ -4616,7 +5388,7 @@ msgstr "Kalendar-informo"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:816
+#: ../calendar/gui/itip-utils.c:978
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Akceptite"
@@ -4625,7 +5397,7 @@ msgstr "Akceptite"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:823
+#: ../calendar/gui/itip-utils.c:985
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr ""
@@ -4637,7 +5409,7 @@ msgstr ""
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:830 ../calendar/gui/itip-utils.c:878
+#: ../calendar/gui/itip-utils.c:992 ../calendar/gui/itip-utils.c:1040
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Malakceptite"
@@ -4646,7 +5418,7 @@ msgstr "Malakceptite"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:837
+#: ../calendar/gui/itip-utils.c:999
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegite"
@@ -4654,7 +5426,7 @@ msgstr "Delegite"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:850
+#: ../calendar/gui/itip-utils.c:1012
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Ĝisdatigite"
@@ -4662,7 +5434,7 @@ msgstr "Ĝisdatigite"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:857
+#: ../calendar/gui/itip-utils.c:1019
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Nuligi"
@@ -4670,7 +5442,7 @@ msgstr "Nuligi"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:864
+#: ../calendar/gui/itip-utils.c:1026
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Aktualigi"
@@ -4678,473 +5450,493 @@ msgstr "Aktualigi"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:871
+#: ../calendar/gui/itip-utils.c:1033
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:949
+#: ../calendar/gui/itip-utils.c:1111
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:957
+#: ../calendar/gui/itip-utils.c:1119
 msgid "iCalendar information"
 msgstr "iCalendar-informo"
 
-#: ../calendar/gui/itip-utils.c:984
+#: ../calendar/gui/itip-utils.c:1148
+#, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:988
+#: ../calendar/gui/itip-utils.c:1153
 msgid "Unable to book a resource, error: "
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:1153
+#: ../calendar/gui/itip-utils.c:1324
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/itip-utils.c:1917
+#, fuzzy
+#| msgid "Sending message"
+msgid "Sending an event"
+msgstr "Sendante mesaĝon"
+
+#: ../calendar/gui/itip-utils.c:1921
+#, fuzzy
+#| msgid "Sending message"
+msgid "Sending a memo"
+msgstr "Sendante mesaĝon"
+
+#: ../calendar/gui/itip-utils.c:1925
+#, fuzzy
+#| msgid "Sending Email"
+msgid "Sending a task"
+msgstr "Retpoŝto estas sendata"
+
+#: ../calendar/gui/print.c:664
 msgid "1st"
 msgstr "1a"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:664
 msgid "2nd"
 msgstr "2a"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:664
 msgid "3rd"
 msgstr "3a"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:664
 msgid "4th"
 msgstr "4a"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:664
 msgid "5th"
 msgstr "5a"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:665
 msgid "6th"
 msgstr "6a"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:665
 msgid "7th"
 msgstr "7a"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:665
 msgid "8th"
 msgstr "8a"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:665
 msgid "9th"
 msgstr "9a"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:665
 msgid "10th"
 msgstr "10a"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:666
 msgid "11th"
 msgstr "11a"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:666
 msgid "12th"
 msgstr "12a"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:666
 msgid "13th"
 msgstr "13a"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:666
 msgid "14th"
 msgstr "14a"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:666
 msgid "15th"
 msgstr "15a"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:667
 msgid "16th"
 msgstr "16a"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:667
 msgid "17th"
 msgstr "17a"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:667
 msgid "18th"
 msgstr "18a"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:667
 msgid "19th"
 msgstr "19a"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:667
 msgid "20th"
 msgstr "20a"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:668
 msgid "21st"
 msgstr "21a"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:668
 msgid "22nd"
 msgstr "22a"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:668
 msgid "23rd"
 msgstr "23a"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:668
 msgid "24th"
 msgstr "24a"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:668
 msgid "25th"
 msgstr "25a"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:669
 msgid "26th"
 msgstr "26a"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:669
 msgid "27th"
 msgstr "27a"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:669
 msgid "28th"
 msgstr "28a"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:669
 msgid "29th"
 msgstr "29a"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:669
 msgid "30th"
 msgstr "30a"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:670
 msgid "31st"
 msgstr "31a"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:655
-msgid "Su"
-msgstr "Di"
-
-#: ../calendar/gui/print.c:655
+#. Translators: These are workday abbreviations,
+#. * e.g. Su=Sunday and Th=thursday
+#. G_DATE_BAD_WEEKDAY
+#. G_DATE_MONDAY
+#: ../calendar/gui/print.c:730
 msgid "Mo"
 msgstr "Lu"
 
-#: ../calendar/gui/print.c:655
+#. G_DATE_TUESDAY
+#: ../calendar/gui/print.c:731
 msgid "Tu"
 msgstr "Ma"
 
-#: ../calendar/gui/print.c:655
+#. G_DATE_WEDNESDAY
+#: ../calendar/gui/print.c:732
 msgid "We"
 msgstr "Me"
 
-#: ../calendar/gui/print.c:656
+#. G_DATE_THURSDAY
+#: ../calendar/gui/print.c:733
 msgid "Th"
 msgstr "Ĵa"
 
-#: ../calendar/gui/print.c:656
+#. G_DATE_FRIDAY
+#: ../calendar/gui/print.c:734
 msgid "Fr"
 msgstr "Ve"
 
-#: ../calendar/gui/print.c:656
+#. G_DATE_SATURDAY
+#: ../calendar/gui/print.c:735
 msgid "Sa"
 msgstr "Sa"
 
+#. G_DATE_SUNDAY
+#: ../calendar/gui/print.c:736
+msgid "Su"
+msgstr "Di"
+
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3156
+#: ../calendar/gui/print.c:3309
 msgid " to "
 msgstr " al "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3166
+#: ../calendar/gui/print.c:3319
 msgid " (Completed "
 msgstr " (Plenumite "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3172
+#: ../calendar/gui/print.c:3325
 msgid "Completed "
 msgstr "Plenumite "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3182
+#: ../calendar/gui/print.c:3335
 msgid " (Due "
 msgstr ""
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3189
+#: ../calendar/gui/print.c:3342
 msgid "Due "
 msgstr "Limdato "
 
-#: ../calendar/gui/print.c:3354
-#, c-format
-msgid "Summary: %s"
-msgstr ""
-
-#: ../calendar/gui/print.c:3381
+#: ../calendar/gui/print.c:3546
 msgid "Attendees: "
-msgstr ""
+msgstr "Alestantoj: "
 
-#: ../calendar/gui/print.c:3424
+#: ../calendar/gui/print.c:3590
 #, c-format
 msgid "Status: %s"
 msgstr "Stato: %s"
 
-#: ../calendar/gui/print.c:3439
+#: ../calendar/gui/print.c:3606
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritato: %s"
 
-#: ../calendar/gui/print.c:3457
+#: ../calendar/gui/print.c:3624
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: ../calendar/gui/print.c:3468
+#: ../calendar/gui/print.c:3638
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3481
+#: ../calendar/gui/print.c:3652
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorioj: %s"
 
-#: ../calendar/gui/print.c:3492
+#: ../calendar/gui/print.c:3663
 msgid "Contacts: "
 msgstr "Kontaktoj: "
 
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "In progress"
+msgstr "Farate"
+
+#: ../calendar/gui/tasktypes.xml.h:25
 #, no-c-format
 msgid "% Completed"
 msgstr "% plenumite"
 
-#: ../calendar/gui/tasktypes.xml.h:7
-msgid "Cancelled"
-msgstr "Nuligite"
-
-#: ../calendar/gui/tasktypes.xml.h:15
-msgid "In progress"
-msgstr ""
-
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/filtertypes.xml.in.h:31
+#: ../mail/searchtypes.xml.in.h:33 ../mail/vfoldertypes.xml.in.h:33
 msgid "is greater than"
 msgstr "pli granda ol"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/filtertypes.xml.in.h:32
+#: ../mail/searchtypes.xml.in.h:34 ../mail/vfoldertypes.xml.in.h:34
 msgid "is less than"
 msgstr "pli malgranda ol"
 
-#: ../calendar/importers/icalendar-importer.c:84
+#: ../calendar/importers/icalendar-importer.c:77
 msgid "Appointments and Meetings"
 msgstr "Rendevuoj kaj kunsidoj"
 
-#: ../calendar/importers/icalendar-importer.c:435
-#: ../calendar/importers/icalendar-importer.c:868
-#: ../plugins/itip-formatter/itip-formatter.c:2486
+#: ../calendar/importers/icalendar-importer.c:452
+#: ../calendar/importers/icalendar-importer.c:891
 msgid "Opening calendar"
 msgstr "Malfermante kalendaron"
 
-#: ../calendar/importers/icalendar-importer.c:583
+#: ../calendar/importers/icalendar-importer.c:600
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar-dosieroj (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:584
+#: ../calendar/importers/icalendar-importer.c:601
 msgid "Evolution iCalendar importer"
 msgstr "Evolucio-iCalendar-enportilo"
 
-#: ../calendar/importers/icalendar-importer.c:674
+#: ../calendar/importers/icalendar-importer.c:693
 msgid "Reminder!"
 msgstr "Memorigilo!"
 
-#: ../calendar/importers/icalendar-importer.c:758
+#: ../calendar/importers/icalendar-importer.c:777
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar-dosieroj (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:759
+#: ../calendar/importers/icalendar-importer.c:778
 msgid "Evolution vCalendar importer"
 msgstr "Evolucio-vCalendar-enportilo"
 
-#: ../calendar/importers/icalendar-importer.c:1039
+#: ../calendar/importers/icalendar-importer.c:1055
 msgid "Calendar Events"
 msgstr "Kalendara-eventoj"
 
-#: ../calendar/importers/icalendar-importer.c:1079
+#: ../calendar/importers/icalendar-importer.c:1098
+msgid "Gnome Calendar"
+msgstr "Gnomo Kalendaro"
+
+#: ../calendar/importers/icalendar-importer.c:1099
 msgid "Evolution Calendar intelligent importer"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:1147
-#: ../calendar/importers/icalendar-importer.c:1465
+#: ../calendar/importers/icalendar-importer.c:1170
+#: ../calendar/importers/icalendar-importer.c:1484
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Kunsido"
 
-#: ../calendar/importers/icalendar-importer.c:1147
-#: ../calendar/importers/icalendar-importer.c:1465
+#: ../calendar/importers/icalendar-importer.c:1170
+#: ../calendar/importers/icalendar-importer.c:1484
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Evento"
 
-#: ../calendar/importers/icalendar-importer.c:1150
-#: ../calendar/importers/icalendar-importer.c:1466
+#: ../calendar/importers/icalendar-importer.c:1173
+#: ../calendar/importers/icalendar-importer.c:1485
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Tasko"
 
-#: ../calendar/importers/icalendar-importer.c:1153
-#: ../calendar/importers/icalendar-importer.c:1467
+#: ../calendar/importers/icalendar-importer.c:1176
+#: ../calendar/importers/icalendar-importer.c:1486
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Noto"
 
-#: ../calendar/importers/icalendar-importer.c:1162
+#: ../calendar/importers/icalendar-importer.c:1185
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:1167
+#: ../calendar/importers/icalendar-importer.c:1190
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:1172
+#: ../calendar/importers/icalendar-importer.c:1195
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "havas memorigaĵojn"
 
-#: ../calendar/importers/icalendar-importer.c:1177
+#: ../calendar/importers/icalendar-importer.c:1200
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "havas aldonaĵojn"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1190
+#: ../calendar/importers/icalendar-importer.c:1213
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Publike"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1193
+#: ../calendar/importers/icalendar-importer.c:1216
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Private"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1196
+#: ../calendar/importers/icalendar-importer.c:1219
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Konfidence"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1200
+#: ../calendar/importers/icalendar-importer.c:1223
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Kategoriado"
 
 #. Translators: Appointment's summary
-#. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:1205
-#: ../calendar/importers/icalendar-importer.c:1506
+#: ../calendar/importers/icalendar-importer.c:1228
+#: ../calendar/importers/icalendar-importer.c:1528
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Resumo"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1211
+#: ../calendar/importers/icalendar-importer.c:1234
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Loko"
 
 #. Translators: Appointment's start time
-#. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:1219
-#: ../calendar/importers/icalendar-importer.c:1502
+#: ../calendar/importers/icalendar-importer.c:1242
+#: ../calendar/importers/icalendar-importer.c:1523
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Komenco"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1230
+#: ../calendar/importers/icalendar-importer.c:1253
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Limdato"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1242
+#: ../calendar/importers/icalendar-importer.c:1265
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Fino"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1252
+#: ../calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Kategorioj"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1276
+#: ../calendar/importers/icalendar-importer.c:1299
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Plenumite"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1284
+#: ../calendar/importers/icalendar-importer.c:1307
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1295
-#: ../calendar/importers/icalendar-importer.c:1298
+#: ../calendar/importers/icalendar-importer.c:1318
+#: ../calendar/importers/icalendar-importer.c:1321
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organizilo"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1318
-#: ../calendar/importers/icalendar-importer.c:1321
+#: ../calendar/importers/icalendar-importer.c:1341
+#: ../calendar/importers/icalendar-importer.c:1344
 msgctxt "iCalImp"
 msgid "Attendees"
-msgstr ""
+msgstr "Alestantoj"
 
-#: ../calendar/importers/icalendar-importer.c:1335
+#: ../calendar/importers/icalendar-importer.c:1358
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Priskribo"
 
-#. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1498
+#: ../calendar/importers/icalendar-importer.c:1518
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Tipo"
 
 #.
 #. *
-#. * This program is free software; you can redistribute it and/or
-#. * modify it under the terms of the GNU Lesser General Public
-#. * License as published by the Free Software Foundation; either
-#. * version 2 of the License, or (at your option) version 3.
+#. * This program is free software; you can redistribute it and/or modify it
+#. * under the terms of the GNU Lesser General Public License as published by
+#. * the Free Software Foundation.
 #. *
-#. * This program is distributed in the hope that it will be useful,
-#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
-#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#. * Lesser General Public License for more details.
+#. * This program is distributed in the hope that it will be useful, but
+#. * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+#. * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#. * for more details.
 #. *
-#. * You should have received a copy of the GNU Lesser General Public
-#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
+#. * You should have received a copy of the GNU Lesser General Public License
+#. * along with this program; if not, see <http://www.gnu.org/licenses/>.
 #. *
 #. *
 #. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -5155,1956 +5947,1705 @@ msgstr "Tipo"
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:25
 msgid "Africa/Abidjan"
 msgstr "Afriko/Abiĝano"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:26
 msgid "Africa/Accra"
 msgstr "Afriko/Akrao"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:27
 msgid "Africa/Addis_Ababa"
-msgstr "Afriko/Adis-Abebo"
+msgstr "Afriko/Adis-_Abebo"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:28
 msgid "Africa/Algiers"
 msgstr "Afriko/Alĝero"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:29
 msgid "Africa/Asmera"
 msgstr "Afriko/Asmaro"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:30
 msgid "Africa/Bamako"
 msgstr "Afriko/Bamako"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:31
 msgid "Africa/Bangui"
 msgstr "Afriko/Bangio"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:32
 msgid "Africa/Banjul"
 msgstr "Afriko/Banĵulo"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:33
 msgid "Africa/Bissau"
 msgstr "Afriko/Bisaŭo"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:34
 msgid "Africa/Blantyre"
 msgstr "Afriko/Blantyre"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:35
 msgid "Africa/Brazzaville"
 msgstr "Afriko/Brazavilo"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:36
 msgid "Africa/Bujumbura"
 msgstr "Afriko/Buĵumburo"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:37
 msgid "Africa/Cairo"
 msgstr "Afriko/Kairo"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:38
 msgid "Africa/Casablanca"
 msgstr "Afriko/Kazablanko"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:39
 msgid "Africa/Ceuta"
 msgstr "Afriko/Ceŭto"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:40
 msgid "Africa/Conakry"
 msgstr "Afriko/Konakrio"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:41
 msgid "Africa/Dakar"
 msgstr "Afriko/Dakaro"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:42
 msgid "Africa/Dar_es_Salaam"
-msgstr "Afriko/Daresalamo"
+msgstr "Afriko/Dar_es_Salamo"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:43
 msgid "Africa/Djibouti"
 msgstr "Afriko/Ĝibutio"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:44
 msgid "Africa/Douala"
 msgstr "Afriko/Dualao"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:45
 msgid "Africa/El_Aaiun"
-msgstr "Afriko/Ajuno"
+msgstr "Afriko/El_Ajuno"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:46
 msgid "Africa/Freetown"
 msgstr "Afriko/Fritaŭno"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:47
 msgid "Africa/Gaborone"
 msgstr "Afriko/Gaborono"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:48
 msgid "Africa/Harare"
 msgstr "Afriko/Harareo"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:49
 msgid "Africa/Johannesburg"
 msgstr "Afriko/Johanesburgo"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:50
 msgid "Africa/Kampala"
 msgstr "Afriko/Kampalo"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:51
 msgid "Africa/Khartoum"
 msgstr "Afriko/Ĥartumo"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:52
 msgid "Africa/Kigali"
 msgstr "Afriko/Kigalo"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:53
 msgid "Africa/Kinshasa"
 msgstr "Afriko/Kinŝaso"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:54
 msgid "Africa/Lagos"
 msgstr "Afriko/Lagoso"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:55
 msgid "Africa/Libreville"
 msgstr "Afriko/Librevilo"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:56
 msgid "Africa/Lome"
 msgstr "Afriko/Lomeo"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:57
 msgid "Africa/Luanda"
 msgstr "Afriko/Luando"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:58
 msgid "Africa/Lubumbashi"
 msgstr "Afriko/Lubumbaŝo"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:59
 msgid "Africa/Lusaka"
 msgstr "Afriko/Lusako"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:60
 msgid "Africa/Malabo"
 msgstr "Afriko/Malabo"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:61
 msgid "Africa/Maputo"
 msgstr "Afriko/Maputo"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:62
 msgid "Africa/Maseru"
 msgstr "Afriko/Maseruo"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:63
 msgid "Africa/Mbabane"
 msgstr "Afriko/Mbabano"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:64
 msgid "Africa/Mogadishu"
 msgstr "Afriko/Mogadiŝo"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:65
 msgid "Africa/Monrovia"
 msgstr "Afriko/Monrovio"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:66
 msgid "Africa/Nairobi"
 msgstr "Afriko/Najrobo"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:67
 msgid "Africa/Ndjamena"
 msgstr "Afriko/Nĵameno"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:68
 msgid "Africa/Niamey"
 msgstr "Afriko/Niameo"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:69
 msgid "Africa/Nouakchott"
 msgstr "Afriko/Nuakŝoto"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:70
 msgid "Africa/Ouagadougou"
 msgstr "Afriko/Uagaduguo"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:71
 msgid "Africa/Porto-Novo"
 msgstr "Afriko/Porto-Novo"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:72
 msgid "Africa/Sao_Tome"
 msgstr "Afriko/Sao_Tomeo"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:73
 msgid "Africa/Timbuktu"
 msgstr "Afriko/Timbuktuo"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:74
 msgid "Africa/Tripoli"
 msgstr "Afriko/Tripolo"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:75
 msgid "Africa/Tunis"
 msgstr "Afriko/Tunizo"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:76
 msgid "Africa/Windhoek"
 msgstr "Afriko/Vindhuko"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:77
 msgid "America/Adak"
 msgstr "Ameriko/Adako"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:78
 msgid "America/Anchorage"
 msgstr "Ameriko/Anchorage"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:79
 msgid "America/Anguilla"
 msgstr "Ameriko/Angvilo"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:80
 msgid "America/Antigua"
 msgstr "Ameriko/Antigvo"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:81
 msgid "America/Araguaina"
 msgstr "Ameriko/Araguaína"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:82
 msgid "America/Aruba"
 msgstr "Ameriko/Arubo"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:83
 msgid "America/Asuncion"
 msgstr "Ameriko/Asunciono"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:84
 msgid "America/Barbados"
 msgstr "Ameriko/Barbado"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:85
 msgid "America/Belem"
 msgstr "Ameriko/Belemo"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:86
 msgid "America/Belize"
 msgstr "Ameriko/Belizo"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:87
 msgid "America/Boa_Vista"
 msgstr "Ameriko/Boa_Visto"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:88
 msgid "America/Bogota"
 msgstr "Ameriko/Bogoto"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:89
 msgid "America/Boise"
 msgstr "Ameriko/Boiso"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:90
 msgid "America/Buenos_Aires"
-msgstr "Ameriko/Bonaero"
+msgstr "Ameriko/Bon_aero"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:91
 msgid "America/Cambridge_Bay"
 msgstr "Ameriko/Cambridge_Bay"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:92
 msgid "America/Cancun"
 msgstr "Ameriko/Kankuno"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:93
 msgid "America/Caracas"
 msgstr "Ameriko/Karakaso"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:94
 msgid "America/Catamarca"
 msgstr "Ameriko/Katamarko"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:95
 msgid "America/Cayenne"
 msgstr "Ameriko/Kajeno"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:96
 msgid "America/Cayman"
 msgstr "Ameriko/Kajmano"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:97
 msgid "America/Chicago"
 msgstr "Ameriko/Ĉikago"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:98
 msgid "America/Chihuahua"
 msgstr "Ameriko/Ĉiuaŭo"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:99
 msgid "America/Cordoba"
 msgstr "Ameriko/Kordobo"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:100
 msgid "America/Costa_Rica"
-msgstr "Ameriko/Kostariko"
+msgstr "Ameriko/Kosta_riko"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:101
 msgid "America/Cuiaba"
 msgstr "Ameriko/Cuiabá"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:102
 msgid "America/Curacao"
 msgstr "Ameriko/Kuracao"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:103
 msgid "America/Danmarkshavn"
 msgstr "Ameriko/Danmarkshavn"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:104
 msgid "America/Dawson"
 msgstr "Ameriko/Dawson"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:105
 msgid "America/Dawson_Creek"
 msgstr "Ameriko/Dawson_Creek"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:106
 msgid "America/Denver"
 msgstr "Ameriko/Denvero"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:107
 msgid "America/Detroit"
 msgstr "Ameriko/Detrojto"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:108
 msgid "America/Dominica"
 msgstr "Ameriko/Dominiko"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:109
 msgid "America/Edmonton"
 msgstr "Ameriko/Edmontono"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:110
 msgid "America/Eirunepe"
 msgstr "Ameriko/Ejrunepo"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:111
 msgid "America/El_Salvador"
-msgstr "Ameriko/Salvadoro"
+msgstr "Ameriko/_Salvadoro"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:112
 msgid "America/Fortaleza"
 msgstr "Ameriko/Fortalezo"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:113
 msgid "America/Glace_Bay"
 msgstr "Ameriko/Glace_Bay"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:114
 msgid "America/Godthab"
 msgstr "Ameriko/Nuko"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:115
 msgid "America/Goose_Bay"
 msgstr "Ameriko/Goose_Bay"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:116
 msgid "America/Grand_Turk"
 msgstr "Ameriko/Grand_Turk"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:117
 msgid "America/Grenada"
 msgstr "Ameriko/Grenado"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:118
 msgid "America/Guadeloupe"
 msgstr "Ameriko/Gvadelupo"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:119
 msgid "America/Guatemala"
 msgstr "Ameriko/Gvatemalo"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:120
 msgid "America/Guayaquil"
 msgstr "Ameriko/Guajakilo"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:121
 msgid "America/Guyana"
 msgstr "Ameriko/Gujano"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:122
 msgid "America/Halifax"
 msgstr "Ameriko/Halifax"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:123
 msgid "America/Havana"
 msgstr "Ameriko/Havano"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:124
 msgid "America/Hermosillo"
 msgstr "Ameriko/Hermosillo"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:125
 msgid "America/Indiana/Indianapolis"
 msgstr "Ameriko/Indianao/Indianapolis"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Knox"
 msgstr "Ameriko/Indianao/Knox"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Marengo"
 msgstr "Ameriko/Indianao/Marengo"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Vevay"
 msgstr "Ameriko/Indianao/Vevay"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:129
 msgid "America/Indianapolis"
 msgstr "Ameriko/Indianapolis"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:130
 msgid "America/Inuvik"
 msgstr "Ameriko/Inuviko"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:131
 msgid "America/Iqaluit"
 msgstr "Ameriko/Ikaluito"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:132
 msgid "America/Jamaica"
 msgstr "Ameriko/Jamajko"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:133
 msgid "America/Jujuy"
 msgstr "Ameriko/Jujuy"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:134
 msgid "America/Juneau"
 msgstr "Ameriko/Juneau"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:135
 msgid "America/Kentucky/Louisville"
 msgstr "Ameriko/Kentukio/Louisville"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Monticello"
 msgstr "Ameriko/Kentukio/Monticello"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:137
 msgid "America/La_Paz"
-msgstr "Ameriko/La-Pazo"
+msgstr "Ameriko/La-_Pazo"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:138
 msgid "America/Lima"
 msgstr "Ameriko/Limo"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:139
 msgid "America/Los_Angeles"
-msgstr "Ameriko/Los-Anĝeleso"
+msgstr "Ameriko/Los-_Anĝeleso"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:140
 msgid "America/Louisville"
 msgstr "Ameriko/Louisville"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:141
 msgid "America/Maceio"
 msgstr "Ameriko/Maceió"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:142
 msgid "America/Managua"
 msgstr "Ameriko/Managvo"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:143
 msgid "America/Manaus"
 msgstr "Ameriko/Manaŭo"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:144
 msgid "America/Martinique"
 msgstr "Ameriko/Martiniko"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:145
 msgid "America/Mazatlan"
 msgstr "Ameriko/Mazatlano"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:146
 msgid "America/Mendoza"
 msgstr "Ameriko/Mendozo"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:147
 msgid "America/Menominee"
 msgstr "Ameriko/Menominee"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:148
 msgid "America/Merida"
 msgstr "Ameriko/Merida"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:149
 msgid "America/Mexico_City"
-msgstr "Ameriko/Meksikurbo"
+msgstr "Ameriko/Meksik_urbo"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:150
 msgid "America/Miquelon"
 msgstr "Ameriko/Miquelon"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:151
 msgid "America/Monterrey"
 msgstr "Ameriko/Monterejo"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:152
 msgid "America/Montevideo"
 msgstr "Ameriko/Montevideo"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:153
 msgid "America/Montreal"
 msgstr "Ameriko/Montrealo"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:154
 msgid "America/Montserrat"
 msgstr "Ameriko/Moncerato"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:155
 msgid "America/Nassau"
 msgstr "Ameriko/Nassau"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:156
 msgid "America/New_York"
-msgstr "Ameriko/Novjorko"
+msgstr "Ameriko/Nov_jorko"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:157
 msgid "America/Nipigon"
 msgstr "Ameriko/Nipigono"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:158
 msgid "America/Nome"
 msgstr "Ameriko/Nome"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:159
 msgid "America/Noronha"
 msgstr "Ameriko/Noronha"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:160
 msgid "America/North_Dakota/Center"
-msgstr "Ameriko/Norda Dakoto/Centro"
+msgstr "Ameriko/Norda _Dakoto/Centro"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:161
 msgid "America/Panama"
 msgstr "Ameriko/Panamo"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:162
 msgid "America/Pangnirtung"
 msgstr "Ameriko/Pangnirtung"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:163
 msgid "America/Paramaribo"
 msgstr "Ameriko/Paramaribo"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:164
 msgid "America/Phoenix"
 msgstr "Ameriko/Fenikso"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:165
 msgid "America/Port-au-Prince"
 msgstr "Ameriko/Portoprinco"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:166
 msgid "America/Port_of_Spain"
-msgstr "Ameriko/Portospeno"
+msgstr "Ameriko/Porto_speno"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:167
 msgid "America/Porto_Velho"
 msgstr "Ameriko/Porto_Velho"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:168
 msgid "America/Puerto_Rico"
-msgstr "Ameriko/Porto-Riko"
+msgstr "Ameriko/Porto-_Riko"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:169
 msgid "America/Rainy_River"
 msgstr "Ameriko/Rainy_River"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:170
 msgid "America/Rankin_Inlet"
 msgstr "Ameriko/Rankin_Inlet"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:171
 msgid "America/Recife"
 msgstr "Ameriko/Recifo"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:172
 msgid "America/Regina"
 msgstr "Ameriko/Regina"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:173
 msgid "America/Rio_Branco"
 msgstr "Ameriko/Rio_Branco"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:174
 msgid "America/Rosario"
 msgstr "Ameriko/Rosario"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:175
 msgid "America/Santiago"
 msgstr "Ameriko/Santiago"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:176
 msgid "America/Santo_Domingo"
 msgstr "Ameriko/Sankta_Domingo"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:177
 msgid "America/Sao_Paulo"
-msgstr "Ameriko/San-Paŭlo"
+msgstr "Ameriko/San-_Paŭlo"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:178
 msgid "America/Scoresbysund"
 msgstr "Ameriko/Scoresbysund"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:179
 msgid "America/Shiprock"
 msgstr "Ameriko/Shiprock"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:180
 msgid "America/St_Johns"
-msgstr "Ameriko/Santjonso"
+msgstr "Ameriko/Sant_jonso"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:181
 msgid "America/St_Kitts"
 msgstr "Ameriko/St_Kitts"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:182
 msgid "America/St_Lucia"
 msgstr "Ameriko/Sankta_Lucio"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:183
 msgid "America/St_Thomas"
 msgstr "Ameriko/St_Thomas"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:184
 msgid "America/St_Vincent"
 msgstr "Ameriko/St_Vincent"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:185
 msgid "America/Swift_Current"
 msgstr "Ameriko/Swift_Current"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:186
 msgid "America/Tegucigalpa"
 msgstr "Ameriko/Tegucigalpo"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:187
 msgid "America/Thule"
 msgstr "Ameriko/Qaanaaq"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:188
 msgid "America/Thunder_Bay"
 msgstr "Ameriko/Thunder_Bay"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:189
 msgid "America/Tijuana"
 msgstr "Ameriko/Tijuana"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:190
 msgid "America/Tortola"
 msgstr "Ameriko/Tortola"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:191
 msgid "America/Vancouver"
 msgstr "Ameriko/Vankuvero"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:192
 msgid "America/Whitehorse"
 msgstr "Ameriko/Whitehorse"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:193
 msgid "America/Winnipeg"
 msgstr "Ameriko/Vinipego"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:194
 msgid "America/Yakutat"
 msgstr "Ameriko/Yakutat"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:195
 msgid "America/Yellowknife"
 msgstr "Ameriko/Yellowknife"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:196
 msgid "Antarctica/Casey"
 msgstr "Antarkto/Casey"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:197
 msgid "Antarctica/Davis"
 msgstr "Antarkto/Davis"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:198
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarkto/Dumont d'Urville"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:199
 msgid "Antarctica/Mawson"
 msgstr "Antarkto/Mawson"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:200
 msgid "Antarctica/McMurdo"
 msgstr "Antarkto/McMurdo"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:201
 msgid "Antarctica/Palmer"
 msgstr "Antarkto/Palmer"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:202
 msgid "Antarctica/South_Pole"
 msgstr "Antarkto/Suda_poluso"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:203
 msgid "Antarctica/Syowa"
 msgstr "Antarkto/Syowa"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:204
 msgid "Antarctica/Vostok"
 msgstr "Antarkto/Vostoko"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:205
 msgid "Arctic/Longyearbyen"
 msgstr "Arkto/Longyearbyen"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:206
 msgid "Asia/Aden"
 msgstr "Azio/Adeno"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:207
 msgid "Asia/Almaty"
 msgstr "Azio/Almato"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:208
 msgid "Asia/Amman"
 msgstr "Azio/Amano"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:209
 msgid "Asia/Anadyr"
 msgstr "Azio/Anadiro"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:210
 msgid "Asia/Aqtau"
 msgstr "Azio/Aqtau"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtobe"
 msgstr "Azio/Aqtobe"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:212
 msgid "Asia/Ashgabat"
 msgstr "Azio/Aŝgabato"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:213
 msgid "Asia/Baghdad"
 msgstr "Azio/Bagdado"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:214
 msgid "Asia/Bahrain"
 msgstr "Azio/Barejno"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:215
 msgid "Asia/Baku"
 msgstr "Azio/Bakuo"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:216
 msgid "Asia/Bangkok"
 msgstr "Azio/Bankoko"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:217
 msgid "Asia/Beirut"
 msgstr "Azio/Bejruto"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:218
 msgid "Asia/Bishkek"
 msgstr "Azio/Biŝkeko"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:219
 msgid "Asia/Brunei"
 msgstr "Azio/Brunejo"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:220
 msgid "Asia/Calcutta"
 msgstr "Azio/Kolkato"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:221
 msgid "Asia/Choibalsan"
 msgstr "Azio/Ĉoibalsano"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:222
 msgid "Asia/Chongqing"
 msgstr "Azio/Ĉongĉingo"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:223
 msgid "Asia/Colombo"
 msgstr "Azio/Kolombo"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:224
 msgid "Asia/Damascus"
 msgstr "Azio/Damasko"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:225
 msgid "Asia/Dhaka"
 msgstr "Azio/Dako"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:226
 msgid "Asia/Dili"
 msgstr "Azio/Dilo"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:227
 msgid "Asia/Dubai"
 msgstr "Azio/Dubajo"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:228
 msgid "Asia/Dushanbe"
 msgstr "Azio/Duŝanbeo"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:229
 msgid "Asia/Gaza"
 msgstr "Azio/Gazao"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:230
 msgid "Asia/Harbin"
 msgstr "Azio/Harbino"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:231
 msgid "Asia/Hong_Kong"
-msgstr "Azio/Honkongo"
+msgstr "Azio/Hon_kongo"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:232
 msgid "Asia/Hovd"
 msgstr "Azio/Hovd"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:233
 msgid "Asia/Irkutsk"
 msgstr "Azio/Irkutsko"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:234
 msgid "Asia/Istanbul"
 msgstr "Azio/Istanbulo"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:235
 msgid "Asia/Jakarta"
 msgstr "Azio/Ĝakarto"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:236
 msgid "Asia/Jayapura"
 msgstr "Azio/Jayapura"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:237
 msgid "Asia/Jerusalem"
 msgstr "Azio/Jerusalemo"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:238
 msgid "Asia/Kabul"
 msgstr "Azio/Kabulo"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:239
 msgid "Asia/Kamchatka"
 msgstr "Azio/Kamĉatko"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:240
 msgid "Asia/Karachi"
 msgstr "Azio/Karaĉo"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:241
 msgid "Asia/Kashgar"
 msgstr "Azio/Kaŝgaro"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:242
 msgid "Asia/Katmandu"
 msgstr "Azio/Katmanduo"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:243
 msgid "Asia/Krasnoyarsk"
 msgstr "Azio/Krasnojarsko"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:244
 msgid "Asia/Kuala_Lumpur"
-msgstr "Azio/Kuala-Lumpuro"
+msgstr "Azio/Kuala-_Lumpuro"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:245
 msgid "Asia/Kuching"
 msgstr "Azio/Kuching"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:246
 msgid "Asia/Kuwait"
 msgstr "Azio/Kuvajto"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:247
 msgid "Asia/Macao"
 msgstr "Azio/Makao"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:248
 msgid "Asia/Macau"
 msgstr "Azio/Makao"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:249
 msgid "Asia/Magadan"
 msgstr "Azio/Magadano"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:250
 msgid "Asia/Makassar"
 msgstr "Azio/Makassar"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:251
 msgid "Asia/Manila"
 msgstr "Azio/Manilo"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:252
 msgid "Asia/Muscat"
 msgstr "Azio/Maskato"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:253
 msgid "Asia/Nicosia"
 msgstr "Azio/Nikozio"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:254
 msgid "Asia/Novosibirsk"
 msgstr "Azio/Novosibirsko"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:255
 msgid "Asia/Omsk"
 msgstr "Azio/Omsko"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:256
 msgid "Asia/Oral"
 msgstr "Azio/Oral"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:257
 msgid "Asia/Phnom_Penh"
-msgstr "Azio/Pnom-Peno"
+msgstr "Azio/Pnom-_Peno"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:258
 msgid "Asia/Pontianak"
 msgstr "Azio/Pontianak"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:259
 msgid "Asia/Pyongyang"
 msgstr "Azio/Pjongjango"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:260
 msgid "Asia/Qatar"
 msgstr "Azio/Kataro"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:261
 msgid "Asia/Qyzylorda"
 msgstr "Azio/Qyzylorda"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:262
 msgid "Asia/Rangoon"
 msgstr "Azio/Jangono"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:263
 msgid "Asia/Riyadh"
 msgstr "Azio/Rijado"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:264
 msgid "Asia/Saigon"
 msgstr "Azio/Ho-Ĉi-Min-urbo"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:265
 msgid "Asia/Sakhalin"
 msgstr "Azio/Saĥaleno"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:266
 msgid "Asia/Samarkand"
 msgstr "Azio/Samarkando"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:267
 msgid "Asia/Seoul"
 msgstr "Azio/Seulo"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:268
 msgid "Asia/Shanghai"
 msgstr "Azio/Ŝanhajo"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:269
 msgid "Asia/Singapore"
 msgstr "Azio/Singapuro"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:270
 msgid "Asia/Taipei"
 msgstr "Azio/Tajpeo"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:271
 msgid "Asia/Tashkent"
 msgstr "Azio/Taŝkento"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:272
 msgid "Asia/Tbilisi"
 msgstr "Azio/Tbiliso"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:273
 msgid "Asia/Tehran"
 msgstr "Azio/Tehrano"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:274
 msgid "Asia/Thimphu"
 msgstr "Azio/Timbuo"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:275
 msgid "Asia/Tokyo"
 msgstr "Azio/Tokio"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:276
 msgid "Asia/Ujung_Pandang"
 msgstr "Azio/Ujung_Pandang"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:277
 msgid "Asia/Ulaanbaatar"
 msgstr "Azio/Ulaanbaataro"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:278
 msgid "Asia/Urumqi"
 msgstr "Azio/Urumĉio"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:279
 msgid "Asia/Vientiane"
 msgstr "Azio/Vjentiano"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:280
 msgid "Asia/Vladivostok"
 msgstr "Azio/Vladivostok"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:281
 msgid "Asia/Yakutsk"
 msgstr "Azio/Yakutsk"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:282
 msgid "Asia/Yekaterinburg"
 msgstr "Azio/Jekaterinburgo"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:283
 msgid "Asia/Yerevan"
 msgstr "Azio/Erevano"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:284
 msgid "Atlantic/Azores"
 msgstr "Atlantiko/Acoroj"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:285
 msgid "Atlantic/Bermuda"
 msgstr "Atlantiko/Bermudo"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:286
 msgid "Atlantic/Canary"
 msgstr "Atlantiko/Kanarioj"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:287
 msgid "Atlantic/Cape_Verde"
-msgstr "Atlantiko/Kabo-Verdo"
+msgstr "Atlantiko/Kabo-_Verdo"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:288
 msgid "Atlantic/Faeroe"
 msgstr "Atlantiko/Ferooj"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:289
 msgid "Atlantic/Jan_Mayen"
-msgstr "Atlantiko/Janmajeno"
+msgstr "Atlantiko/Jan_majeno"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:290
 msgid "Atlantic/Madeira"
 msgstr "Atlantiko/Madejro"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:291
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantiko/Rejkjaviko"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:292
 msgid "Atlantic/South_Georgia"
-msgstr "Atlantiko/Sud-Georgio"
+msgstr "Atlantiko/Sud-_Georgio"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:293
 msgid "Atlantic/St_Helena"
 msgstr "Atlantiko/Sankta_Heleno"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:294
 msgid "Atlantic/Stanley"
 msgstr "Atlantiko/Stanlejo"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:295
 msgid "Australia/Adelaide"
 msgstr "Aŭstralio/Adelajdo"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:296
 msgid "Australia/Brisbane"
 msgstr "Aŭstralio/Brisbano"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:297
 msgid "Australia/Broken_Hill"
 msgstr "Aŭstralio/Broken_Hill"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:298
 msgid "Australia/Darwin"
 msgstr "Aŭstralio/Darvino"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:299
 msgid "Australia/Hobart"
 msgstr "Aŭstralio/Hobarto"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:300
 msgid "Australia/Lindeman"
 msgstr "Aŭstralio/Lindemano"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:301
 msgid "Australia/Lord_Howe"
 msgstr "Aŭstralio/Lord_Howe"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:302
 msgid "Australia/Melbourne"
 msgstr "Aŭstralio/Melburno"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:303
 msgid "Australia/Perth"
 msgstr "Aŭstralio/Perto"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:304
 msgid "Australia/Sydney"
 msgstr "Aŭstralio/Sidnejo"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:305
 msgid "Europe/Amsterdam"
 msgstr "Eŭropo/Amsterdamo"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:306
 msgid "Europe/Andorra"
 msgstr "Eŭropo/Andoro"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:307
 msgid "Europe/Athens"
 msgstr "Eŭropo/Ateno"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:308
 msgid "Europe/Belfast"
 msgstr "Eŭropo/Belfasto"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:309
 msgid "Europe/Belgrade"
 msgstr "Eŭropo/Beogrado"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:310
 msgid "Europe/Berlin"
 msgstr "Eŭropo/Berlino"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:311
 msgid "Europe/Bratislava"
 msgstr "Eŭropo/Bratislavo"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:312
 msgid "Europe/Brussels"
 msgstr "Eŭropo/Bruselo"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:313
 msgid "Europe/Bucharest"
 msgstr "Eŭropo/Bukareŝto"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:314
 msgid "Europe/Budapest"
 msgstr "Eŭropo/Budapeŝto"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:315
 msgid "Europe/Chisinau"
 msgstr "Eŭropo/Kiŝinevo"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:316
 msgid "Europe/Copenhagen"
 msgstr "Eŭropo/Kopenhago"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:317
 msgid "Europe/Dublin"
 msgstr "Eŭropo/Dublino"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:318
 msgid "Europe/Gibraltar"
 msgstr "Eŭropo/Ĝibraltaro"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:319
 msgid "Europe/Helsinki"
 msgstr "Eŭropo/Helsinko"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:320
 msgid "Europe/Istanbul"
 msgstr "Eŭropo/Istanbulo"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:321
 msgid "Europe/Kaliningrad"
 msgstr "Eŭropo/Kaliningrado"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:322
 msgid "Europe/Kiev"
 msgstr "Eŭropo/Kievo"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:323
 msgid "Europe/Lisbon"
 msgstr "Eŭropo/Lisbono"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:324
 msgid "Europe/Ljubljana"
 msgstr "Eŭropo/Ljubljano"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:325
 msgid "Europe/London"
 msgstr "Eŭropo/Londono"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:326
 msgid "Europe/Luxembourg"
 msgstr "Eŭropo/Luksemburgo"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:327
 msgid "Europe/Madrid"
 msgstr "Eŭropo/Madrido"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:328
 msgid "Europe/Malta"
 msgstr "Eŭropo/Malto"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:329
 msgid "Europe/Minsk"
 msgstr "Eŭropo/Minsko"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:330
 msgid "Europe/Monaco"
 msgstr "Eŭropo/Monako"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:331
 msgid "Europe/Moscow"
 msgstr "Eŭropo/Moskvo"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:332
 msgid "Europe/Nicosia"
 msgstr "Eŭropo/Nicosia"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:333
 msgid "Europe/Oslo"
 msgstr "Eŭropo/Oslo"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:334
 msgid "Europe/Paris"
 msgstr "Eŭropo/Parizo"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:335
 msgid "Europe/Prague"
 msgstr "Eŭropo/Prago"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:336
 msgid "Europe/Riga"
 msgstr "Eŭropo/Rigo"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:337
 msgid "Europe/Rome"
 msgstr "Eŭropo/Romo"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:338
 msgid "Europe/Samara"
 msgstr "Eŭropo/Samara"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:339
 msgid "Europe/San_Marino"
-msgstr "Eŭropo/San-Marino"
+msgstr "Eŭropo/San-_Marino"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:340
 msgid "Europe/Sarajevo"
 msgstr "Eŭropo/Sarajevo"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:341
 msgid "Europe/Simferopol"
 msgstr "Eŭropo/Simferopolo"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:342
 msgid "Europe/Skopje"
 msgstr "Eŭropo/Skopjo"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:343
 msgid "Europe/Sofia"
 msgstr "Eŭropo/Sofio"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:344
 msgid "Europe/Stockholm"
 msgstr "Eŭropo/Stokholmo"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:345
 msgid "Europe/Tallinn"
 msgstr "Eŭropo/Talino"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:346
 msgid "Europe/Tirane"
 msgstr "Eŭropo/Tirano"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:347
 msgid "Europe/Uzhgorod"
 msgstr "Eŭropo/Uĵhorodo"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:348
 msgid "Europe/Vaduz"
 msgstr "Eŭropo/Vaduzo"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:349
 msgid "Europe/Vatican"
 msgstr "Eŭropo/Vatikano"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:350
 msgid "Europe/Vienna"
 msgstr "Eŭropo/Vieno"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:351
 msgid "Europe/Vilnius"
 msgstr "Eŭropo/Vilno"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:352
 msgid "Europe/Warsaw"
 msgstr "Eŭropo/Varsovio"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:353
 msgid "Europe/Zagreb"
 msgstr "Eŭropo/Zagrebo"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:354
 msgid "Europe/Zaporozhye"
 msgstr "Eŭropo/Zaporiĵo"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:355
 msgid "Europe/Zurich"
 msgstr "Eŭropo/Zuriko"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:356
 msgid "Indian/Antananarivo"
 msgstr "Hinda_Oceano/Antananarivo"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:357
 msgid "Indian/Chagos"
 msgstr "Hinda_Oceano/Ĉagosoj"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:358
 msgid "Indian/Christmas"
 msgstr "Hinda_Oceano/Kristnaskinsulo"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:359
 msgid "Indian/Cocos"
 msgstr "Hinda_Oceano/Kokosinsuloj"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:360
 msgid "Indian/Comoro"
 msgstr "Hinda_Oceano/Komoroj"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:361
 msgid "Indian/Kerguelen"
 msgstr "Hinda_Oceano/Kerguelen"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:362
 msgid "Indian/Mahe"
 msgstr "Hinda_Oceano/Mahe"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:363
 msgid "Indian/Maldives"
 msgstr "Hinda_Oceano/Maldivoj"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:364
 msgid "Indian/Mauritius"
 msgstr "Hinda_Oceano/Maŭricio"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:365
 msgid "Indian/Mayotte"
 msgstr "Hinda_Oceano/Majoto"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:366
 msgid "Indian/Reunion"
 msgstr "Hinda_Oceano/Reunio"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:367
 msgid "Pacific/Apia"
 msgstr "Pacifiko/Apio"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:368
 msgid "Pacific/Auckland"
 msgstr "Pacifiko/Aŭklando"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:369
 msgid "Pacific/Chatham"
 msgstr "Pacifiko/Chatham"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:370
 msgid "Pacific/Easter"
 msgstr "Pacifiko/Paskinsulo"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:371
 msgid "Pacific/Efate"
 msgstr "Pacifiko/Efate"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:372
 msgid "Pacific/Enderbury"
 msgstr "Pacifiko/Enderbury"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:373
 msgid "Pacific/Fakaofo"
 msgstr "Pacifiko/Fakaofo"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:374
 msgid "Pacific/Fiji"
 msgstr "Pacifiko/Fiĝioj"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:375
 msgid "Pacific/Funafuti"
 msgstr "Pacifiko/Funafutio"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:376
 msgid "Pacific/Galapagos"
 msgstr "Pacifiko/Galapagoj"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:377
 msgid "Pacific/Gambier"
 msgstr "Pacifiko/Gambier"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:378
 msgid "Pacific/Guadalcanal"
 msgstr "Pacifiko/Guadalcanal"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:379
 msgid "Pacific/Guam"
 msgstr "Pacifiko/Gvamo"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:380
 msgid "Pacific/Honolulu"
 msgstr "Pacifiko/Honolulo"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:381
 msgid "Pacific/Johnston"
 msgstr "Pacifiko/Johnston"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:382
 msgid "Pacific/Kiritimati"
 msgstr "Pacifiko/Kiritimati"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:383
 msgid "Pacific/Kosrae"
 msgstr "Pacifiko/Kosrae"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:384
 msgid "Pacific/Kwajalein"
 msgstr "Pacifiko/Kwajalein"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:385
 msgid "Pacific/Majuro"
 msgstr "Pacifiko/Majuro"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:386
 msgid "Pacific/Marquesas"
 msgstr "Pacifiko/Markizinsuloj"
 
-#: ../calendar/zones.h:388
+#: ../calendar/zones.h:387
 msgid "Pacific/Midway"
 msgstr "Pacifiko/Midvejinsuloj"
 
-#: ../calendar/zones.h:389
+#: ../calendar/zones.h:388
 msgid "Pacific/Nauru"
 msgstr "Pacifiko/Nauro"
 
-#: ../calendar/zones.h:390
+#: ../calendar/zones.h:389
 msgid "Pacific/Niue"
 msgstr "Pacifiko/Niuo"
 
-#: ../calendar/zones.h:391
+#: ../calendar/zones.h:390
 msgid "Pacific/Norfolk"
 msgstr "Pacifiko/Norfolkinsulo"
 
-#: ../calendar/zones.h:392
+#: ../calendar/zones.h:391
 msgid "Pacific/Noumea"
 msgstr "Pacifiko/Noumeo"
 
-#: ../calendar/zones.h:393
+#: ../calendar/zones.h:392
 msgid "Pacific/Pago_Pago"
-msgstr "Pacifiko/Pagopago"
+msgstr "Pacifiko/Pago_pago"
 
-#: ../calendar/zones.h:394
+#: ../calendar/zones.h:393
 msgid "Pacific/Palau"
 msgstr "Pacifiko/Palaŭo"
 
-#: ../calendar/zones.h:395
+#: ../calendar/zones.h:394
 msgid "Pacific/Pitcairn"
 msgstr "Pacifiko/Pitkarna_Insulo"
 
-#: ../calendar/zones.h:396
+#: ../calendar/zones.h:395
 msgid "Pacific/Ponape"
 msgstr "Pacifiko/Ponape"
 
-#: ../calendar/zones.h:397
+#: ../calendar/zones.h:396
 msgid "Pacific/Port_Moresby"
-msgstr "Pacifiko/Port-Moresbo"
+msgstr "Pacifiko/Port-_Moresbo"
 
-#: ../calendar/zones.h:398
+#: ../calendar/zones.h:397
 msgid "Pacific/Rarotonga"
 msgstr "Pacifiko/Rarotonga"
 
-#: ../calendar/zones.h:399
+#: ../calendar/zones.h:398
 msgid "Pacific/Saipan"
 msgstr "Pacifiko/Saipano"
 
-#: ../calendar/zones.h:400
+#: ../calendar/zones.h:399
 msgid "Pacific/Tahiti"
 msgstr "Pacifiko/Tahitio"
 
-#: ../calendar/zones.h:401
+#: ../calendar/zones.h:400
 msgid "Pacific/Tarawa"
 msgstr "Pacifiko/Tarawa"
 
-#: ../calendar/zones.h:402
+#: ../calendar/zones.h:401
 msgid "Pacific/Tongatapu"
 msgstr "Pacifiko/Tongatapu"
 
-#: ../calendar/zones.h:403
+#: ../calendar/zones.h:402
 msgid "Pacific/Truk"
 msgstr "Pacifiko/Truk"
 
-#: ../calendar/zones.h:404
+#: ../calendar/zones.h:403
 msgid "Pacific/Wake"
 msgstr "Pacifiko/Vejkinsulo"
 
-#: ../calendar/zones.h:405
+#: ../calendar/zones.h:404
 msgid "Pacific/Wallis"
 msgstr "Pacifiko/Wallis"
 
-#: ../calendar/zones.h:406
+#: ../calendar/zones.h:405
 msgid "Pacific/Yap"
 msgstr "Pacifiko/Yap"
 
-#. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:153
-msgid "ID of the socket to embed in"
-msgstr ""
-
-#: ../capplet/anjal-settings-main.c:154
-msgid "socket"
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:76
-msgid "Please enter your full name."
-msgstr "Bonvole enigu vian tutan nomon."
-
-#: ../capplet/settings/mail-account-view.c:77
-msgid "Please enter your email address."
-msgstr "Bonvole enigu vian retpoŝtadreson."
-
-#: ../capplet/settings/mail-account-view.c:78
-msgid "The email address you have entered is invalid."
-msgstr "La enmetita retpoŝtadreso estas nevalida."
-
-#: ../capplet/settings/mail-account-view.c:79
-msgid "Please enter your password."
-msgstr "Bonvole enigu vian pasvorton."
-
-#: ../capplet/settings/mail-account-view.c:280
-#: ../mail/em-account-editor.c:5085 ../plugins/caldav/caldav-source.c:67
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#: ../capplet/settings/mail-account-view.c:374
-#: ../capplet/settings/mail-account-view.c:419
-#: ../mail/em-account-editor.c:4956 ../mail/em-account-editor.c:5013
-#: ../modules/online-accounts/e-online-accounts-google.c:295
-#: ../modules/online-accounts/e-online-accounts-google.c:369
-#: ../plugins/google-account-setup/google-contacts-source.c:55
-#: ../plugins/google-account-setup/google-source.c:87
-msgid "Google"
-msgstr "Guglo"
-
-#: ../capplet/settings/mail-account-view.c:486
-msgid "Personal details:"
-msgstr "Persondetaloj:"
-
-#: ../capplet/settings/mail-account-view.c:493 ../mail/mail-config.ui.h:75
-msgid "Name:"
-msgstr "Nomo:"
-
-#: ../capplet/settings/mail-account-view.c:502 ../mail/mail-config.ui.h:46
-msgid "Email address:"
-msgstr "Retpoŝtadreso:"
-
-#: ../capplet/settings/mail-account-view.c:512 ../mail/mail-config.ui.h:38
-msgid "Details:"
-msgstr "Detaloj:"
-
-#: ../capplet/settings/mail-account-view.c:520 ../mail/mail-config.ui.h:93
-msgid "Receiving"
-msgstr "Ricevante"
-
-#: ../capplet/settings/mail-account-view.c:527 ../mail/mail-config.ui.h:129
-msgid "Server type:"
-msgstr "Serviltipo:"
-
-#: ../capplet/settings/mail-account-view.c:536 ../mail/mail-config.ui.h:128
-msgid "Server address:"
-msgstr "Serviladreso:"
-
-#: ../capplet/settings/mail-account-view.c:545 ../mail/mail-config.ui.h:153
-msgid "Username:"
-msgstr "Uzantonomo:"
-
-#: ../capplet/settings/mail-account-view.c:554
-msgid "Use encryption:"
-msgstr "Uti ĉifradon:"
-
-#: ../capplet/settings/mail-account-view.c:559
-#: ../capplet/settings/mail-account-view.c:594
-msgid "never"
-msgstr "neniam"
-
-#: ../capplet/settings/mail-account-view.c:571 ../mail/mail-config.ui.h:113
-msgid "Sending"
-msgstr "Sendante"
-
-#: ../capplet/settings/mail-account-view.c:613
-msgid ""
-"To use the email application you'll need to setup an account. Put your email "
-"address and password in below and we'll try and work out all the settings. "
-"If we can't do it automatically you'll need your server details as well."
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:615
-msgid ""
-"Sorry, we can't work out the settings to get your mail automatically. Please "
-"enter them below. We've tried to make a start with the details you just "
-"entered but you may need to change them."
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:617
-msgid "You can specify more options to configure the account."
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:619
-msgid ""
-"Now we need your settings for sending mail. We've tried to make some guesses "
-"but you should check them over to make sure."
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:620
-msgid "You can specify your default settings for your account."
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:621
-msgid ""
-"Time to check things over before we try and connect to the server and fetch "
-"your mail."
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:636
-#: ../mail/em-account-editor.c:2878 ../mail/em-account-editor.c:3014
-msgid "Identity"
-msgstr "Identeco"
-
-#: ../capplet/settings/mail-account-view.c:636
-msgid "Next - Receiving mail"
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:637
-msgid "Receiving mail"
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:637
-#: ../capplet/settings/mail-account-view.c:638
-msgid "Next - Sending mail"
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:637
-msgid "Back - Identity"
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:637
-msgid "Next - Receiving options"
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:638
-msgid "Receiving options"
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:638
-#: ../capplet/settings/mail-account-view.c:640
-msgid "Back - Receiving mail"
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:640
-msgid "Sending mail"
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:640
-#: ../capplet/settings/mail-account-view.c:641
-msgid "Next - Review account"
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:640
-msgid "Next - Defaults"
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:640
-msgid "Back - Receiving options"
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:641
-#: ../mail/em-account-editor.c:4001
-msgid "Defaults"
-msgstr "Defaŭltoj"
-
-#: ../capplet/settings/mail-account-view.c:641
-msgid "Back - Sending mail"
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:643
-msgid "Review account"
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:643
-msgid "Finish"
-msgstr "Fini"
-
-#: ../capplet/settings/mail-account-view.c:643
-msgid "Back - Sending"
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:766
-msgid "Setup Google contacts with Evolution"
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:767
-msgid "Setup Google calendar with Evolution"
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:772
-#: ../mail/em-account-editor.c:4752
-msgid "You may need to enable IMAP access."
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:780
-#: ../mail/em-account-editor.c:4743
-msgid "Google account settings:"
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:806
-msgid "Setup Yahoo calendar with Evolution"
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:810
-#: ../mail/em-account-editor.c:4770
-msgid ""
-"Yahoo calendars are named as firstname_lastname. We have tried to form the "
-"calendar name. So please confirm and re-enter the calendar name if it is not "
-"correct."
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:819
-#: ../mail/em-account-editor.c:4779
-msgid "Yahoo account settings:"
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:833
-msgid "Yahoo Calendar name:"
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:1020
-msgid "Password:"
-msgstr "Pasvorto:"
-
-#: ../capplet/settings/mail-account-view.c:1072
-#: ../capplet/settings/mail-settings-view.c:254
-msgid "Close Tab"
-msgstr "Fermi la langeton"
-
-#: ../capplet/settings/mail-account-view.c:1082
-msgid "Account Wizard"
-msgstr ""
-
-#: ../capplet/settings/mail-capplet-shell.c:212
-msgid "Evolution account assistant"
-msgstr ""
-
-#. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:371 ../mail/e-mail-session.c:839
-#: ../modules/addressbook/e-book-shell-backend.c:106
-#: ../modules/addressbook/e-book-shell-migrate.c:136
-#: ../modules/calendar/e-cal-shell-backend.c:119
-#: ../modules/calendar/e-cal-shell-migrate.c:154
-#: ../modules/calendar/e-memo-shell-backend.c:108
-#: ../modules/calendar/e-memo-shell-migrate.c:109
-#: ../modules/calendar/e-task-shell-backend.c:108
-#: ../modules/calendar/e-task-shell-migrate.c:121
-msgid "On This Computer"
-msgstr "En ĉi tiu komputilo"
-
-#: ../capplet/settings/mail-settings-view.c:150
-#, c-format
-msgid "Modify %s..."
-msgstr "Modifi %s..."
-
-#: ../capplet/settings/mail-settings-view.c:152
-msgid "Add a new account"
-msgstr "Aldoni novan konton"
-
-#: ../capplet/settings/mail-settings-view.c:188
-msgid "Account management"
-msgstr "Konto-administrado"
-
-#: ../capplet/settings/mail-settings-view.c:264
-msgid "Settings"
-msgstr "Agordoj"
-
-#: ../composer/e-composer-actions.c:208
+#: ../composer/e-composer-actions.c:212
 msgid "Save as..."
 msgstr "Konservi kiel..."
 
-#: ../composer/e-composer-actions.c:295
-#: ../widgets/misc/e-signature-editor.c:207
-msgid "_Close"
-msgstr "_Fermi"
-
-#: ../composer/e-composer-actions.c:297
+#: ../composer/e-composer-actions.c:336
 msgid "Close the current file"
 msgstr "Fermi la aktualan dosieron"
 
-#: ../composer/e-composer-actions.c:302
+#: ../composer/e-composer-actions.c:341
 msgid "New _Message"
 msgstr "Nova _mesaĝo"
 
-#: ../composer/e-composer-actions.c:304
+#: ../composer/e-composer-actions.c:343
 msgid "Open New Message window"
-msgstr ""
+msgstr "Malfermi fenestron de nova mesaĝo"
 
-#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1523
+#: ../composer/e-composer-actions.c:348 ../shell/e-shell-window-actions.c:978
+#| msgid "Evolution Preferences"
+msgid "_Preferences"
+msgstr "_Agordoj"
+
+#: ../composer/e-composer-actions.c:350 ../shell/e-shell-window-actions.c:980
 msgid "Configure Evolution"
 msgstr "Agordi Evolucion"
 
-#: ../composer/e-composer-actions.c:318
+#: ../composer/e-composer-actions.c:357
 msgid "Save the current file"
 msgstr "Konservi la aktualan dosieron"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:362
 msgid "Save _As..."
 msgstr "_Konservi kiel..."
 
-#: ../composer/e-composer-actions.c:325
+#: ../composer/e-composer-actions.c:364
 msgid "Save the current file with a different name"
 msgstr "Konservi la aktualan dosieron kun alia nomo"
 
-#: ../composer/e-composer-actions.c:332
+#: ../composer/e-composer-actions.c:371
 msgid "Character _Encoding"
-msgstr ""
+msgstr "Signara _kodoprezento"
 
-#: ../composer/e-composer-actions.c:349
-msgid "_Print..."
-msgstr "_Presi..."
-
-#: ../composer/e-composer-actions.c:356
+#: ../composer/e-composer-actions.c:395
 msgid "Print Pre_view"
 msgstr "Presi antaŭ_vidon"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:402
 msgid "Save as _Draft"
 msgstr "Konservi kiel _malneto"
 
-#: ../composer/e-composer-actions.c:365
+#: ../composer/e-composer-actions.c:404
 msgid "Save as draft"
 msgstr "Konservi kiel malneto"
 
-#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:349
+#: ../composer/e-composer-actions.c:409
 msgid "S_end"
 msgstr "S_endi"
 
-#: ../composer/e-composer-actions.c:372
+#: ../composer/e-composer-actions.c:411
 msgid "Send this message"
 msgstr "Sendi tiun mesaĝon"
 
-#: ../composer/e-composer-actions.c:380
+#: ../composer/e-composer-actions.c:419
 msgid "PGP _Encrypt"
-msgstr ""
+msgstr "PGP-ĉ_ifro"
 
-#: ../composer/e-composer-actions.c:382
+#: ../composer/e-composer-actions.c:421
 msgid "Encrypt this message with PGP"
-msgstr ""
+msgstr "Ĉifri tiun ĉi mesaĝon per PGP"
 
-#: ../composer/e-composer-actions.c:388
+#: ../composer/e-composer-actions.c:427
 msgid "PGP _Sign"
-msgstr ""
+msgstr "PGP-_subskribo"
 
-#: ../composer/e-composer-actions.c:390
+#: ../composer/e-composer-actions.c:429
 msgid "Sign this message with your PGP key"
-msgstr ""
+msgstr "Subskribi tiun ĉi mesaĝon pere de via PGP-ŝlosilo"
 
-#: ../composer/e-composer-actions.c:396
+#: ../composer/e-composer-actions.c:435
 msgid "_Picture Gallery"
-msgstr ""
+msgstr "_Bildogalerio"
 
-#: ../composer/e-composer-actions.c:398
+#: ../composer/e-composer-actions.c:437
 msgid "Show a collection of pictures that you can drag to your message"
-msgstr ""
+msgstr "Vidigi kolekton de bildoj, kiujn vi povas treni al via mesaĝo"
 
-#: ../composer/e-composer-actions.c:404
+#: ../composer/e-composer-actions.c:443
 msgid "_Prioritize Message"
-msgstr ""
+msgstr "_Prioritatatigita mesaĝo"
 
-#: ../composer/e-composer-actions.c:406
+#: ../composer/e-composer-actions.c:445
 msgid "Set the message priority to high"
-msgstr ""
+msgstr "Agordi mesaĝan prioritaton kiel alta"
 
-#: ../composer/e-composer-actions.c:412
+#: ../composer/e-composer-actions.c:451
 msgid "Re_quest Read Receipt"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:414
+#: ../composer/e-composer-actions.c:453
 msgid "Get delivery notification when your message is read"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:420
+#: ../composer/e-composer-actions.c:459
 msgid "S/MIME En_crypt"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:422
+#: ../composer/e-composer-actions.c:461
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:428
+#: ../composer/e-composer-actions.c:467
 msgid "S/MIME Sig_n"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:430
+#: ../composer/e-composer-actions.c:469
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:436
+#: ../composer/e-composer-actions.c:523
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+#, fuzzy
+#| msgid "Unicode"
+msgid "Unicode smileys"
+msgstr "Unikodo"
+
+#: ../composer/e-composer-actions.c:525
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
+msgid "Use Unicode characters for smileys."
+msgstr ""
+
+#: ../composer/e-composer-actions.c:531
 msgid "_Bcc Field"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:438
+#: ../composer/e-composer-actions.c:533
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:444
+#: ../composer/e-composer-actions.c:539
 msgid "_Cc Field"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:446
+#: ../composer/e-composer-actions.c:541
 msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:452
+#: ../composer/e-composer-actions.c:547
+msgid "_From Override Field"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:549
+#, fuzzy
+msgid ""
+"Toggles whether the From override field to change name or email address is "
+"displayed"
+msgstr "Tio ĉi baskulas montron de rola kampo"
+
+#: ../composer/e-composer-actions.c:555
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:454
+#: ../composer/e-composer-actions.c:557
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:618
 msgid "Save Draft"
-msgstr ""
+msgstr "Konservi malneton"
+
+#: ../composer/e-composer-from-header.c:109
+#: ../e-util/e-mail-signature-script-dialog.c:415
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
+#: ../mail/e-mail-config-identity-page.c:327
+#: ../mail/e-mail-config-summary-page.c:339
+msgid "_Name:"
+msgstr "_Nomo:"
 
 #: ../composer/e-composer-header-table.c:38
 msgid "Enter the recipients of the message"
@@ -7120,636 +7661,652 @@ msgid ""
 "appearing in the recipient list of the message"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:775
+#: ../composer/e-composer-header-table.c:829
 msgid "Fr_om:"
 msgstr "_De:"
 
-#: ../composer/e-composer-header-table.c:784
+#: ../composer/e-composer-header-table.c:836
 msgid "_Reply-To:"
 msgstr "_Respondi-al:"
 
-#: ../composer/e-composer-header-table.c:788
+#: ../composer/e-composer-header-table.c:841
 msgid "_To:"
 msgstr "_Al:"
 
-#: ../composer/e-composer-header-table.c:793
+#: ../composer/e-composer-header-table.c:847
 msgid "_Cc:"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:798
+#: ../composer/e-composer-header-table.c:853
 msgid "_Bcc:"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:803
+#: ../composer/e-composer-header-table.c:858
 msgid "_Post To:"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:807
+#: ../composer/e-composer-header-table.c:862
 msgid "S_ubject:"
 msgstr "_Temo:"
 
-#: ../composer/e-composer-header-table.c:816
+#: ../composer/e-composer-header-table.c:870
+#: ../mail/e-mail-config-identity-page.c:505
 msgid "Si_gnature:"
 msgstr "_Subskribo:"
 
-#: ../composer/e-composer-name-header.c:145
+#: ../composer/e-composer-name-header.c:233
 msgid "Click here for the address book"
 msgstr "Klaku ĉi tien por la adresaro"
 
-#: ../composer/e-composer-post-header.c:135
+#: ../composer/e-composer-post-header.c:182
 msgid "Click here to select folders to post to"
 msgstr ""
 
-#: ../composer/e-composer-private.c:247
-msgid "Undo the last action"
-msgstr "Malfari la lastan agon"
-
-#: ../composer/e-composer-private.c:251
-msgid "Redo the last undone action"
-msgstr "Refari la lastan malfaritan agon"
-
-#: ../composer/e-composer-private.c:255
-msgid "Search for text"
-msgstr "Serĉi tekston"
-
-#: ../composer/e-composer-private.c:259
-msgid "Search for and replace text"
-msgstr "Serĉi kaj anstataŭigi tekston"
-
-#: ../composer/e-composer-private.c:369
-msgid "Save draft"
-msgstr "Konservi malneton"
-
-#: ../composer/e-msg-composer.c:813
+#: ../composer/e-msg-composer.c:871
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:822
+#: ../composer/e-msg-composer.c:880
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1609 ../composer/e-msg-composer.c:1996
+#: ../composer/e-msg-composer.c:1594 ../composer/e-msg-composer.c:2282
 msgid "Compose Message"
-msgstr ""
+msgstr "Krei mesaĝon"
 
-#: ../composer/e-msg-composer.c:4166
+#: ../composer/e-msg-composer.c:4583
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 
-#: ../composer/e-msg-composer.c:4870
-msgid "Untitled Message"
-msgstr ""
-
 #: ../composer/mail-composer.error.xml.h:1
-msgid ""
-" There are few attachments getting downloaded. Sending the mail will cause "
-"the mail to be sent without those pending attachments "
+msgid "You cannot attach the file &quot;{0}&quot; to this message."
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:2
-msgid "All accounts have been removed."
-msgstr "Ĉiuj kontoj estas forigitaj."
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
+msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:3
-msgid "An error occurred while saving to your Drafts folder."
-msgstr "Eraro okazis dum konservado al via malnetdosierujo."
+msgid "Could not retrieve messages to attach from {0}."
+msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:4
-msgid "An error occurred while saving to your Outbox folder."
-msgstr "Eraro okazis dum konservado al via senditaĵujo."
+msgid "Because &quot;{1}&quot;."
+msgstr "Ĉar &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:5
-msgid "An error occurred while sending. How do you want to proceed?"
-msgstr "Eraro okazis dum sendo. Kiel vi volas daŭrigi?"
+msgid "Do you want to recover unfinished messages?"
+msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:6
 msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:7
-msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr ""
+msgid "_Do not Recover"
+msgstr "_Ne ripari"
 
 #: ../composer/mail-composer.error.xml.h:8
-msgid "Because &quot;{1}&quot;."
-msgstr "Ĉar &quot;{1}&quot;."
+msgid "_Recover"
+msgstr "_Ripari"
 
 #: ../composer/mail-composer.error.xml.h:9
-msgid ""
-"Because you are working offline, the message will be saved to your local "
-"Outbox folder. When you are back online you can send the message by clicking "
-"the Send/Receive button in Evolution's toolbar."
+msgid "Could not save to autosave file &quot;{0}&quot;."
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:10
-msgid ""
-"Closing this composer window will discard the message permanently, unless "
-"you choose to save the message in your Drafts folder. This will allow you to "
-"continue the message at a later date."
+msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:11
-msgid "Could not create message."
-msgstr "Ne eblis kreii mesaĝon."
-
-#: ../composer/mail-composer.error.xml.h:12
-msgid "Could not read signature file &quot;{0}&quot;."
+msgid "Download in progress. Do you want to send the mail?"
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:13
-msgid "Could not retrieve messages to attach from {0}."
+#: ../composer/mail-composer.error.xml.h:12
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:14
-msgid "Could not save to autosave file &quot;{0}&quot;."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:15
-msgid "Do you want to recover unfinished messages?"
-msgstr ""
-
-#: ../composer/mail-composer.error.xml.h:16
-msgid "Download in progress. Do you want to send the mail?"
-msgstr ""
-
-#: ../composer/mail-composer.error.xml.h:17
-msgid "Error saving to autosave because &quot;{1}&quot;."
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
 msgstr ""
 
+#. Response codes were chosen somewhat arbitrarily.
 #: ../composer/mail-composer.error.xml.h:18
-msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
-msgstr ""
+msgid "_Continue Editing"
+msgstr "_Daŭrigi redakton"
 
 #: ../composer/mail-composer.error.xml.h:19
-msgid "Saving message to Outbox."
-msgstr "Konservi mesaĝon en senditujo."
+msgid "_Save Draft"
+msgstr "_Konservi malneton"
 
 #: ../composer/mail-composer.error.xml.h:20
-msgid "The file '{0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#, fuzzy
+#| msgid "Are you sure you want to delete these {0} memos?"
+msgid "Are you sure you want to discard the message you are composing?"
+msgstr "Ĉu vi certe volas forigi tiujn notojn?"
 
-#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:123
-msgid "The reported error was &quot;{0}&quot;."
-msgstr ""
+#: ../composer/mail-composer.error.xml.h:21
+msgid "Could not create message."
+msgstr "Ne eblis kreii mesaĝon."
 
 #: ../composer/mail-composer.error.xml.h:22
-msgid ""
-"The reported error was &quot;{0}&quot;. The message has most likely not been "
-"saved."
+msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:23
-msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
+msgid "Could not read signature file &quot;{0}&quot;."
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:24
-msgid "You cannot attach the file &quot;{0}&quot; to this message."
-msgstr ""
+msgid "All accounts have been removed."
+msgstr "Ĉiuj kontoj estas forigitaj."
 
 #: ../composer/mail-composer.error.xml.h:25
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:26
-msgid "Your message was sent, but an error occurred during post-processing."
+msgid "An error occurred while saving to your Outbox folder."
+msgstr "Eraro okazis dum konservado al via senditaĵujo."
+
+#: ../composer/mail-composer.error.xml.h:27
+msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
 msgstr ""
 
-#. Response codes were chosen somewhat arbitrarily.
 #: ../composer/mail-composer.error.xml.h:28
-msgid "_Continue Editing"
-msgstr "_Daŭrigi redakton"
+msgid "An error occurred while saving to your Drafts folder."
+msgstr "Eraro okazis dum konservado al via malnetdosierujo."
+
+#: ../composer/mail-composer.error.xml.h:29
+msgid ""
+"The reported error was &quot;{0}&quot;. The message has most likely not been "
+"saved."
+msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:30
-msgid "_Do not Recover"
-msgstr "_Ne ripari"
+msgid "An error occurred while sending. How do you want to proceed?"
+msgstr "Eraro okazis dum sendo. Kiel vi volas daŭrigi?"
 
-#: ../composer/mail-composer.error.xml.h:31
-msgid "_Recover"
-msgstr "_Ripari"
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:163
+msgid "The reported error was &quot;{0}&quot;."
+msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Draft"
-msgstr "_Konservi malneton"
-
-#: ../composer/mail-composer.error.xml.h:33
 msgid "_Save to Outbox"
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:35
+#: ../composer/mail-composer.error.xml.h:33
 msgid "_Try Again"
 msgstr "_Provi denove"
 
+#: ../composer/mail-composer.error.xml.h:34
+msgid "Your message was sent, but an error occurred during post-processing."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:35
+msgid "Saving message to Outbox."
+msgstr "Konservi mesaĝon en senditujo."
+
+#: ../composer/mail-composer.error.xml.h:36
+msgid ""
+"The message will be saved to your local Outbox folder, because the "
+"destination service is currently unavailable. You can send the message by "
+"clicking the Send/Receive button in Evolution's toolbar."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:37
+#, fuzzy
+#| msgid "Are you sure you want to delete this memo?"
+msgid "Are you sure you want to send the message?"
+msgstr "Ĉu vi certe volas forigi tiun noton?"
+
+#: ../composer/mail-composer.error.xml.h:38
+msgid ""
+"A keyboard accelerator to send the message has been pressed. Either cancel "
+"sending the message, if it was done by an accident, or send the message."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:39
+#, fuzzy
+#| msgid "Are you sure you want to delete this memo?"
+msgid "Are you sure you want to change the composer mode?"
+msgstr "Ĉu vi certe volas forigi tiun noton?"
+
+#: ../composer/mail-composer.error.xml.h:40
+msgid ""
+"Turning HTML mode off will cause the text to lose all formatting. Do you "
+"want to continue?"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:41
+msgid "_Don't lose formatting"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:42
+#| msgid "Task information"
+msgid "Lose _formatting"
+msgstr ""
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
-msgid "Calendar event notifications"
+msgid "Evolution Alarm Notify"
 msgstr ""
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:2
-msgid "Evolution Alarm Notify"
+msgid "Calendar event notifications"
 msgstr ""
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:938
-#: ../modules/mailto-handler/evolution-mailto-handler.c:215
-#: ../shell/e-shell-window-private.c:243
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1032
+#: ../modules/mailto-handler/evolution-mailto-handler.c:210
+#: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
 msgstr "Evolucio"
 
-#: ../data/evolution.desktop.in.in.h:2
-msgid "Evolution Mail and Calendar"
-msgstr "Evolucio - Retpoŝto kaj Kalendaro"
-
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:81
 msgid "Groupware Suite"
 msgstr "Grupprogramaro"
 
+#: ../data/evolution.desktop.in.in.h:3
+msgid "Evolution Mail and Calendar"
+msgstr "Evolucio - Retpoŝto kaj Kalendaro"
+
 #: ../data/evolution.desktop.in.in.h:4
 msgid "Manage your email, contacts and schedule"
 msgstr "Administri viajn retpoŝton, kontaktojn kaj planojn"
 
-#: ../data/evolution-settings.desktop.in.in.h:1
-msgid "Configure email accounts"
-msgstr "Agordi la retpoŝtkontojn"
-
-#: ../data/evolution-settings.desktop.in.in.h:2
-msgid "Email Settings"
-msgstr "Retpoŝtagordoj"
+#: ../data/evolution.desktop.in.in.h:5
+msgid "email;calendar;contact;addressbook;task;"
+msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
-msgid "Autocomplete length"
-msgstr "Aŭtomata longo"
+msgid "Enable address formatting"
+msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:2
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
-msgid "Contact layout style"
+msgid ""
+"Whether addresses should be formatted according to standard in their "
+"destination country"
 msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:3
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
-msgid "Contact preview pane position (horizontal)"
-msgstr ""
+msgid "Autocomplete length"
+msgstr "Aŭtomata longo"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:4
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
-msgid "Contact preview pane position (vertical)"
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
 msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:5
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
-msgid "Enable address formatting"
+msgid "Show autocompleted name with an address"
 msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:6
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
-msgid "Position of the contact preview pane when oriented horizontally."
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
 msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:7
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
-msgid "Position of the contact preview pane when oriented vertically."
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:8
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
-msgid "Primary address book"
-msgstr "Ĉefa adresaro"
+msgid "URI for the folder last used in the select names dialog."
+msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:9
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
-msgid "Show autocompleted name with an address"
+msgid "Contact layout style"
 msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
-msgid "Show maps"
-msgstr "Montri mapojn"
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. \"0\" (Classic View) places the preview pane below the "
+"contact list. \"1\" (Vertical View) places the preview pane next to the "
+"contact list."
+msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
-msgid "Show preview pane"
+msgid "Contact preview pane position (horizontal)"
 msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
-msgid ""
-"The UID of the selected (or \"primary\") address book in the sidebar of the "
-"\"Contacts\" view"
+msgid "Position of the contact preview pane when oriented horizontally."
 msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the contact list. \"0\" (Classic View) places the preview pane below the "
-"contact list. \"1\" (Vertical View) places the preview pane next to the "
-"contact list."
+msgid "Contact preview pane position (vertical)"
 msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:14
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
+msgid "Position of the contact preview pane when oriented vertically."
 msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:15
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
-msgid "URI for the folder last used in the select names dialog"
-msgstr ""
+msgid "Show maps"
+msgstr "Montri mapojn"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:16
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
-msgid "URI for the folder last used in the select names dialog."
+msgid "Whether to show maps in preview pane"
 msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
-msgid ""
-"Whether addresses should be formatted according to standard in their "
-"destination country"
-msgstr ""
+msgid "Primary address book"
+msgstr "Ĉefa adresaro"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:18
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
 msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
+"The UID of the selected (or \"primary\") address book in the sidebar of the "
+"\"Contacts\" view"
 msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
-msgid "Whether to show maps in preview pane"
+msgid "Show preview pane"
 msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:20
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:22
 msgid "Whether to show the preview pane."
 msgstr ""
 
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:21
+msgid "true"
+msgstr "vera"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:22
+msgid "Whether to show phone numbers in the editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:23
+msgid "Whether to show SIP addresses in the editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:24
+msgid "Whether to show IM addresses in the editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:25
+msgid "Whether to show mailing Home addresses in the editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:26
+msgid "Whether to show mailing addresses Work in the editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:27
+msgid "Whether to show mailing addresses Other in the editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:28
+msgid "Whether to show Web Addresses in the editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:29
+msgid "Whether to show job information in the editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:30
+msgid "Whether to show Miscellaneous information in the editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:31
+msgid "Whether to show notes in the editor"
+msgstr ""
+
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
-#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
 msgid "Convert mail messages to Unicode"
 msgstr "Konverti retmesaĝojn al Unikodo"
 
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:2
-#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
 msgid ""
 "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
 "different character sets."
 msgstr ""
 
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:3
+msgid "Full path command to run Bogofilter"
+msgstr ""
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:4
+msgid ""
+"Full path to a Bogofilter command. If not set, then a compile-time path is "
+"used, usually /usr/bin/bogofilter. The command should not contain any other "
+"arguments."
+msgstr ""
+
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
-msgid "Ask for confirmation when deleting items"
+msgid "Save directory for reminder audio"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:2
-msgid ""
-"Background color of tasks that are due today, in \"#rrggbb\" format. Used "
-"together with task-due-today-highlight"
+msgid "Directory for saving reminder audio files"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:3
-msgid ""
-"Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
-"together with task-overdue-highlight."
+msgid "Birthday and anniversary reminder value"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:4
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
-msgid "Birthday and anniversary reminder"
+msgid "Number of units for determining a birthday or anniversary reminder"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:5
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
 msgid "Birthday and anniversary reminder units"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:6
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
-msgid "Birthday and anniversary reminder value"
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\""
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:7
-#, fuzzy
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
+msgid "Compress weekends in month view"
 msgstr ""
-"Koloro por kolori la nunhoromontrilan linion en la tempa tabulbarilo "
-"(malplenigu la kampon elektos la aprioran koloron)."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:8
-#, fuzzy
-msgid "Color to draw the Marcus Bains line in the Day View"
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday"
 msgstr ""
-"Koloro por kolori la nunhoromontrilan linion en la tempa tabulbarilo "
-"(malplenigu la kampon elektos la aprioran koloron)."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:9
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
-msgid "Compress weekends in month view"
+msgid "Ask for confirmation when deleting items"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:10
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
-msgid "Confirm expunge"
+msgid "Whether to ask for confirmation when deleting an appointment or task"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
-msgid "Days on which the start and end of work hours should be indicated"
+msgid "Confirm expunge"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:12
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
-msgid "Default appointment reminder"
-msgstr "Defaŭlta rendevuo-memorigilo"
+msgid "Whether to ask for confirmation when expunging appointments and tasks"
+msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:13
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
-msgid "Default reminder units"
+msgid "Month view vertical pane position"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
-msgid "Default reminder value"
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:15
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
-msgid "Directory for saving reminder audio files"
+msgid "Workday end hour"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:16
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
-msgid "Free/busy template URL"
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:17
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
-msgid "Hide completed tasks"
-msgstr "Kaŝi plenumigitajn taskojn"
+msgid "Workday end minute"
+msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:18
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
-#, fuzzy
-msgid "Hide task units"
-msgstr "Kaŝi task-unuojn"
+msgid "Minute the workday ends on, 0 to 59."
+msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:19
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
-msgid "Hide task value"
-msgstr "Kaŝi task-valoron"
+msgid "Workday start hour"
+msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:20
-#, fuzzy
-msgid "Highlight overdue tasks"
-msgstr "Malfruaj taskoj"
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:21
-msgid "Highlight tasks due today"
+msgid "Workday start minute"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:22
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
-msgid "Horizontal pane position"
+msgid "Minute the workday starts on, 0 to 59."
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
-msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
-msgstr ""
+msgid "The second timezone for a Day View"
+msgstr "La dua horzono de taga vido"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
-msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
-msgid "If \"true\", show the memo preview pane in the main window"
+msgid "Recently used second time zones in a Day View"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
-msgid "If \"true\", show the task preview pane in the main window"
+msgid "List of recently used second time zones in a Day View"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
-msgid "Intervals shown in Day and Work Week views, in minutes"
+msgid "Maximum number of recently used timezones to remember"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
-msgid "Last reminder time"
+msgid ""
+"Maximum number of recently used timezones to remember in a 'day-second-"
+"zones' list"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
-#, fuzzy
-msgid "List of calendars to load"
-msgstr "Listo de disponeblaj kalendaroj:"
+msgid "Default reminder value"
+msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
-msgid "List of memo lists to load"
+msgid "Number of units for determining a default reminder"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
-msgid "List of recently used second time zones in a Day View"
+msgid "Default reminder units"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
-msgid "List of selected calendars"
-msgstr "Listo de elektitaj kalendaroj"
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
+msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
-msgid "List of selected memo lists"
-msgstr "Listo de elektitaj notolistoj"
+msgid "Show categories field in the event/meeting/task editor"
+msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
-msgid "List of selected task lists"
-msgstr "Listo de elektitaj tasklistoj"
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
-msgid "List of task lists to load"
+msgid "Show Role field in the event/task/meeting editor"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
-msgid "Marcus Bains Line"
+msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
-msgid "Marcus Bains Line Color - Day View"
+msgid "Show RSVP field in the event/task/meeting editor"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
-msgid "Marcus Bains Line Color - Time bar"
+msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
-msgid "Maximum number of recently used timezones to remember"
+msgid "Show status field in the event/task/meeting editor"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
-msgid ""
-"Maximum number of recently used timezones to remember in a 'day-second-"
-"zones' list"
+msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
-msgid "Memo layout style"
-msgstr "Noto-stilo"
+msgid "Show timezone field in the event/meeting editor"
+msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
-msgid "Memo preview pane position (horizontal)"
+msgid "Whether to show timezone field in the event/meeting editor"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
-msgid "Memo preview pane position (vertical)"
+msgid "Show type field in the event/task/meeting editor"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
-msgid "Minute the workday ends on, 0 to 59."
+msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
-msgid "Minute the workday starts on, 0 to 59."
-msgstr ""
+msgid "Hide completed tasks"
+msgstr "Kaŝi plenumigitajn taskojn"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
-msgid "Month view horizontal pane position"
+msgid "Whether to hide completed tasks in the tasks view"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
-msgid "Month view vertical pane position"
-msgstr ""
+#, fuzzy
+msgid "Hide task units"
+msgstr "Kaŝi task-unuojn"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
-msgid "Number of units for determining a birthday or anniversary reminder"
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
-msgid "Number of units for determining a default reminder"
-msgstr ""
+msgid "Hide task value"
+msgstr "Kaŝi task-valoron"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
 msgid "Number of units for determining when to hide tasks"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
-#, fuzzy
-msgid "Overdue tasks color"
-msgstr "Koloro de malfruaj taskoj"
+msgid "Horizontal pane position"
+msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
 msgid ""
@@ -7758,396 +8315,388 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels"
+msgid "Last reminder time"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
-msgid "Position of the memo preview pane when oriented vertically"
+msgid "Time the last reminder ran, in time_t"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
-msgid "Position of the task preview pane when oriented horizontally"
+msgid "Marcus Bains Line Color - Day View"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
-msgid "Position of the task preview pane when oriented vertically"
+msgid "Color to draw the Marcus Bains line in the Day View"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar"
+msgid "Marcus Bains Line Color - Time bar"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
-msgid "Primary calendar"
-msgstr "Ĉefa kalendaro"
+#, fuzzy
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
+msgstr ""
+"Koloro por kolori la nunhoromontrilan linion en la tempa tabulbarilo "
+"(malplenigu la kampon elektos la aprioran koloron)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
-#, fuzzy
-msgid "Primary memo list"
-msgstr "Ĉefa tasklisto"
+msgid "Marcus Bains Line"
+msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
-msgid "Primary task list"
-msgstr "Ĉefa tasklisto"
+#, fuzzy
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar"
+msgstr ""
+"Koloro por kolori la nunhoromontrilan linion en la tempa tabulbarilo "
+"(malplenigu la kampon elektos la aprioran koloron)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
-msgid "Programs that are allowed to be run by reminders"
+msgid "Memo preview pane position (horizontal)"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
-msgid "Recently used second time zones in a Day View"
+msgid "Position of the task preview pane when oriented horizontally"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
-msgid "Recurrent Events in Italic"
-msgstr ""
+msgid "Memo layout style"
+msgstr "Noto-stilo"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
-msgid "Reminder programs"
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for reminder audio"
+msgid "Memo preview pane position (vertical)"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
-msgid "Scroll Month View by a week, not by a month"
+msgid "Position of the memo preview pane when oriented vertically"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
-msgid "Show RSVP field in the event/task/meeting editor"
+msgid "Month view horizontal pane position"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
-msgid "Show Role field in the event/task/meeting editor"
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
-msgid "Show appointment end times in week and month views"
+msgid "Scroll Month View by a week, not by a month"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
-msgid "Show categories field in the event/meeting/task editor"
+msgid "Whether to scroll a Month View by a week, not by a month"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
-msgid "Show days with recurrent events in italic font in bottom left calendar"
+msgid "Reminder programs"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
-msgid "Show display reminders in notification tray"
+msgid "Programs that are allowed to be run by reminders"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
-msgid "Show status field in the event/task/meeting editor"
+msgid "Show display reminders in notification tray"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
-msgid "Show the memo preview pane"
+msgid "Whether or not to use the notification tray for display reminders"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
-msgid "Show the task preview pane"
+msgid "Preferred New button item"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
-msgid "Show timezone field in the event/meeting editor"
+msgid "Name of the preferred New toolbar button item"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
-msgid "Show type field in the event/task/meeting editor"
-msgstr ""
+msgid "Primary calendar"
+msgstr "Ĉefa kalendaro"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
-msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgid ""
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
-msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key"
-msgstr ""
+#, fuzzy
+msgid "Primary memo list"
+msgstr "Ĉefa tasklisto"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
-msgid "Task layout style"
+msgid ""
+"The UID of the selected (or \"primary\") memo list in the sidebar of the "
+"\"Memos\" view"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
-msgid "Task preview pane position (horizontal)"
-msgstr ""
+msgid "Primary task list"
+msgstr "Ĉefa tasklisto"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
-msgid "Task preview pane position (vertical)"
+msgid ""
+"The UID of the selected (or \"primary\") task list in the sidebar of the "
+"\"Tasks\" view"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
-msgid "Tasks due today color"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
-msgid ""
-"The UID of the selected (or \"primary\") calendar in the sidebar of the "
-"\"Calendar\" view"
+msgid "Free/busy template URL"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+#, no-c-format
 msgid ""
-"The UID of the selected (or \"primary\") memo list in the sidebar of the "
-"\"Memos\" view"
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
-msgid ""
-"The UID of the selected (or \"primary\") task list in the sidebar of the "
-"\"Tasks\" view"
+msgid "Recurrent Events in Italic"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
+msgid "Show days with recurrent events in italic font in bottom left calendar"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
-#, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain"
+msgid "Search range for time-based searching in years"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
 msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\""
+"How many years can the time-based search go forward or backward from "
+"currently selected day when searching for another occurrence; default is ten "
+"years"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list"
+msgid "Show appointment end times in week and month views"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list"
+msgid "Whether to display the end time of events in the week and month views"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
-msgid "The second timezone for a Day View"
-msgstr "La dua horzono de taga vido"
+msgid "Show the memo preview pane"
+msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
-msgid "Time divisions"
+msgid "If \"true\", show the memo preview pane in the main window"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
-msgid "Time the last reminder ran, in time_t"
+msgid "Show the task preview pane"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
-msgid "Timezone"
-msgstr "Horzono"
+msgid "If \"true\", show the task preview pane in the main window"
+msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
-msgid "Twenty four hour time format"
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
-msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\""
+msgid "Whether to show week numbers in various places in the Calendar"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
-msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
+msgid "Vertical position for the tag pane"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
+msgid "Highlight tasks due today"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
-msgid "Use system timezone"
-msgstr "Uzi la sisteman horzonon"
+msgid ""
+"Whether highlight tasks due today with a special color (task-due-today-color)"
+msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
-#, fuzzy
-msgid "Use the system timezone instead of the timezone selected in Evolution"
+msgid "Tasks due today color"
 msgstr ""
-"Uzi la sisteman horzonon anstataŭ la horzono kiu estas elektita en Evolucio."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
-msgid "Vertical position for the tag pane"
+msgid ""
+"Background color of tasks that are due today, in \"#rrggbb\" format. Used "
+"together with task-due-today-highlight"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
-msgid "Week start"
-msgstr "Semajnkomenco"
+msgid "Task preview pane position (horizontal)"
+msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
+msgid "Task layout style"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 msgid ""
-"Whether highlight overdue tasks with a special color (task-overdue-color)"
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
-msgid ""
-"Whether highlight tasks due today with a special color (task-due-today-color)"
+msgid "Task preview pane position (vertical)"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
-msgid "Whether or not to use the notification tray for display reminders"
+msgid "Position of the task preview pane when oriented vertically"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
-msgid "Whether to ask for confirmation when deleting an appointment or task"
-msgstr ""
+#, fuzzy
+msgid "Highlight overdue tasks"
+msgstr "Malfruaj taskoj"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
-msgid "Whether to ask for confirmation when expunging appointments and tasks"
+msgid ""
+"Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday"
-msgstr ""
+#, fuzzy
+msgid "Overdue tasks color"
+msgstr "Koloro de malfruaj taskoj"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
-msgid "Whether to display the end time of events in the week and month views"
+msgid ""
+"Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
+"together with task-overdue-highlight."
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
-#, fuzzy
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar"
+msgid "Time divisions"
 msgstr ""
-"Koloro por kolori la nunhoromontrilan linion en la tempa tabulbarilo "
-"(malplenigu la kampon elektos la aprioran koloron)."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
-msgid "Whether to hide completed tasks in the tasks view"
+msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
-msgid "Whether to scroll a Month View by a week, not by a month"
-msgstr ""
+msgid "Timezone"
+msgstr "Horzono"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
-msgid "Whether to set a default reminder for appointments"
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olson timezone database location like \"America/New York\""
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
-msgid "Whether to set a reminder for birthdays and anniversaries"
+msgid "Twenty four hour time format"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
-msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgid "Whether to show times in twenty four hour format instead of using am/pm"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
-msgid "Whether to show categories field in the event/meeting editor"
+msgid "Birthday and anniversary reminder"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
-msgid "Whether to show role field in the event/task/meeting editor"
+msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
-msgid "Whether to show status field in the event/task/meeting editor"
-msgstr ""
+msgid "Default appointment reminder"
+msgstr "Defaŭlta rendevuo-memorigilo"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
-msgid "Whether to show times in twenty four hour format instead of using am/pm"
+msgid "Whether to set a default reminder for appointments"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
-msgid "Whether to show timezone field in the event/meeting editor"
-msgstr ""
+msgid "Use system timezone"
+msgstr "Uzi la sisteman horzonon"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121
-msgid "Whether to show type field in the event/task/meeting editor"
+msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr ""
+"Uzi la sisteman horzonon anstataŭ la horzono kiu estas elektita en Evolucio"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
-#, fuzzy
-msgid "Whether to show week numbers in various places in the Calendar"
-msgstr ""
-"Koloro por kolori la nunhoromontrilan linion en la tempa tabulbarilo "
-"(malplenigu la kampon elektos la aprioran koloron)."
+msgid "First day of the week"
+msgstr "Unua tago de la semajno"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
-msgid "Work days"
-msgstr "Labortagoj"
+msgid "Monday is a work day"
+msgstr "Lundo estas labortago"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
-msgid "Workday end hour"
-msgstr ""
+msgid "Tuesday is a work day"
+msgstr "Mardo estas labortago"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
-msgid "Workday end minute"
-msgstr ""
+msgid "Wednesday is a work day"
+msgstr "Merkredo estas labortago"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
-msgid "Workday start hour"
-msgstr ""
+msgid "Thursday is a work day"
+msgstr "Ĵaŭdo estas labortago"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
-msgid "Workday start minute"
+msgid "Friday is a work day"
+msgstr "Vendredo estas labortablo"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+msgid "Saturday is a work day"
+msgstr "Sabato estas labortago"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+msgid "Sunday is a work day"
+msgstr "Dimanĉo estas labortablo"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"week-start-day-name\" instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+msgid "(Deprecated) Work days"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+msgid ""
+"Days on which the start and end of work hours should be indicated. (This key "
+"was deprecated in version 3.10 and should no longer be used. Use the \"work-"
+"day-monday\", \"work-day-tuesday\", etc. keys instead.)"
 msgstr ""
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:1
-#: ../shell/apps_evolution_shell.schemas.in.h:3
-msgid "Configuration version"
-msgstr "Agordo-versio"
+#, fuzzy
+#| msgid "Evolution Website"
+msgid "Previous Evolution version"
+msgstr "Retpaĝaro de Evolucio"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:2
-#: ../shell/apps_evolution_shell.schemas.in.h:21
-msgid "Last upgraded configuration version"
+msgid ""
+"The most recently used version of Evolution, expressed as \"major.minor.micro"
+"\". This is used for data and settings migration from older to newer "
+"versions."
 msgstr ""
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:3
@@ -8155,53 +8704,39 @@ msgid "List of disabled plugins"
 msgstr "Listo de elŝaltitaj kromprogramoj"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:4
-#: ../shell/apps_evolution_shell.schemas.in.h:35
-msgid ""
-"The configuration version of Evolution, with major/minor/configuration level "
-"(for example \"2.6.0\")."
-msgstr ""
+msgid "The list of disabled plugins in Evolution"
+msgstr "La listo de elŝaltitaj kromprogramoj de Evolucio"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:5
-#: ../shell/apps_evolution_shell.schemas.in.h:41
-msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
-msgstr ""
+msgid "The window's X coordinate"
+msgstr "La fenestra X-koordinato"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:6
-msgid "The list of disabled plugins in Evolution"
-msgstr "La listo de elŝaltitaj kromprogramoj de Evolucio"
+msgid "The window's Y coordinate"
+msgstr "La fenestra Y-koordinato"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:7
-msgid "The window's X coordinate"
-msgstr ""
+msgid "The window's width in pixels"
+msgstr "La fenestra larĝo laŭ bilderoj"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:8
-msgid "The window's Y coordinate"
-msgstr ""
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:9
 msgid "The window's height in pixels"
-msgstr ""
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:10
-msgid "The window's width in pixels"
-msgstr ""
+msgstr "La fenestra alto laŭ bilderoj"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:11
+#: ../data/org.gnome.evolution.gschema.xml.in.h:9
 msgid "Whether the window is maximized"
-msgstr ""
+msgstr "Ĉu la fenestro estas maksimumigita"
 
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:1
 msgid "Gnome Calendar's calendar import done"
 msgstr ""
 
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:2
-msgid "Gnome Calendar's tasks import done"
+msgid "Whether calendar from Gnome Calendar has been imported or not"
 msgstr ""
 
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:3
-msgid "Whether calendar from Gnome Calendar has been imported or not"
+msgid "Gnome Calendar's tasks import done"
 msgstr ""
 
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:4
@@ -8209,1202 +8744,1119 @@ msgid "Whether tasks from Gnome Calendar have been imported or not"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:1
-#: ../mail/evolution-mail.schemas.in.h:13
-msgid "Always request read receipt"
-msgstr "Ĉiam peti kvitancon pri legado"
+msgid "Check whether Evolution is the default mailer"
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
-msgid "Amount of time in seconds the error should be shown on the status bar."
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
+"Ĉiufoje Evolucio startas, kontroli ĉu ĝi estas la defaŭlta poŝtilo aŭ ne."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:3
-#: ../mail/evolution-mail.schemas.in.h:15
-msgid ""
-"Asks whether to close the message window when the user forwards or replies "
-"to the message shown in the window"
+msgid "Default charset in which to compose messages"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
-#, fuzzy
-msgid "Attribute message"
-msgstr "Aldonita mesaĝo"
+msgid "Default charset in which to compose messages."
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
-#: ../mail/evolution-mail.schemas.in.h:17
-msgid "Automatic emoticon recognition"
+msgid "Path where picture gallery should search for its content"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
-#: ../mail/evolution-mail.schemas.in.h:18
-msgid "Automatic link recognition"
+msgid ""
+"This value can be an empty string, which means it'll use the system Picture "
+"folder, usually set to ~/Pictures. This folder will be also used when the "
+"set path is not pointing to the existent folder"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
-#: ../mail/evolution-mail.schemas.in.h:19
-msgid ""
-"Automatically enable PGP or S/MIME signatures when replying to a message "
-"which is also PGP or S/MIME signed."
-msgstr ""
+#, fuzzy
+msgid "Spell check inline"
+msgstr "Literum-kontrolataj"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
-#: ../mail/evolution-mail.schemas.in.h:20
-msgid "Check for new messages in all active accounts"
+msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
-#: ../mail/evolution-mail.schemas.in.h:21
-msgid "Check for new messages on start"
-msgstr ""
+msgid "Automatic link recognition"
+msgstr "Aŭtomata rekono de ligiloj"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
-#: ../mail/evolution-mail.schemas.in.h:22
-#, fuzzy
-msgid "Check incoming mail being junk"
-msgstr "Kontrolu alvenantajn poŝtaĵojn pri nedezirateco"
+msgid "Recognize links in text and replace them."
+msgstr "Rekoni ligilojn en teksto kaj anstataŭigi ilin."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr ""
+msgid "Automatic emoticon recognition"
+msgstr "Aŭtomata miensimbola rekono"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
-#: ../mail/evolution-mail.schemas.in.h:23
-msgid "Citation highlight color"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
-#: ../mail/evolution-mail.schemas.in.h:24
-msgid "Citation highlight color."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
+#, fuzzy
 msgid ""
-"Comma-separated list of localized 'Re' abbreviations to skip in a subject "
-"text when replying to a message, as an addition to the standard \"Re\" "
-"prefix. An example is 'SV,AV'."
-msgstr ""
+"Recognize emoticons in text and replace them with images or Unicode "
+"characters."
+msgstr "Rekoni miensimbolojn en teksto kaj anstataŭigi ilin per bildoj."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
-msgid "Composer load/attach directory"
-msgstr ""
+#, fuzzy
+msgid "Attribute message"
+msgstr "Aldonita mesaĝo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
-#: ../mail/evolution-mail.schemas.in.h:27
-msgid "Compress display of addresses in TO/CC/BCC"
+msgid ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
-#: ../mail/evolution-mail.schemas.in.h:28
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
+msgid "Forward message"
+msgstr "Plusendi mesaĝon"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
-#: ../mail/evolution-mail.schemas.in.h:29
 msgid ""
-"Controls how frequently local changes are synchronized with the remote mail "
-"server. The interval must be at least 30 seconds."
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
-#: ../mail/evolution-mail.schemas.in.h:30
-msgid "Custom headers to use while checking for junk."
-msgstr ""
+msgid "Original message"
+msgstr "Originala mesaĝo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
-#: ../mail/evolution-mail.schemas.in.h:31
 msgid ""
-"Custom headers to use while checking for junk. The list elements are string "
-"in the format \"headername=value\"."
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
-#: ../mail/evolution-mail.schemas.in.h:32
-msgid "Default charset in which to compose messages"
+msgid "Group Reply replies to list"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
-#: ../mail/evolution-mail.schemas.in.h:33
-msgid "Default charset in which to compose messages."
+msgid ""
+"Instead of the normal \"Reply to All\" behaviour, this option will make the "
+"'Group Reply' toolbar button try to reply only to the mailing list through "
+"which you happened to receive the copy of the message to which you're "
+"replying."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
-#: ../mail/evolution-mail.schemas.in.h:34
-msgid "Default charset in which to display messages"
+msgid "Put the cursor at the bottom of replies"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
-#: ../mail/evolution-mail.schemas.in.h:35
-msgid "Default charset in which to display messages."
+msgid ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
 msgstr ""
+"Tio ĉi difinas, ĉu en respondo la kursoro komence estu supre aŭ malsupre en "
+"la mesaĝo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
-#: ../mail/evolution-mail.schemas.in.h:36
-msgid "Default forward style"
-msgstr ""
+msgid "Always request read receipt"
+msgstr "Ĉiam peti kvitancon pri legado"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
-#: ../mail/evolution-mail.schemas.in.h:41
-msgid "Default value for thread expand state"
-msgstr ""
+msgid "Whether a read receipt request gets added to every message by default."
+msgstr "Ĉu defaŭlte peti lego-konfirmon por ĉiu sendita mesaĝo?"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
-msgid ""
-"Describes whether message headers in paned view should be collapsed or "
-"expanded by default. \"0\" = expanded and \"1\" = collapsed"
-msgstr ""
+msgid "Send HTML mail by default"
+msgstr "Sendi HTML-poŝton defaŭlte"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
-#: ../mail/evolution-mail.schemas.in.h:46
-msgid ""
-"Determines whether to look up addresses for junk filtering in local address "
-"book only"
-msgstr ""
+msgid "Send HTML mail by default."
+msgstr "Sendi HTML-poŝton defaŭlte."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
-#: ../mail/evolution-mail.schemas.in.h:47
-msgid "Determines whether to lookup in address book for sender email"
-msgstr ""
+msgid "Spell checking languages"
+msgstr "Literum-kontrolataj lingvoj"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
-#: ../mail/evolution-mail.schemas.in.h:48
-msgid ""
-"Determines whether to lookup the sender email in address book. If found, it "
-"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
-"can be slow, if remote address books (like LDAP) are marked for "
-"autocompletion."
+msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
-#: ../mail/evolution-mail.schemas.in.h:49
-msgid "Determines whether to use custom headers to check for junk"
+msgid "Show \"Bcc\" field when sending a mail message"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
-#: ../mail/evolution-mail.schemas.in.h:50
 msgid ""
-"Determines whether to use custom headers to check for junk. If this option "
-"is enabled and the headers are mentioned, it will be improve the junk "
-"checking speed."
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view"
+msgid "Show \"Cc\" field when sending a mail message"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
-#: ../mail/evolution-mail.schemas.in.h:51
 msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view."
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
-msgid "Digitally sign replies when the original message is signed"
+msgid "Show \"From\" override field when sending a mail message"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
-msgid "Directory for loading/attaching files to composer."
+msgid ""
+"Show the \"From\" override field when sending a mail message. This is "
+"controlled from the View menu when a mail account is chosen."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
-#: ../mail/evolution-mail.schemas.in.h:53
-msgid "Directory for saving mail component files."
+msgid "Show \"Reply To\" field when sending a mail message"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
-#: ../mail/evolution-mail.schemas.in.h:54
-#, fuzzy
-msgid "Disable or enable ellipsizing of folder names in side bar"
-msgstr "Ĉu elŝalti la mallongigon de mesaĝujaj nomoj en la flanka breto?"
+msgid ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
-#: ../mail/evolution-mail.schemas.in.h:55
-msgid "Display only message texts not exceeding certain size"
+msgid "Show \"From\" field when posting to a newsgroup"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
-#: ../mail/evolution-mail.schemas.in.h:56
-msgid "Do not add signature delimiter"
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
-#: ../mail/evolution-mail.schemas.in.h:58
-msgid "Draw spelling error indicators on words as you type."
+msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
-#: ../mail/evolution-mail.schemas.in.h:59
-msgid "Empty Junk folders on exit"
+msgid ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
-#: ../mail/evolution-mail.schemas.in.h:60
-msgid "Empty Trash folders on exit"
+msgid "Digitally sign replies when the original message is signed"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
-#: ../mail/evolution-mail.schemas.in.h:61
-msgid "Empty all Junk folders when exiting Evolution."
+msgid ""
+"Automatically enable PGP or S/MIME signatures when replying to a message "
+"which is also PGP or S/MIME signed."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
-#: ../mail/evolution-mail.schemas.in.h:62
-msgid "Empty all Trash folders when exiting Evolution."
+msgid "Encode filenames in an Outlook/GMail way"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
-#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
-"Enable animated images in HTML mail. Many users find animated images "
-"annoying and prefer to see a static image instead."
+"Encode filenames in the mail headers same as Outlook or GMail do, to let "
+"them display correctly filenames with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
-#: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr ""
+#, fuzzy
+#| msgid "Saving message to Outbox."
+msgid "Send messages through Outbox folder"
+msgstr "Konservi mesaĝon en senditujo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
-#: ../mail/evolution-mail.schemas.in.h:65
-#, fuzzy
-msgid "Enable local folders"
-msgstr "Ĉiuj lokaj dosierujoj"
+msgid ""
+"Always save messages to Outbox folder when sending, to let a user choose "
+"when the messages should be sent."
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
-#: ../mail/evolution-mail.schemas.in.h:66
-msgid "Enable or disable magic space bar"
-msgstr "Enŝalti aŭ elŝalti magian spacostangon"
+msgid "Put personalized signatures at the top of replies"
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "Enable or disable the prompt whilst marking multiple messages."
+msgid ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
 msgstr ""
+"Tio ĉi difinas, ĉu en respondo la subskriba alineo aperu super aŭ sub la "
+"mesaĝo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
-#: ../mail/evolution-mail.schemas.in.h:68
-msgid "Enable or disable type ahead search feature"
+msgid "Do not add signature delimiter"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
-#: ../mail/evolution-mail.schemas.in.h:69
-msgid "Enable search folders"
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:70
-msgid "Enable search folders on startup."
+msgid "Ignore list Reply-To:"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:71
 msgid ""
-"Enable the side bar search feature to allow interactive searching of folder "
-"names."
+"Some mailing lists set a Reply-To: header to trick users into sending "
+"replies to the list, even when they ask Evolution to make a private reply. "
+"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
+"so that Evolution will do as you ask it. If you use the private reply "
+"action, it will reply privately, while if you use the 'Reply to List' action "
+"it will do that. It works by comparing the Reply-To: header with a List-"
+"Post: header, if there is one."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
-#: ../mail/evolution-mail.schemas.in.h:72
-msgid ""
-"Enable this to use Space bar key to scroll in message preview, message list "
-"and folders."
+msgid "List of localized 'Re'"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
-#: ../mail/evolution-mail.schemas.in.h:73
 msgid ""
-"Enable to display only message texts not exceeding size defined in "
-"'message_text_part_limit' key."
+"Comma-separated list of localized 'Re' abbreviations to skip in a subject "
+"text when replying to a message, as an addition to the standard \"Re\" "
+"prefix. An example is 'SV,AV'."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-#: ../mail/evolution-mail.schemas.in.h:74
-msgid "Enable to use a similar message list view settings for all folders"
-msgstr ""
+#, fuzzy
+msgid "Enable developer mode"
+msgstr "Ĉiuj lokaj dosierujoj"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
-#: ../mail/evolution-mail.schemas.in.h:75
-msgid "Enable to use a similar message list view settings for all folders."
+msgid ""
+"Enables some hidden actions and tools aimed for development and debugging."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
-#: ../mail/evolution-mail.schemas.in.h:76
-msgid "Enable/disable caret mode"
+msgid "Number of characters for wrapping"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:77 ../mail/mail-config.ui.h:48
-msgid "Encode file names in an Outlook/GMail way"
+msgid "Will autowrap lines after given number of characters."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid ""
-"Encode file names in the mail headers same as Outlook or GMail do, to let "
-"them display correctly file names with UTF-8 letters sent by Evolution, "
-"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
-"standard."
+msgid "Save file format for drag-and-drop operation"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
+msgid "Can be either 'mbox' or 'pdf'."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
-#: ../mail/evolution-mail.schemas.in.h:80
-msgid "Flush Outbox after filtering"
-msgstr ""
+msgid "Show image animations"
+msgstr "Montri movbildojn"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
-msgid "Forward message"
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
-#: ../mail/evolution-mail.schemas.in.h:83
-msgid "Group Reply replies to list"
+msgid "Enable or disable type ahead search feature"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
-#: ../mail/evolution-mail.schemas.in.h:84
-msgid "Height of the message-list pane"
-msgstr "Alto de la mesaĝo-lista fenestro"
+msgid ""
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
-#: ../mail/evolution-mail.schemas.in.h:85
-msgid "Height of the message-list pane."
-msgstr "Alto de la mesaĝo-lista fenestro."
+msgid "Enable or disable magic space bar"
+msgstr "Enŝalti aŭ elŝalti magian spacostangon"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
-#: ../mail/evolution-mail.schemas.in.h:86
-msgid "Hides the per-folder preview and removes the selection"
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
-#: ../mail/evolution-mail.schemas.in.h:87
-msgid ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
+msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
-#: ../mail/evolution-mail.schemas.in.h:88
-msgid ""
-"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
-"any MIME types appearing in this list which map to a Bonobo component viewer "
-"in GNOME's MIME type database may be used for displaying content."
+msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
-#: ../mail/evolution-mail.schemas.in.h:89
-msgid "Ignore list Reply-To:"
+msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
-#: ../mail/evolution-mail.schemas.in.h:102
-msgid ""
-"Instead of the normal \"Reply to All\" behaviour, this option will make the "
-"'Group Reply' toolbar button try to reply only to the mailing list through "
-"which you happened to receive the copy of the message to which you're "
-"replying."
+msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
-#: ../mail/evolution-mail.schemas.in.h:103
-msgid ""
-"It disables/enables the repeated prompts to warn that deleting messages from "
-"a search folder permanently deletes the message, not simply removing it from "
-"the search results."
+msgid "Citation highlight color"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
-#: ../mail/evolution-mail.schemas.in.h:104
-msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"private reply to a message which arrived via a mailing list."
+msgid "Citation highlight color."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
-#: ../mail/evolution-mail.schemas.in.h:105
-msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"reply to many people."
+msgid "Enable/disable caret mode"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
-#: ../mail/evolution-mail.schemas.in.h:106
-msgid ""
-"It disables/enables the repeated prompts to warn that you are trying sending "
-"a private reply to a message which arrived via a mailing list, but the list "
-"sets a Reply-To: header which redirects your reply back to the list"
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
-#: ../mail/evolution-mail.schemas.in.h:107
-msgid ""
-"It disables/enables the repeated prompts to warn that you are trying to send "
-"a message to recipients not entered as mail addresses"
+msgid "Default charset in which to display messages"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
-#: ../mail/evolution-mail.schemas.in.h:108
-msgid "Last time Empty Junk was run"
+msgid "Default charset in which to display messages."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
-#: ../mail/evolution-mail.schemas.in.h:109
-msgid "Last time Empty Trash was run"
+msgid "Automatically load images for HTML messages over HTTP"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
-#: ../mail/evolution-mail.schemas.in.h:110
-msgid "Layout style"
-msgstr ""
+msgid "Show Animations"
+msgstr "Vidigi movbildojn"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
-#: ../mail/evolution-mail.schemas.in.h:111
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
-msgid "Level beyond which the message should be logged."
+msgid "Show animated images as animations."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
-#: ../mail/evolution-mail.schemas.in.h:112
-msgid "List of Labels and their associated colors"
-msgstr ""
+msgid "Show all message headers"
+msgstr "Montri ĉiujn kapliniojn"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
-#: ../mail/evolution-mail.schemas.in.h:113
-msgid "List of MIME types to check for Bonobo component viewers"
+msgid "Show all the headers when viewing a messages."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
-#: ../mail/evolution-mail.schemas.in.h:117
-msgid "List of custom headers and whether they are enabled."
+msgid "List of headers to show when viewing a message."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
-#: ../mail/evolution-mail.schemas.in.h:118
-msgid "List of dictionary language codes used for spell checking."
+msgid ""
+"Each header is represented as a pair: the header name, and a boolean "
+"indicating whether the header is enabled. Disabled headers are not shown "
+"when viewing a message, but are still listed in Preferences."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
-#: ../mail/evolution-mail.schemas.in.h:119
-msgid ""
-"List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:color where color uses the HTML hex encoding."
+msgid "Show photo of the sender"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
-msgid "List of localized 'Re'"
+msgid "Show the photo of the sender in the message reading pane."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
-#: ../mail/evolution-mail.schemas.in.h:121
-msgid "Load images for HTML messages over HTTP"
+msgid "Search gravatar.com for photo of the sender"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
-#: ../mail/evolution-mail.schemas.in.h:122
-msgid ""
-"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
-"Never load images off the net. \"1\" - Load images in messages from "
-"contacts. \"2\" - Always load images off the net."
+msgid "Allow searching also at gravatar.com for photo of the sender."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
-#: ../mail/evolution-mail.schemas.in.h:123
-msgid "Log filter actions"
+msgid "Mark as Seen after specified timeout"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
-#: ../mail/evolution-mail.schemas.in.h:124
-msgid "Log filter actions to the specified log file."
+msgid "Mark as Seen after specified timeout."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
-#: ../mail/evolution-mail.schemas.in.h:125
-msgid "Logfile to log filter actions"
-msgstr ""
+#, fuzzy
+#| msgid "Timeout for marking message as seen"
+msgid "Timeout for marking messages as seen"
+msgstr "Tempolimo, post kiu mesaĝo estas markita kiel \"legita\""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
-#: ../mail/evolution-mail.schemas.in.h:126
-msgid "Logfile to log filter actions."
-msgstr ""
+#, fuzzy
+#| msgid "Timeout for marking message as seen."
+msgid "Timeout in milliseconds for marking messages as seen."
+msgstr "Tempolimo, post kiu mesaĝo estas markita kiel \"legita\"."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
-#: ../mail/evolution-mail.schemas.in.h:130
-msgid "Mark as Seen after specified timeout"
+msgid "Sender email-address column in the message list"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
-#: ../mail/evolution-mail.schemas.in.h:131
-msgid "Mark as Seen after specified timeout."
+msgid ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
-#: ../mail/evolution-mail.schemas.in.h:132
-msgid "Mark citations in the message \"Preview\""
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
-#: ../mail/evolution-mail.schemas.in.h:133
-msgid "Mark citations in the message \"Preview\"."
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
-#: ../mail/evolution-mail.schemas.in.h:134
-msgid "Message text limit for display"
+msgid "Show deleted messages in the message-list"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
-#: ../mail/evolution-mail.schemas.in.h:135
-msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
+msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
-#: ../mail/evolution-mail.schemas.in.h:136
-msgid "Minimum days between emptying the junk on exit"
-msgstr ""
+#, fuzzy
+msgid "Enable Unmatched search folder"
+msgstr "Ĉiuj lokaj dosierujoj"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
-#: ../mail/evolution-mail.schemas.in.h:137
-msgid "Minimum days between emptying the trash on exit"
+msgid ""
+"Enable Unmatched search folder within Search Folders. It does nothing if "
+"Search Folders are disabled."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
-#: ../mail/evolution-mail.schemas.in.h:138
-msgid "Minimum time between emptying the junk on exit, in days."
+msgid "Hides the per-folder preview and removes the selection"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
-#: ../mail/evolution-mail.schemas.in.h:139
-msgid "Minimum time between emptying the trash on exit, in days."
+msgid ""
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
 msgstr ""
+"Tiu ĉi ŝlosilo estas legata nur unufoje kaj poste metita al \"ne\". Tio "
+"malmarkas la mesaĝon en la listo kaj forigas la antaŭrigardilon el la "
+"mesaĝujo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
-#: ../mail/evolution-mail.schemas.in.h:140
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr ""
+msgid "Height of the message-list pane"
+msgstr "Alto de la mesaĝo-lista fenestro"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
-msgid "Original message"
-msgstr "Originala mesaĝo"
+msgid "Height of the message-list pane."
+msgstr "Alto de la mesaĝo-lista fenestro."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
-#: ../mail/evolution-mail.schemas.in.h:142
-msgid "Path where picture gallery should search for its content"
+msgid "Whether message headers are collapsed in the user interface"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
-msgid ""
-"Possible values are: 'never' - to never close browser window, 'always' - to "
-"always close browser window or 'ask' - (or any other value) will ask user."
-msgstr ""
+msgid "Width of the message-list pane"
+msgstr "Larĝo de la mesaĝo-lista areo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
-#: ../mail/evolution-mail.schemas.in.h:144
-msgid "Prompt before sending to recipients not entered as mail addresses"
-msgstr ""
+msgid "Width of the message-list pane."
+msgstr "Larĝo de la mesaĝo-lista areo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
-#: ../mail/evolution-mail.schemas.in.h:145
-msgid "Prompt on empty subject"
-msgstr ""
+msgid "Layout style"
+msgstr "Stilo de aranĝo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
-msgid "Prompt the user when he or she tries to empty the trash."
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the message list. \"0\" (Classic View) places the preview pane below the "
+"message list. \"1\" (Vertical View) places the preview pane next to the "
+"message list."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
-#: ../mail/evolution-mail.schemas.in.h:146
-msgid "Prompt the user when he or she tries to expunge a folder."
-msgstr ""
+msgid "Variable width font"
+msgstr "Diverslarĝa tiparo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
-#: ../mail/evolution-mail.schemas.in.h:147
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
-msgstr ""
+msgid "The variable width font for mail display."
+msgstr "La varilarĝa tiparo por montrado de retpoŝtaĵoj."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
-#: ../mail/evolution-mail.schemas.in.h:148
-msgid "Prompt when deleting messages in search folder"
-msgstr ""
+msgid "Terminal font"
+msgstr "Terminala tiparo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
-msgid "Prompt when emptying the trash"
-msgstr ""
+msgid "The terminal font for mail display."
+msgstr "La terminala litertiparo por montri poŝtaĵojn."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
-#: ../mail/evolution-mail.schemas.in.h:149
-msgid "Prompt when mailing list hijacks private replies"
-msgstr ""
+msgid "Use custom fonts"
+msgstr "Uzu personecigitajn riparojn"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
-#: ../mail/evolution-mail.schemas.in.h:150
-msgid "Prompt when replying privately to list messages"
-msgstr ""
+msgid "Use custom fonts for displaying mail."
+msgstr "Uzu personecigitajn riparojn por montri poŝtaĵojn."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
-#: ../mail/evolution-mail.schemas.in.h:151
-msgid "Prompt when replying to many recipients"
+msgid "Compress display of addresses in TO/CC/BCC"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
-#: ../mail/evolution-mail.schemas.in.h:152
-msgid "Prompt when user expunges"
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
-#: ../mail/evolution-mail.schemas.in.h:153
-msgid "Prompt when user only fills Bcc"
+msgid "Number of addresses to display in TO/CC/BCC"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
-#: ../mail/evolution-mail.schemas.in.h:154
-msgid "Prompt when user tries to open 10 or more messages at once"
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
 msgstr ""
+"Tio ĉi difinas la nombron de adresoj montrataj en la normala mesaĝa vido, "
+"post kiuj aperas '...'."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
-#: ../mail/evolution-mail.schemas.in.h:155
-msgid ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
+msgid "Thread the message-list based on Subject"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
-#: ../mail/evolution-mail.schemas.in.h:156
-msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
-#: ../mail/evolution-mail.schemas.in.h:157
-msgid "Prompt when user tries to send unwanted HTML"
+msgid "Default value for thread expand state"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
-#: ../mail/evolution-mail.schemas.in.h:158
-msgid "Prompt while marking multiple messages"
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
-#: ../mail/evolution-mail.schemas.in.h:159
-msgid "Put personalized signatures at the top of replies"
+msgid "Whether sort threads based on latest message in that thread"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
-#: ../mail/evolution-mail.schemas.in.h:160
-msgid "Put the cursor at the bottom of replies"
+msgid ""
+"This setting specifies whether the threads should be sorted based on latest "
+"message in each thread, rather than by message's date. Evolution requires a "
+"restart."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
-#: ../mail/evolution-mail.schemas.in.h:161
-msgid "Recognize emoticons in text and replace them with images."
+msgid "Sort accounts alphabetically in a folder tree"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
-#: ../mail/evolution-mail.schemas.in.h:162
-msgid "Recognize links in text and replace them."
+msgid ""
+"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
+"true accounts are sorted alphabetically, with an exception of On This "
+"Computer and Search folders, otherwise accounts are sorted based on an order "
+"given by a user"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
-#: ../mail/evolution-mail.schemas.in.h:163
-msgid "Run junk test on incoming mail."
+msgid "Log filter actions"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
-#: ../mail/evolution-mail.schemas.in.h:164
-msgid "Save directory"
+msgid "Log filter actions to the specified log file."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
-#: ../mail/evolution-mail.schemas.in.h:165
-msgid "Search for the sender photo in local address books"
+msgid "Logfile to log filter actions"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
-#: ../mail/evolution-mail.schemas.in.h:166
-msgid "Send HTML mail by default"
+msgid "Logfile to log filter actions."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "Send HTML mail by default."
+msgid "Flush Outbox after filtering"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Sender email-address column in the message list"
+msgid ""
+"Whether to flush Outbox after filtering is done. Outbox flush will happen "
+"only when there was used any 'Forward to' filter action and approximately "
+"one minute after the last action invocation."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "Server synchronization interval"
+msgid "Default forward style"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid ""
-"Set to TRUE in case you do not want to add signature delimiter before your "
-"signature when composing a mail."
+msgid "Default reply style"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "Show \"Bcc\" field when sending a mail message"
+msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "Show \"Cc\" field when sending a mail message"
+msgid ""
+"Prompt the user when he or she tries to send a message with a key "
+"accelerator."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
-#: ../mail/evolution-mail.schemas.in.h:173
-msgid "Show \"From\" field when posting to a newsgroup"
+msgid "Prompt on empty subject"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
-#: ../mail/evolution-mail.schemas.in.h:174
-msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "Show \"Reply To\" field when sending a mail message"
+msgid "Prompt when emptying the trash"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "Show Animations"
+msgid "Prompt the user when he or she tries to empty the trash."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
-#: ../mail/evolution-mail.schemas.in.h:177
-msgid "Show all message headers"
-msgstr "Montri ĉiujn kapliniojn"
+msgid "Prompt when user expunges"
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
-#: ../mail/evolution-mail.schemas.in.h:178
-msgid "Show all the headers when viewing a messages."
+msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
-#: ../mail/evolution-mail.schemas.in.h:179
-msgid "Show animated images as animations."
+msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
-#: ../mail/evolution-mail.schemas.in.h:180
-msgid "Show deleted messages (with a strike-through) in the message-list."
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying to send "
+"a message to recipients not entered as mail addresses"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
-#: ../mail/evolution-mail.schemas.in.h:181
-msgid "Show deleted messages in the message-list"
+msgid "Prompt when user only fills Bcc"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
-#: ../mail/evolution-mail.schemas.in.h:182
-msgid "Show image animations"
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
-#: ../mail/evolution-mail.schemas.in.h:183
-msgid "Show original \"Date\" header value."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
-#: ../mail/evolution-mail.schemas.in.h:184
-msgid "Show photo of the sender"
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
-#: ../mail/evolution-mail.schemas.in.h:185
-msgid ""
-"Show the \"Bcc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
+msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
-#: ../mail/evolution-mail.schemas.in.h:186
 msgid ""
-"Show the \"Cc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
-#: ../mail/evolution-mail.schemas.in.h:187
-msgid ""
-"Show the \"From\" field when posting to a newsgroup. This is controlled from "
-"the View menu when a news account is chosen."
+msgid "Prompt while marking multiple messages"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
-#: ../mail/evolution-mail.schemas.in.h:188
-msgid ""
-"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
-"from the View menu when a news account is chosen."
+msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
-#: ../mail/evolution-mail.schemas.in.h:189
-msgid ""
-"Show the \"Reply To\" field when sending a mail message. This is controlled "
-"from the View menu when a mail account is chosen."
+msgid "Prompt when deleting messages in search folder"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
-#: ../mail/evolution-mail.schemas.in.h:190
 msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
+"It disables/enables the repeated prompts to warn that deleting messages from "
+"a search folder permanently deletes the message, not simply removing it from "
+"the search results."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
-#: ../mail/evolution-mail.schemas.in.h:191
-msgid ""
-"Show the original \"Date\" header (with a local time only if the time zone "
-"differs). Otherwise always show \"Date\" header value in a user preferred "
-"format and local time zone."
+msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
-#: ../mail/evolution-mail.schemas.in.h:192
-msgid "Show the photo of the sender in the message reading pane."
+msgid ""
+"Possible values are: 'never' - do not allow copy with drag &amp; drop of "
+"folders in folder tree, 'always' - allow copy with drag &amp; drop of "
+"folders in folder tree without asking, or 'ask' - (or any other value) will "
+"ask user."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
-#: ../mail/evolution-mail.schemas.in.h:193
-msgid ""
-"Some mailing lists set a Reply-To: header to trick users into sending "
-"replies to the list, even when they ask Evolution to make a private reply. "
-"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
-"so that Evolution will do as you ask it. If you use the private reply "
-"action, it will reply privately, while if you use the 'Reply to List' action "
-"it will do that. It works by comparing the Reply-To: header with a List-"
-"Post: header, if there is one."
+msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
-#: ../mail/evolution-mail.schemas.in.h:194
-msgid "Sort accounts alphabetically in a folder tree"
+msgid ""
+"Possible values are: 'never' - do not allow move with drag &amp; drop of "
+"folders in folder tree, 'always' - allow move with drag &amp; drop of "
+"folders in folder tree without asking, or 'ask' - (or any other value) will "
+"ask user."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
-#: ../mail/evolution-mail.schemas.in.h:195
-#, fuzzy
-msgid "Spell check inline"
-msgstr "Literum-kontrolataj"
+msgid "Prompt when replying privately to list messages"
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
-#: ../mail/evolution-mail.schemas.in.h:196
-msgid "Spell checking color"
-msgstr "Koloro de literumkontrolo"
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"private reply to a message which arrived via a mailing list."
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
-#: ../mail/evolution-mail.schemas.in.h:197
-msgid "Spell checking languages"
-msgstr "Literum-kontrolataj lingvoj"
+msgid "Prompt when mailing list hijacks private replies"
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
-#: ../mail/evolution-mail.schemas.in.h:198
-msgid "State of message headers in paned view"
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying sending "
+"a private reply to a message which arrived via a mailing list, but the list "
+"sets a Reply-To: header which redirects your reply back to the list"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
-msgid ""
-"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
-"true accounts are sorted alphabetically, with an exception of On This "
-"Computer and Search folders, otherwise accounts are sorted based on an order "
-"given by a user"
+msgid "Prompt when replying to many recipients"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
-#: ../mail/evolution-mail.schemas.in.h:200
-msgid "Terminal font"
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
-#: ../mail/evolution-mail.schemas.in.h:201
-msgid "The default plugin for Junk hook"
+msgid ""
+"Prompt when switching composer mode and the content needs to lose its "
+"formatting"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
-#: ../mail/evolution-mail.schemas.in.h:202
 msgid ""
-"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+"It disables/enables the repeated prompts to warn that you are switching "
+"composer mode and the content needs to lose its formatting."
 msgstr ""
-"La tempo de la lasta malplenigo de la mesaĝaĉujo, en tagoj ekde la 1-a de "
-"januaro 1970 (\"la epoko\")."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
-#: ../mail/evolution-mail.schemas.in.h:203
 msgid ""
-"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+"Policy for automatically closing the message browser window when forwarding "
+"or replying to the displayed message."
 msgstr ""
-"La tempo de la lasta malplenigo de la rubujo, en tagoj ekde la 1-a de "
-"januaro 1970 (\"la epoko\")."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
-#: ../mail/evolution-mail.schemas.in.h:204
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the message list. \"0\" (Classic View) places the preview pane below the "
-"message list. \"1\" (Vertical View) places the preview pane next to the "
-"message list."
+msgid "Empty Trash folders on exit"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
-#: ../mail/evolution-mail.schemas.in.h:205
-msgid "The terminal font for mail display."
-msgstr "La terminala litertiparo por montri poŝtaĵojn."
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
-msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows"
+msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
-msgid ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows"
+msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
-msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author"
+msgid "Last time Empty Trash was run"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
-#: ../mail/evolution-mail.schemas.in.h:209
-msgid "The variable width font for mail display."
-msgstr "La varilarĝa tiparo por montrado de retpoŝtaĵoj"
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr ""
+"La tempo de la lasta malplenigo de la rubujo, en tagoj ekde la 1-a de "
+"januaro 1970 (\"la epoko\")."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
-#: ../mail/evolution-mail.schemas.in.h:210
-msgid ""
-"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
-"\"2\" for debug messages."
+msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr ""
-"Tio ĉi povas havi unu el tri valoroj: 0 = eraro, 1 = averto, 2 = erarospura "
-"informo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
-#: ../mail/evolution-mail.schemas.in.h:211
-msgid ""
-"This decides the max size of the message text that will be displayed under "
-"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
-"is used only when 'force_message_limit' key is activated."
+msgid "Level beyond which the message should be logged."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
-#: ../mail/evolution-mail.schemas.in.h:212
 msgid ""
-"This is the default junk plugin, even though there are multiple plugins "
-"enabled. If the default listed plugin is disabled, then it won't fall back "
-"to the other available plugins."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr ""
+"Tio ĉi povas havi unu el tri valoroj: 0 = eraro, 1 = averto, 2 = erarospura "
+"informo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
-#: ../mail/evolution-mail.schemas.in.h:213
-msgid ""
-"This key is read only once and reset to \"false\" after read. This unselects "
-"the mail in the list and removes the preview for that folder."
+msgid "Show original \"Date\" header value."
 msgstr ""
-"Tiu ĉi ŝlosilo estas legata nur unufoje kaj poste metita al \"ne\". Tio "
-"malmarkas la mesaĝon en la listo kaj forigas la antaŭrigardilon el la "
-"mesaĝujo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
-#: ../mail/evolution-mail.schemas.in.h:214
 msgid ""
-"This key should contain a list of XML structures specifying custom headers, "
-"and whether they are to be displayed. The format of the XML structure is &lt;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
+"Show the original \"Date\" header (with a local time only if the time zone "
+"differs). Otherwise always show \"Date\" header value in a user preferred "
+"format and local time zone."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
-#: ../mail/evolution-mail.schemas.in.h:215
-msgid ""
-"This option is related to the key lookup_addressbook and is used to "
-"determine whether to look up addresses in local address book only to exclude "
-"mail sent by known contacts from junk filtering."
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
-#: ../mail/evolution-mail.schemas.in.h:216
-msgid "This option would help in improving the speed of fetching."
-msgstr "Tiu ĉi opcio povas plirapidigi la elŝutadon."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
-#: ../mail/evolution-mail.schemas.in.h:217
 msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
-"Tio ĉi difinas la nombron de adresoj montrataj en la normala mesaĝa vido, "
-"post kiuj aperas \"...\"."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#, fuzzy
+msgid "Check incoming mail being junk"
+msgstr "Kontrolu alvenantajn poŝtaĵojn pri nedezirateco"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
+msgid "Run junk test on incoming mail."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
-#: ../mail/evolution-mail.schemas.in.h:219
-msgid ""
-"This setting specifies whether the threads should be sorted based on latest "
-"message in each thread, rather than by message's date. Evolution requires a "
-"restart."
+msgid "Empty Junk folders on exit"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
-msgid ""
-"This value can be an empty string, which means it'll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder"
+msgid "Empty all Junk folders when exiting Evolution."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
-#: ../mail/evolution-mail.schemas.in.h:221
-msgid "Thread the message-list based on Subject"
+msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
-#: ../mail/evolution-mail.schemas.in.h:222
-msgid "Timeout for marking message as seen"
-msgstr "Tempolimo, post kiu mesaĝo estas markita kiel \"legita\"."
+msgid "Minimum time between emptying the junk on exit, in days."
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
-#: ../mail/evolution-mail.schemas.in.h:223
-msgid "Timeout for marking message as seen."
-msgstr "Tempolimo, post kiu mesaĝo estas markita kiel \"legita\"."
+msgid "Last time Empty Junk was run"
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
-#: ../mail/evolution-mail.schemas.in.h:224
-msgid "UID string of the default account."
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
+"La tempo de la lasta malplenigo de la mesaĝaĉujo, en tagoj ekde la 1-a de "
+"januaro 1970 (\"la epoko\")."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
-#: ../mail/evolution-mail.schemas.in.h:225
-msgid "Underline color for misspelled words when using inline spelling."
+msgid "The default plugin for Junk hook"
 msgstr ""
-"Koloro por substreki misliterumitajn vortojn ĉe uzo de la enprograma "
-"ortografia kontrolo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
-#: ../mail/evolution-mail.schemas.in.h:226
-msgid "Use custom fonts"
-msgstr "Uzu personecigitajn riparojn"
+msgid ""
+"This is the default junk plugin, even though there are multiple plugins "
+"enabled. If the default listed plugin is disabled, then it won't fall back "
+"to the other available plugins."
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
-#: ../mail/evolution-mail.schemas.in.h:227
-msgid "Use custom fonts for displaying mail."
-msgstr "Uzu personecigitajn riparojn por montri poŝtaĵojn."
+msgid "Determines whether to lookup in address book for sender email"
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
-#: ../mail/evolution-mail.schemas.in.h:228
 msgid ""
-"Users get all up in arms over where the cursor should go when replying to a "
-"message. This determines whether the cursor is placed at the top of the "
-"message or the bottom."
+"Determines whether to lookup the sender email in address book. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote address books (like LDAP) are marked for "
+"autocompletion."
 msgstr ""
-"Tio ĉi difinas, ĉu en respondo la kursoro komence estu supre aŭ malsupre en "
-"la mesaĝo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
-#: ../mail/evolution-mail.schemas.in.h:229
 msgid ""
-"Users get all up in arms over where their signature should go when replying "
-"to a message. This determines whether the signature is placed at the top of "
-"the message or the bottom."
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
 msgstr ""
-"Tio ĉi difinas, ĉu en respondo la subskriba alineo aperu super aŭ sub la "
-"mesaĝo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
-#: ../mail/evolution-mail.schemas.in.h:230
-msgid "Variable width font"
-msgstr "Diverslarĝa tiparo"
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local address book only to exclude "
+"mail sent by known contacts from junk filtering."
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
-#: ../mail/evolution-mail.schemas.in.h:231
-msgid "Whether a read receipt request gets added to every message by default."
-msgstr "Ĉu defaŭlte peti lego-konfirmon por ĉiu sendita mesaĝo?"
+msgid "Determines whether to use custom headers to check for junk"
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
-#: ../mail/evolution-mail.schemas.in.h:232
 msgid ""
-"Whether check for new messages in all active accounts regardless of the "
-"account \"Check for new messages every X minutes\" option when Evolution is "
-"started. This option is used only together with 'send_recv_on_start' option."
+"Determines whether to use custom headers to check for junk. If this option "
+"is enabled and the headers are mentioned, it will be improve the junk "
+"checking speed."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
-#: ../mail/evolution-mail.schemas.in.h:233
-msgid ""
-"Whether check for new messages when Evolution is started. This includes also "
-"sending messages from Outbox."
+msgid "Custom headers to use while checking for junk."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
-#: ../mail/evolution-mail.schemas.in.h:234
-msgid "Whether disable ellipsizing feature of folder names in side bar."
-msgstr "Ĉu elŝalti la mallongigon de mesaĝujaj nomoj en la flanka breto?"
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
-#: ../mail/evolution-mail.schemas.in.h:235
-msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
+msgid "UID string of the default account."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
-#: ../mail/evolution-mail.schemas.in.h:236
-msgid "Whether sort threads based on latest message in that thread"
-msgstr ""
+msgid "Save directory"
+msgstr "Konservi dosierujon"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
-#: ../mail/evolution-mail.schemas.in.h:237
-msgid ""
-"Whether to flush Outbox after filtering is done. Outbox flush will happen "
-"only when there was used any 'Forward to' filter action and approximately "
-"one minute after the last action invocation."
+msgid "Directory for saving mail component files."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
-msgid "Whether to show local folders (On This Computer) in a folder tree"
+msgid "Composer load/attach directory"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
-#: ../mail/evolution-mail.schemas.in.h:239
-msgid "Width of the message-list pane"
-msgstr "Larĝo de la mesaĝo-lista areo"
+msgid "Directory for loading/attaching files to composer."
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
-#: ../mail/evolution-mail.schemas.in.h:240
-msgid "Width of the message-list pane."
-msgstr "Larĝo de la mesaĝo-lista areo"
+msgid "Check for new messages on start"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+msgid ""
+"Whether to check for new messages when Evolution is started. This includes "
+"also sending messages from Outbox."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+msgid "Check for new messages in all active accounts"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+msgid ""
+"Whether to check for new messages in all active accounts regardless of the "
+"account \"Check for new messages every X minutes\" option when Evolution is "
+"started. This option is used only together with 'send_recv_on_start' option."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+msgid "Server synchronization interval"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+msgid "Allow expunge in virtual folders"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+msgid ""
+"Enables Expunge in virtual folders, which means that the Folder->Expunge "
+"will be callable in virtual folders, while the expunge itself will be done "
+"in all folders for all deleted messages within the virtual folder, not only "
+"for deleted messages belonging to the virtual folder."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+msgid "An Archive folder for On This Computer folders."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+msgid ""
+"An Archive folder to use for Messages|Archive... feature when in an On This "
+"Computer folder."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+msgid "(Deprecated) Default forward style"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"forward-style-name\" instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+msgid "(Deprecated) Default reply style"
+msgstr ""
 
-#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:1
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"reply-style-name\" instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+msgid "(Deprecated) List of custom headers and whether they are enabled."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"show-headers\" instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+msgid "(Deprecated) Load images for HTML messages over HTTP"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"image-loading-policy\" instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+msgid ""
+"(Deprecated) Asks whether to close the message window when the user forwards "
+"or replies to the message shown in the window"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"browser-close-on-reply-policy\" instead."
+msgstr ""
+
+#. Translators: This is the a list of words for the attach reminder plugin to look
+#. for in a message body. Please use any number of words here in your language that might
+#. indicate that an attachment should have been attached to the message.
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:4
+msgid "['attachment','attaching','attached','enclosed']"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:5
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
 msgstr ""
 
-#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:2
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:6
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body."
@@ -9415,57 +9867,66 @@ msgid "Address book source"
 msgstr "Adresaro-fonto"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:2
-msgid "Address book to use for storing automatically synced contacts"
+msgid "Address book to use for storing automatically synced contacts."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
-msgid "Address book to use for storing automatically synced contacts from GAIM"
+msgid "Auto sync Pidgin contacts"
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
-msgid "Auto sync GAIM contacts"
+msgid "Whether Pidgin contacts should be automatically synced."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
-msgid "Check interval for GAIM syncing of contacts"
-msgstr ""
+msgid "Enable autocontacts"
+msgstr "Enŝalti aŭtomatajn kontaktojn"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
-msgid "Enable autocontacts"
+msgid ""
+"Whether contacts should be automatically added to the user's address book."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
-msgid "GAIM address book source"
-msgstr ""
+#, fuzzy
+#| msgid "Address book source"
+msgid "Pidgin address book source"
+msgstr "Adresaro-fonto"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
-msgid "GAIM check interval"
+msgid ""
+"Address book to use for storing automatically synced contacts from Pidgin."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
-msgid "GAIM last sync MD5"
+msgid "Pidgin check interval"
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
-msgid "GAIM last sync time"
+msgid "Check interval for Pidgin syncing of contacts."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
-msgid "Whether GAIM contacts should be automaticall synced"
+msgid "Pidgin last sync MD5"
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
-msgid ""
-"Whether contacts should be automatically added to the user's addressbook"
+msgid "Pidgin last sync MD5."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
+msgid "Pidgin last sync time"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:14
+msgid "Pidgin last sync time."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:1
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
 msgid "List of Custom Headers"
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:2
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
 msgid ""
 "The key specifies the list of custom headers that you can add to an outgoing "
 "message. The format for specifying a Header and Header value is: Name of the "
@@ -9473,32 +9934,26 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
-msgid "Automatically launch editor when key is pressed in the mail composer."
-msgstr ""
+msgid "Default External Editor"
+msgstr "Defaŭlta ekstera redaktilo"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:2
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:125
-msgid "Automatically launch when a new mail is edited"
+msgid "The default command that must be used as the editor."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
-msgid "Default External Editor"
+msgid "Automatically launch when a new mail is edited"
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:4
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
-msgid "The default command that must be used as the editor."
+msgid "Automatically launch editor when key is pressed in the mail composer."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:1
-#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
 msgid "Insert Face picture by default"
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:2
-#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
 msgid ""
 "Whether insert Face picture to outgoing messages by default. The picture "
 "should be set before checking this, otherwise nothing happens."
@@ -9513,85 +9968,85 @@ msgid "Whether to delete processed iTip objects"
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
-msgid "Beep or play sound file."
-msgstr "Pepi aŭ ludi sondosieron."
+msgid "Notify new messages for Inbox only."
+msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:2
-msgid "Enable D-Bus messages."
+msgid "Whether to notify new messages in Inbox folder only."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:3
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Enable icon in notification area."
+msgid "Enable D-Bus messages."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:4
-msgid "FIXME"
+msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:5
-msgid "Generates a D-Bus message when new mail messages arrive."
+msgid "Enable icon in notification area."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:6
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
-msgid ""
-"If \"true\", then beep, otherwise will play sound file when new messages "
-"arrive."
+msgid "Show new mail icon in notification area when new messages arrive."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:7
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
-msgid "Notify new messages for Inbox only."
+msgid "Popup message together with the icon."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:8
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
-msgid "Play sound when new messages arrive."
+msgid "Whether show message over the icon when new messages arrive."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgid "Enable audible notifications when new messages arrive."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
-msgid "Popup message together with the icon."
+msgid ""
+"Whether to make a sound of any kind when new messages arrive. If \"false\", "
+"the \"notify-sound-beep\", \"notify-sound-file\", \"notify-sound-play-file\" "
+"and \"notify-sound-use-theme\" keys are disregarded."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
-msgid "Show new mail icon in notification area when new messages arrive."
+msgid "Whether to emit a beep."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
-msgid "Sound file name to be played."
+msgid "Whether to emit a beep when new messages arrive."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgid "Sound filename to be played."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
-msgid "Use sound theme"
+msgid ""
+"Sound file to be played when new messages arrive, if \"notify-sound-play-file"
+"\" is \"true\"."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
-msgid "Whether play sound or beep when new messages arrive."
-msgstr ""
+#, fuzzy
+#| msgid "Beep or play sound file."
+msgid "Whether to play a sound file."
+msgstr "Pepi aŭ ludi sondosieron."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
-msgid "Whether show message over the icon when new messages arrive."
+msgid ""
+"Whether to play a sound file when new messages arrive. The name of the sound "
+"file is given by the 'notify-sound-file' key."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
-msgid "Whether to notify new messages in Inbox folder only."
+#, fuzzy
+msgid "Use sound theme"
+msgstr "Uzi sontemon"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:18
+msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
@@ -9609,89 +10064,87 @@ msgstr ""
 msgid "Whether to show suppressed HTML output"
 msgstr ""
 
+#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:1
+msgid "List of Destinations for publishing"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:2
+msgid ""
+"The key specifies the list of destinations to where publish calendars. Each "
+"values specifies an XML with setup for publishing to one destination."
+msgstr ""
+
 #: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
-#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
 "message body."
 msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
-#: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid "Default sidebar width"
+msgid "Skip development warning dialog"
 msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
-#: ../shell/apps_evolution_shell.schemas.in.h:10
-msgid "Enable express mode"
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:3
-#: ../shell/apps_evolution_shell.schemas.in.h:12
-msgid "Flag that enables a much simplified user interface."
+msgid "Initial attachment view"
 msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
-#: ../shell/apps_evolution_shell.schemas.in.h:17
-msgid "ID or alias of the component to be shown by default at start-up."
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
 msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:5
-#: ../shell/apps_evolution_shell.schemas.in.h:19
-msgid "Initial attachment view"
-msgstr ""
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:6
 msgid "Initial file chooser folder"
 msgstr ""
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:6
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr ""
 
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:308
+msgid "Start in offline mode"
+msgstr "Starti per nekonektita reĝimo"
+
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
-#: ../shell/apps_evolution_shell.schemas.in.h:20
-msgid ""
-"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
-"View."
-msgstr ""
+msgid "Whether Evolution will start up in offline mode instead of online mode."
+msgstr "Ĉu starti Evolucion per nekonektita reĝimo anstataŭ konektita reĝimo?"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage."
+msgid "Offline folder paths"
 msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
-msgid "Offline folder paths"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage."
 msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
-#: ../shell/apps_evolution_shell.schemas.in.h:31
-msgid "Sidebar is visible"
-msgstr "Flanka breto estas videbla"
+msgid "Enable express mode"
+msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
-#: ../shell/apps_evolution_shell.schemas.in.h:32
-msgid "Skip development warning dialog"
+msgid "Flag that enables a much simplified user interface."
 msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:317
-msgid "Start in offline mode"
-msgstr "Starti per nekonektita reĝimo"
+msgid "Window buttons are visible"
+msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
-#: ../shell/apps_evolution_shell.schemas.in.h:34
-msgid "Statusbar is visible"
-msgstr "Statobreto estas videbla"
+msgid "Whether the window buttons should be visible."
+msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
-#: ../shell/apps_evolution_shell.schemas.in.h:40
-msgid "The default width for the sidebar, in pixels."
+msgid "Window button style"
 msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
-#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -9699,313 +10152,1275 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
-#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Toolbar is visible"
 msgstr "Ilobreto estas videbla"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
-#: ../shell/apps_evolution_shell.schemas.in.h:54
-msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr "Ĉu starti Evolucion per nekonektita reĝimo anstataŭ konektita reĝimo?"
+msgid "Whether the toolbar should be visible."
+msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
-#: ../shell/apps_evolution_shell.schemas.in.h:56
-msgid "Whether the sidebar should be visible."
-msgstr ""
+msgid "Sidebar is visible"
+msgstr "Flanka breto estas videbla"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
-#: ../shell/apps_evolution_shell.schemas.in.h:57
-msgid "Whether the status bar should be visible."
+msgid "Whether the sidebar should be visible."
 msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
-#: ../shell/apps_evolution_shell.schemas.in.h:58
-msgid "Whether the toolbar should be visible."
-msgstr ""
+msgid "Statusbar is visible"
+msgstr "Statobreto estas videbla"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
-#: ../shell/apps_evolution_shell.schemas.in.h:59
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
+msgid "Whether the status bar should be visible."
 msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
-#: ../shell/apps_evolution_shell.schemas.in.h:60
-msgid "Whether the window buttons should be visible."
+msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
-#: ../shell/apps_evolution_shell.schemas.in.h:61
-msgid "Window button style"
+msgid "Default sidebar width"
 msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
-#: ../shell/apps_evolution_shell.schemas.in.h:62
-msgid "Window buttons are visible"
+msgid "The default width for the sidebar, in pixels."
 msgstr ""
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
-msgid "Socket path for SpamAssassin"
+msgid "Use only local spam tests."
 msgstr ""
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:2
-msgid "SpamAssassin client binary"
+msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
-msgid "SpamAssassin daemon binary"
+msgid "Full path command to run spamassassin"
 msgstr ""
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
-msgid "Use SpamAssassin daemon and client"
+msgid ""
+"Full path to a spamassassin command. If not set, then a compile-time path is "
+"used, usually /usr/bin/spamassassin. The command should not contain any "
+"other arguments."
 msgstr ""
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgid "Full path command to run sa-learn"
 msgstr ""
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
-msgid "Use only local spam tests."
+msgid ""
+"Full path to a sa-learn command. If not set, then a compile-time path is "
+"used, usually /usr/bin/sa-learn. The command should not contain any other "
+"arguments."
 msgstr ""
 
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:7
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
-msgid "Use only the local spam tests (no DNS)."
+#: ../em-format/e-mail-formatter-attachment.c:405
+#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
+#: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
+#: ../mail/message-list.etspec.h:4
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Aldonaĵo"
+msgstr[1] "Aldonaĵoj"
+
+#: ../em-format/e-mail-formatter-attachment.c:406
+#, fuzzy
+#| msgctxt "iCalImp"
+#| msgid "has attachments"
+msgid "Display as attachment"
+msgstr "Montri kiel aldonaĵo"
+
+#: ../em-format/e-mail-formatter-audio.c:152
+msgid "Audio Player"
+msgstr ""
+
+#: ../em-format/e-mail-formatter-audio.c:153
+msgid "Play the attachment in embedded audio player"
 msgstr ""
 
-#: ../em-format/em-format.c:1060 ../em-format/em-format-quote.c:318
-#: ../mail/e-mail-tag-editor.c:327 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../em-format/e-mail-formatter-headers.c:102
+#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:277
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:62
 msgid "From"
 msgstr "De"
 
-#: ../em-format/em-format.c:1061 ../em-format/em-format-quote.c:318
-#: ../modules/mail/em-mailer-prefs.c:71
-msgid "Reply-To"
-msgstr "Respondo-al"
+#: ../em-format/e-mail-formatter-headers.c:128
+msgid "(no subject)"
+msgstr "(sen temo)"
 
-#: ../em-format/em-format.c:1063 ../em-format/em-format-quote.c:318
-#: ../mail/em-format-html.c:2664 ../mail/em-format-html.c:2732
-#: ../mail/em-format-html.c:2755 ../modules/mail/em-mailer-prefs.c:73
-msgid "Cc"
+#: ../em-format/e-mail-formatter-headers.c:329
+#, c-format
+msgid "This message was sent by %s on behalf of %s"
 msgstr ""
 
-#: ../em-format/em-format.c:1064 ../em-format/em-format-quote.c:318
-#: ../mail/em-format-html.c:2665 ../mail/em-format-html.c:2736
-#: ../mail/em-format-html.c:2758 ../modules/mail/em-mailer-prefs.c:74
-msgid "Bcc"
+#: ../em-format/e-mail-formatter-image.c:170
+#, fuzzy
+#| msgid "Save Image"
+msgid "Regular Image"
+msgstr "Konservi bildon"
+
+#: ../em-format/e-mail-formatter-image.c:171
+#, fuzzy
+#| msgid "Display the next message"
+msgid "Display part as an image"
+msgstr "Montri la sekvan mesaĝon"
+
+#: ../em-format/e-mail-formatter-message-rfc822.c:254
+#| msgid "Custom _message"
+msgid "RFC822 message"
+msgstr "RFC822-mesaĝo"
+
+#: ../em-format/e-mail-formatter-message-rfc822.c:255
+msgid "Format part as an RFC822 message"
 msgstr ""
 
-#: ../em-format/em-format.c:1065 ../em-format/em-format-quote.c:463
-#: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:75
-#: ../smime/lib/e-cert.c:1147
+#: ../em-format/e-mail-formatter-print.c:53
+#: ../e-util/gal-view-instance-save-as-dialog.c:94
+#: ../mail/e-mail-label-tree-view.c:98
+#: ../modules/plugin-manager/evolution-plugin-manager.c:66
+msgid "Name"
+msgstr "Nomo"
+
+#: ../em-format/e-mail-formatter-print.c:53
+#: ../e-util/e-attachment-tree-view.c:573 ../mail/message-list.etspec.h:10
+msgid "Size"
+msgstr "Grando"
+
+#: ../em-format/e-mail-formatter-quote-headers.c:174
+#: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:282
+#: ../mail/filtertypes.xml.in.h:16 ../mail/message-list.etspec.h:6
+#: ../mail/searchtypes.xml.in.h:17 ../mail/vfoldertypes.xml.in.h:17
+#: ../modules/mail/em-mailer-prefs.c:67
+#: ../smime/gui/certificate-manager.c:1630
 msgid "Subject"
 msgstr "Temo"
 
-#: ../em-format/em-format.c:1066 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:523
-#: ../widgets/misc/e-dateedit.c:545
-msgid "Date"
-msgstr "Dato"
+#. pseudo-header
+#: ../em-format/e-mail-formatter-quote-headers.c:193
+#: ../em-format/e-mail-formatter-utils.c:343
+#: ../modules/mail/em-mailer-prefs.c:1166
+msgid "Mailer"
+msgstr ""
 
-#: ../em-format/em-format.c:1067 ../modules/mail/em-mailer-prefs.c:77
-msgid "Newsgroups"
-msgstr "Novaĵogrupoj"
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:94
+#: ../em-format/e-mail-formatter-text-enriched.c:102
+msgid "Richtext"
+msgstr "Riĉa teksto"
 
-#: ../em-format/em-format.c:1068 ../modules/mail/em-mailer-prefs.c:78
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "Vizaĝo"
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:95
+#: ../em-format/e-mail-formatter-text-enriched.c:103
+msgid "Display part as enriched text"
+msgstr ""
 
-#: ../em-format/em-format.c:1469
-#, c-format
-msgid "%s attachment"
-msgstr "%s aldonaĵo"
+#: ../em-format/e-mail-formatter-quote-text-html.c:95
+#: ../em-format/e-mail-formatter-text-html.c:360
+msgid "HTML"
+msgstr "HTML"
 
-#: ../em-format/em-format.c:1580
-msgid "Could not parse S/MIME message: Unknown error"
+#: ../em-format/e-mail-formatter-quote-text-html.c:96
+#: ../em-format/e-mail-formatter-text-html.c:361
+msgid "Format part as HTML"
 msgstr ""
 
-#: ../em-format/em-format.c:1774 ../em-format/em-format.c:2002
-msgid "Could not parse MIME message. Displaying as source."
+#: ../em-format/e-mail-formatter-quote-text-plain.c:123
+#: ../em-format/e-mail-formatter-text-plain.c:198
+#: ../e-util/e-html-editor-actions.c:1544
+msgid "Plain Text"
+msgstr "Plata teksto"
+
+#: ../em-format/e-mail-formatter-quote-text-plain.c:124
+#: ../em-format/e-mail-formatter-text-plain.c:199
+msgid "Format part as plain text"
 msgstr ""
 
-#: ../em-format/em-format.c:1785
-msgid "Unsupported encryption type for multipart/encrypted"
+#: ../em-format/e-mail-formatter-secure-button.c:51
+msgid "Unsigned"
+msgstr ""
+
+#: ../em-format/e-mail-formatter-secure-button.c:51
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 
-#: ../em-format/em-format.c:1805
-msgid "Could not parse PGP/MIME message"
+#: ../em-format/e-mail-formatter-secure-button.c:52
+msgid "Valid signature"
 msgstr ""
 
-#: ../em-format/em-format.c:1806
-msgid "Could not parse PGP/MIME message: Unknown error"
+#: ../em-format/e-mail-formatter-secure-button.c:52
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr ""
 
-#: ../em-format/em-format.c:2027
-msgid "Unsupported signature format"
+#: ../em-format/e-mail-formatter-secure-button.c:53
+msgid "Invalid signature"
+msgstr "Nevalida subskribo"
+
+#: ../em-format/e-mail-formatter-secure-button.c:53
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
 
-#: ../em-format/em-format.c:2040 ../em-format/em-format.c:2222
-msgid "Error verifying signature"
+#: ../em-format/e-mail-formatter-secure-button.c:54
+msgid "Valid signature, but cannot verify sender"
 msgstr ""
 
-#: ../em-format/em-format.c:2041 ../em-format/em-format.c:2207
-#: ../em-format/em-format.c:2223
-msgid "Unknown error verifying signature"
+#: ../em-format/e-mail-formatter-secure-button.c:54
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
 msgstr ""
 
-#: ../em-format/em-format.c:2315
-msgid "Could not parse PGP message: "
+#: ../em-format/e-mail-formatter-secure-button.c:55
+msgid "Signature exists, but need public key"
 msgstr ""
 
-#. pseudo-header
-#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2857
-#: ../modules/mail/em-mailer-prefs.c:1025
-msgid "Mailer"
+#: ../em-format/e-mail-formatter-secure-button.c:55
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
 msgstr ""
 
-#: ../em-format/em-format-quote.c:564 ../mail/em-composer-utils.c:1219
-msgid "-------- Forwarded Message --------"
-msgstr "-------- plusendita mesaĝo --------"
+#: ../em-format/e-mail-formatter-secure-button.c:62
+msgid "Unencrypted"
+msgstr "Neĉifrite"
+
+#: ../em-format/e-mail-formatter-secure-button.c:62
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+msgstr ""
+
+#: ../em-format/e-mail-formatter-secure-button.c:63
+msgid "Encrypted, weak"
+msgstr ""
+
+#: ../em-format/e-mail-formatter-secure-button.c:63
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: ../em-format/e-mail-formatter-secure-button.c:64
+msgid "Encrypted"
+msgstr "Ĉifrite"
+
+#: ../em-format/e-mail-formatter-secure-button.c:64
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: ../em-format/e-mail-formatter-secure-button.c:65
+msgid "Encrypted, strong"
+msgstr "Ĉifrite, forte"
+
+#: ../em-format/e-mail-formatter-secure-button.c:65
+msgid ""
+"This message is encrypted, with a strong encryption algorithm. It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: ../em-format/e-mail-formatter-secure-button.c:187
+#: ../shell/shell.error.xml.h:23 ../smime/gui/smime-ui.ui.h:22
+msgid "_View Certificate"
+msgstr "_Montri ateston"
+
+#: ../em-format/e-mail-formatter-secure-button.c:202
+msgid "This certificate is not viewable"
+msgstr ""
+
+#: ../em-format/e-mail-formatter-source.c:120
+#| msgid "Sources"
+msgid "Source"
+msgstr "Fonto"
+
+#: ../em-format/e-mail-formatter-source.c:121
+msgid "Display source of a MIME part"
+msgstr ""
+
+#: ../em-format/e-mail-formatter-utils.c:203
+#: ../em-format/e-mail-formatter-utils.c:220
+#: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:65
+#, fuzzy
+msgid "Cc"
+msgstr "Km"
+
+#: ../em-format/e-mail-formatter-utils.c:204
+#: ../em-format/e-mail-formatter-utils.c:221
+#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:66
+#, fuzzy
+msgid "Bcc"
+msgstr "Kkm"
+
+#: ../em-format/e-mail-formatter-utils.c:564
+msgid "GPG signed"
+msgstr "Subskribita per GPG"
+
+#: ../em-format/e-mail-formatter-utils.c:570
+#| msgid "Unencrypted"
+msgid "GPG encrypted"
+msgstr "GPG-ĉifrite"
+
+#: ../em-format/e-mail-formatter-utils.c:576
+msgid "S/MIME signed"
+msgstr ""
+
+#: ../em-format/e-mail-formatter-utils.c:582
+#, fuzzy
+#| msgid "Encrypted"
+msgid "S/MIME encrypted"
+msgstr "S/MIME-ĉifrite"
+
+#: ../em-format/e-mail-formatter-utils.c:591
+#: ../mail/e-mail-config-security-page.c:736
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:194
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:144
+msgid "Security"
+msgstr "Sekureco"
+
+#: ../em-format/e-mail-parser-application-mbox.c:87
+#, c-format
+msgid "Error parsing MBOX part: %s"
+msgstr ""
+
+#: ../em-format/e-mail-parser-application-smime.c:83
+#, c-format
+#| msgid "Could not create message."
+msgid "Could not parse S/MIME message: %s"
+msgstr "Ne eblis analizi S/MIME-mesaĝon: %s"
+
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:77
+#, c-format
+#| msgid "Could not create message."
+msgid "Could not parse PGP message: %s"
+msgstr "Ne eblis analizi PGP-mesaĝon: %s"
+
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:80
+#: ../em-format/e-mail-parser-multipart-signed.c:135
+#, fuzzy, c-format
+#| msgid "Error modifying contact"
+msgid "Error verifying signature: %s"
+msgstr "Eraro dum modifado de kontaktulo: %s"
+
+#: ../em-format/e-mail-parser-message-external.c:68
+msgid "Malformed external-body part"
+msgstr ""
+
+#: ../em-format/e-mail-parser-message-external.c:101
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr ""
+
+#: ../em-format/e-mail-parser-message-external.c:112
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr ""
+
+#: ../em-format/e-mail-parser-message-external.c:114
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr ""
+
+#: ../em-format/e-mail-parser-message-external.c:133
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr ""
+
+#: ../em-format/e-mail-parser-message-external.c:151
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
+
+#: ../em-format/e-mail-parser-multipart-encrypted.c:66
+#: ../em-format/e-mail-parser-multipart-signed.c:83
+msgid "Could not parse MIME message. Displaying as source."
+msgstr ""
+
+#: ../em-format/e-mail-parser-multipart-encrypted.c:82
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+#: ../em-format/e-mail-parser-multipart-encrypted.c:101
+#, c-format
+#| msgid "Could not create message."
+msgid "Could not parse PGP/MIME message: %s"
+msgstr "Ne eblis analizi PGP/MIME-mesaĝon: %s"
+
+#: ../em-format/e-mail-parser-multipart-signed.c:121
+msgid "Unsupported signature format"
+msgstr ""
+
+#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:63
+msgid "Reply-To"
+msgstr "Respondo-al"
+
+#: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:549
+#: ../e-util/e-dateedit.c:572 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:68
+msgid "Date"
+msgstr "Dato"
+
+#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:69
+msgid "Newsgroups"
+msgstr "Novaĵogrupoj"
+
+#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:70
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid "Face"
+msgstr "Vizaĝo"
+
+#: ../em-format/e-mail-part-utils.c:544
+#, c-format
+msgid "%s attachment"
+msgstr "%s aldonaĵo"
+
+#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
+
+#: ../e-util/ea-calendar-item.c:326
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Kalendaro: de %s al %s"
+
+#: ../e-util/ea-calendar-item.c:363
+msgid "evolution calendar item"
+msgstr "kalendar-elemento de Evolucio"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:227
+#: ../e-util/e-activity.c:258
 #, c-format
 msgid "%s (cancelled)"
 msgstr ""
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:230
+#: ../e-util/e-activity.c:261
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (plenumite)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:233
+#: ../e-util/e-activity.c:264
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (atendante)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:237
+#: ../e-util/e-activity.c:268
 #, c-format
 msgid "%s (cancelling)"
 msgstr ""
 
-#: ../e-util/e-activity.c:239
+#: ../e-util/e-activity.c:270
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:244
+#. Translators: This is a running activity whose percent complete is known.
+#: ../e-util/e-activity.c:275
+#: ../modules/calendar/e-cal-base-shell-content.c:144
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% plenumite)"
 
-#: ../e-util/e-charset.c:53
+#: ../e-util/e-activity-proxy.c:352
+#: ../modules/mail/e-mail-shell-view-actions.c:1786
+msgid "Cancel"
+msgstr "Nuligi"
+
+#. Translators: Escape is a keyboard binding.
+#: ../e-util/e-alert-bar.c:118
+#, fuzzy
+#| msgid "Close this message"
+msgid "Close this message (Escape)"
+msgstr "Fermi tiun mesaĝon"
+
+#: ../e-util/e-alert-sink.c:246
+#, fuzzy
+#| msgid "Failed to delete contact"
+msgid "Failed to create a thread: "
+msgstr "Malsukcesis krei fadenon: "
+
+#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:736
+msgid "Icon View"
+msgstr "Piktograma vido"
+
+#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:738
+msgid "List View"
+msgstr "Lista vido"
+
+#. To Translators: This text is set as a description of an attached
+#. * message when, for example, attaching it to a composer. When the
+#. * message to be attached has also filled Subject, then this text is
+#. * of form "Attached message - Subject", otherwise it's left as is.
+#: ../e-util/e-attachment.c:1223
+msgid "Attached message"
+msgstr "Aldonita mesaĝo"
+
+#: ../e-util/e-attachment.c:2152 ../e-util/e-attachment.c:3149
+msgid "Operation was cancelled"
+msgstr ""
+
+#. Translators: Default attachment filename.
+#: ../e-util/e-attachment.c:2312 ../e-util/e-attachment.c:3011
+#: ../e-util/e-attachment.c:3382 ../e-util/e-attachment-store.c:691
+msgid "attachment.dat"
+msgstr "aldonajxo.dat"
+
+#: ../e-util/e-attachment.c:2393 ../e-util/e-attachment.c:3442
+msgid "A load operation is already in progress"
+msgstr ""
+
+#: ../e-util/e-attachment.c:2401 ../e-util/e-attachment.c:3450
+msgid "A save operation is already in progress"
+msgstr ""
+
+#: ../e-util/e-attachment.c:2521
+#, c-format
+msgid "Could not load '%s'"
+msgstr "Ne eblis ŝargi na '%s'"
+
+#: ../e-util/e-attachment.c:2524
+#, c-format
+msgid "Could not load the attachment"
+msgstr ""
+
+#: ../e-util/e-attachment.c:2809
+#, c-format
+msgid "Could not open '%s'"
+msgstr "Ne eblis malfermi na '%s'"
+
+#: ../e-util/e-attachment.c:2812
+#, c-format
+msgid "Could not open the attachment"
+msgstr "Ne eblis malfermi aldonaĵon"
+
+#: ../e-util/e-attachment.c:3459
+msgid "Attachment contents not loaded"
+msgstr ""
+
+#: ../e-util/e-attachment.c:3550
+#, c-format
+msgid "Could not save '%s'"
+msgstr "Ne eblis konservi na '%s'"
+
+#: ../e-util/e-attachment.c:3553
+#, c-format
+msgid "Could not save the attachment"
+msgstr "Ne eblis konservi la aldonaĵon"
+
+#: ../e-util/e-attachment-dialog.c:317
+msgid "Attachment Properties"
+msgstr "Ecoj de aldonaĵoj"
+
+#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:273
+msgid "F_ilename:"
+msgstr "_Dosiernomo:"
+
+#: ../e-util/e-attachment-dialog.c:374
+msgid "MIME Type:"
+msgstr "MIME-tipo:"
+
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:521
+msgid "_Suggest automatic display of attachment"
+msgstr ""
+
+#: ../e-util/e-attachment-handler-image.c:98
+msgid "Could not set as background"
+msgstr ""
+
+#: ../e-util/e-attachment-handler-image.c:148
+msgid "Set as _Background"
+msgstr "Uzi kiel _fono"
+
+#: ../e-util/e-attachment-icon-view.c:168
+#: ../e-util/e-attachment-tree-view.c:548
+msgid "Loading"
+msgstr "Ŝargante"
+
+#: ../e-util/e-attachment-icon-view.c:180
+#: ../e-util/e-attachment-tree-view.c:560
+msgid "Saving"
+msgstr "Konservante"
+
+#: ../e-util/e-attachment-paned.c:107
+msgid "Hide Attachment _Bar"
+msgstr "Kaŝi aldonaĵ_breton"
+
+#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:752
+msgid "Show Attachment _Bar"
+msgstr "Montri aldonaĵ_breton"
+
+#: ../e-util/e-attachment-store.c:486
+msgid "Add Attachment"
+msgstr "Aldoni aldonaĵo"
+
+#: ../e-util/e-attachment-store.c:493 ../e-util/e-attachment-store.c:495
+msgid "A_ttach"
+msgstr "_Aldoni"
+
+#: ../e-util/e-attachment-store.c:533
+msgid "Archive selected directories using this format:"
+msgstr ""
+
+#: ../e-util/e-attachment-store.c:626
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "Konservi aldonaĵon"
+msgstr[1] "Konservi aldonaĵojn"
+
+#: ../e-util/e-attachment-store.c:653
+#, fuzzy
+#| msgid "Could not save the attachment"
+msgid "Do _not extract files from the attachment"
+msgstr "_Ne eblis konservi la aldonaĵon"
+
+#: ../e-util/e-attachment-store.c:658
+msgid "Save extracted files _only"
+msgstr ""
+
+#: ../e-util/e-attachment-store.c:663
+msgid "Save extracted files and the original _archive"
+msgstr ""
+
+#: ../e-util/e-attachment-view.c:413
+msgid "Open With Other Application..."
+msgstr ""
+
+#: ../e-util/e-attachment-view.c:420
+msgid "S_ave All"
+msgstr "_Konservi ĉiujn"
+
+#: ../e-util/e-attachment-view.c:427
+#| msgid "S_ave All"
+msgid "Sa_ve As"
+msgstr "Konser_vi kiel"
+
+#: ../e-util/e-attachment-view.c:436
+#: ../plugins/save-calendar/save-calendar.c:349
+#: ../plugins/save-calendar/save-calendar.c:380
+#: ../plugins/save-calendar/save-calendar.c:411
+#| msgid "Save _As..."
+msgid "Save _As"
+msgstr "Konservi _kiel"
+
+#: ../e-util/e-attachment-view.c:446
+msgid "A_dd Attachment..."
+msgstr "_Alsodni aldonaĵon..."
+
+#: ../e-util/e-attachment-view.c:453
+#: ../modules/addressbook/e-book-shell-view-actions.c:1071
+#: ../modules/calendar/e-cal-shell-view-actions.c:1240
+#: ../modules/calendar/e-memo-shell-view-actions.c:571
+#: ../modules/calendar/e-task-shell-view-actions.c:696
+#: ../modules/mail/e-mail-shell-view-actions.c:1587
+#: ../modules/mail/e-mail-shell-view-actions.c:1658
+msgid "_Properties"
+msgstr "_Ecoj"
+
+#: ../e-util/e-attachment-view.c:470
+msgid "_Hide"
+msgstr "_Kaŝi"
+
+#: ../e-util/e-attachment-view.c:477
+msgid "Hid_e All"
+msgstr "Kaŝ_i ĉiujn"
+
+#: ../e-util/e-attachment-view.c:484
+msgid "_View Inline"
+msgstr ""
+
+#: ../e-util/e-attachment-view.c:491
+msgid "Vie_w All Inline"
+msgstr ""
+
+#: ../e-util/e-attachment-view.c:498
+msgid "_Zoom to 100%"
+msgstr ""
+
+#: ../e-util/e-attachment-view.c:500
+#, fuzzy
+#| msgid "Save the image to a file"
+msgid "Zoom the image to its natural size"
+msgstr "Konservi la bildon al dosiero"
+
+#: ../e-util/e-attachment-view.c:505
+#| msgid "Close this window"
+msgid "_Zoom to window"
+msgstr "_Zomi al fenestro"
+
+#: ../e-util/e-attachment-view.c:507
+msgid "Zoom large images to not be wider than the window width"
+msgstr ""
+
+#: ../e-util/e-attachment-view.c:850
+#, c-format
+msgid "Open With \"%s\""
+msgstr "Malfermi per \"%s\""
+
+#: ../e-util/e-attachment-view.c:853
+#, c-format
+msgid "Open this attachment in %s"
+msgstr ""
+
+#: ../e-util/e-book-source-config.c:97
+#| msgid "Mark as _default calendar"
+msgid "Mark as default address book"
+msgstr "Marki kiel defaŭlta adresaro"
+
+#: ../e-util/e-book-source-config.c:102
+#, fuzzy
+#| msgid "Delete the selected address book"
+msgid "Autocomplete with this address book"
+msgstr "Forigi la elektitan adresaron"
+
+#: ../e-util/e-book-source-config.c:276
+#, fuzzy
+#| msgid "Cop_y task list contents locally for offline operation"
+msgid "Copy book content locally for offline operation"
+msgstr "Loke kopii tasklistan enhavon por nekonektitaj agoj"
+
+#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
+#: ../e-util/e-buffer-tagger.c:407
+msgid "Ctrl-click to open a link"
+msgstr ""
+
+#: ../e-util/e-calendar.c:195
+#| msgid "Previous"
+msgid "Previous month"
+msgstr "Antaŭa monato"
+
+#: ../e-util/e-calendar.c:220
+#| msgctxt "DateFmt"
+#| msgid "Next Mon"
+msgid "Next month"
+msgstr "Sekva monato"
+
+#: ../e-util/e-calendar.c:246
+#| msgid "Previous"
+msgid "Previous year"
+msgstr "Antaŭa jaro"
+
+#: ../e-util/e-calendar.c:271
+#| msgctxt "DateFmt"
+#| msgid "Next Tue"
+msgid "Next year"
+msgstr "Sekva jaro"
+
+#: ../e-util/e-calendar.c:295
+msgid "Month Calendar"
+msgstr "Monata kalendaro"
+
+#. This is a strftime() format. %B = Month name.
+#: ../e-util/e-calendar-item.c:1323 ../e-util/e-calendar-item.c:2201
+msgctxt "CalItem"
+msgid "%B"
+msgstr "%B"
+
+#. This is a strftime() format. %Y = Year.
+#: ../e-util/e-calendar-item.c:1325
+msgctxt "CalItem"
+msgid "%Y"
+msgstr "%Y"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../e-util/e-calendar-item.c:1362
+#| msgid "%B %Y"
+msgctxt "CalItem"
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../e-util/e-cal-source-config.c:169
+#| msgid "Mark as _default calendar"
+msgid "Mark as default calendar"
+msgstr "Marki kiel defaŭlta kalendaro"
+
+#: ../e-util/e-cal-source-config.c:172
+#| msgid "Mark as _default task list"
+msgid "Mark as default task list"
+msgstr "Marki kiel defaŭlta tasklisto"
+
+#: ../e-util/e-cal-source-config.c:175
+#| msgid "Mark as _default task list"
+msgid "Mark as default memo list"
+msgstr "Marki kiel defaŭlta notolisto"
+
+#: ../e-util/e-cal-source-config.c:200
+#| msgid "Colo_r:"
+msgid "Color:"
+msgstr "Koloro:"
+
+#: ../e-util/e-cal-source-config.c:405
+#| msgid "Cop_y calendar contents locally for offline operation"
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Loke kopii kalendaran enhavon por nekonektitaj agoj"
+
+#: ../e-util/e-cal-source-config.c:409
+#| msgid "Cop_y task list contents locally for offline operation"
+msgid "Copy task list contents locally for offline operation"
+msgstr "Loke kopii tasklistan enhavon por nekonektitaj agoj"
+
+#: ../e-util/e-cal-source-config.c:413
+#| msgid "Cop_y memo list contents locally for offline operation"
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Loke kopii notlistan enhavon por nekonektitaj agoj"
+
+#: ../e-util/e-categories-editor.c:223
+msgid "Currently _used categories:"
+msgstr ""
+
+#: ../e-util/e-categories-editor.c:234
+#| msgid "Available Cate_gories"
+msgid "_Available Categories:"
+msgstr "_Disponeblaj kategorioj:"
+
+#: ../e-util/e-categories-editor.c:274
+#| msgid "_New"
+msgctxt "category"
+msgid "_New"
+msgstr "_Nova"
+
+#: ../e-util/e-categories-editor.c:278
+#| msgid "_Edit"
+msgctxt "category"
+msgid "_Edit"
+msgstr "R_edakti"
+
+#: ../e-util/e-categories-editor.c:282
+#| msgid "_Delete"
+msgctxt "category"
+msgid "_Delete"
+msgstr "_Forigi"
+
+#: ../e-util/e-categories-selector.c:322
+#| msgid "Icon View"
+msgid "Icon"
+msgstr "Piktogramo"
+
+#: ../e-util/e-category-completion.c:307
+#, c-format
+msgid "Create category \"%s\""
+msgstr ""
+
+#: ../e-util/e-category-editor.c:136
+#, fuzzy
+#| msgid "Category"
+msgid "Category Icon"
+msgstr "Kategorio"
+
+#: ../e-util/e-category-editor.c:140
+#, fuzzy
+#| msgid "_No image"
+msgid "_No Image"
+msgstr "_Neniu bildo"
+
+#: ../e-util/e-category-editor.c:173
+#| msgid "Category"
+msgid "Category _Name"
+msgstr "Kategorio-_nomo"
+
+#: ../e-util/e-category-editor.c:185
+#, fuzzy
+#| msgid "Category"
+msgid "Category _Icon"
+msgstr "Kategorio-_piktogramo"
+
+#: ../e-util/e-category-editor.c:211
+#, fuzzy
+#| msgid "Calendar Properties"
+msgid "Category Properties"
+msgstr "Kalendar-ecoj"
+
+#: ../e-util/e-category-editor.c:272
+#, c-format
+msgid ""
+"There is already a category '%s' in the configuration. Please use another "
+"name"
+msgstr ""
+
+#: ../e-util/e-cell-combo.c:185
+msgid "popup list"
+msgstr ""
+
+#: ../e-util/e-cell-date.c:52 ../mail/message-list.c:2033
+msgid "?"
+msgstr "?"
+
+#: ../e-util/e-cell-date-edit.c:298
+msgid "Now"
+msgstr "Nun"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-cell-date-edit.c:306 ../e-util/e-datetime-format.c:208
+#: ../modules/calendar/e-cal-shell-view-actions.c:1740
+#: ../modules/itip-formatter/itip-view.c:223
+msgid "Today"
+msgstr "Hodiaŭ"
+
+#. Translators: "None" as a label of a button to unset date in a
+#. * date table cell.
+#: ../e-util/e-cell-date-edit.c:316
+msgctxt "table-date"
+msgid "None"
+msgstr "Neniu"
+
+#: ../e-util/e-cell-date-edit.c:324 ../mail/e-mail-label-dialog.c:200
+msgid "OK"
+msgstr "Bone"
+
+#: ../e-util/e-cell-date-edit.c:873
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr ""
+
+#: ../e-util/e-cell-percent.c:81
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr ""
+
+#: ../e-util/e-charset.c:52
 msgid "Arabic"
 msgstr "Araba"
 
-#: ../e-util/e-charset.c:54
+#: ../e-util/e-charset.c:53
 msgid "Baltic"
 msgstr "Balta"
 
-#: ../e-util/e-charset.c:55
+#: ../e-util/e-charset.c:54
 msgid "Central European"
 msgstr "Mezeŭropa"
 
-#: ../e-util/e-charset.c:56
+#: ../e-util/e-charset.c:55
 msgid "Chinese"
 msgstr "Ĉina"
 
-#: ../e-util/e-charset.c:57
+#: ../e-util/e-charset.c:56
 msgid "Cyrillic"
 msgstr "Cirila"
 
-#: ../e-util/e-charset.c:58
+#: ../e-util/e-charset.c:57
 msgid "Greek"
 msgstr "Greka"
 
-#: ../e-util/e-charset.c:59
+#: ../e-util/e-charset.c:58
 msgid "Hebrew"
 msgstr "Hebrea"
 
-#: ../e-util/e-charset.c:60
+#: ../e-util/e-charset.c:59
 msgid "Japanese"
 msgstr "Japana"
 
-#: ../e-util/e-charset.c:61
+#: ../e-util/e-charset.c:60
 msgid "Korean"
 msgstr "Korea"
 
-#: ../e-util/e-charset.c:62
+#: ../e-util/e-charset.c:61
 msgid "Thai"
 msgstr "Taja"
 
-#: ../e-util/e-charset.c:63
+#: ../e-util/e-charset.c:62
 msgid "Turkish"
 msgstr "Turka"
 
-#: ../e-util/e-charset.c:64
+#: ../e-util/e-charset.c:63
 msgid "Unicode"
 msgstr "Unikodo"
 
-#: ../e-util/e-charset.c:65
+#: ../e-util/e-charset.c:64
 msgid "Western European"
 msgstr "Okcidenteŭropa"
 
-#: ../e-util/e-charset.c:66
+#: ../e-util/e-charset.c:65
 msgid "Western European, New"
 msgstr "Okcidenteŭropa nova"
 
 #. Translators: Character set "Chinese, Traditional"
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
+#: ../e-util/e-charset.c:84 ../e-util/e-charset.c:86 ../e-util/e-charset.c:88
 msgid "Traditional"
 msgstr "Tradicia"
 
 #. Translators: Character set "Chinese, Simplified"
-#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
-#: ../e-util/e-charset.c:97
+#: ../e-util/e-charset.c:90 ../e-util/e-charset.c:92 ../e-util/e-charset.c:94
+#: ../e-util/e-charset.c:96
 msgid "Simplified"
 msgstr "Simpligite"
 
 #. Translators: Character set "Cyrillic, Ukrainian"
-#: ../e-util/e-charset.c:101
+#: ../e-util/e-charset.c:100
 msgid "Ukrainian"
 msgstr "Ukraina"
 
 #. Translators: Character set "Hebrew, Visual"
-#: ../e-util/e-charset.c:105
+#: ../e-util/e-charset.c:104
 msgid "Visual"
 msgstr ""
 
-#. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:206
-#: ../modules/calendar/e-cal-shell-view-actions.c:1863
-#: ../plugins/itip-formatter/itip-view.c:190
-#: ../widgets/table/e-cell-date-edit.c:307
-msgid "Today"
-msgstr "Hodiaŭ"
+#: ../e-util/e-charset-combo-box.c:99
+msgid "Character Encoding"
+msgstr ""
+
+#: ../e-util/e-charset-combo-box.c:119
+msgid "Enter the character set to use"
+msgstr ""
+
+#: ../e-util/e-charset-combo-box.c:365
+msgid "Other..."
+msgstr "Alia..."
+
+#: ../e-util/e-client-cache.c:1266
+#, c-format
+msgid "Cannot create a client object from extension name '%s'"
+msgstr ""
+
+#: ../e-util/e-color-chooser-widget.c:124
+#, fuzzy
+#| msgid "Use custom fonts"
+msgid "Choose custom color"
+msgstr "Uzu personecigitajn riparojn"
+
+#: ../e-util/e-color-combo.c:81
+msgid "black"
+msgstr "nigra"
+
+#: ../e-util/e-color-combo.c:82
+msgid "light brown"
+msgstr "bruneta"
+
+#: ../e-util/e-color-combo.c:83
+msgid "brown gold"
+msgstr "brunaora"
+
+#: ../e-util/e-color-combo.c:84
+msgid "dark green #2"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:85
+msgid "navy"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:86
+msgid "dark blue"
+msgstr "nigrablua"
+
+#: ../e-util/e-color-combo.c:87
+msgid "purple #2"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:88
+#| msgid "Every day"
+#| msgid_plural "Every %d days"
+msgid "very dark gray"
+msgstr "malhelega grizo"
+
+#: ../e-util/e-color-combo.c:90
+#| msgid "Mark as _Unread"
+msgid "dark red"
+msgstr "malhela ruĝo"
+
+#: ../e-util/e-color-combo.c:91
+msgid "red-orange"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:92
+msgid "gold"
+msgstr "ora"
+
+#: ../e-util/e-color-combo.c:93
+msgid "dark green"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:94
+msgid "dull blue"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:95
+msgid "blue"
+msgstr "blua"
+
+#: ../e-util/e-color-combo.c:96
+msgid "dull purple"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:97
+msgid "dark grey"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:99
+#| msgid "3rd"
+msgid "red"
+msgstr "ruĝa"
+
+#: ../e-util/e-color-combo.c:100
+msgid "orange"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:101
+msgid "lime"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:102
+msgid "dull green"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:103
+msgid "dull blue #2"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:104
+msgid "sky blue #2"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:105
+msgid "purple"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:106
+msgid "gray"
+msgstr "griza"
+
+#: ../e-util/e-color-combo.c:108
+#| msgid "Image"
+msgid "magenta"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:109
+msgid "bright orange"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:110
+msgid "yellow"
+msgstr "flava"
+
+#: ../e-util/e-color-combo.c:111
+msgid "green"
+msgstr "verda"
+
+#: ../e-util/e-color-combo.c:112
+msgid "cyan"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:113
+msgid "bright blue"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:114
+msgid "red purple"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:115
+msgid "light grey"
+msgstr "grizeta"
+
+#: ../e-util/e-color-combo.c:117
+msgid "pink"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:118
+msgid "light orange"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:119
+msgid "light yellow"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:120
+msgid "light green"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:121
+msgid "light cyan"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:122
+msgid "light blue"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:123
+msgid "light purple"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:124
+msgid "white"
+msgstr "blanka"
+
+#: ../e-util/e-color-combo.c:639 ../mail/e-mail-account-tree-view.c:134
+#: ../mail/e-mail-config-security-page.c:426
+#: ../mail/e-mail-config-security-page.c:566 ../mail/e-mail-reader.c:3863
+#: ../mail/mail-config.ui.h:69
+msgid "Default"
+msgstr "Defaŭlto"
+
+#: ../e-util/e-dateedit.c:523
+msgid "Date and Time"
+msgstr "Dato kaj horo"
+
+#: ../e-util/e-dateedit.c:548
+msgid "Text entry to input date"
+msgstr ""
+
+#: ../e-util/e-dateedit.c:571
+msgid "Click this button to show a calendar"
+msgstr ""
+
+#: ../e-util/e-dateedit.c:625
+msgid "Drop-down combination box to select time"
+msgstr ""
+
+#: ../e-util/e-dateedit.c:626
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
+msgid "Time"
+msgstr "Tempo"
+
+#: ../e-util/e-dateedit.c:700
+msgid "No_w"
+msgstr "_Nun"
+
+#: ../e-util/e-dateedit.c:707
+msgid "_Today"
+msgstr "_Hodiaŭ"
+
+#. Note that we don't show this here, since by default a 'None' date
+#. * is not permitted.
+#: ../e-util/e-dateedit.c:716
+msgid "_None"
+msgstr "_Neniu"
+
+#. Translators: "None" for date field of a date edit, shown when
+#. * there is no date set.
+#: ../e-util/e-dateedit.c:1838 ../e-util/e-dateedit.c:2086
+msgctxt "date"
+msgid "None"
+msgstr "Neniu"
+
+#: ../e-util/e-dateedit.c:1978
+msgid "Invalid Date Value"
+msgstr "Nevalida valoro de dato"
+
+#: ../e-util/e-dateedit.c:2023
+msgid "Invalid Time Value"
+msgstr "Nevalida valoro de tempo"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:218
+#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:251
 msgid "Tomorrow"
 msgstr "Morgaŭ"
 
-#: ../e-util/e-datetime-format.c:219
+#: ../e-util/e-datetime-format.c:221
 msgid "Yesterday"
 msgstr "Hieraŭ"
 
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:227
+#: ../e-util/e-datetime-format.c:229
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "Sekva lun"
@@ -10013,7 +11428,7 @@ msgstr "Sekva lun"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:233
+#: ../e-util/e-datetime-format.c:235
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "Sekva mar"
@@ -10021,7 +11436,7 @@ msgstr "Sekva mar"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:239
+#: ../e-util/e-datetime-format.c:241
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "Sekva mer"
@@ -10029,7 +11444,7 @@ msgstr "Sekva mer"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:245
+#: ../e-util/e-datetime-format.c:247
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "Sekva ĵaŭ"
@@ -10037,7 +11452,7 @@ msgstr "Sekva ĵaŭ"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:251
+#: ../e-util/e-datetime-format.c:253
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "Sekva ven"
@@ -10045,7 +11460,7 @@ msgstr "Sekva ven"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:257
+#: ../e-util/e-datetime-format.c:259
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "Sekva sab"
@@ -10053,1212 +11468,4509 @@ msgstr "Sekva sab"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:263
+#: ../e-util/e-datetime-format.c:265
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Sekva dim"
 
-#: ../e-util/e-datetime-format.c:350 ../e-util/e-datetime-format.c:360
-#: ../e-util/e-datetime-format.c:369
+#: ../e-util/e-datetime-format.c:351 ../e-util/e-datetime-format.c:361
+#: ../e-util/e-datetime-format.c:370
 msgid "Use locale default"
 msgstr "Uzi lokan defaŭlton"
 
-#: ../e-util/e-datetime-format.c:574
+#: ../e-util/e-datetime-format.c:575
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../e-util/e-file-utils.c:150
-msgid "(Unknown Filename)"
-msgstr "(Nekonata dosiernomo)"
+#. Translators: :-)
+#: ../e-util/e-emoticon-chooser.c:40
+msgid "_Smile"
+msgstr ""
 
-#. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:154
-#, c-format
-msgid "Writing \"%s\""
-msgstr "Skribante \"%s\""
+#. Translators: :-(
+#: ../e-util/e-emoticon-chooser.c:42
+msgid "S_ad"
+msgstr ""
 
-#. Translators: The first string value is the basename of a
-#. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:159
-#, c-format
-msgid "Writing \"%s\" to %s"
-msgstr "Skribante \"%s\" al %s"
+#. Translators: ;-)
+#: ../e-util/e-emoticon-chooser.c:44
+#, fuzzy
+#| msgid "_Window"
+msgid "_Wink"
+msgstr "_Fenestro"
 
-#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:388
-#: ../plugins/publish-calendar/publish-calendar.ui.h:33
-msgid "weeks"
-msgstr "semajnoj"
+#. Translators: :-P
+#: ../e-util/e-emoticon-chooser.c:46
+msgid "Ton_gue"
+msgstr ""
 
-#: ../e-util/e-print.c:161
-msgid "An error occurred while printing"
-msgstr "Eraro okazis dum presado"
+#. Translators: :-))
+#: ../e-util/e-emoticon-chooser.c:48
+msgid "Laug_h"
+msgstr ""
 
-#: ../e-util/e-print.c:168
-msgid "The printing system reported the following details about the error:"
-msgstr "La pres-sistemo raportis la jenajn detalojn pri la eraro:"
+#. Translators: :-|
+#: ../e-util/e-emoticon-chooser.c:50
+msgid "_Plain"
+msgstr "_Plata"
 
-#: ../e-util/e-print.c:174
-msgid ""
-"The printing system did not report any additional details about the error."
-msgstr "La pres-sistemo ne raportis iun pluan detalon pri la eraro."
+#. Translators: :-!
+#: ../e-util/e-emoticon-chooser.c:52
+msgid "Smi_rk"
+msgstr ""
 
-#: ../e-util/e-signature.c:707
-msgid "Autogenerated"
+#. Translators: :"-)
+#: ../e-util/e-emoticon-chooser.c:54
+msgid "_Embarrassed"
 msgstr ""
 
-#: ../e-util/e-system.error.xml.h:1
-msgid "Because \"{1}\"."
-msgstr "Ĉar \"{1}\"."
+#. Translators: :-D
+#: ../e-util/e-emoticon-chooser.c:56
+msgid "_Big Smile"
+msgstr ""
 
-#: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file \"{0}\"."
-msgstr "Ne eblis malfermi dosieron \"{0}\"."
+#. Translators: :-/
+#: ../e-util/e-emoticon-chooser.c:58
+msgid "Uncer_tain"
+msgstr ""
 
-#: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file \"{0}\"."
-msgstr "Ne eblis konservi dosieron \"{0}\"."
+#. Translators: :-O
+#: ../e-util/e-emoticon-chooser.c:60
+msgid "S_urprise"
+msgstr ""
 
-#: ../e-util/e-system.error.xml.h:4
-msgid "Do you wish to overwrite it?"
-msgstr "Ĉu vi volas anstataŭigi ĝin?"
+#. Translators: :-S
+#: ../e-util/e-emoticon-chooser.c:62
+msgid "W_orried"
+msgstr ""
 
-#: ../e-util/e-system.error.xml.h:5
-msgid "File exists \"{0}\"."
-msgstr "Dosiero ekzistas \"{0}\"."
+#. Translators: :-*
+#: ../e-util/e-emoticon-chooser.c:64
+msgid "_Kiss"
+msgstr ""
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:163
-msgid "_Overwrite"
-msgstr "_Anstataŭigi"
+#. Translators: X-(
+#: ../e-util/e-emoticon-chooser.c:66
+msgid "A_ngry"
+msgstr ""
 
-#: ../e-util/e-util.c:245
-msgid "Could not open the link."
-msgstr "Ne eblis malfermi la ligilon."
+#. Translators: B-)
+#: ../e-util/e-emoticon-chooser.c:68
+msgid "_Cool"
+msgstr ""
 
-#: ../e-util/e-util.c:292
-msgid "Could not display help for Evolution."
-msgstr "Ne eblis montri helpon pri Evolucio."
+#. Translators: O:-)
+#: ../e-util/e-emoticon-chooser.c:70
+msgid "Ange_l"
+msgstr "Anĝe_lo"
+
+#. Translators: :'(
+#: ../e-util/e-emoticon-chooser.c:72
+msgid "Cr_ying"
+msgstr "Pl_oranta"
+
+#. Translators: :-Q
+#: ../e-util/e-emoticon-chooser.c:74
+msgid "S_ick"
+msgstr "M_alsana"
+
+#. Translators: |-)
+#: ../e-util/e-emoticon-chooser.c:76
+msgid "Tire_d"
+msgstr "Lac_a"
+
+#. Translators: >:-)
+#: ../e-util/e-emoticon-chooser.c:78
+msgid "De_vilish"
+msgstr ""
+
+#. Translators: :-(|)
+#: ../e-util/e-emoticon-chooser.c:80
+#, fuzzy
+#| msgid "_Mon"
+msgid "_Monkey"
+msgstr "_Lun"
+
+#: ../e-util/e-file-utils.c:120
+msgid "(Unknown Filename)"
+msgstr "(Nekonata dosiernomo)"
+
+#. Translators: The string value is the basename of a file.
+#: ../e-util/e-file-utils.c:124
+#, c-format
+msgid "Writing \"%s\""
+msgstr "Skribante \"%s\""
+
+#. Translators: The first string value is the basename of a
+#. * remote file, the second string value is the hostname.
+#: ../e-util/e-file-utils.c:129
+#, c-format
+msgid "Writing \"%s\" to %s"
+msgstr "Skribante \"%s\" al %s"
 
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
-#: ../filter/e-filter-datespec.c:66
+#: ../e-util/e-filter-datespec.c:66
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "antaŭ 1 sekundo"
 msgstr[1] "antaŭ %d sekundoj"
 
-#: ../filter/e-filter-datespec.c:67
+#: ../e-util/e-filter-datespec.c:67
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 sekundo en la estonteco"
 msgstr[1] "%d sekundoj en la estonteco"
 
-#: ../filter/e-filter-datespec.c:68
+#: ../e-util/e-filter-datespec.c:68
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "antaŭ 1 minuto"
 msgstr[1] "antaŭ %d minutoj"
 
-#: ../filter/e-filter-datespec.c:69
+#: ../e-util/e-filter-datespec.c:69
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 minuto en la estonteco"
 msgstr[1] "%d minutoj en la estonteco"
 
-#: ../filter/e-filter-datespec.c:70
+#: ../e-util/e-filter-datespec.c:70
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "antaŭ 1 horo"
 msgstr[1] "antaŭ %d horoj"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../e-util/e-filter-datespec.c:71
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 horo en la estonteco"
 msgstr[1] "%d horoj en la estonteco"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../e-util/e-filter-datespec.c:72
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "antaŭ 1 tago"
 msgstr[1] "antaŭ %d tagoj"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../e-util/e-filter-datespec.c:73
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "1 tago en la estonteco"
 msgstr[1] "%d tagoj en la estonteco"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../e-util/e-filter-datespec.c:74
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "antaŭ 1 semajno"
 msgstr[1] "antaŭ %d semajnoj"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../e-util/e-filter-datespec.c:75
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 semajno en la estonteco"
 msgstr[1] "%d semajnoj en la estonteco"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../e-util/e-filter-datespec.c:76
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "antaŭ 1 monato"
 msgstr[1] "antaŭ %d monatoj"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../e-util/e-filter-datespec.c:77
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 monato en la estonteco"
 msgstr[1] "%d monatoj en la estonteco"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../e-util/e-filter-datespec.c:78
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "antaŭ 1 jaro"
 msgstr[1] "antaŭ %d jaroj"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../e-util/e-filter-datespec.c:79
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 jaro en la estonteco"
 msgstr[1] "%d jaroj en la estonteco"
 
-#: ../filter/e-filter-datespec.c:129
+#: ../e-util/e-filter-datespec.c:129
 msgid "<click here to select a date>"
 msgstr "<klaku ĉi tie por elekti daton>"
 
-#: ../filter/e-filter-datespec.c:132 ../filter/e-filter-datespec.c:143
-#: ../filter/e-filter-datespec.c:154
+#: ../e-util/e-filter-datespec.c:132 ../e-util/e-filter-datespec.c:143
+#: ../e-util/e-filter-datespec.c:154
 msgid "now"
 msgstr "nun"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:139
+#: ../e-util/e-filter-datespec.c:139
 msgid "%d-%b-%Y"
-msgstr ""
+msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:286
+#: ../e-util/e-filter-datespec.c:288
 msgid "Select a time to compare against"
 msgstr ""
 
-#: ../filter/e-filter-file.c:188
+#: ../e-util/e-filter-file.c:186
 msgid "Choose a File"
 msgstr "Elekti dosieron"
 
-#: ../filter/e-filter-rule.c:675
+#: ../e-util/e-filter-rule.c:751
 msgid "R_ule name:"
 msgstr ""
 
-#: ../filter/e-filter-rule.c:705
-msgid "Find items that meet the following conditions"
+#: ../e-util/e-filter-rule.c:801
+msgid "all the following conditions"
 msgstr ""
 
-#: ../filter/e-filter-rule.c:730
-msgid "If all conditions are met"
+#: ../e-util/e-filter-rule.c:802
+msgid "any of the following conditions"
 msgstr ""
 
-#: ../filter/e-filter-rule.c:731
-msgid "If any conditions are met"
+#: ../e-util/e-filter-rule.c:808
+msgid "_Find items which match:"
 msgstr ""
 
-#: ../filter/e-filter-rule.c:734
-msgid "_Find items:"
+#: ../e-util/e-filter-rule.c:831
+msgid "Find items that meet the following conditions"
 msgstr ""
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:763
+#. protocol:
+#. name:
+#: ../e-util/e-filter-rule.c:846 ../e-util/e-html-editor-page-dialog.c:62
+#: ../e-util/e-mail-identity-combo-box.c:476
+#: ../e-util/e-mail-signature-combo-box.c:367 ../e-util/e-proxy-editor.c:560
+#: ../libemail-engine/camel-null-store.c:27
+#: ../mail/e-mail-config-summary-page.c:138
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:615
 msgid "None"
 msgstr "Nenio"
 
-#: ../filter/e-filter-rule.c:764
+#: ../e-util/e-filter-rule.c:847
 msgid "All related"
 msgstr ""
 
-#: ../filter/e-filter-rule.c:765 ../widgets/misc/e-send-options.ui.h:19
+#: ../e-util/e-filter-rule.c:848 ../e-util/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Respondoj"
 
-#: ../filter/e-filter-rule.c:766
+#: ../e-util/e-filter-rule.c:849
 msgid "Replies and parents"
 msgstr ""
 
-#: ../filter/e-filter-rule.c:767
+#: ../e-util/e-filter-rule.c:850
 msgid "No reply or parent"
 msgstr ""
 
-#: ../filter/e-filter-rule.c:770
+#: ../e-util/e-filter-rule.c:853
 msgid "I_nclude threads:"
 msgstr ""
 
-#: ../filter/e-filter-rule.c:795
+#: ../e-util/e-filter-rule.c:930
 msgid "A_dd Condition"
 msgstr ""
 
-#: ../filter/e-filter-rule.c:1146 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:304
+#: ../e-util/e-filter-rule.c:1244 ../e-util/filter.ui.h:1
+#: ../mail/em-utils.c:164
 msgid "Incoming"
-msgstr ""
+msgstr "Alveninta"
 
-#: ../filter/e-filter-rule.c:1146 ../mail/em-utils.c:305
+#: ../e-util/e-filter-rule.c:1244 ../mail/em-utils.c:165
 msgid "Outgoing"
+msgstr "Eliranta"
+
+#: ../e-util/e-html-editor-actions.c:58
+#| msgid "Failed to open folder."
+msgid "Failed to insert HTML file."
+msgstr "Malsukcesis enmeti HTML-dosierujon."
+
+#: ../e-util/e-html-editor-actions.c:95
+msgid "Failed to insert text file."
+msgstr "Malsukcesis enmeti tekstdosieron."
+
+#: ../e-util/e-html-editor-actions.c:612
+msgid "Insert HTML File"
 msgstr ""
 
-#: ../filter/e-rule-editor.c:270
+#: ../e-util/e-html-editor-actions.c:618
+#| msgid "HTML _Mode"
+msgid "HTML file"
+msgstr "HTML-dosiero"
+
+#: ../e-util/e-html-editor-actions.c:645
+#, fuzzy
+#| msgid "Save Image"
+msgctxt "dialog-title"
+msgid "Insert Image"
+msgstr "Konservi bildon"
+
+#: ../e-util/e-html-editor-actions.c:706
+#, fuzzy
+#| msgid "Increase the text size"
+msgid "Insert text file"
+msgstr "Pligrandigi la tekston"
+
+#: ../e-util/e-html-editor-actions.c:712
+#, fuzzy
+#| msgid "Select a file"
+msgid "Text file"
+msgstr "Elekti dosieron"
+
+#: ../e-util/e-html-editor-actions.c:1096
+#, fuzzy
+#| msgid "Copy selected tasks to the clipboard"
+msgid "Copy selected text to the clipboard"
+msgstr "Kopii elektitajn taskojn al la tondujo"
+
+#: ../e-util/e-html-editor-actions.c:1103
+#, fuzzy
+#| msgid "Cut selected tasks to the clipboard"
+msgid "Cut selected text to the clipboard"
+msgstr "Eltondi elektitajn taskojn al la tondujo"
+
+#. Widgets are treating Ctrl + v shortcut themselves
+#: ../e-util/e-html-editor-actions.c:1110
+#, fuzzy
+#| msgid "Paste tasks from the clipboard"
+msgid "Paste text from the clipboard"
+msgstr "Enmeti taskojn de la tondujo"
+
+#: ../e-util/e-html-editor-actions.c:1117
+msgid "Redo the last undone action"
+msgstr "Refari la lastan malfaritan agon"
+
+#: ../e-util/e-html-editor-actions.c:1131
+msgid "Undo the last action"
+msgstr "Malfari la lastan agon"
+
+#: ../e-util/e-html-editor-actions.c:1152
+msgid "For_mat"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1159
+#, fuzzy
+#| msgid "Tool_bar Style"
+msgid "_Paragraph Style"
+msgstr "Ilo_bret-stilo"
+
+#: ../e-util/e-html-editor-actions.c:1173
+#: ../e-util/e-html-editor-image-dialog.c:635
+#, fuzzy
+#| msgctxt "New"
+#| msgid "_Appointment"
+msgid "_Alignment"
+msgstr "_Rendevuo"
+
+#: ../e-util/e-html-editor-actions.c:1180
+#, fuzzy
+#| msgid "_Languages"
+msgid "Current _Languages"
+msgstr "_Lingvoj"
+
+#: ../e-util/e-html-editor-actions.c:1197
+msgid "_Increase Indent"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1199
+msgid "Increase Indent"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1204
+msgid "_HTML File..."
+msgstr "_HTML-dosiero..."
+
+#: ../e-util/e-html-editor-actions.c:1211
+msgid "Te_xt File..."
+msgstr "Te_ksto-dosiero..."
+
+#: ../e-util/e-html-editor-actions.c:1218
+msgid "Paste _Quotation"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1225
+#| msgid "_Find in Memo..."
+msgid "_Find..."
+msgstr "_Serĉi..."
+
+#: ../e-util/e-html-editor-actions.c:1227
+msgid "Search for text"
+msgstr "Serĉi tekston"
+
+#: ../e-util/e-html-editor-actions.c:1232
+msgid "Find A_gain"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1239
+#, fuzzy
+#| msgid "_Rename..."
+msgid "Re_place..."
+msgstr "_Alinomigi..."
+
+#: ../e-util/e-html-editor-actions.c:1241
+msgid "Search for and replace text"
+msgstr "Serĉi kaj anstataŭigi tekston"
+
+#: ../e-util/e-html-editor-actions.c:1246
+#, fuzzy
+#| msgid "New _Meeting..."
+msgid "Check _Spelling..."
+msgstr "Nova _kunsido..."
+
+#: ../e-util/e-html-editor-actions.c:1253
+msgid "_Decrease Indent"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1255
+msgid "Decrease Indent"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1260
+msgid "_Wrap Lines"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1267
+msgid "Open Inspector"
+msgstr ""
+
+#. Center
+#: ../e-util/e-html-editor-actions.c:1277
+#: ../e-util/e-html-editor-paragraph-dialog.c:110
+msgid "_Center"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1279
+#| msgid "_Delete Appointment"
+msgid "Center Alignment"
+msgstr ""
+
+#. Left
+#: ../e-util/e-html-editor-actions.c:1284
+#: ../e-util/e-html-editor-paragraph-dialog.c:101
+msgid "_Left"
+msgstr "_Maldekstre"
+
+#: ../e-util/e-html-editor-actions.c:1286
+#, fuzzy
+#| msgid "New Appointment"
+msgid "Left Alignment"
+msgstr "Nova rendevuo"
+
+#. Right
+#: ../e-util/e-html-editor-actions.c:1291
+#: ../e-util/e-html-editor-paragraph-dialog.c:119
+msgid "_Right"
+msgstr "_Dekstre"
+
+#: ../e-util/e-html-editor-actions.c:1293
+#, fuzzy
+#| msgid "Edit Appointment"
+msgid "Right Alignment"
+msgstr "Redakti rendevuon"
+
+#: ../e-util/e-html-editor-actions.c:1301
+#: ../modules/text-highlight/languages.c:72
+msgid "_HTML"
+msgstr "_HTML"
+
+#: ../e-util/e-html-editor-actions.c:1303
+msgid "HTML editing mode"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1308
+msgid "Plain _Text"
+msgstr "Plata _teksto"
+
+#: ../e-util/e-html-editor-actions.c:1310
+msgid "Plain text editing mode"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1318
+#, fuzzy
+#| msgid "Normal"
+msgid "_Normal"
+msgstr "_Normala"
+
+#: ../e-util/e-html-editor-actions.c:1325
+#| msgid "Header"
+msgid "Header _1"
+msgstr "Paĝokapo _1"
+
+#: ../e-util/e-html-editor-actions.c:1332
+#| msgid "Header"
+msgid "Header _2"
+msgstr "Paĝokapo _2"
+
+#: ../e-util/e-html-editor-actions.c:1339
+#| msgid "Header"
+msgid "Header _3"
+msgstr "Paĝokapo _3"
+
+#: ../e-util/e-html-editor-actions.c:1346
+#| msgid "Header"
+msgid "Header _4"
+msgstr "Paĝokapo _4"
+
+#: ../e-util/e-html-editor-actions.c:1353
+#| msgid "Header"
+msgid "Header _5"
+msgstr "Paĝokapo _5"
+
+#: ../e-util/e-html-editor-actions.c:1360
+#| msgid "Header"
+msgid "Header _6"
+msgstr "Paĝokapo _6"
+
+#: ../e-util/e-html-editor-actions.c:1367
+msgid "_Preformatted"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1374
+#| msgid "Address"
+msgid "A_ddress"
+msgstr "A_dreso"
+
+#: ../e-util/e-html-editor-actions.c:1381
+msgid "_Blockquote"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1388
+#, fuzzy
+#| msgid "D_elete Memo List"
+msgid "_Bulleted List"
+msgstr "_Forigi la notoliston"
+
+#: ../e-util/e-html-editor-actions.c:1395
+msgid "_Roman Numeral List"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1402
+msgid "Numbered _List"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1409
+msgid "_Alphabetical List"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1425
+#: ../e-util/e-html-editor-actions.c:1463
+#| msgid "Save _Image..."
+msgid "_Image..."
+msgstr "B_ildo..."
+
+#. Translators: This is an action tooltip
+#: ../e-util/e-html-editor-actions.c:1428
+#, fuzzy
+#| msgid "Save Image"
+msgid "Insert Image"
+msgstr "Konservi bildon"
+
+#: ../e-util/e-html-editor-actions.c:1433
+#: ../e-util/e-html-editor-actions.c:1470
+msgid "_Link..."
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1435
+#| msgid "_Insert"
+msgid "Insert Link"
+msgstr "Enmeti ligilon"
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1441
+#: ../e-util/e-html-editor-actions.c:1485
+#, fuzzy
+#| msgid "_Rename..."
+msgid "_Rule..."
+msgstr "_Alinomigi..."
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1444
+#, fuzzy
+#| msgid "_Insert"
+msgid "Insert Rule"
+msgstr "Enmeti rolon"
+
+#: ../e-util/e-html-editor-actions.c:1449
+#: ../e-util/e-html-editor-actions.c:1492
+#, fuzzy
+#| msgid "Table"
+msgid "_Table..."
+msgstr "_Tabelo..."
+
+#: ../e-util/e-html-editor-actions.c:1451
+#, fuzzy
+#| msgid "_Insert"
+msgid "Insert Table"
+msgstr "Enmeti tabelon"
+
+#: ../e-util/e-html-editor-actions.c:1456
+msgid "_Cell..."
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1477
+#, fuzzy
+#| msgid "Save _Image..."
+msgid "Pa_ge..."
+msgstr "Konservi b_ildon..."
+
+#: ../e-util/e-html-editor-actions.c:1501
+msgid "Font _Size"
+msgstr "Tipara _grando"
+
+#: ../e-util/e-html-editor-actions.c:1508
+msgid "_Font Style"
+msgstr "_Tipara stilo"
+
+#: ../e-util/e-html-editor-actions.c:1515
+msgid "Paste As _Text"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1526
+#: ../e-util/e-html-editor-text-dialog.c:214
+msgid "_Bold"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1528
+msgid "Bold"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1534
+#: ../e-util/e-html-editor-text-dialog.c:225
+msgid "_Italic"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1536
+msgid "Italic"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1542
+#, fuzzy
+#| msgid "Icons _and Text"
+msgid "_Plain Text"
+msgstr "Bildsimboloj _kaj tekto"
+
+#: ../e-util/e-html-editor-actions.c:1550
+#: ../e-util/e-html-editor-text-dialog.c:246
+msgid "_Strikethrough"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1552
+msgid "Strikethrough"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1558
+#: ../e-util/e-html-editor-text-dialog.c:236
+#| msgid "Undefined"
+msgid "_Underline"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1560
+#, fuzzy
+#| msgid "Undefined"
+msgid "Underline"
+msgstr "Nedifinite"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1570
+msgid "-2"
+msgstr "-2"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1578
+#| msgid "1"
+msgid "-1"
+msgstr "-1"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1586
+msgid "+0"
+msgstr "+0"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1594
+#| msgid "1"
+msgid "+1"
+msgstr "+1"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1602
+msgid "+2"
+msgstr "+2"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1610
+msgid "+3"
+msgstr "+3"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1618
+msgid "+4"
+msgstr "+4"
+
+#: ../e-util/e-html-editor-actions.c:1637
+#, fuzzy
+#| msgid "_Contents"
+msgid "Cell Contents"
+msgstr "Ĉel-anhavoj"
+
+#: ../e-util/e-html-editor-actions.c:1644
+msgid "Column"
+msgstr "Kolumno"
+
+#: ../e-util/e-html-editor-actions.c:1651
+#, fuzzy
+#| msgid "Low"
+msgid "Row"
+msgstr "Malalta"
+
+#: ../e-util/e-html-editor-actions.c:1658
+#: ../e-util/e-html-editor-actions.c:1743
+msgid "Table"
+msgstr "Tabelo"
+
+#. Translators: Popup menu item caption, containing all the Delete options for a table
+#: ../e-util/e-html-editor-actions.c:1668
+#, fuzzy
+#| msgid "Table Cell"
+msgid "Table Delete"
+msgstr "Tabela ĉelo"
+
+#: ../e-util/e-html-editor-actions.c:1675 ../e-util/e-text.c:2127
+msgid "Input Methods"
+msgstr "Enigaj metodoj"
+
+#. Translators: Popup menu item caption, containing all the Insert options for a table
+#: ../e-util/e-html-editor-actions.c:1683
+#, fuzzy
+#| msgid "Table Cell"
+msgid "Table Insert"
+msgstr "Tabela ĉelo"
+
+#: ../e-util/e-html-editor-actions.c:1690
+#| msgid "_Properties"
+msgid "Properties"
+msgstr "Atributoj"
+
+#: ../e-util/e-html-editor-actions.c:1708
+msgid "Column After"
+msgstr "Kolumno poste"
+
+#: ../e-util/e-html-editor-actions.c:1715
+msgid "Column Before"
+msgstr "Kolumno antaŭe"
+
+#: ../e-util/e-html-editor-actions.c:1722
+#, fuzzy
+#| msgid "_Insert"
+msgid "Insert _Link"
+msgstr "_Enmeti"
+
+#: ../e-util/e-html-editor-actions.c:1729
+msgid "Row Above"
+msgstr "Vico supre"
+
+#: ../e-util/e-html-editor-actions.c:1736
+msgid "Row Below"
+msgstr "Vico malsupre"
+
+#: ../e-util/e-html-editor-actions.c:1750
+msgid "Cell..."
+msgstr "Ĉelo..."
+
+#: ../e-util/e-html-editor-actions.c:1757
+msgid "Image..."
+msgstr "Bildo..."
+
+#: ../e-util/e-html-editor-actions.c:1764
+msgid "Link..."
+msgstr "Ligilo..."
+
+#: ../e-util/e-html-editor-actions.c:1771
+#| msgid "Pager"
+msgid "Page..."
+msgstr "Paĝo..."
+
+#: ../e-util/e-html-editor-actions.c:1778
+msgid "Paragraph..."
+msgstr "Paragrafo..."
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1786
+#, fuzzy
+#| msgid "Full _Name..."
+msgid "Rule..."
+msgstr "Rolo..."
+
+#: ../e-util/e-html-editor-actions.c:1793
+#, fuzzy
+#| msgid "Table"
+msgid "Table..."
+msgstr "Tabelo..."
+
+#: ../e-util/e-html-editor-actions.c:1800
+#| msgid "Select..."
+msgid "Text..."
+msgstr "Teksto..."
+
+#: ../e-util/e-html-editor-actions.c:1807
+#| msgid "_Remove"
+msgid "Remove Link"
+msgstr "Forigi ligilon"
+
+#: ../e-util/e-html-editor-actions.c:1824
+msgid "Add Word to Dictionary"
+msgstr "Aldoni vorton al vortaro"
+
+#: ../e-util/e-html-editor-actions.c:1831
+#| msgid "Color for _misspelled words:"
+msgid "Ignore Misspelled Word"
+msgstr "Ignori misliterumitajn vortojn"
+
+#: ../e-util/e-html-editor-actions.c:1838
+msgid "Add Word To"
+msgstr "Aldoni vorton al"
+
+#: ../e-util/e-html-editor-actions.c:1847
+msgid "More Suggestions"
+msgstr ""
+
+#. Translators: %s will be replaced with the actual dictionary
+#. * name, where a user can add a word to. This is part of an
+#. * "Add Word To" submenu.
+#: ../e-util/e-html-editor-actions.c:1955
+#, c-format
+msgid "%s Dictionary"
+msgstr "%s vortaro"
+
+#: ../e-util/e-html-editor-actions.c:2042
+msgid "_Emoticon"
+msgstr "_Miensimbolo"
+
+#: ../e-util/e-html-editor-actions.c:2043
+#, fuzzy
+#| msgid "Restart Evolution"
+msgid "Insert Emoticon"
+msgstr "Restartigi Evolucion"
+
+#: ../e-util/e-html-editor-actions.c:2111
+msgid "Re_place"
+msgstr "An_stataŭigi"
+
+#: ../e-util/e-html-editor-actions.c:2114
+#| msgid "Image"
+msgid "_Image"
+msgstr "B_ildo"
+
+#: ../e-util/e-html-editor-actions.c:2117
+msgid "_Link"
+msgstr ""
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:2121
+#, fuzzy
+#| msgid "Add Rule"
+msgid "_Rule"
+msgstr "_Rolo"
+
+#: ../e-util/e-html-editor-actions.c:2124
+#: ../e-util/e-html-editor-cell-dialog.c:732
+#, fuzzy
+#| msgid "Table"
+msgid "_Table"
+msgstr "_Tabelo"
+
+#: ../e-util/e-html-editor.c:672
+msgid "Paragraph Style"
+msgstr "Paragrafa stilo"
+
+#: ../e-util/e-html-editor.c:686
+#, fuzzy
+#| msgid "Edit Reminder"
+msgid "Editing Mode"
+msgstr "Redakti memorigaĵon"
+
+#: ../e-util/e-html-editor.c:698
+#| msgid "Color"
+msgid "Font Color"
+msgstr "Tiparkoloro"
+
+#: ../e-util/e-html-editor.c:716
+#| msgid "Size"
+msgid "Font Size"
+msgstr "Tipargrando"
+
+#: ../e-util/e-html-editor-cell-dialog.c:692
+msgid "<b>Scope</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:706
+msgid "C_ell"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:719
+msgid "_Row"
+msgstr "_Vico"
+
+#: ../e-util/e-html-editor-cell-dialog.c:745
+msgid "Col_umn"
+msgstr "Kol_umno"
+
+#: ../e-util/e-html-editor-cell-dialog.c:755
+msgid "<b>Alignment &amp; Behavior</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:768
+#: ../e-util/e-html-editor-hrule-dialog.c:407
+#: ../e-util/e-html-editor-table-dialog.c:894
+msgid "Left"
+msgstr "Maldekstre"
+
+#: ../e-util/e-html-editor-cell-dialog.c:769
+#: ../e-util/e-html-editor-hrule-dialog.c:409
+#: ../e-util/e-html-editor-table-dialog.c:895
+msgid "Center"
+msgstr "Centre"
+
+#: ../e-util/e-html-editor-cell-dialog.c:770
+#: ../e-util/e-html-editor-hrule-dialog.c:411
+#: ../e-util/e-html-editor-table-dialog.c:896
+msgid "Right"
+msgstr "Dekstre"
+
+#: ../e-util/e-html-editor-cell-dialog.c:778
+msgid "_Horizontal:"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:786
+#: ../e-util/e-html-editor-image-dialog.c:625
+#| msgid "To"
+msgid "Top"
+msgstr "Supre"
+
+#: ../e-util/e-html-editor-cell-dialog.c:787
+#: ../e-util/e-html-editor-image-dialog.c:626
+#| msgid "_Middle:"
+msgid "Middle"
+msgstr "Meze"
+
+#: ../e-util/e-html-editor-cell-dialog.c:788
+#: ../e-util/e-html-editor-image-dialog.c:627
+msgid "Bottom"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:796
+#| msgid "Critical"
+msgid "_Vertical:"
+msgstr "_Vertikale:"
+
+#. Wrap Text
+#: ../e-util/e-html-editor-cell-dialog.c:802
+msgid "_Wrap Text"
+msgstr ""
+
+#. Header Style
+#: ../e-util/e-html-editor-cell-dialog.c:810
+#| msgid "Header content"
+msgid "_Header Style"
+msgstr "_Paĝokapa stilo"
+
+#: ../e-util/e-html-editor-cell-dialog.c:824
+#: ../e-util/e-html-editor-image-dialog.c:565
+#: ../e-util/e-html-editor-table-dialog.c:806
+msgid "<b>Layout</b>"
+msgstr ""
+
+#. Width
+#: ../e-util/e-html-editor-cell-dialog.c:835
+msgid "_Width"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:874
+msgid "Row S_pan:"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:888
+msgid "Co_lumn Span:"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:895
+#: ../e-util/e-html-editor-table-dialog.c:910
+msgid "<b>Background</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:908
+#: ../e-util/e-html-editor-table-dialog.c:923
+msgid "Transparent"
+msgstr "Travidebla"
+
+#: ../e-util/e-html-editor-cell-dialog.c:916
+msgid "C_olor:"
+msgstr "K_oloro:"
+
+#: ../e-util/e-html-editor-cell-dialog.c:924
+#: ../e-util/e-html-editor-image-dialog.c:527
+#: ../e-util/e-html-editor-table-dialog.c:939
+msgid "Choose Background Image"
+msgstr "Elekti fonbildon"
+
+#: ../e-util/e-html-editor-cell-dialog.c:929
+#: ../e-util/e-html-editor-image-dialog.c:533
+#: ../e-util/e-html-editor-table-dialog.c:944
+#| msgid "Image"
+msgid "Images"
+msgstr "Bildoj"
+
+#: ../e-util/e-html-editor-cell-dialog.c:942
+#| msgid "Image"
+msgid "_Image:"
+msgstr "B_ildo:"
+
+#: ../e-util/e-html-editor-cell-dialog.c:949
+#: ../e-util/e-html-editor-page-dialog.c:579
+#: ../e-util/e-html-editor-table-dialog.c:964
+#, fuzzy
+#| msgid "_No image"
+msgid "_Remove image"
+msgstr "_Neniu bildo"
+
+#: ../e-util/e-html-editor-cell-dialog.c:969
+#| msgid "_Properties"
+msgid "Cell Properties"
+msgstr "Ĉelo-atributoj"
+
+#: ../e-util/e-html-editor-find-dialog.c:105
+#: ../e-util/e-html-editor-replace-dialog.c:90
+#: ../e-util/e-html-editor-replace-dialog.c:108
+msgid "No match found"
+msgstr ""
+
+#: ../e-util/e-html-editor-find-dialog.c:160
+#: ../e-util/e-html-editor-replace-dialog.c:247
+#| msgid "Search _base:"
+msgid "Search _backwards"
+msgstr "Serĉi _malantaŭen"
+
+#: ../e-util/e-html-editor-find-dialog.c:167
+msgid "Case _Sensitive"
+msgstr ""
+
+#: ../e-util/e-html-editor-find-dialog.c:174
+#, fuzzy
+#| msgid "_Search"
+msgid "_Wrap Search"
+msgstr "_Serĉi"
+
+#: ../e-util/e-html-editor-find-dialog.c:213
+#| msgid "_Find Now"
+msgid "Find"
+msgstr "Serĉi"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:342
+msgid "<b>Size</b>"
+msgstr "<b>Grando</b>"
+
+#. Width
+#: ../e-util/e-html-editor-hrule-dialog.c:362
+#: ../e-util/e-html-editor-image-dialog.c:583
+#: ../e-util/e-html-editor-table-dialog.c:817
+msgid "_Width:"
+msgstr "_Larĝo:"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:387
+msgid "_Size:"
+msgstr "_Grando:"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:394
+msgid "<b>Style</b>"
+msgstr "<b>Stilo</b>"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:419
+#: ../e-util/e-html-editor-table-dialog.c:903
+#| msgid "_Arguments:"
+msgid "_Alignment:"
+msgstr "Ĝis_randigo:"
+
+#. Shaded
+#: ../e-util/e-html-editor-hrule-dialog.c:425
+msgid "S_haded"
+msgstr ""
+
+#: ../e-util/e-html-editor-hrule-dialog.c:442
+#, fuzzy
+#| msgid "Calendar Properties"
+msgid "Rule properties"
+msgstr "Kalendar-ecoj"
+
+#: ../e-util/e-html-editor-image-dialog.c:515
+#: ../e-util/e-html-editor-paragraph-dialog.c:66
+#: ../e-util/e-html-editor-table-dialog.c:760
+#| msgid "General"
+msgid "<b>General</b>"
+msgstr "<b>Ĝenerale</b>"
+
+#: ../e-util/e-html-editor-image-dialog.c:544
+#, fuzzy
+#| msgid "Sources"
+msgid "_Source:"
+msgstr "_Fonto:"
+
+#: ../e-util/e-html-editor-image-dialog.c:607
+msgid "_Height:"
+msgstr ""
+
+#: ../e-util/e-html-editor-image-dialog.c:648
+msgid "_X-Padding:"
+msgstr ""
+
+#: ../e-util/e-html-editor-image-dialog.c:664
+msgid "_Y-Padding:"
+msgstr ""
+
+#: ../e-util/e-html-editor-image-dialog.c:680
+#: ../e-util/e-html-editor-table-dialog.c:884
+msgid "_Border:"
+msgstr ""
+
+#: ../e-util/e-html-editor-image-dialog.c:690
+msgid "<b>Link</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-image-dialog.c:708
+#: ../e-util/e-html-editor-link-dialog.c:352
+msgid "_URL:"
+msgstr "_URL:"
+
+#: ../e-util/e-html-editor-image-dialog.c:713
+#: ../e-util/e-html-editor-link-dialog.c:357
+msgid "_Test URL..."
+msgstr ""
+
+#: ../e-util/e-html-editor-image-dialog.c:730
+#, fuzzy
+#| msgid "Calendar Properties"
+msgid "Image Properties"
+msgstr "Kalendar-ecoj"
+
+#: ../e-util/e-html-editor-link-dialog.c:381
+#, fuzzy
+#| msgid "_Remove"
+msgid "_Remove Link"
+msgstr "Fo_rigi"
+
+#: ../e-util/e-html-editor-link-dialog.c:406
+#| msgid "_Properties"
+msgid "Link Properties"
+msgstr "Ligilo-atributoj"
+
+#: ../e-util/e-html-editor-page-dialog.c:71
+msgid "Perforated Paper"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:80
+msgid "Blue Ink"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:89
+msgid "Paper"
+msgstr "Papero"
+
+#: ../e-util/e-html-editor-page-dialog.c:98
+msgid "Ribbon"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:107
+msgid "Midnight"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:125 ../mail/filtertypes.xml.in.h:36
+#: ../mail/searchtypes.xml.in.h:39 ../mail/vfoldertypes.xml.in.h:39
+msgid "Draft"
+msgstr "Malneto"
+
+#: ../e-util/e-html-editor-page-dialog.c:134
+msgid "Graph Paper"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:478
+msgid "<b>Colors</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:497
+#| msgid "_Text Only"
+msgid "_Text:"
+msgstr "_Teksto:"
+
+#: ../e-util/e-html-editor-page-dialog.c:512
+msgid "_Link:"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:527
+#| msgid "Set as _Background"
+msgid "_Background:"
+msgstr "_Fono:"
+
+#: ../e-util/e-html-editor-page-dialog.c:535
+msgid "<b>Background Image</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:557
+#| msgid "Template:"
+msgid "_Template:"
+msgstr "Ŝ_ablono:"
+
+#: ../e-util/e-html-editor-page-dialog.c:565
+#: ../e-util/e-import-assistant.c:283
+msgid "Select a file"
+msgstr "Elekti dosieron"
+
+#: ../e-util/e-html-editor-page-dialog.c:572
+#, fuzzy
+#| msgid "_Custom"
+msgid "_Custom:"
+msgstr "_Propre:"
+
+#: ../e-util/e-html-editor-page-dialog.c:599
+#| msgid "_Properties"
+msgid "Page Properties"
+msgstr "Paĝo-atributoj"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:83
+msgid "_Style:"
+msgstr "_Stilo:"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:90
+msgid "<b>Alignment</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:155
+#, fuzzy
+#| msgid "Calendar Properties"
+msgid "Paragraph Properties"
+msgstr "Kalendar-ecoj"
+
+#: ../e-util/e-html-editor-replace-dialog.c:163
+#, c-format
+msgid "%d occurence replaced"
+msgid_plural "%d occurences replaced"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../e-util/e-html-editor-replace-dialog.c:227
+msgid "R_eplace:"
+msgstr ""
+
+#: ../e-util/e-html-editor-replace-dialog.c:239
+#, fuzzy
+#| msgid "O_pen With"
+msgid "_With:"
+msgstr "_Kun:"
+
+#: ../e-util/e-html-editor-replace-dialog.c:251
+msgid "_Case sensitive"
+msgstr ""
+
+#: ../e-util/e-html-editor-replace-dialog.c:255
+#, fuzzy
+#| msgid "_Search"
+msgid "Wra_p search"
+msgstr "_Serĉi"
+
+#: ../e-util/e-html-editor-replace-dialog.c:265
+msgid "_Skip"
+msgstr ""
+
+#: ../e-util/e-html-editor-replace-dialog.c:273
+#: ../e-util/e-system.error.xml.h:3
+#| msgid "_Reply"
+msgid "_Replace"
+msgstr "_Anstataŭigi"
+
+#: ../e-util/e-html-editor-replace-dialog.c:281
+#| msgid "Reply to _All"
+msgid "Replace _All"
+msgstr "Anstataŭigi ĉ_iujn"
+
+#: ../e-util/e-html-editor-replace-dialog.c:301
+#| msgid "Replies"
+msgctxt "dialog-title"
+msgid "Replace"
+msgstr "Anstataŭigi"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:87
+#, c-format
+msgid "<b>Suggestions for '%s'</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:505
+msgid "<b>Suggestions</b>"
+msgstr ""
+
+#. Replace
+#: ../e-util/e-html-editor-spell-check-dialog.c:540
+#| msgid "Replies"
+msgid "Replace"
+msgstr "Anstataŭigi"
+
+#. Replace All
+#: ../e-util/e-html-editor-spell-check-dialog.c:549
+#| msgid "Reply to All"
+msgid "Replace All"
+msgstr "Anstataŭigi ĉiujn"
+
+#. Ignore
+#: ../e-util/e-html-editor-spell-check-dialog.c:558
+#: ../mail/mail.error.xml.h:109
+msgid "Ignore"
+msgstr "Ignori"
+
+#. Skip
+#: ../e-util/e-html-editor-spell-check-dialog.c:567
+msgid "Skip"
+msgstr "Transsalti"
+
+#. Back
+#: ../e-util/e-html-editor-spell-check-dialog.c:576
+#| msgid "Go Back"
+msgid "Back"
+msgstr "Malantaŭen"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:585
+msgid "<b>Dictionary</b>"
+msgstr "<b>Vortaro</b>"
+
+#. Add Word button
+#: ../e-util/e-html-editor-spell-check-dialog.c:605
+#| msgid "Add Folder"
+msgid "Add word"
+msgstr "Aldoni vorton"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:622
+#: ../mail/mail-config.ui.h:37
+msgid "Spell Checking"
+msgstr "Literumkontrolo"
+
+#: ../e-util/e-html-editor-table-dialog.c:782
+msgid "_Rows:"
+msgstr "_Vicoj:"
+
+#: ../e-util/e-html-editor-table-dialog.c:799
+msgid "C_olumns:"
+msgstr "K_olumnoj:"
+
+#: ../e-util/e-html-editor-table-dialog.c:850
+msgid "_Spacing:"
+msgstr ""
+
+#: ../e-util/e-html-editor-table-dialog.c:867
+#| msgid "Loading"
+msgid "_Padding:"
+msgstr ""
+
+#: ../e-util/e-html-editor-table-dialog.c:931
+#: ../e-util/e-html-editor-text-dialog.c:261
+#| msgid "Colo_r:"
+msgid "_Color:"
+msgstr "_Koloro:"
+
+#: ../e-util/e-html-editor-table-dialog.c:957
+#| msgid "Image"
+msgid "Image:"
+msgstr "Bildo:"
+
+#: ../e-util/e-html-editor-table-dialog.c:984
+#, fuzzy
+#| msgid "Calendar Properties"
+msgid "Table Properties"
+msgstr "Kalendar-ecoj"
+
+#: ../e-util/e-html-editor-text-dialog.c:281
+msgid "Si_ze:"
+msgstr "Gr_ando:"
+
+#: ../e-util/e-html-editor-text-dialog.c:296
+#| msgid "_Properties"
+msgid "Text Properties"
+msgstr "Tekst-atributoj"
+
+#: ../e-util/e-html-editor-view.c:4939
+#, fuzzy
+#| msgid "Calendar Properties"
+msgid "Changed property"
+msgstr "Kalendar-ecoj"
+
+#: ../e-util/e-html-editor-view.c:4940
+msgid "Whether editor changed"
+msgstr ""
+
+#: ../e-util/e-import-assistant.c:256
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr ""
+
+#: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
+msgid "File _type:"
+msgstr "Dosier-_tipo:"
+
+#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:917
+msgid "Choose the destination for this import"
+msgstr ""
+
+#: ../e-util/e-import-assistant.c:365
+msgid "Choose the type of importer to run:"
+msgstr ""
+
+#: ../e-util/e-import-assistant.c:373
+msgid "Import data and settings from _older programs"
+msgstr ""
+
+#: ../e-util/e-import-assistant.c:381
+msgid "Import a _single file"
+msgstr ""
+
+#: ../e-util/e-import-assistant.c:403
+#: ../modules/startup-wizard/e-mail-config-import-page.c:200
+msgid "Please select the information that you would like to import:"
+msgstr ""
+
+#: ../e-util/e-import-assistant.c:533
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
+msgstr ""
+
+#: ../e-util/e-import-assistant.c:559
+#: ../modules/startup-wizard/e-mail-config-import-page.c:229
+#, c-format
+msgid "From %s:"
+msgstr "De %s:"
+
+#. Install a custom "Cancel Import" button.
+#: ../e-util/e-import-assistant.c:775
+msgid "_Cancel Import"
+msgstr "_Nuligi enporton"
+
+#: ../e-util/e-import-assistant.c:916
+msgid "Preview data to be imported"
+msgstr ""
+
+#: ../e-util/e-import-assistant.c:922 ../e-util/e-import-assistant.c:935
+#: ../e-util/e-import-assistant.c:1288 ../e-util/e-import-assistant.c:1364
+#: ../e-util/e-import-assistant.c:1373
+msgid "Import Data"
+msgstr "Enporti datumojn"
+
+#: ../e-util/e-import-assistant.c:930
+msgid "Select what type of file you want to import from the list."
+msgstr ""
+
+#: ../e-util/e-import-assistant.c:1278 ../e-util/e-import-assistant.c:1313
+msgid "Evolution Import Assistant"
+msgstr "Enport-asistanto de Evolucio"
+
+#: ../e-util/e-import-assistant.c:1295 ../e-util/e-import-assistant.c:1351
+msgid "Import Location"
+msgstr "Enporti lokon"
+
+#: ../e-util/e-import-assistant.c:1306
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
+msgstr ""
+
+#: ../e-util/e-import-assistant.c:1323
+msgid "Importer Type"
+msgstr ""
+
+#: ../e-util/e-import-assistant.c:1333
+msgid "Select Information to Import"
+msgstr ""
+
+#: ../e-util/e-import-assistant.c:1342
+msgid "Select a File"
+msgstr "Elekti dosieron"
+
+#: ../e-util/e-import-assistant.c:1359
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "Alkaku \"Apliki\" por komenci la enporton de la dosiero en Evolucion."
+
+#: ../e-util/e-mail-signature-combo-box.c:376
+msgid "Autogenerated"
+msgstr ""
+
+#: ../e-util/e-mail-signature-editor.c:297
+#| msgid "_Close"
+msgid "Close"
+msgstr "Fermi"
+
+#: ../e-util/e-mail-signature-editor.c:302
+msgid "_Save and Close"
+msgstr "_Konservi kaj fermi"
+
+#: ../e-util/e-mail-signature-editor.c:531
+msgid "Edit Signature"
+msgstr "Redakti subskribon"
+
+#: ../e-util/e-mail-signature-editor.c:564
+msgid "_Signature Name:"
+msgstr "_Subsribonomo:"
+
+#: ../e-util/e-mail-signature-editor.c:600
+msgid "Unnamed"
+msgstr "Sennome"
+
+#: ../e-util/e-mail-signature-manager.c:337
+msgid "Add _Script"
+msgstr ""
+
+#: ../e-util/e-mail-signature-manager.c:426
+msgid "Add Signature Script"
+msgstr ""
+
+#: ../e-util/e-mail-signature-manager.c:497
+msgid "Edit Signature Script"
+msgstr ""
+
+#: ../e-util/e-mail-signature-script-dialog.c:393
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only."
+msgstr ""
+
+#: ../e-util/e-mail-signature-script-dialog.c:444
+msgid "S_cript:"
+msgstr ""
+
+#: ../e-util/e-mail-signature-script-dialog.c:475
+msgid "Script file must be executable."
+msgstr ""
+
+#: ../e-util/e-map.c:885
+msgid "World Map"
+msgstr "Mondmapo"
+
+#: ../e-util/e-map.c:888
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should instead select the timezone from the drop-down combination box below."
+msgstr ""
+
+#: ../e-util/e-misc-utils.c:249
+msgid "Could not open the link."
+msgstr "Ne eblis malfermi la ligilon."
+
+#: ../e-util/e-misc-utils.c:331
+msgid "Could not display help for Evolution."
+msgstr "Ne eblis montri helpon pri Evolucio."
+
+#: ../e-util/e-misc-utils.c:2384
+#, c-format
+#| msgid "Opening calendar at %s"
+msgid "Opening calendar '%s'"
+msgstr "Malfermante kalendaron '%s'"
+
+#: ../e-util/e-misc-utils.c:2387
+#, c-format
+#| msgid "Opening memos at %s"
+msgid "Opening memo list '%s'"
+msgstr "Malfermante notliston '%s'"
+
+#: ../e-util/e-misc-utils.c:2390
+#, c-format
+#| msgid "Opening tasks at %s"
+msgid "Opening task list '%s'"
+msgstr "Malfermante taskliston '%s'"
+
+#: ../e-util/e-misc-utils.c:2393
+#, c-format
+#| msgid "Opening tasks at %s"
+msgid "Opening address book '%s'"
+msgstr "Malfermante adresaron '%s'"
+
+#: ../e-util/e-misc-utils.c:3127
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
+msgid "_Do not show this message again"
+msgstr "Ne _plu montri ĉi tiun mesaĝon"
+
+#: ../e-util/e-name-selector-dialog.c:277
+#, fuzzy
+#| msgid "Contacts"
+msgid "Show Contacts"
+msgstr "Kontaktoj"
+
+#: ../e-util/e-name-selector-dialog.c:309
+#, fuzzy
+#| msgid "Address Book"
+msgid "Address B_ook:"
+msgstr "_Adresaro:"
+
+#: ../e-util/e-name-selector-dialog.c:316
+#| msgid "Category"
+msgid "Cat_egory:"
+msgstr "Kat_egorio:"
+
+#: ../e-util/e-name-selector-dialog.c:340
+#| msgid "_Search"
+msgid "_Search:"
+msgstr "_Serĉi:"
+
+#: ../e-util/e-name-selector-dialog.c:366
+#: ../e-util/e-name-selector-dialog.c:1274
+#: ../modules/addressbook/e-book-shell-view-actions.c:1157
+#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-memo-shell-view-actions.c:709
+#: ../modules/calendar/e-task-shell-view-actions.c:881
+msgid "Any Category"
+msgstr "Iu kategorio"
+
+#: ../e-util/e-name-selector-dialog.c:368
+#| msgid "Contacts"
+msgid "Co_ntacts"
+msgstr "Ko_ntaktoj"
+
+#: ../e-util/e-name-selector-dialog.c:445
+#| msgid "_Search"
+msgid "Search"
+msgstr "Serĉi"
+
+#: ../e-util/e-name-selector-dialog.c:448
+#: ../mail/importers/pine-importer.c:427
+msgid "Address Book"
+msgstr "Adresaro"
+
+#: ../e-util/e-name-selector-dialog.c:451
+#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-view.c:373
+msgid "Contacts"
+msgstr "Kontaktoj"
+
+#: ../e-util/e-name-selector-dialog.c:576
+#, fuzzy
+#| msgid "Select Address Book"
+msgid "Select Contacts from Address Book"
+msgstr "Elekti adresaron"
+
+#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
+#: ../e-util/e-name-selector-entry.c:3183
+#, fuzzy, c-format
+#| msgid "E_xpand All"
+msgid "E_xpand %s Inline"
+msgstr "_Etendi %s"
+
+#. Copy Contact Item
+#: ../e-util/e-name-selector-entry.c:3199
+#, c-format
+msgid "Cop_y %s"
+msgstr "Kopi_i na %s"
+
+#. Cut Contact Item
+#: ../e-util/e-name-selector-entry.c:3210
+#, c-format
+msgid "C_ut %s"
+msgstr "Elt_ondi na %s"
+
+#. Edit Contact item
+#: ../e-util/e-name-selector-entry.c:3228
+#, c-format
+#| msgid "_Edit"
+msgid "_Edit %s"
+msgstr "R_edakti na %s"
+
+#: ../e-util/e-name-selector-list.c:583
+#, c-format
+#| msgid "_Delete"
+msgid "_Delete %s"
+msgstr "_Forigi na %s"
+
+#: ../e-util/e-online-button.c:32
+msgid "Evolution is currently online.  Click this button to work offline."
+msgstr ""
+"Evolucio nun estas konektite.  Alklaku tiun butonon por labori nekonektite."
+
+#: ../e-util/e-online-button.c:35
+msgid "Evolution is currently offline.  Click this button to work online."
+msgstr ""
+"Evolucio nun estas nekonektite.  Alklaku tiun butonon por labori konektite."
+
+#: ../e-util/e-online-button.c:38
+msgid "Evolution is currently offline because the network is unavailable."
+msgstr "Evolucio nun estas nekonektite ĉar la reto ne disponeblas."
+
+#: ../e-util/e-passwords.c:127
+msgid "Keyring key is unusable: no user or host name"
+msgstr ""
+
+#: ../e-util/e-passwords.c:447
+msgid "You have the Caps Lock key on."
+msgstr ""
+
+#: ../e-util/e-passwords.c:578
+msgid "_Remember this passphrase"
+msgstr ""
+
+#: ../e-util/e-passwords.c:579
+msgid "_Remember this passphrase for the remainder of this session"
+msgstr ""
+
+#: ../e-util/e-passwords.c:584
+msgid "_Remember this password"
+msgstr "_Memori tiun ĉi pasvorton"
+
+#: ../e-util/e-passwords.c:585
+msgid "_Remember this password for the remainder of this session"
+msgstr ""
+
+#: ../e-util/e-preferences-window.c:318
+msgid "Evolution Preferences"
+msgstr "Evolucio-agordoj"
+
+#: ../e-util/e-print.c:160
+msgid "An error occurred while printing"
+msgstr "Eraro okazis dum presado"
+
+#: ../e-util/e-print.c:167
+msgid "The printing system reported the following details about the error:"
+msgstr "La pres-sistemo raportis la jenajn detalojn pri la eraro:"
+
+#: ../e-util/e-print.c:173
+msgid ""
+"The printing system did not report any additional details about the error."
+msgstr "La pres-sistemo ne raportis iun pluan detalon pri la eraro."
+
+#: ../e-util/e-proxy-editor.c:325
+#| msgid "_Login method:"
+msgid "_Method:"
+msgstr "_Metodo:"
+
+#: ../e-util/e-proxy-editor.c:347
+msgid "Defer to Desktop Settings"
+msgstr ""
+
+#: ../e-util/e-proxy-editor.c:351
+msgid "_Open Desktop Settings"
+msgstr ""
+
+#: ../e-util/e-proxy-editor.c:377
+#, fuzzy
+#| msgid "January"
+msgid "Manual"
+msgstr "Januaro"
+
+#: ../e-util/e-proxy-editor.c:396
+#| msgid "Use HTTP proxy"
+msgid "_HTTP Proxy:"
+msgstr "_HTTP-prokurilo:"
+
+#: ../e-util/e-proxy-editor.c:427
+#| msgid "Use HTTP proxy"
+msgid "H_TTPS Proxy:"
+msgstr "H_TTPS-prokurilo:"
+
+#: ../e-util/e-proxy-editor.c:458
+msgid "_Socks Proxy:"
+msgstr ""
+
+#: ../e-util/e-proxy-editor.c:489
+#, fuzzy
+#| msgid "Ignore"
+msgid "_Ignore Hosts:"
+msgstr "_Ignori aparatojn:"
+
+#: ../e-util/e-proxy-editor.c:515
+#| msgid "Autocompletion"
+msgid "Automatic"
+msgstr "Aŭtomate"
+
+#: ../e-util/e-proxy-editor.c:534
+#| msgid "Configuration"
+msgid "Configuration _URL:"
+msgstr ""
+
+#: ../e-util/e-proxy-editor.c:563
+msgid "Use a direct connection, no proxying required."
+msgstr ""
+
+#: ../e-util/e-proxy-preferences.c:213
+msgid "Switch to Basic Proxy Preferences"
+msgstr ""
+
+#: ../e-util/e-proxy-preferences.c:215
+msgid "Switch to Advanced Proxy Preferences"
+msgstr ""
+
+#: ../e-util/e-proxy-preferences.c:526
+msgid "Apply custom proxy settings to these accounts:"
+msgstr ""
+
+#: ../e-util/e-proxy-preferences.c:561
+msgid ""
+"<b>Advanced Proxy Preferences</b> lets you define alternate network proxies "
+"and apply them to specific accounts"
+msgstr ""
+
+#: ../e-util/e-proxy-selector.c:85
+#| msgid "Custom Alarm:"
+msgid "Custom Proxy"
+msgstr "Propra prokurilo"
+
+#: ../e-util/e-proxy-selector.c:487
+#, fuzzy
+#| msgid "Create a new appointment"
+msgid "Create a new proxy profile"
+msgstr "Kreii novan rendevuon"
+
+#: ../e-util/e-proxy-selector.c:492
+#, fuzzy
+#| msgid "Delete the selected memo list"
+msgid "Delete the selected proxy profile"
+msgstr "Forigi la elektitan notoliston"
+
+#: ../e-util/e-rule-editor.c:184
 msgid "Add Rule"
 msgstr "Aldoni regulon"
 
-#: ../filter/e-rule-editor.c:359
+#: ../e-util/e-rule-editor.c:286
 msgid "Edit Rule"
 msgstr "Redakti regulon"
 
-#: ../filter/filter.error.xml.h:1
-msgid "Bad regular expression &quot;{0}&quot;."
+#: ../e-util/e-search-bar.c:83
+#, c-format
+msgid "Matches: %u"
 msgstr ""
 
-#: ../filter/filter.error.xml.h:2
-msgid "Could not compile regular expression &quot;{1}&quot;."
+#: ../e-util/e-search-bar.c:567
+msgid "Close the find bar"
 msgstr ""
 
-#: ../filter/filter.error.xml.h:3
-msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+#: ../e-util/e-search-bar.c:575
+msgid "Fin_d:"
+msgstr "_Serĉi:"
+
+#: ../e-util/e-search-bar.c:587
+msgid "Clear the search"
+msgstr ""
+
+#: ../e-util/e-search-bar.c:611
+msgid "_Previous"
+msgstr "_Antaŭa"
+
+#: ../e-util/e-search-bar.c:614
+msgid "Find the previous occurrence of the phrase"
+msgstr ""
+
+#: ../e-util/e-search-bar.c:623
+msgid "_Next"
+msgstr "_Sekva"
+
+#: ../e-util/e-search-bar.c:626
+msgid "Find the next occurrence of the phrase"
+msgstr ""
+
+#: ../e-util/e-search-bar.c:635
+msgid "Mat_ch case"
+msgstr ""
+
+#: ../e-util/e-search-bar.c:663
+msgid "Reached bottom of page, continued from top"
+msgstr ""
+
+#: ../e-util/e-search-bar.c:685
+msgid "Reached top of page, continued from bottom"
+msgstr ""
+
+#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:327
+#: ../mail/importers/kmail-importer.c:253
+#: ../mail/importers/pine-importer.c:420
+#: ../modules/mail/e-mail-shell-view.c:1163
+#: ../smime/gui/certificate-manager.c:1669
+msgid "Mail"
+msgstr "Retpoŝto"
+
+#: ../e-util/e-send-options.c:570
+msgid "When de_leted:"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:3
+msgid "Standard"
+msgstr "Standarde"
+
+#: ../e-util/e-send-options.ui.h:6
+msgid "Proprietary"
+msgstr "Mallibere"
+
+#: ../e-util/e-send-options.ui.h:8
+msgid "Secret"
+msgstr "Sekrete"
+
+#: ../e-util/e-send-options.ui.h:9
+msgid "Top Secret"
+msgstr "Sekretege"
+
+#: ../e-util/e-send-options.ui.h:10
+msgid "For Your Eyes Only"
+msgstr "Nur por viaj okuloj"
+
+#. Translators: Used in send options dialog
+#: ../e-util/e-send-options.ui.h:12
+msgctxt "send-options"
+msgid "None"
+msgstr "Neniu"
+
+#: ../e-util/e-send-options.ui.h:13
+msgid "Mail Receipt"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:16
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "_Dum"
+
+#: ../e-util/e-send-options.ui.h:17
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "tagoj"
+
+#: ../e-util/e-send-options.ui.h:18
+msgid "_When convenient"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:20
+msgid "_Delay message delivery"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:21
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_Post"
+
+#: ../e-util/e-send-options.ui.h:22
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "tagoj"
+
+#: ../e-util/e-send-options.ui.h:23
+msgid "_Set expiration date"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:24
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "Ĝ_is"
+
+#: ../e-util/e-send-options.ui.h:25
+msgid "Delivery Options"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:26
+msgid "_Priority:"
+msgstr "_Prioritato:"
+
+#: ../e-util/e-send-options.ui.h:27
+msgid "_Classification:"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:28
+msgid "Gene_ral Options"
+msgstr "Ĝene_ralaj agordoj"
+
+#: ../e-util/e-send-options.ui.h:29
+msgid "Creat_e a sent item to track information"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:30
+msgid "_Delivered"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:31
+msgid "Deli_vered and opened"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:32
+msgid "_All information"
+msgstr "Ĉi_uj informoj"
+
+#: ../e-util/e-send-options.ui.h:33
+msgid "A_uto-delete sent item"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:34
+msgid "Status Tracking"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:35
+msgid "_When opened:"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:36
+msgid "When decli_ned:"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:37
+msgid "When co_mpleted:"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:38
+msgid "When acce_pted:"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:39
+msgid "Return Notification"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:40
+msgid "Sta_tus Tracking"
+msgstr ""
+
+#: ../e-util/e-source-config.c:690 ../e-util/e-source-config.c:694
+msgid "Type:"
+msgstr "Tipo:"
+
+#: ../e-util/e-source-config.c:702 ../e-util/e-source-config.c:706
+msgid "Name:"
+msgstr "Nomo:"
+
+#. Translators: This is the first of a sequence of widgets:
+#. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
+#: ../e-util/e-source-config.c:1311
+#, fuzzy
+#| msgid "Refresh the folder"
+msgid "Refresh every"
+msgstr "Aktualigi la dosierujon"
+
+#: ../e-util/e-source-config.c:1341 ../e-util/e-source-config.c:1411
+#| msgid "Use _secure connection"
+msgid "Use a secure connection"
+msgstr "Uzi sekuran konekton"
+
+#: ../e-util/e-source-config.c:1437
+msgid "Unset _trust for SSL certificate"
+msgstr ""
+
+#: ../e-util/e-source-config.c:1473
+#| msgid "Users"
+msgid "User"
+msgstr "Uzanto"
+
+#: ../e-util/e-source-selector-dialog.c:229
+#| msgid "_Destination folder:"
+msgid "_Destination"
+msgstr "_Celo"
+
+#: ../e-util/e-source-selector-dialog.c:342
+#, fuzzy
+#| msgid "Select destination file"
+msgid "Select destination"
+msgstr "Elekti celdosieron"
+
+#. Translators: %s is the language ISO code.
+#: ../e-util/e-spell-dictionary.c:266
+#, c-format
+#| msgid "Unknown"
+msgctxt "language"
+msgid "Unknown (%s)"
+msgstr "Nekonate (%s)"
+
+#. Translators: The first %s is the language name, and the
+#. * second is the country name. Example: "French (France)"
+#: ../e-util/e-spell-dictionary.c:281 ../e-util/e-spell-dictionary.c:286
+#, c-format
+#| msgctxt "folder-display"
+#| msgid "%s (%u%s)"
+msgctxt "language"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#. no suggestions. Put something in the menu anyway...
+#: ../e-util/e-spell-entry.c:379
+#| msgid "(no subject)"
+msgid "(no suggestions)"
+msgstr "(neniuj proponoj)"
+
+#: ../e-util/e-spell-entry.c:403
+msgid "More..."
+msgstr ""
+
+#. + Add to Dictionary
+#: ../e-util/e-spell-entry.c:488
+#, c-format
+msgid "Add \"%s\" to Dictionary"
+msgstr ""
+
+#. - Ignore All
+#: ../e-util/e-spell-entry.c:537
+#| msgid "Ignore"
+msgid "Ignore All"
+msgstr "Ignori ĉiujn"
+
+#: ../e-util/e-spell-entry.c:569
+msgid "Spelling Suggestions"
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:1
+msgid "A file named \"{0}\" already exists. Do you want to replace it?"
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:2
+msgid ""
+"The file already exists in \"{0}\". Replacing it will overwrite its contents."
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:4
+msgid "Cannot save file \"{0}\"."
+msgstr "Ne eblis konservi dosieron \"{0}\"."
+
+#: ../e-util/e-system.error.xml.h:5
+msgid "Because \"{1}\"."
+msgstr "Ĉar \"{1}\"."
+
+#: ../e-util/e-system.error.xml.h:6
+msgid "Cannot open file \"{0}\"."
+msgstr "Ne eblis malfermi dosieron \"{0}\"."
+
+#: ../e-util/e-system.error.xml.h:7
+msgid "Failed to remove data source &quot;{0}&quot;."
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:61
+#, fuzzy
+#| msgid "Because &quot;{1}&quot;."
+msgid "The reported error was &quot;{1}&quot;."
+msgstr "Ĉar &quot;{1}&quot;."
+
+#: ../e-util/e-system.error.xml.h:9
+msgid "Failed to update data source &quot;{0}&quot;."
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:10
+#, fuzzy
+#| msgid "Failed to delete contact"
+msgid "Failed to delete resource &quot;{0}&quot;."
+msgstr "Malsukcesis forigi rizurcon &quot;{0}&quot;."
+
+#: ../e-util/e-system.error.xml.h:11
+#, fuzzy
+#| msgid "The Evolution address book has quit unexpectedly."
+msgid ""
+"The address book backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgstr "La adresaro &quot;{0}&quot; ĉesigitis neatendite."
+
+#: ../e-util/e-system.error.xml.h:12
+#| msgid ""
+#| "Your contacts for {0} will not be available until Evolution is restarted."
+msgid ""
+"Some of your contacts may not be available until Evolution is restarted."
+msgstr ""
+"Kelkaj de viaj kontaktoj eble ne estos disponeblaj nur post restartigo de "
+"Evolucio."
+
+#: ../e-util/e-system.error.xml.h:13
+#, fuzzy
+#| msgid "The Evolution calendar has quit unexpectedly."
+msgid "The calendar backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgstr "La Evolucio-kalendaro &quot;{0}&quot; ĉesigitis neatendite."
+
+#: ../e-util/e-system.error.xml.h:14
+#, fuzzy
+#| msgid "Your memos will not be available until Evolution is restarted."
+msgid ""
+"Some of your appointments may not be available until Evolution is restarted."
+msgstr "Viaj notoj ne disponeblas ĝis restarto de Evolucio."
+
+#: ../e-util/e-system.error.xml.h:15
+#, fuzzy
+#| msgid "The Evolution calendar has quit unexpectedly."
+msgid "The memo list backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgstr "La notolisto &quot;{0}&quot; ĉesigitis neatendite."
+
+#: ../e-util/e-system.error.xml.h:16
+#, fuzzy
+#| msgid "Your memos will not be available until Evolution is restarted."
+msgid "Some of your memos may not be available until Evolution is restarted."
+msgstr "Viaj notoj ne disponeblas ĝis restarto de Evolucio."
+
+#: ../e-util/e-system.error.xml.h:17
+#, fuzzy
+#| msgid "The Evolution calendar has quit unexpectedly."
+msgid "The task list backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgstr "La taskolisto &quot;{0}&quot; ĉesigitis neatendite."
+
+#: ../e-util/e-system.error.xml.h:18
+#, fuzzy
+#| msgid "Your tasks will not be available until Evolution is restarted."
+msgid "Some of your tasks may not be available until Evolution is restarted."
+msgstr "Viaj taskoj ne estas disponeblaj ĝis restarto de Evolucio."
+
+#: ../e-util/e-system.error.xml.h:19
+msgid ""
+"The address book backend servicing &quot;{0}&quot; encountered an error."
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:20
+msgid "The calendar backend servicing &quot;{0}&quot; encountered an error."
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:21
+msgid "The memo list backend servicing &quot;{0}&quot; encountered an error."
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:22
+msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
+msgstr ""
+
+#: ../e-util/e-table-click-to-add.c:684
+#: ../e-util/gal-a11y-e-table-click-to-add.c:61
+#: ../e-util/gal-a11y-e-table-click-to-add.c:142
+msgid "click to add"
+msgstr "klaku por aldoni"
+
+#: ../e-util/e-table-column-selector.c:264
+#, fuzzy
+#| msgid "Move selected contacts to another address book"
+msgid "Move selected column names to top"
+msgstr "Movi elektitajn kontaktojn al alia adresaro"
+
+#: ../e-util/e-table-column-selector.c:269
+#, fuzzy
+#| msgid "Move selected contacts to another address book"
+msgid "Move selected column names up one row"
+msgstr "Movi elektitajn kontaktojn al alia adresaro"
+
+#: ../e-util/e-table-column-selector.c:274
+#, fuzzy
+#| msgid "Move selected contacts to another address book"
+msgid "Move selected column names down one row"
+msgstr "Movi elektitajn kontaktojn al alia adresaro"
+
+#: ../e-util/e-table-column-selector.c:279
+#, fuzzy
+#| msgid "Move selected contacts to another address book"
+msgid "Move selected column names to bottom"
+msgstr "Movi elektitajn kontaktojn al alia adresaro"
+
+#: ../e-util/e-table-column-selector.c:284
+#, fuzzy
+#| msgid "Select all visible memos"
+msgid "Select all column names"
+msgstr "Elekti ĉiujn videblajn notojn"
+
+#: ../e-util/e-table-config.c:388 ../e-util/e-table-config.c:434
+msgid "(Ascending)"
+msgstr ""
+
+#: ../e-util/e-table-config.c:388 ../e-util/e-table-config.c:434
+msgid "(Descending)"
+msgstr ""
+
+#: ../e-util/e-table-config.c:395
+msgid "Not sorted"
+msgstr "Ne ordigite"
+
+#: ../e-util/e-table-config.c:440
+msgid "No grouping"
+msgstr "Ne grupite"
+
+#: ../e-util/e-table-config.c:545
+msgid "Show Fields"
+msgstr "Montri kampojn"
+
+#: ../e-util/e-table-config.c:559
+msgid "Choose the order of information to appear in the message list."
+msgstr ""
+
+#: ../e-util/e-table-config.ui.h:2
+#| msgid "_Append"
+msgid "_Apply"
+msgstr "_Apliki"
+
+#: ../e-util/e-table-config.ui.h:4
+msgid "_Sort..."
+msgstr "_Ordigi..."
+
+#: ../e-util/e-table-config.ui.h:5
+msgid "_Group By..."
+msgstr ""
+
+#: ../e-util/e-table-config.ui.h:6
+msgid "_Fields Shown..."
+msgstr ""
+
+#: ../e-util/e-table-config.ui.h:9
+msgid "Clear _All"
+msgstr "Vakigi ĉi_on"
+
+#: ../e-util/e-table-config.ui.h:10
+msgid "_Show field in View"
+msgstr ""
+
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1755
+msgid "Ascending"
+msgstr "Kreskante"
+
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1755
+msgid "Descending"
+msgstr "Malkreskante"
+
+#: ../e-util/e-table-config.ui.h:13
+msgid "Group Items By"
+msgstr ""
+
+#: ../e-util/e-table-config.ui.h:14
+msgid "Show _field in View"
+msgstr ""
+
+#: ../e-util/e-table-config.ui.h:15
+msgid "Then By"
+msgstr "Tiam laŭ"
+
+#: ../e-util/e-table-config.ui.h:16
+msgid "Show field i_n View"
+msgstr ""
+
+#: ../e-util/e-table-config.ui.h:17
+msgid "Show field in _View"
+msgstr ""
+
+#: ../e-util/e-table-config.ui.h:18
+msgid "Sort"
+msgstr "Ordigi"
+
+#: ../e-util/e-table-config.ui.h:19
+msgid "Clear All"
+msgstr "Vakigi ĉion"
+
+#: ../e-util/e-table-config.ui.h:20
+msgid "Sort Items By"
+msgstr ""
+
+#: ../e-util/e-table-field-chooser.c:166
+msgid ""
+"To add a column to your table, drag it into\n"
+"the location in which you want it to appear."
+msgstr ""
+
+#: ../e-util/e-table-field-chooser-dialog.c:226
+msgid "Add a Column"
+msgstr "Aldoni kolumnon"
+
+#: ../e-util/e-table-group-container.c:368
+#, c-format
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../e-util/e-table-group-container.c:382
+#, c-format
+msgid "%s (%d item)"
+msgid_plural "%s (%d items)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../e-util/e-table-header-item.c:1578
+msgid "Customize Current View"
+msgstr ""
+
+#: ../e-util/e-table-header-item.c:1601
+msgid "Sort _Ascending"
+msgstr ""
+
+#: ../e-util/e-table-header-item.c:1604
+msgid "Sort _Descending"
+msgstr ""
+
+#: ../e-util/e-table-header-item.c:1607
+msgid "_Unsort"
+msgstr "_Neordigite"
+
+#: ../e-util/e-table-header-item.c:1610
+msgid "Group By This _Field"
+msgstr ""
+
+#: ../e-util/e-table-header-item.c:1613
+msgid "Group By _Box"
+msgstr ""
+
+#: ../e-util/e-table-header-item.c:1617
+msgid "Remove This _Column"
+msgstr ""
+
+#: ../e-util/e-table-header-item.c:1620
+msgid "Add a C_olumn..."
+msgstr ""
+
+#: ../e-util/e-table-header-item.c:1624
+msgid "A_lignment"
+msgstr ""
+
+#: ../e-util/e-table-header-item.c:1627
+msgid "B_est Fit"
+msgstr ""
+
+#: ../e-util/e-table-header-item.c:1630
+msgid "Format Column_s..."
 msgstr ""
 
-#: ../filter/filter.error.xml.h:4
+#: ../e-util/e-table-header-item.c:1634
+msgid "Custo_mize Current View..."
+msgstr ""
+
+#: ../e-util/e-table-header-item.c:1705
+msgid "_Sort By"
+msgstr "_Ordigi laŭ"
+
+#. Custom
+#: ../e-util/e-table-header-item.c:1728
+msgid "_Custom"
+msgstr "_Propre"
+
+#: ../e-util/e-text.c:2114
+msgid "Select All"
+msgstr "Elekti ĉiujn"
+
+#. Put the "UTC" entry at the top of the combo's list.
+#: ../e-util/e-timezone-dialog.c:206 ../e-util/e-timezone-dialog.c:428
+#: ../e-util/e-timezone-dialog.c:432 ../e-util/e-timezone-dialog.c:436
+#: ../e-util/e-timezone-dialog.c:804
+msgid "UTC"
+msgstr "UTC"
+
+#: ../e-util/e-timezone-dialog.ui.h:1
+msgid "Select a Time Zone"
+msgstr "Elekti horzonon"
+
+#: ../e-util/e-timezone-dialog.ui.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+
+#: ../e-util/e-timezone-dialog.ui.h:6
+msgid "Time Zones"
+msgstr "Horzonoj"
+
+#: ../e-util/e-timezone-dialog.ui.h:7
+msgid "_Selection"
+msgstr "_Elekto"
+
+#: ../e-util/e-timezone-dialog.ui.h:8
+msgid "Timezone drop-down combination box"
+msgstr ""
+
+#: ../e-util/e-url-entry.c:108
+#| msgid "Click to open %s"
+msgid "Click here to open the URL"
+msgstr "Klaki ĉi tien por malfermi la adreson"
+
+#: ../e-util/e-url-entry.c:110
+#| msgid "Enter Passphrase"
+msgid "Enter a URL here"
+msgstr "Enigi adreson ĉi tien"
+
+#: ../e-util/evolution-source-viewer.c:637
+#, fuzzy
+#| msgid "Evolution Pine importer"
+msgid "Evolution Source Viewer"
+msgstr "Evolucio-Pine-enportilo"
+
+#. Translators: The name that is displayed in the user interface
+#: ../e-util/evolution-source-viewer.c:667
+#, fuzzy
+#| msgid "Display"
+msgid "Display Name"
+msgstr "Montri"
+
+#: ../e-util/evolution-source-viewer.c:676
+msgid "Flags"
+msgstr "Flagoj"
+
+#: ../e-util/evolution-source-viewer.c:728
+#: ../mail/e-mail-config-identity-page.c:722
+msgid "Identity"
+msgstr "Identeco"
+
+#: ../e-util/e-web-view.c:285
+msgid "_Copy Link Location"
+msgstr ""
+
+#: ../e-util/e-web-view.c:287
+msgid "Copy the link to the clipboard"
+msgstr ""
+
+#: ../e-util/e-web-view.c:295
+msgid "_Open Link in Browser"
+msgstr "_Malfermi ligilon per foliumilo"
+
+#: ../e-util/e-web-view.c:297
+msgid "Open the link in a web browser"
+msgstr "Malfermi la ligilon per foliumilo"
+
+#: ../e-util/e-web-view.c:305
+msgid "_Copy Email Address"
+msgstr "_Kopii la retpoŝtadreson"
+
+#: ../e-util/e-web-view.c:322
+msgid "_Copy Image"
+msgstr "_Kopii bildon"
+
+#: ../e-util/e-web-view.c:324
+msgid "Copy the image to the clipboard"
+msgstr "Kopii la bildon en la tondujon"
+
+#: ../e-util/e-web-view.c:329
+msgid "Save _Image..."
+msgstr "Konservi b_ildon..."
+
+#: ../e-util/e-web-view.c:331
+msgid "Save the image to a file"
+msgstr "Konservi la bildon al dosiero"
+
+#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1340
+msgid "Select all text and images"
+msgstr "Elekti ĉiujn tekston kaj bildojn"
+
+#: ../e-util/e-web-view.c:1004
+#, c-format
+msgid "Click to call %s"
+msgstr ""
+
+#: ../e-util/e-web-view.c:1006
+msgid "Click to hide/unhide addresses"
+msgstr ""
+
+#: ../e-util/e-web-view.c:1017
+#, c-format
+msgid "Go to the section %s of the message"
+msgstr ""
+
+#: ../e-util/e-web-view.c:1019
+msgid "Go to the beginning of the message"
+msgstr ""
+
+#: ../e-util/e-web-view.c:1023
+#, c-format
+msgid "Click to open %s"
+msgstr "Klaki por malfermi %s"
+
+#: ../e-util/e-web-view.c:2946
+#, fuzzy
+#| msgid "Copy the image to the clipboard"
+msgid "Copying image to clipboard"
+msgstr "Kopii la bildon en la tondujon"
+
+#: ../e-util/e-web-view.c:3134
+msgid "Save Image"
+msgstr "Konservi bildon"
+
+#: ../e-util/e-web-view.c:3170
+#, c-format
+#| msgid "Saving message to Outbox."
+msgid "Saving image to '%s'"
+msgstr "Konservante bildon al '%s'"
+
+#: ../e-util/e-widget-undo.c:430
+msgid "Undo 'Insert text'"
+msgstr "Malfari 'Enmeti tekston'"
+
+#: ../e-util/e-widget-undo.c:432
+msgid "Redo 'Insert text'"
+msgstr "Refari 'Enmeti tekston'"
+
+#: ../e-util/e-widget-undo.c:446
+msgid "Undo 'Delete text'"
+msgstr "Malfari 'Forigi tekston'"
+
+#: ../e-util/e-widget-undo.c:448
+msgid "Redo 'Delete text'"
+msgstr "Refari 'Forigi tekston'"
+
+#: ../e-util/filter.error.xml.h:1
 msgid "Missing date."
 msgstr "Mankanta dato."
 
-#: ../filter/filter.error.xml.h:5
-msgid "Missing file name."
+#: ../e-util/filter.error.xml.h:2
+msgid "You must choose a date."
+msgstr "Vi devas elekti daton."
+
+#: ../e-util/filter.error.xml.h:3
+#, fuzzy
+#| msgid "Missing file name."
+msgid "Missing filename."
 msgstr "Mankanta dosiernomo."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:89
+#: ../e-util/filter.error.xml.h:4
+#, fuzzy
+#| msgid "You must specify a file name."
+msgid "You must specify a filename."
+msgstr "Vi davas specifi dosiernomon."
+
+#: ../e-util/filter.error.xml.h:5
+msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+msgstr ""
+
+#: ../e-util/filter.error.xml.h:6
+msgid "Bad regular expression &quot;{0}&quot;."
+msgstr ""
+
+#: ../e-util/filter.error.xml.h:7
+msgid "Could not compile regular expression &quot;{1}&quot;."
+msgstr ""
+
+#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
 msgid "Missing name."
 msgstr "Mankanta nomo."
 
-#: ../filter/filter.error.xml.h:7
+#: ../e-util/filter.error.xml.h:9
+msgid "You must name this filter."
+msgstr "Vi devas nomi tiun filtrilon."
+
+#: ../e-util/filter.error.xml.h:10
 msgid "Name &quot;{0}&quot; already used."
 msgstr ""
 
-#: ../filter/filter.error.xml.h:8
+#: ../e-util/filter.error.xml.h:11
 msgid "Please choose another name."
 msgstr ""
 
-#: ../filter/filter.error.xml.h:9
-msgid "You must choose a date."
-msgstr "Vi devas elekti daton."
+#: ../e-util/filter.error.xml.h:12
+#, fuzzy
+#| msgid "Missing date."
+msgid "Missing condition."
+msgstr "Mankanta dato."
 
-#: ../filter/filter.error.xml.h:10
-msgid "You must name this filter."
-msgstr "Vi devas nomi tiun filtrilon."
+#: ../e-util/filter.error.xml.h:13
+msgid "Filter should have at least one condition."
+msgstr ""
 
-#: ../filter/filter.error.xml.h:11
-msgid "You must specify a file name."
-msgstr "Vi davas specifi dosiernomon."
+#: ../e-util/filter.error.xml.h:14
+#, fuzzy
+#| msgid "Missing date."
+msgid "Missing value."
+msgstr "Mankanta dato."
 
-#: ../filter/filter.ui.h:1
-msgid "Compare against"
+#: ../e-util/filter.error.xml.h:15
+msgid "One or more values cannot be empty."
+msgstr ""
+
+#: ../e-util/filter.ui.h:2
+msgid "the current time"
+msgstr "la aktuala tempo"
+
+#: ../e-util/filter.ui.h:3
+msgid "the time you specify"
 msgstr ""
 
-#: ../filter/filter.ui.h:3
+#: ../e-util/filter.ui.h:4
+msgid "a time relative to the current time"
+msgstr ""
+
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:86
+msgid "seconds"
+msgstr "sekundoj"
+
+#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "weeks"
+msgstr "semajnoj"
+
+#: ../e-util/filter.ui.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+msgid "months"
+msgstr "monatoj"
+
+#: ../e-util/filter.ui.h:11
+msgid "years"
+msgstr "jaroj"
+
+#: ../e-util/filter.ui.h:12
+msgid "ago"
+msgstr "antaŭe"
+
+#: ../e-util/filter.ui.h:13
+msgid "in the future"
+msgstr "en la estonteco"
+
+#: ../e-util/filter.ui.h:14
 msgid "Show filters for mail:"
 msgstr ""
 
-#: ../filter/filter.ui.h:4
+#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
+msgid "_Filter Rules"
+msgstr "_Filtril-reguloj"
+
+#: ../e-util/filter.ui.h:23
+msgid "Compare against"
+msgstr "Kompari kun"
+
+#: ../e-util/filter.ui.h:24
 msgid ""
 "The message's date will be compared against\n"
-"12:00am of the date specified."
+"the current time when filtering occurs."
 msgstr ""
 
-#: ../filter/filter.ui.h:6
+#: ../e-util/filter.ui.h:26
 msgid ""
 "The message's date will be compared against\n"
-"a time relative to when filtering occurs."
+"12:00am of the date specified."
 msgstr ""
 
-#: ../filter/filter.ui.h:8
+#: ../e-util/filter.ui.h:28
 msgid ""
 "The message's date will be compared against\n"
-"the current time when filtering occurs."
+"a time relative to when filtering occurs."
 msgstr ""
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:163
-msgid "_Filter Rules"
-msgstr "_Filtril-reguloj"
+#: ../e-util/gal-a11y-e-cell.c:122
+msgid "Table Cell"
+msgstr "Tabela ĉelo"
 
-#: ../filter/filter.ui.h:12
-msgid "a time relative to the current time"
+#. Translators: description of a "popup" action
+#: ../e-util/gal-a11y-e-cell-popup.c:127
+msgid "popup a child"
+msgstr "ŝpruci idon"
+
+#. Translators: description of an "edit" action
+#: ../e-util/gal-a11y-e-cell-text.c:617
+msgid "begin editing this cell"
 msgstr ""
 
-#: ../filter/filter.ui.h:13
-msgid "ago"
-msgstr "antaŭe"
+#. Translators: description of a "toggle" action
+#: ../e-util/gal-a11y-e-cell-toggle.c:185
+msgid "toggle the cell"
+msgstr "baskuligi la ĉelon"
 
-#: ../filter/filter.ui.h:16
-msgid "in the future"
-msgstr "en la estonteco"
+#. Translators: description of an "expand" action
+#: ../e-util/gal-a11y-e-cell-tree.c:213
+msgid "expands the row in the ETree containing this cell"
+msgstr ""
 
-#: ../filter/filter.ui.h:18
-#: ../plugins/publish-calendar/publish-calendar.ui.h:32
-msgid "months"
-msgstr "monatoj"
+#. Translators: description of a "collapse" action
+#: ../e-util/gal-a11y-e-cell-tree.c:221
+msgid "collapses the row in the ETree containing this cell"
+msgstr "maletendas la vicon en la ETree enhavanta ĉi tiun ĉelon"
 
-#: ../filter/filter.ui.h:19
-msgid "seconds"
-msgstr "sekundoj"
+#: ../e-util/gal-a11y-e-table-click-to-add.c:71
+msgid "click"
+msgstr "klaki"
 
-#: ../filter/filter.ui.h:20
-msgid "the current time"
-msgstr "la aktuala tempo"
+#: ../e-util/gal-a11y-e-table-column-header.c:162
+msgid "sort"
+msgstr "ordigi"
 
-#: ../filter/filter.ui.h:21
-msgid "the time you specify"
-msgstr ""
+#: ../e-util/gal-view-instance-save-as-dialog.c:295
+msgid "Save Current View"
+msgstr "Konservi aktualan vidon"
 
-#: ../filter/filter.ui.h:23
-msgid "years"
-msgstr "jaroj"
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
+msgid "_Create new view"
+msgstr "_Krei novan vidon"
 
-#: ../mail/e-mail-account-manager.c:405
-msgid "_Restore Default"
-msgstr "_Restaŭri defaŭlton"
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
+msgid "_Replace existing view"
+msgstr "_Anstataŭigi ekzistantan vidon"
 
-#: ../mail/e-mail-account-manager.c:418
-msgid "You can drag and drop account names to reorder them."
+#: ../e-util/widgets.error.xml.h:1
+msgid "Do you wish to save your changes?"
 msgstr ""
 
-#: ../mail/e-mail-account-manager.c:463
-msgid "De_fault"
-msgstr "De_faŭlto"
+#: ../e-util/widgets.error.xml.h:2
+msgid "This signature has been changed, but has not been saved."
+msgstr ""
 
-#: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:503
-#: ../modules/plugin-manager/evolution-plugin-manager.c:360
-#: ../plugins/publish-calendar/publish-calendar.c:849
-msgid "Enabled"
-msgstr "Enŝaltite"
+#: ../e-util/widgets.error.xml.h:3
+msgid "_Discard changes"
+msgstr "_Ignori ŝanĝojn"
 
-#: ../mail/e-mail-account-tree-view.c:105
-msgid "Account Name"
-msgstr "Kontonomo"
+#: ../e-util/widgets.error.xml.h:4
+msgid "Blank Signature"
+msgstr ""
 
-#. we changed user, thus reset the chosen calendar combo too, because
-#. * other user means other calendars subscribed
-#: ../mail/e-mail-account-tree-view.c:116 ../mail/e-mail-reader.c:3362
-#: ../mail/mail-config.ui.h:32
-#: ../plugins/google-account-setup/google-source.c:316
-#: ../plugins/google-account-setup/google-source.c:558
-#: ../plugins/google-account-setup/google-source.c:695
-msgid "Default"
-msgstr "Defaŭlto"
+#: ../e-util/widgets.error.xml.h:5
+msgid "Please provide an unique name to identify this signature."
+msgstr ""
 
-#: ../mail/e-mail-attachment-bar.c:102 ../mail/e-mail-attachment-bar.c:107
-#: ../mail/em-format-html-display.c:1398 ../mail/mail-config.ui.h:14
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:172
-#: ../widgets/misc/e-attachment-paned.c:177
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "Aldonaĵo"
-msgstr[1] "Aldonaĵoj"
+#: ../e-util/widgets.error.xml.h:6
+#| msgid "Copy the image to the clipboard"
+msgid "Unable to copy image to clipboard."
+msgstr "Ne eblas kopii bildon tondujen."
 
-#: ../mail/e-mail-attachment-bar.c:616
-#: ../widgets/misc/e-attachment-paned.c:696
-msgid "Icon View"
-msgstr "Piktograma vido"
+#: ../e-util/widgets.error.xml.h:7
+#, fuzzy
+#| msgid "Unable to save {0}."
+msgid "Unable to save image."
+msgstr "Ne eblas konservi bildon."
 
-#: ../mail/e-mail-attachment-bar.c:618
-#: ../widgets/misc/e-attachment-paned.c:698
-msgid "List View"
-msgstr "Lista vido"
+#: ../e-util/widgets.error.xml.h:8
+#| msgid "Could not load '%s'"
+msgid "Could not load signature."
+msgstr "Ne eblis ŝargi subskribon."
 
-#: ../mail/e-mail-browser.c:130 ../shell/e-shell-window-actions.c:1439
-#: ../shell/e-shell-window-actions.c:1446
-#: ../shell/e-shell-window-actions.c:1453
-msgid "Close this window"
-msgstr "Fermi ĉi tiun fenestron"
+#: ../e-util/widgets.error.xml.h:9
+#| msgid "Could not save '%s'"
+msgid "Could not save signature."
+msgstr "Ne eblis konservi subskribon."
 
-#: ../mail/e-mail-browser.c:289
-msgid "(No Subject)"
+#: ../evolution.appdata.xml.in.h:1
+msgid ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
 msgstr ""
 
-#: ../mail/e-mail-display.c:68
-msgid "_Add to Address Book..."
-msgstr "_Aldoni al adresaro..."
-
-#: ../mail/e-mail-display.c:75
-msgid "_To This Address"
-msgstr "_Al tiu adreso"
-
-#: ../mail/e-mail-display.c:82
-msgid "_From This Address"
-msgstr "_De tiu adreso"
-
-#: ../mail/e-mail-display.c:89
-msgid "Send _Reply To..."
-msgstr "Sendi _respondon al..."
+#: ../evolution.appdata.xml.in.h:2
+msgid ""
+"Evolution supports a wide range of industry standard data formats and "
+"network protocols for information exchange, with an emphasis on standards "
+"compliance and security. Evolution can also integrate smoothly with "
+"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
+msgstr ""
 
-#: ../mail/e-mail-display.c:91
-msgid "Send a reply message to this address"
-msgstr "Sendi respond-mesaĝon al tiu ĉi adreso"
+#: ../libemail-engine/camel-sasl-xoauth2.c:26
+msgid "OAuth2"
+msgstr ""
 
-#: ../mail/e-mail-display.c:98
-msgid "Create Search _Folder"
-msgstr "Kreii serĉ_dosierujon"
+#: ../libemail-engine/camel-sasl-xoauth2.c:27
+msgid "This option will use an OAuth 2.0 access token to connect to the server"
+msgstr ""
 
-#: ../mail/e-mail-folder-utils.c:109
+#: ../libemail-engine/e-mail-folder-utils.c:113
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr ""
 
-#: ../mail/e-mail-folder-utils.c:270
+#: ../libemail-engine/e-mail-folder-utils.c:571
 msgid "Forwarded messages"
 msgstr ""
 
-#: ../mail/e-mail-folder-utils.c:385
-msgid "Scanning messages for duplicates"
-msgstr "Kontroli mesaĝojn pri duobligitoj"
-
-#: ../mail/e-mail-folder-utils.c:576
+#: ../libemail-engine/e-mail-folder-utils.c:681
+#: ../libemail-engine/e-mail-folder-utils.c:932
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/e-mail-folder-utils.c:824
+#: ../libemail-engine/e-mail-folder-utils.c:775
+msgid "Scanning messages for duplicates"
+msgstr "Kontroli mesaĝojn pri duobligitoj"
+
+#: ../libemail-engine/e-mail-folder-utils.c:1145
 #, c-format
 msgid "Removing folder '%s'"
 msgstr ""
 
-#: ../mail/e-mail-folder-utils.c:956
+#: ../libemail-engine/e-mail-folder-utils.c:1325
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Dosiero \"%s\" estas forigita."
 
-#: ../mail/e-mail-folder-utils.c:960
+#: ../libemail-engine/e-mail-folder-utils.c:1329
 msgid "File has been removed."
 msgstr "Dosiero estas forigita."
 
-#: ../mail/e-mail-folder-utils.c:1019
+#: ../libemail-engine/e-mail-folder-utils.c:1388
 msgid "Removing attachments"
 msgstr "Forigante aldonaĵon"
 
-#: ../mail/e-mail-folder-utils.c:1181
+#: ../libemail-engine/e-mail-folder-utils.c:1552
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Konservi %d mesaĝon"
 msgstr[1] "Konservi %d mesaĝojn"
 
-#: ../mail/e-mail-folder-utils.c:1525 ../mail/em-folder-utils.c:622
+#: ../libemail-engine/e-mail-folder-utils.c:1930
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Nevalida dosierujo-adreso '%s'"
 
-#. Label + combo box has a 12px left margin so it's
-#. * aligned with the junk mail options above it.
-#: ../mail/e-mail-junk-options.c:252
+#. Some local folders
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-properties.c:410
+#: ../mail/em-folder-tree-model.c:1174 ../mail/importers/kmail-libs.c:141
+#: ../modules/mail/e-mail-shell-view-private.c:1074
+#: ../modules/mail/e-mail-shell-view-private.c:1085
+msgid "Inbox"
+msgstr "Enirkesto"
+
+#. E_MAIL_LOCAL_FOLDER_INBOX
+#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1167
+#: ../mail/importers/kmail-libs.c:147
+#: ../modules/mail/e-mail-shell-view-private.c:1072
+msgid "Drafts"
+msgstr "Malnetaĵoj"
+
+#. E_MAIL_LOCAL_FOLDER_DRAFTS
+#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1178
+#: ../mail/importers/kmail-libs.c:143
+#: ../modules/mail/e-mail-shell-view-private.c:1076
+msgid "Outbox"
+msgstr "Elirkesto"
+
+#. E_MAIL_LOCAL_FOLDER_OUTBOX
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1182
+#: ../mail/importers/kmail-libs.c:145
+#: ../modules/mail/e-mail-shell-view-private.c:1078
+msgid "Sent"
+msgstr "Sendite"
+
+#. E_MAIL_LOCAL_FOLDER_SENT
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1170
+#: ../mail/importers/kmail-libs.c:149
+#: ../modules/mail/e-mail-shell-view-private.c:1080
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+#: ../plugins/templates/templates.c:1176 ../plugins/templates/templates.c:1478
+#: ../plugins/templates/templates.c:1488
+msgid "Templates"
+msgstr "Ŝablonoj"
+
+#: ../libemail-engine/e-mail-session.c:1261
+#, c-format
+msgid "User cancelled operation"
+msgstr ""
+
+#: ../libemail-engine/e-mail-session.c:1318
+#, c-format
+msgid ""
+"No destination address provided, forwarding of the message has been "
+"cancelled."
+msgstr ""
+
+#: ../libemail-engine/e-mail-session.c:1331
+#, c-format
+msgid "No identity found to use, forwarding of the message has been cancelled."
+msgstr ""
+
+#: ../libemail-engine/e-mail-session.c:2360
+#, fuzzy, c-format
+#| msgid "Creating folder '%s'"
+msgid "Waiting for '%s'"
+msgstr "Kreante dosierujon '%s'"
+
+#: ../libemail-engine/e-mail-session-utils.c:539
+#, fuzzy
+#| msgid "No location information available."
+msgid "No mail transport service available"
+msgstr "Neniu lokinformo disponeblas"
+
+#: ../libemail-engine/e-mail-session-utils.c:629
+#: ../libemail-engine/mail-ops.c:718
+#, c-format
+#| msgid "Composing Messages"
+msgid "Posting message to '%s'"
+msgstr "Afiŝante mesaĝon al '%s'"
+
+#: ../libemail-engine/e-mail-session-utils.c:666
+#: ../libemail-engine/mail-ops.c:754
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr ""
+
+#: ../libemail-engine/e-mail-session-utils.c:696
+#: ../libemail-engine/e-mail-session-utils.c:731
+#: ../libemail-engine/mail-ops.c:778 ../libemail-engine/mail-ops.c:813
+#, c-format
+#| msgid "_Send Message to List"
+msgid "Storing sent message to '%s'"
+msgstr "Konservi senditan mesaĝon al '%s'"
+
+#: ../libemail-engine/e-mail-session-utils.c:720
+#: ../libemail-engine/mail-ops.c:802
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+msgstr ""
+
+#: ../libemail-engine/e-mail-session-utils.c:750
+#: ../libemail-engine/mail-ops.c:830
+#, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr ""
+
+#: ../libemail-engine/e-mail-session-utils.c:952
+#: ../libemail-engine/mail-ops.c:978 ../libemail-engine/mail-ops.c:1080
+msgid "Sending message"
+msgstr "Sendante mesaĝon"
+
+#: ../libemail-engine/e-mail-store-utils.c:189
+#, c-format
+msgid "Disconnecting from '%s'"
+msgstr ""
+
+#: ../libemail-engine/e-mail-store-utils.c:265
+#, c-format
+msgid "Reconnecting to '%s'"
+msgstr ""
+
+#: ../libemail-engine/e-mail-store-utils.c:350
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr ""
+
+#: ../libemail-engine/mail-ops.c:90
+msgid "Filtering Selected Messages"
+msgstr ""
+
+#: ../libemail-engine/mail-ops.c:148
+#, c-format
+msgid ""
+"Failed to filter selected messages. One reason can be that folder location "
+"set in one or more filters is invalid. Please check your filters in Edit-"
+">Message Filters.\n"
+"Original error was: %s"
+msgstr ""
+
+#: ../libemail-engine/mail-ops.c:229
+#, fuzzy, c-format
+#| msgid "Mail from %s"
+msgid "Fetching mail from '%s'"
+msgstr "Poŝtaĵo de '%s'"
+
+#: ../libemail-engine/mail-ops.c:748
+#, c-format
+msgid ""
+"Failed to apply outgoing filters. One reason can be that folder location set "
+"in one or more filters is invalid. Please check your filters in Edit-"
+">Message Filters.\n"
+"Original error was: %s"
+msgstr ""
+
+#: ../libemail-engine/mail-ops.c:989
+#, c-format
+msgid "Sending message %d of %d"
+msgstr ""
+
+#: ../libemail-engine/mail-ops.c:1041
+#, fuzzy, c-format
+#| msgid "Calendar Message"
+msgid "Failed to send a message"
+msgid_plural "Failed to send %d of %d messages"
+msgstr[0] "Kalendar-mesaĝo"
+msgstr[1] "Kalendar-mesaĝo"
+
+#: ../libemail-engine/mail-ops.c:1047
+msgid "Canceled."
+msgstr "Nuligite."
+
+#: ../libemail-engine/mail-ops.c:1049
+msgid "Complete."
+msgstr "Plenumite."
+
+#: ../libemail-engine/mail-ops.c:1163
+#, c-format
+msgid "Moving messages to '%s'"
+msgstr "Movante mesaĝojn al '%s'"
+
+#: ../libemail-engine/mail-ops.c:1164
+#, c-format
+msgid "Copying messages to '%s'"
+msgstr "Kopiante mesaĝojn al '%s'"
+
+#: ../libemail-engine/mail-ops.c:1283
+#, c-format
+msgid "Storing folder '%s'"
+msgstr "Konserva dosierujo '%s'"
+
+#: ../libemail-engine/mail-ops.c:1411
+#, c-format
+msgid "Expunging and storing account '%s'"
+msgstr ""
+
+#: ../libemail-engine/mail-ops.c:1412
+#, c-format
+msgid "Storing account '%s'"
+msgstr "Konserva konto '%s'"
+
+#: ../libemail-engine/mail-ops.c:1487
+#, c-format
+msgid "Emptying trash in '%s'"
+msgstr ""
+
+#: ../libemail-engine/mail-ops.c:1579
+#, fuzzy, c-format
+#| msgid "Creating folder '%s'"
+msgid "Processing folder changes in '%s'"
+msgstr "Kreante dosierujon '%s'"
+
+#: ../libemail-engine/mail-tools.c:70
+#, c-format
+msgid "Could not create spool directory '%s': %s"
+msgstr ""
+
+#: ../libemail-engine/mail-tools.c:110
+#, c-format
+msgid "Trying to movemail a non-mbox source '%s'"
+msgstr ""
+
+#: ../libemail-engine/mail-tools.c:236
+#, c-format
+msgid "Forwarded message - %s"
+msgstr ""
+
+#: ../libemail-engine/mail-tools.c:238
+msgid "Forwarded message"
+msgstr ""
+
+#: ../libemail-engine/mail-vfolder.c:151
+#, c-format
+msgid "Setting up Search Folder: %s"
+msgstr ""
+
+#: ../libemail-engine/mail-vfolder.c:304
+#, c-format
+msgid "Updating Search Folders for '%s' - %s"
+msgstr ""
+
+#. Translators: The first %s is name of the affected
+#. * search folder(s), the second %s is the URI of the
+#. * removed folder. For more than one search folder is
+#. * each of them on a separate line, with four spaces
+#. * in front of its name, without quotes.
+#: ../libemail-engine/mail-vfolder.c:668
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been modified to account for the deleted "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been modified to account for the deleted folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/e-mail-account-manager.c:117 ../mail/e-mail-account-manager.c:204
+#, fuzzy
+#| msgid "All Accounts"
+msgid "Open _Online Accounts"
+msgstr "Malfermi _retajn kontojn"
+
+#: ../mail/e-mail-account-manager.c:143 ../mail/e-mail-account-manager.c:230
+msgid "This account was created through the Online Accounts service."
+msgstr ""
+
+#: ../mail/e-mail-account-manager.c:689
+msgid "_Reset Order"
+msgstr ""
+
+#: ../mail/e-mail-account-manager.c:702
+msgid "You can drag and drop account names to reorder them."
+msgstr ""
+
+#: ../mail/e-mail-account-manager.c:745
+msgid "De_fault"
+msgstr "De_faŭlto"
+
+#: ../mail/e-mail-account-tree-view.c:83
+#: ../modules/mail/em-composer-prefs.c:1263
+#: ../modules/plugin-manager/evolution-plugin-manager.c:358
+#: ../plugins/publish-calendar/publish-calendar.c:896
+msgid "Enabled"
+msgstr "Enŝaltite"
+
+#: ../mail/e-mail-account-tree-view.c:107
+msgid "Account Name"
+msgstr "Kontonomo"
+
+#: ../mail/e-mail-autoconfig.c:619
+#, fuzzy
+#| msgid "Using email address"
+msgid "No email address provided"
+msgstr "Uzas retpoŝtadreson"
+
+#: ../mail/e-mail-autoconfig.c:628
+#, fuzzy
+#| msgid "Using email address"
+msgid "Missing domain in email address"
+msgstr "Uzas retpoŝtadreson"
+
+#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:903
+#: ../shell/e-shell-window-actions.c:910 ../shell/e-shell-window-actions.c:917
+msgid "Close this window"
+msgstr "Fermi ĉi tiun fenestron"
+
+#: ../mail/e-mail-browser.c:285
+msgid "(No Subject)"
+msgstr "(Neniu temo)"
+
+#. GtkAssistant's back button label.
+#: ../mail/e-mail-config-assistant.c:46
+#| msgid "Go Back"
+msgid "Go _Back"
+msgstr "Iri _malantaŭen"
+
+#. GtkAssistant sinks the floating button reference.
+#: ../mail/e-mail-config-assistant.c:115
+msgid "_Skip Lookup"
+msgstr ""
+
+#: ../mail/e-mail-config-assistant.c:660
+msgid "Evolution Account Assistant"
+msgstr "Konto-asistanto de Evolucio"
+
+#: ../mail/e-mail-config-assistant.c:952
+#| msgid "Task Details"
+msgid "_Revise Details"
+msgstr ""
+
+#: ../mail/e-mail-config-auth-check.c:337
+msgid "Check for Supported Types"
+msgstr ""
+
+#: ../mail/e-mail-config-confirm-page.c:155
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+
+#: ../mail/e-mail-config-confirm-page.c:167
+msgid "Done"
+msgstr "Farite"
+
+#: ../mail/e-mail-config-defaults-page.c:549
+msgid "Special Folders"
+msgstr "Specialaj dosierujoj"
+
+#: ../mail/e-mail-config-defaults-page.c:558
+#, fuzzy
+#| msgid "Drafts _Folder:"
+msgid "Draft Messages _Folder:"
+msgstr "Malnet_dosierujo:"
+
+#: ../mail/e-mail-config-defaults-page.c:568
+msgid "Choose a folder for saving draft messages."
+msgstr ""
+
+#: ../mail/e-mail-config-defaults-page.c:582
+msgid "Sent _Messages Folder:"
+msgstr ""
+
+#: ../mail/e-mail-config-defaults-page.c:592
+msgid "Choose a folder for saving sent messages."
+msgstr ""
+
+#: ../mail/e-mail-config-defaults-page.c:611
+msgid "S_ave replies in the folder of the message being replied to"
+msgstr ""
+
+#: ../mail/e-mail-config-defaults-page.c:628
+#| msgid "Search Folders"
+msgid "Archi_ve Folder:"
+msgstr "Arki_vo-dosierujo:"
+
+#: ../mail/e-mail-config-defaults-page.c:638
+#: ../modules/mail/em-mailer-prefs.c:1079
+msgid "Choose a folder to archive messages to."
+msgstr ""
+
+#: ../mail/e-mail-config-defaults-page.c:652
+#, fuzzy
+#| msgid "_Restore Default"
+msgid "_Restore Defaults"
+msgstr "_Restaŭri defaŭlton"
+
+#: ../mail/e-mail-config-defaults-page.c:666
+msgid "Use a Real Folder for _Trash:"
+msgstr ""
+
+#: ../mail/e-mail-config-defaults-page.c:667
+#, fuzzy
+#| msgid "Could not create message."
+msgid "Choose a folder for deleted messages."
+msgstr "Ne eblis kreii mesaĝon."
+
+#: ../mail/e-mail-config-defaults-page.c:676
+msgid "Use a Real Folder for _Junk:"
+msgstr ""
+
+#: ../mail/e-mail-config-defaults-page.c:677
+msgid "Choose a folder for junk messages."
+msgstr ""
+
+#: ../mail/e-mail-config-defaults-page.c:694
+msgid "Composing Messages"
+msgstr "Kreado de mesaĝoj"
+
+#: ../mail/e-mail-config-defaults-page.c:703
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr ""
+
+#: ../mail/e-mail-config-defaults-page.c:728
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Ĉiam sendi _kaŝitan kopion (bcc) al:"
+
+#: ../mail/e-mail-config-defaults-page.c:763
+msgid "Message Receipts"
+msgstr ""
+
+#: ../mail/e-mail-config-defaults-page.c:772
+msgid "S_end message receipts:"
+msgstr ""
+
+#: ../mail/e-mail-config-defaults-page.c:797
+msgid "Never"
+msgstr "Neniam"
+
+#: ../mail/e-mail-config-defaults-page.c:803
+msgid "Always"
+msgstr "Ĉiam"
+
+#: ../mail/e-mail-config-defaults-page.c:809
+msgid "Ask for each message"
+msgstr ""
+
+#: ../mail/e-mail-config-defaults-page.c:880
+msgid "Defaults"
+msgstr "Defaŭltoj"
+
+#: ../mail/e-mail-config-identity-page.c:282
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+
+#: ../mail/e-mail-config-identity-page.c:310
+#: ../mail/e-mail-config-summary-page.c:322
+msgid "Account Information"
+msgstr "Kontoinformoj"
+
+#: ../mail/e-mail-config-identity-page.c:319
+#: ../mail/e-mail-config-summary-page.c:331
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example, \"Work\" or \"Personal\"."
+msgstr ""
+
+#: ../mail/e-mail-config-identity-page.c:364
+msgid "Required Information"
+msgstr "Nepra informo"
+
+#: ../mail/e-mail-config-identity-page.c:373
+msgid "Full Nam_e:"
+msgstr "Tuta _nomo:"
+
+#: ../mail/e-mail-config-identity-page.c:400
+msgid "Email _Address:"
+msgstr "Retpoŝt_adreso:"
+
+#: ../mail/e-mail-config-identity-page.c:447
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
+msgid "Optional Information"
+msgstr "Nedeviga informo"
+
+#: ../mail/e-mail-config-identity-page.c:456
+msgid "Re_ply-To:"
+msgstr ""
+
+#: ../mail/e-mail-config-identity-page.c:483
+msgid "Or_ganization:"
+msgstr "Or_ganizo:"
+
+#: ../mail/e-mail-config-identity-page.c:538
+msgid "Add Ne_w Signature..."
+msgstr "Aldoni no_van subskribon..."
+
+#: ../mail/e-mail-config-identity-page.c:556
+msgid "_Look up mail server details based on the entered e-mail address"
+msgstr ""
+
+#: ../mail/e-mail-config-lookup-page.c:70
+#, fuzzy
+#| msgid "Loading accounts..."
+msgid "Looking up account details..."
+msgstr "Ŝargante kontojn..."
+
+#: ../mail/e-mail-config-provider-page.c:484
+msgid "Checking for New Mail"
+msgstr ""
+
+#: ../mail/e-mail-config-provider-page.c:500
+msgid "Check for _new messages every"
+msgstr ""
+
+#: ../mail/e-mail-config-provider-page.c:698
+msgid "Receiving Options"
+msgstr ""
+
+#: ../mail/e-mail-config-receiving-page.c:49
+msgid "Receiving Email"
+msgstr "Retpoŝto estas ricevata"
+
+#. Translators: This string is to describe a PGP key in a combo box in mail account's preferences.
+#. The first '%s' is a key ID, the second '%s' is a display name of the key.
+#: ../mail/e-mail-config-security-page.c:251
+#, c-format
+#| msgid "Task - %s"
+msgctxt "PGPKeyDescription"
+msgid "%s - %s"
+msgstr "%s - %s"
+
+#: ../mail/e-mail-config-security-page.c:340
+#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:29
+#: ../modules/addressbook/autocompletion-config.c:114
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
+#: ../modules/itip-formatter/plugin/config-ui.c:90
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+msgid "General"
+msgstr "Ĝenerale"
+
+#: ../mail/e-mail-config-security-page.c:349
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr ""
+
+#: ../mail/e-mail-config-security-page.c:371
+msgid "Pretty Good Privacy (OpenPGP)"
+msgstr ""
+
+#: ../mail/e-mail-config-security-page.c:380
+msgid "OpenPGP _Key ID:"
+msgstr ""
+
+#: ../mail/e-mail-config-security-page.c:413
+msgid "Si_gning algorithm:"
+msgstr ""
+
+#: ../mail/e-mail-config-security-page.c:429
+#: ../mail/e-mail-config-security-page.c:569 ../mail/mail-config.ui.h:70
+msgid "SHA1"
+msgstr "SHA1"
+
+#: ../mail/e-mail-config-security-page.c:432
+#: ../mail/e-mail-config-security-page.c:572 ../mail/mail-config.ui.h:71
+msgid "SHA256"
+msgstr "SHA256"
+
+#: ../mail/e-mail-config-security-page.c:435
+#: ../mail/e-mail-config-security-page.c:575 ../mail/mail-config.ui.h:72
+msgid "SHA384"
+msgstr "SHA384"
+
+#: ../mail/e-mail-config-security-page.c:438
+#: ../mail/e-mail-config-security-page.c:578 ../mail/mail-config.ui.h:73
+msgid "SHA512"
+msgstr "SHA512"
+
+#: ../mail/e-mail-config-security-page.c:454
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr ""
+
+#: ../mail/e-mail-config-security-page.c:466
+msgid "Always encrypt to _myself when sending encrypted messages"
+msgstr ""
+
+#: ../mail/e-mail-config-security-page.c:478
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
+
+#: ../mail/e-mail-config-security-page.c:502
+msgid "Secure MIME (S/MIME)"
+msgstr ""
+
+#: ../mail/e-mail-config-security-page.c:511
+msgid "Sig_ning certificate:"
+msgstr ""
+
+#: ../mail/e-mail-config-security-page.c:535
+#: ../mail/e-mail-config-security-page.c:641
+#| msgid "Select..."
+msgid "Select"
+msgstr "Elekti"
+
+#: ../mail/e-mail-config-security-page.c:544
+#: ../mail/e-mail-config-security-page.c:650 ../mail/mail-dialogs.ui.h:5
+#: ../shell/e-shell-window-actions.c:1006
+#| msgid "Clea_r"
+msgid "_Clear"
+msgstr "_Vakigi"
+
+#: ../mail/e-mail-config-security-page.c:553
+msgid "Signing _algorithm:"
+msgstr ""
+
+#: ../mail/e-mail-config-security-page.c:594
+msgid "Always sign outgoing messages when using this account"
+msgstr ""
+
+#: ../mail/e-mail-config-security-page.c:617
+#, fuzzy
+#| msgid "Encryption:"
+msgid "Encryption certificate:"
+msgstr "Ĉifrado:"
+
+#: ../mail/e-mail-config-security-page.c:659
+msgid "Always encrypt outgoing messages when using this account"
+msgstr ""
+
+#: ../mail/e-mail-config-security-page.c:679
+msgid "Always encrypt to myself when sending encrypted messages"
+msgstr ""
+
+#: ../mail/e-mail-config-sending-page.c:49
+msgid "Sending Email"
+msgstr "Retpoŝto estas sendata"
+
+#: ../mail/e-mail-config-service-page.c:638
+msgid "Server _Type:"
+msgstr ""
+
+#: ../mail/e-mail-config-summary-page.c:141
+msgid "SSL"
+msgstr "SSL"
+
+#: ../mail/e-mail-config-summary-page.c:144
+msgid "TLS"
+msgstr "TLS"
+
+#: ../mail/e-mail-config-summary-page.c:305
+msgid ""
+"This is a summary of the settings which will be used to access your mail."
+msgstr ""
+
+#: ../mail/e-mail-config-summary-page.c:370
+#| msgid "Personal Details:"
+msgid "Personal Details"
+msgstr "Persondetaloj"
+
+#: ../mail/e-mail-config-summary-page.c:379
+#| msgid "Full Nam_e:"
+msgid "Full Name:"
+msgstr "Tuta nomo:"
+
+#: ../mail/e-mail-config-summary-page.c:393
+#| msgid "Email _Address:"
+msgid "Email Address:"
+msgstr "Retpoŝtadreso:"
+
+#: ../mail/e-mail-config-summary-page.c:407
+msgid "Receiving"
+msgstr "Ricevante"
+
+#: ../mail/e-mail-config-summary-page.c:419
+msgid "Sending"
+msgstr "Sendante"
+
+#: ../mail/e-mail-config-summary-page.c:431
+#| msgid "Server type:"
+msgid "Server Type:"
+msgstr "Serviltipo:"
+
+#: ../mail/e-mail-config-summary-page.c:452
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:601
+#| msgid "_Server:"
+msgid "Server:"
+msgstr "Servilo:"
+
+#: ../mail/e-mail-config-summary-page.c:473
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
+msgid "Username:"
+msgstr "Uzantonomo:"
+
+#: ../mail/e-mail-config-summary-page.c:494
+#| msgctxt "email-custom-header-Security"
+#| msgid "Security:"
+msgid "Security:"
+msgstr "Sekureco:"
+
+#: ../mail/e-mail-config-summary-page.c:785
+msgid "Account Summary"
+msgstr "Konta resumo"
+
+#: ../mail/e-mail-config-welcome-page.c:156
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Next\" to begin."
+msgstr ""
+
+#: ../mail/e-mail-config-welcome-page.c:166
+#: ../modules/startup-wizard/e-startup-assistant.c:151
+msgid "Welcome"
+msgstr "Bonvenon"
+
+#: ../mail/e-mail-config-window.c:325
+msgid "Account Editor"
+msgstr "Kontoredaktilo"
+
+#: ../mail/e-mail-display.c:97
+msgid "_Add to Address Book..."
+msgstr "_Aldoni al adresaro..."
+
+#: ../mail/e-mail-display.c:104
+msgid "_To This Address"
+msgstr "_Al tiu adreso"
+
+#: ../mail/e-mail-display.c:111
+msgid "_From This Address"
+msgstr "_De tiu adreso"
+
+#: ../mail/e-mail-display.c:118
+msgid "Send _Reply To..."
+msgstr "Sendi _respondon al..."
+
+#: ../mail/e-mail-display.c:120
+msgid "Send a reply message to this address"
+msgstr "Sendi respond-mesaĝon al tiu ĉi adreso"
+
+#: ../mail/e-mail-display.c:127
+msgid "Create Search _Folder"
+msgstr "Kreii serĉ_dosierujon"
+
+#: ../mail/e-mail-folder-create-dialog.c:327
+msgid "Create Folder"
+msgstr "Krei dosierujon"
+
+#: ../mail/e-mail-folder-create-dialog.c:331
+msgid "Specify where to create the folder:"
+msgstr ""
+
+#: ../mail/e-mail-folder-create-dialog.c:334
+msgid "C_reate"
+msgstr "K_rei"
+
+#: ../mail/e-mail-folder-create-dialog.c:351
+msgid "Folder _name:"
+msgstr "Dosieruj_nomo:"
+
+#. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
+#. The translated value should not contain spaces.
+#: ../mail/e-mail-free-form-exp.c:226
+#| msgid "Answered"
+msgctxt "ffe"
+msgid "Answered"
+msgstr "Respondite"
+
+#: ../mail/e-mail-free-form-exp.c:227
+#| msgid "Deleted"
+msgctxt "ffe"
+msgid "Deleted"
+msgstr "Forigite"
+
+#: ../mail/e-mail-free-form-exp.c:228
+#| msgid "Draft"
+msgctxt "ffe"
+msgid "Draft"
+msgstr "Malneto"
+
+#: ../mail/e-mail-free-form-exp.c:229
+msgctxt "ffe"
+msgid "Flagged"
+msgstr "Flagita"
+
+#: ../mail/e-mail-free-form-exp.c:230
+#| msgid "Seen"
+msgctxt "ffe"
+msgid "Seen"
+msgstr "Vidite"
+
+#: ../mail/e-mail-free-form-exp.c:231
+#| msgid "Attachment"
+#| msgid_plural "Attachments"
+msgctxt "ffe"
+msgid "Attachment"
+msgstr "Aldonaĵo"
+
+#: ../mail/e-mail-free-form-exp.c:479
+#| msgid "now"
+msgctxt "ffe"
+msgid "no"
+msgstr "ne"
+
+#: ../mail/e-mail-free-form-exp.c:480
+msgctxt "ffe"
+msgid "false"
+msgstr ""
+
+#: ../mail/e-mail-junk-options.c:295
 msgid "Junk filtering software:"
 msgstr ""
 
-#: ../mail/e-mail-label-dialog.c:225
+#: ../mail/e-mail-label-dialog.c:224
 msgid "_Label name:"
 msgstr "_Marknomo:"
 
-#: ../mail/e-mail-label-list-store.c:45
+#: ../mail/e-mail-label-list-store.c:57
 msgid "I_mportant"
 msgstr "_Grave"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:46
+#: ../mail/e-mail-label-list-store.c:58
 msgid "_Work"
 msgstr "_Labore"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:47
+#: ../mail/e-mail-label-list-store.c:59
 msgid "_Personal"
 msgstr "_Persone"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:48
+#: ../mail/e-mail-label-list-store.c:60
 msgid "_To Do"
 msgstr "_Ende"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:49
+#: ../mail/e-mail-label-list-store.c:61
 msgid "_Later"
 msgstr "_Poste"
 
-#: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:705
+#: ../mail/e-mail-label-manager.c:171
+#: ../modules/mail/e-mail-shell-view-actions.c:1085
 msgid "Add Label"
 msgstr "Aldoni etikedon"
 
-#: ../mail/e-mail-label-manager.c:221
+#: ../mail/e-mail-label-manager.c:222
 msgid "Edit Label"
 msgstr "Redakti etikedon"
 
-#: ../mail/e-mail-label-manager.c:353
+#: ../mail/e-mail-label-manager.c:354
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
 msgstr ""
 
-#: ../mail/e-mail-label-tree-view.c:89
+#: ../mail/e-mail-label-tree-view.c:88
 msgid "Color"
 msgstr "Koloro"
 
-#: ../mail/e-mail-label-tree-view.c:99
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../plugins/caldav/caldav-browse-server.c:1358
-#: ../widgets/menus/gal-define-views-dialog.c:347
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:92
-msgid "Name"
-msgstr "Nomo"
+#: ../mail/e-mail-print-config-headers.c:165
+#, fuzzy
+#| msgid "Move the selected folder into another folder"
+msgid "Move selected headers to top"
+msgstr "Movi la elektitan dosierujon al alia dosierujo"
 
-#: ../mail/e-mail-migrate.c:1182
-#, c-format
-msgid "Unable to create local mail folders at '%s': %s"
-msgstr ""
+#: ../mail/e-mail-print-config-headers.c:170
+#, fuzzy
+#| msgid "Move the selected folder into another folder"
+msgid "Move selected headers up one row"
+msgstr "Movi la elektitan dosierujon al alia dosierujo"
 
-#: ../mail/e-mail-notebook-view.c:627
-msgid "Please select a folder"
-msgstr "Bonvole elektu dosierujon"
+#: ../mail/e-mail-print-config-headers.c:175
+#, fuzzy
+#| msgid "Move the selected folder into another folder"
+msgid "Move selected headers down one row"
+msgstr "Movi la elektitan dosierujon al alia dosierujo"
 
-#: ../mail/e-mail-reader.c:310 ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "Kopii la dosierujon"
+#: ../mail/e-mail-print-config-headers.c:180
+#, fuzzy
+#| msgid "Move the selected folder into another folder"
+msgid "Move selected headers to bottom"
+msgstr "Movi la elektitan dosierujon al alia dosierujo"
 
-#: ../mail/e-mail-reader.c:310 ../mail/em-folder-utils.c:486
-msgid "C_opy"
-msgstr "K_opii"
+#: ../mail/e-mail-print-config-headers.c:185
+#, fuzzy
+#| msgid "Select all text"
+msgid "Select all headers"
+msgstr "Elekti tutan tekston"
 
-#: ../mail/e-mail-reader.c:825 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-print-config-headers.c:204
+#, fuzzy
+#| msgid "Header name"
+msgid "Header Name"
+msgstr "Paĝokapa nomo"
+
+#: ../mail/e-mail-print-config-headers.c:213
+#, fuzzy
+#| msgid "Header name"
+msgid "Header Value"
+msgstr "Paĝokapa nomo"
+
+#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:114
+msgid "Headers"
+msgstr "Kaplinioj"
+
+#: ../mail/e-mail-printer.c:166
+#, c-format
+msgid "Page %d of %d"
+msgstr "Paĝo %d de %d"
+
+#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:62
 msgid "Move to Folder"
 msgstr "Movi al dosierujo"
 
-#: ../mail/e-mail-reader.c:825 ../mail/em-folder-utils.c:486
+#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:63
+msgid "Copy to Folder"
+msgstr "Kopii la dosierujon"
+
+#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
 msgid "_Move"
 msgstr "_Movi"
 
-#: ../mail/e-mail-reader.c:1186 ../mail/e-mail-reader.c:1366
-#: ../mail/e-mail-reader.c:1405
+#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
+msgid "C_opy"
+msgstr "K_opii"
+
+#: ../mail/e-mail-reader.c:1268 ../mail/e-mail-reader.c:1480
+#: ../mail/e-mail-reader.c:1520
 msgid "_Do not ask me again."
 msgstr "_Ne demandu min denove."
 
-#: ../mail/e-mail-reader.c:1411
+#: ../mail/e-mail-reader.c:1526
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1772
+#: ../mail/e-mail-reader.c:1728
+#, fuzzy
+#| msgid "Detailed error message:"
+msgid "Failed to retrieve message:"
+msgstr "Detala erar-mesaĝo:"
+
+#: ../mail/e-mail-reader.c:1773 ../mail/e-mail-reader.c:3014
+#, c-format
+msgid "Retrieving message '%s'"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1961
 msgid "A_dd Sender to Address Book"
 msgstr "Al_doni sendinton al adresaro"
 
-#: ../mail/e-mail-reader.c:1774
+#: ../mail/e-mail-reader.c:1963
 msgid "Add sender to address book"
 msgstr "Aldoni sendinton al adresaro"
 
-#: ../mail/e-mail-reader.c:1779
+#: ../mail/e-mail-reader.c:1968
+msgid "_Archive..."
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1970
+msgid "Move selected messages to the Archive folder for the account"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1975
 msgid "Check for _Junk"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1781
+#: ../mail/e-mail-reader.c:1977
 msgid "Filter the selected messages for junk status"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1786
+#: ../mail/e-mail-reader.c:1982
 msgid "_Copy to Folder..."
 msgstr "_Kopii al dosierujo..."
 
-#: ../mail/e-mail-reader.c:1788
+#: ../mail/e-mail-reader.c:1984
 msgid "Copy selected messages to another folder"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1793
+#: ../mail/e-mail-reader.c:1989
 msgid "_Delete Message"
 msgstr "_Forigi mesaĝojn"
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:1991
 msgid "Mark the selected messages for deletion"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1800
-msgid "Filter on Mailing _List..."
+#: ../mail/e-mail-reader.c:1996
+msgid "Create a Filter Rule for Mailing _List..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1802
+#: ../mail/e-mail-reader.c:1998
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1807
-msgid "Filter on _Recipients..."
+#: ../mail/e-mail-reader.c:2003
+msgid "Create a Filter Rule for _Recipients..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1809
+#: ../mail/e-mail-reader.c:2005
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1814
-msgid "Filter on Se_nder..."
+#: ../mail/e-mail-reader.c:2010
+msgid "Create a Filter Rule for Se_nder..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1816
+#: ../mail/e-mail-reader.c:2012
 msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1821
-msgid "Filter on _Subject..."
+#: ../mail/e-mail-reader.c:2017
+msgid "Create a Filter Rule for _Subject..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1823
+#: ../mail/e-mail-reader.c:2019
 msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1828
+#: ../mail/e-mail-reader.c:2024
 msgid "A_pply Filters"
 msgstr "A_pliki filtrilojn"
 
-#: ../mail/e-mail-reader.c:1830
+#: ../mail/e-mail-reader.c:2026
 msgid "Apply filter rules to the selected messages"
 msgstr "Apliki filtril-regulojn al la elektitaj mesaĝoj"
 
-#: ../mail/e-mail-reader.c:1835
+#: ../mail/e-mail-reader.c:2031
 msgid "_Find in Message..."
 msgstr "_Trovi en mesaĝo..."
 
-#: ../mail/e-mail-reader.c:1837
+#: ../mail/e-mail-reader.c:2033
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1842
+#: ../mail/e-mail-reader.c:2038
 msgid "_Clear Flag"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1844
+#: ../mail/e-mail-reader.c:2040
 msgid "Remove the follow-up flag from the selected messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1849
+#: ../mail/e-mail-reader.c:2045
 msgid "_Flag Completed"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1851
+#: ../mail/e-mail-reader.c:2047
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1856
+#: ../mail/e-mail-reader.c:2052
 msgid "Follow _Up..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:2054
 msgid "Flag the selected messages for follow-up"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1863
+#: ../mail/e-mail-reader.c:2059
 msgid "_Attached"
 msgstr "_Aldonite"
 
-#: ../mail/e-mail-reader.c:1865 ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:2061 ../mail/e-mail-reader.c:2068
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1870
+#: ../mail/e-mail-reader.c:2066
 msgid "Forward As _Attached"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1877
+#: ../mail/e-mail-reader.c:2073
 msgid "_Inline"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1879 ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:2075 ../mail/e-mail-reader.c:2082
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1884
+#: ../mail/e-mail-reader.c:2080
 msgid "Forward As _Inline"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1891
+#: ../mail/e-mail-reader.c:2087
 msgid "_Quoted"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1893 ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:2089 ../mail/e-mail-reader.c:2096
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1898
+#: ../mail/e-mail-reader.c:2094
 msgid "Forward As _Quoted"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1905
+#: ../mail/e-mail-reader.c:2101
 msgid "_Load Images"
-msgstr "_Ŝargi bildojn"
+msgstr "Ŝ_argi bildojn"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:2103
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1912
+#: ../mail/e-mail-reader.c:2108 ../mail/e-mail-reader.c:2486
+msgid "_Ignore Subthread"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2110
+msgid "Mark new mails in a subthread as read automatically"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2115 ../mail/e-mail-reader.c:2490
+#, fuzzy
+#| msgid "Next _Thread"
+msgid "_Ignore Thread"
+msgstr "Sekva _fadeno"
+
+#: ../mail/e-mail-reader.c:2117
+msgid "Mark new mails in this thread as read automatically"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2122
 msgid "_Important"
 msgstr "_Grave"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:2124
 msgid "Mark the selected messages as important"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1919
+#: ../mail/e-mail-reader.c:2129
 msgid "_Junk"
 msgstr "_Rubaĵo"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:2131
 msgid "Mark the selected messages as junk"
 msgstr "Marki la elektitajn mesaĝojn kiel rubaĵo"
 
-#: ../mail/e-mail-reader.c:1926
+#: ../mail/e-mail-reader.c:2136
 msgid "_Not Junk"
 msgstr "_Ne rubaĵo"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:2138
 msgid "Mark the selected messages as not being junk"
 msgstr "Marki la elektitajn mesaĝojn kiel ne-rubaĵo"
 
-#: ../mail/e-mail-reader.c:1933
+#: ../mail/e-mail-reader.c:2143
 msgid "_Read"
 msgstr "_Legi"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:2145
 msgid "Mark the selected messages as having been read"
 msgstr "Marki la elektitajn mesaĝojn kiel legite"
 
-#: ../mail/e-mail-reader.c:1940
+#: ../mail/e-mail-reader.c:2150 ../mail/e-mail-reader.c:2510
+msgid "Do not _Ignore Subthread"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2152
+msgid "Do not mark new mails in a subthread as read automatically"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2157 ../mail/e-mail-reader.c:2514
+msgid "Do not _Ignore Thread"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2159
+msgid "Do not mark new mails in this thread as read automatically"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2164
 msgid "Uni_mportant"
 msgstr "_Malgrave"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:2166
 msgid "Mark the selected messages as unimportant"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1947
+#: ../mail/e-mail-reader.c:2171
 msgid "_Unread"
 msgstr "_Nelegite"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:2173
 msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1954
+#: ../mail/e-mail-reader.c:2178
 msgid "_Edit as New Message..."
 msgstr "_Redakti kiel nova mesaĝo..."
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:2180
 msgid "Open the selected messages in the composer for editing"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1961
+#: ../mail/e-mail-reader.c:2185
 msgid "Compose _New Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:2187
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1968
+#: ../mail/e-mail-reader.c:2192
 msgid "_Open in New Window"
 msgstr "_Malfermi en nova fenestro"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:2194
 msgid "Open the selected messages in a new window"
 msgstr "Malfermi la elektitajn mesaĝojn en nova fenestro"
 
-#: ../mail/e-mail-reader.c:1975
+#: ../mail/e-mail-reader.c:2199
 msgid "_Move to Folder..."
 msgstr "_Movi al dosierujo..."
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:2201
 msgid "Move selected messages to another folder"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1982
-msgid "_Switch to Folder"
-msgstr ""
-
-#: ../mail/e-mail-reader.c:1984
-msgid "Display the parent folder"
-msgstr ""
-
-#: ../mail/e-mail-reader.c:1989
-msgid "Switch to _next tab"
-msgstr ""
-
-#: ../mail/e-mail-reader.c:1991
-msgid "Switch to the next tab"
-msgstr ""
-
-#: ../mail/e-mail-reader.c:1996
-msgid "Switch to _previous tab"
-msgstr ""
-
-#: ../mail/e-mail-reader.c:1998
-msgid "Switch to the previous tab"
-msgstr ""
-
-#: ../mail/e-mail-reader.c:2003
-msgid "Cl_ose current tab"
-msgstr ""
-
-#: ../mail/e-mail-reader.c:2005
-msgid "Close current tab"
-msgstr ""
-
-#: ../mail/e-mail-reader.c:2010
+#: ../mail/e-mail-reader.c:2206
 msgid "_Next Message"
 msgstr "_Sekva mesaĝo"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2208
 msgid "Display the next message"
 msgstr "Montri la sekvan mesaĝon"
 
-#: ../mail/e-mail-reader.c:2017
+#: ../mail/e-mail-reader.c:2213
 msgid "Next _Important Message"
 msgstr "Sekva _grava mesaĝo"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2215
 msgid "Display the next important message"
 msgstr "Montri la sekvan gravan mesaĝon"
 
-#: ../mail/e-mail-reader.c:2024
+#: ../mail/e-mail-reader.c:2220
 msgid "Next _Thread"
 msgstr "Sekva _fadeno"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2222
 msgid "Display the next thread"
 msgstr "Montri la sekvan fadenon"
 
-#: ../mail/e-mail-reader.c:2031
+#: ../mail/e-mail-reader.c:2227
 msgid "Next _Unread Message"
 msgstr "Sekva _nelegita mesaĝo"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2229
 msgid "Display the next unread message"
 msgstr "Montri la sekvan nelegitan mesaĝon"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:2234
 msgid "_Previous Message"
 msgstr "_Antaŭa mesaĝo"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2236
 msgid "Display the previous message"
 msgstr "Montri la antaŭan mesaĝon"
 
-#: ../mail/e-mail-reader.c:2045
+#: ../mail/e-mail-reader.c:2241
 msgid "Pr_evious Important Message"
 msgstr "_Antaŭa grava mesaĝo"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2243
 msgid "Display the previous important message"
 msgstr "Montri la antaŭan gravan mesaĝon"
 
-#: ../mail/e-mail-reader.c:2052
+#: ../mail/e-mail-reader.c:2248
 msgid "Previous T_hread"
 msgstr "_Antaŭa fadeno"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2250
 msgid "Display the previous thread"
 msgstr "Montri la antaŭan fadenon"
 
-#: ../mail/e-mail-reader.c:2059
+#: ../mail/e-mail-reader.c:2255
 msgid "P_revious Unread Message"
 msgstr "A_ntaŭa nelegita mesaĝo"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:2257
 msgid "Display the previous unread message"
 msgstr "Montri la antaŭan nelegitan mesaĝon"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:2264
 msgid "Print this message"
 msgstr "Presi tiun mesaĝon"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2271
 msgid "Preview the message to be printed"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2080
+#: ../mail/e-mail-reader.c:2276
 msgid "Re_direct"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2278
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2087
+#: ../mail/e-mail-reader.c:2283
 msgid "Remo_ve Attachments"
 msgstr "_Forigi aldonaĵon"
 
-#: ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:2285
 msgid "Remove attachments"
 msgstr "Forigi aldonaĵojn"
 
-#: ../mail/e-mail-reader.c:2094
+#: ../mail/e-mail-reader.c:2290
 msgid "Remove Du_plicate Messages"
 msgstr "Forigi duo_bligitajn mesaĝojn"
 
-#: ../mail/e-mail-reader.c:2096
+#: ../mail/e-mail-reader.c:2292
 msgid "Checks selected messages for duplicates"
 msgstr "Kontroli elektitajn mesaĝojn pri duobligitoj"
 
-#: ../mail/e-mail-reader.c:2101 ../mail/mail.error.xml.h:107
-#: ../modules/calendar/e-cal-shell-view-actions.c:1510
-#: ../modules/mail/e-mail-attachment-handler.c:177
+#: ../mail/e-mail-reader.c:2297 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1387
+#: ../modules/mail/e-mail-attachment-handler.c:213
 msgid "Reply to _All"
 msgstr "Respondi al ĉi_uj"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2299
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2108 ../mail/mail.error.xml.h:108
+#: ../mail/e-mail-reader.c:2304 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Respondi al la _listo"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2306
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2115
-#: ../modules/mail/e-mail-attachment-handler.c:184
+#: ../mail/e-mail-reader.c:2311
+#: ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "_Respondi al sendinto"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2313
 msgid "Compose a reply to the sender of the selected message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2122
+#: ../mail/e-mail-reader.c:2318
 msgid "_Save as mbox..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2320
 msgid "Save selected messages as an mbox file"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2129
+#: ../mail/e-mail-reader.c:2325
 msgid "_Message Source"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2131
+#: ../mail/e-mail-reader.c:2327
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2143
+#: ../mail/e-mail-reader.c:2339
 msgid "_Undelete Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2341
 msgid "Undelete the selected messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2150
+#: ../mail/e-mail-reader.c:2346
 msgid "_Normal Size"
 msgstr "_Normala grando"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2348
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2157
+#: ../mail/e-mail-reader.c:2353
 msgid "_Zoom In"
 msgstr "E_nzomi"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2355
 msgid "Increase the text size"
 msgstr "Pligrandigi la tekston"
 
-#: ../mail/e-mail-reader.c:2164
-msgid "Zoom _Out"
-msgstr "E_lzomi"
-
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2362
 msgid "Decrease the text size"
 msgstr "Plimalgrandigi la tekston"
 
-#: ../mail/e-mail-reader.c:2173
-msgid "Create R_ule"
-msgstr "Krei reg_ulon"
+#: ../mail/e-mail-reader.c:2369
+msgid "Cre_ate"
+msgstr ""
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2376
 msgid "Ch_aracter Encoding"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2383
 msgid "F_orward As"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2194
+#: ../mail/e-mail-reader.c:2390
 msgid "_Group Reply"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2201
+#: ../mail/e-mail-reader.c:2397
 msgid "_Go To"
 msgstr "_Iri al"
 
-#: ../mail/e-mail-reader.c:2208
+#: ../mail/e-mail-reader.c:2404
 msgid "Mar_k As"
 msgstr "Mar_ki kiel"
 
-#: ../mail/e-mail-reader.c:2215
+#: ../mail/e-mail-reader.c:2411
 msgid "_Message"
 msgstr "_Mesaĝo"
 
-#: ../mail/e-mail-reader.c:2222
+#: ../mail/e-mail-reader.c:2418
 msgid "_Zoom"
 msgstr "_Zomo"
 
-#: ../mail/e-mail-reader.c:2232
-msgid "Search Folder from Mailing _List..."
-msgstr ""
+#: ../mail/e-mail-reader.c:2428
+#, fuzzy
+#| msgid "Create Search _Folder"
+msgid "Create a Search Folder from Mailing _List..."
+msgstr "Kreii serĉ_dosierujon..."
 
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2430
 msgid "Create a search folder for this mailing list"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2239
-msgid "Search Folder from Recipien_ts..."
-msgstr ""
+#: ../mail/e-mail-reader.c:2435
+#, fuzzy
+#| msgid "Create Search _Folder"
+msgid "Create a Search Folder from Recipien_ts..."
+msgstr "Kreii serĉ_dosierujon..."
 
-#: ../mail/e-mail-reader.c:2241
+#: ../mail/e-mail-reader.c:2437
 msgid "Create a search folder for these recipients"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2246
-msgid "Search Folder from Sen_der..."
-msgstr ""
+#: ../mail/e-mail-reader.c:2442
+#, fuzzy
+#| msgid "Create Search _Folder"
+msgid "Create a Search Folder from Sen_der..."
+msgstr "Kreii serĉ_dosierujon..."
 
-#: ../mail/e-mail-reader.c:2248
+#: ../mail/e-mail-reader.c:2444
 msgid "Create a search folder for this sender"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2253
-msgid "Search Folder from S_ubject..."
-msgstr ""
+#: ../mail/e-mail-reader.c:2449
+#, fuzzy
+#| msgid "Create Search _Folder"
+msgid "Create a Search Folder from S_ubject..."
+msgstr "Kreii serĉ_dosierujon..."
 
-#: ../mail/e-mail-reader.c:2255
+#: ../mail/e-mail-reader.c:2451
 msgid "Create a search folder for this subject"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2478
 msgid "Mark for Follo_w Up..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2286
+#: ../mail/e-mail-reader.c:2494
 msgid "Mark as _Important"
 msgstr "Marki kiel _grava"
 
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2498
 msgid "Mark as _Junk"
 msgstr "Marki kiel _rubaĵo"
 
-#: ../mail/e-mail-reader.c:2294
+#: ../mail/e-mail-reader.c:2502
 msgid "Mark as _Not Junk"
 msgstr "Marki kiel _nerubaĵo"
 
-#: ../mail/e-mail-reader.c:2298
+#: ../mail/e-mail-reader.c:2506
 msgid "Mar_k as Read"
 msgstr "Marki kiel _legite"
 
-#: ../mail/e-mail-reader.c:2302
+#: ../mail/e-mail-reader.c:2518
 msgid "Mark as Uni_mportant"
 msgstr "Marki kiel n_egrava"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2522
 msgid "Mark as _Unread"
 msgstr "Marki kiel neleg_ite"
 
-#: ../mail/e-mail-reader.c:2350
+#: ../mail/e-mail-reader.c:2566
 msgid "_Caret Mode"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2352
+#: ../mail/e-mail-reader.c:2568
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2358
+#: ../mail/e-mail-reader.c:2574
 msgid "All Message _Headers"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2360
+#: ../mail/e-mail-reader.c:2576
 msgid "Show messages with all email headers"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2653
-#, c-format
-msgid "Retrieving message '%s'"
-msgstr ""
+#: ../mail/e-mail-reader.c:3020
+#, fuzzy
+#| msgid "Sending message"
+msgid "Retrieving message"
+msgstr "Sendante mesaĝon"
 
-#: ../mail/e-mail-reader.c:3555
-#: ../modules/mail/e-mail-attachment-handler.c:170
+#: ../mail/e-mail-reader.c:4033
+#: ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "_Plusendi"
 
-#: ../mail/e-mail-reader.c:3556
+#: ../mail/e-mail-reader.c:4034
 msgid "Forward the selected message to someone"
 msgstr "Plusendi la elektitan mesaĝon al iu"
 
-#: ../mail/e-mail-reader.c:3575
+#: ../mail/e-mail-reader.c:4053
 msgid "Group Reply"
 msgstr "Gruprespondo"
 
-#: ../mail/e-mail-reader.c:3576
+#: ../mail/e-mail-reader.c:4054
 msgid "Reply to the mailing list, or to all recipients"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:3629 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:4120 ../mail/filtertypes.xml.in.h:64
 msgid "Delete"
 msgstr "Forigi"
 
-#: ../mail/e-mail-reader.c:3662
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
-#: ../widgets/misc/e-calendar.c:202
+#: ../mail/e-mail-reader.c:4132
+#: ../modules/calendar/e-cal-shell-view-actions.c:1212
 msgid "Next"
 msgstr "Sekva"
 
-#: ../mail/e-mail-reader.c:3666
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
-#: ../widgets/misc/e-calendar.c:178
+#: ../mail/e-mail-reader.c:4136
+#: ../modules/calendar/e-cal-shell-view-actions.c:1205
 msgid "Previous"
 msgstr "Antaŭa"
 
-#: ../mail/e-mail-reader.c:3675 ../mail/mail-dialogs.ui.h:17
+#: ../mail/e-mail-reader.c:4145 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Respondi"
 
-#: ../mail/e-mail-reader.c:4362
-#, c-format
-msgid "Folder '%s'"
-msgstr "Dosierujo '%s'"
-
-#: ../mail/e-mail-reader-utils.c:144
+#: ../mail/e-mail-reader-utils.c:146
 msgid "Do not warn me again"
 msgstr "Ne averti min denove"
 
+#: ../mail/e-mail-reader-utils.c:556 ../plugins/face/face.c:170
+#: ../shell/e-shell.c:867 ../shell/e-shell.c:888
+#: ../smime/gui/certificate-manager.c:346
+msgid "Unknown error"
+msgstr "Nekonata eraro"
+
+#: ../mail/e-mail-reader-utils.c:1043
+msgid "Marking thread to be ignored"
+msgstr ""
+
+#: ../mail/e-mail-reader-utils.c:1047
+msgid "Unmarking thread from being ignored"
+msgstr ""
+
+#: ../mail/e-mail-reader-utils.c:1051
+msgid "Marking subthread to be ignored"
+msgstr ""
+
+#: ../mail/e-mail-reader-utils.c:1055
+msgid "Unmarking subthread from being ignored"
+msgstr ""
+
+#: ../mail/e-mail-reader-utils.c:1290
+#| msgid "Print"
+msgid "Printing"
+msgstr "Presante"
+
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:639
+#: ../mail/e-mail-reader-utils.c:1525
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -11269,7 +15981,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/e-mail-reader-utils.c:1016
+#: ../mail/e-mail-reader-utils.c:2355
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Konservi mesaĝon"
@@ -11280,1385 +15992,756 @@ msgstr[1] "Konservi mesaĝojn"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1037
+#: ../mail/e-mail-reader-utils.c:2376
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Mesaĝo"
 msgstr[1] "Mesaĝoj"
 
-#: ../mail/e-mail-session.c:135 ../mail/em-folder-properties.c:308
-#: ../mail/em-folder-tree-model.c:714
-#: ../modules/mail/e-mail-shell-view-private.c:1070
-#: ../modules/mail/e-mail-shell-view-private.c:1081
-msgid "Inbox"
-msgstr "Enirkesto"
-
-#. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../mail/e-mail-session.c:136 ../mail/em-folder-tree-model.c:707
-#: ../modules/mail/e-mail-shell-view-private.c:1068
-msgid "Drafts"
-msgstr "Malnetaĵoj"
-
-#. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../mail/e-mail-session.c:137 ../mail/em-folder-tree-model.c:718
-#: ../modules/mail/e-mail-shell-view-private.c:1072
-msgid "Outbox"
-msgstr "Elirkesto"
-
-#. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../mail/e-mail-session.c:138 ../mail/em-folder-tree-model.c:722
-#: ../modules/mail/e-mail-shell-view-private.c:1074
-msgid "Sent"
-msgstr "Sendite"
-
-#. E_MAIL_LOCAL_FOLDER_SENT
-#: ../mail/e-mail-session.c:139 ../mail/em-folder-tree-model.c:710
-#: ../modules/mail/e-mail-shell-view-private.c:1076
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:1035 ../plugins/templates/templates.c:1335
-#: ../plugins/templates/templates.c:1345
-msgid "Templates"
-msgstr "Ŝablonoj"
-
-#: ../mail/e-mail-session.c:908 ../mail/mail-vfolder.c:1108
-msgid "Search Folders"
-msgstr "Serĉdosierujoj"
-
-#: ../mail/e-mail-session.c:1340
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr ""
-
-#: ../mail/e-mail-session.c:1344
-msgid "Enter Passphrase"
-msgstr "Enigi pasfrazon"
-
-#: ../mail/e-mail-session.c:1348
-#, c-format
-msgid "Enter Password for %s"
-msgstr "Enigu pasvorton por %s"
-
-#: ../mail/e-mail-session.c:1352
-msgid "Enter Password"
-msgstr "Enigu pasvorton"
-
-#: ../mail/e-mail-session.c:1403
-#, c-format
-msgid "User canceled operation."
-msgstr ""
+#: ../mail/e-mail-reader-utils.c:2749
+#, fuzzy
+#| msgid "Saving %d message"
+#| msgid_plural "Saving %d messages"
+msgid "Parsing message"
+msgstr "Analizante mesaĝon"
 
-#: ../mail/e-mail-session.c:1522
-#, c-format
-msgid ""
-"No destination address provided, forward of the message has been cancelled."
-msgstr ""
+#: ../mail/e-mail-request.c:199
+#| msgid "Message has no attachments"
+msgid "The message has no text content."
+msgstr "La mesaĝo ne havas tekstan enhavon."
 
-#: ../mail/e-mail-session.c:1531
-#, c-format
-msgid "No account found to use, forward of the message has been cancelled."
+#: ../mail/e-mail-tag-editor.c:237
+msgid "Flag to Follow Up"
 msgstr ""
 
-#: ../mail/e-mail-session.c:1685
+#: ../mail/e-mail-ui-session.c:801
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s aŭtentokontrolo malsukcesis"
 
-#: ../mail/e-mail-session.c:1759
-#, c-format
-msgid "No password was provided"
-msgstr ""
-
-#: ../mail/e-mail-session-utils.c:414
-#, c-format
-msgid "Cannot get transport for account '%s'"
-msgstr ""
-
-#: ../mail/e-mail-session-utils.c:499 ../mail/mail-ops.c:612
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr ""
-
-#: ../mail/e-mail-session-utils.c:525 ../mail/e-mail-session-utils.c:559
-#: ../mail/mail-ops.c:631 ../mail/mail-ops.c:667
+#: ../mail/e-mail-ui-session.c:851
 #, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-msgstr ""
-
-#: ../mail/e-mail-session-utils.c:579 ../mail/mail-ops.c:687
-#, c-format
-msgid "Failed to append to local 'Sent' folder: %s"
-msgstr ""
-
-#: ../mail/e-mail-session-utils.c:789 ../mail/mail-ops.c:810
-#: ../mail/mail-ops.c:906
-msgid "Sending message"
-msgstr "Sendante mesaĝon"
-
-#: ../mail/e-mail-session-utils.c:863
-#, c-format
-msgid "Unsubscribing from folder '%s'"
-msgstr "Malaboni de dosierujo '%s'"
-
-#: ../mail/e-mail-store-utils.c:166
-#, c-format
-msgid "Disconnecting from '%s'"
-msgstr ""
-
-#: ../mail/e-mail-store-utils.c:255
-#, c-format
-msgid "Reconnecting to '%s'"
-msgstr ""
-
-#: ../mail/e-mail-store-utils.c:328
-#, c-format
-msgid "Preparing account '%s' for offline"
-msgstr ""
-
-#: ../mail/e-mail-tag-editor.c:293
-msgid "Flag to Follow Up"
-msgstr ""
-
-#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:1600 ../widgets/misc/e-signature-combo-box.c:75
-msgctxt "mail-signature"
-msgid "None"
-msgstr "Nenio"
-
-#: ../mail/em-account-editor.c:1682 ../mail/em-account-editor.c:4688
-#: ../mail/em-account-editor.c:4713
-msgid "Never"
-msgstr "Neniam"
-
-#: ../mail/em-account-editor.c:1683
-msgid "Always"
-msgstr "Ĉiam"
-
-#: ../mail/em-account-editor.c:1684
-msgid "Ask for each message"
-msgstr ""
-
-#: ../mail/em-account-editor.c:2426
-msgctxt "mail-receiving"
-msgid "None"
-msgstr "Nenio"
-
-#: ../mail/em-account-editor.c:2835 ../mail/mail-config.ui.h:169
-msgid "_Path:"
-msgstr "_Vojo:"
-
-#: ../mail/em-account-editor.c:2838
-msgid "Fil_e:"
-msgstr "Dosi_ero:"
-
-#: ../mail/em-account-editor.c:2875
-msgid "Mail Configuration"
-msgstr "Agordoj pri retmesaĝoj"
-
-#: ../mail/em-account-editor.c:2876
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Continue\" to begin."
-msgstr ""
-
-#: ../mail/em-account-editor.c:2879
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-
-#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:3073
-msgid "Receiving Email"
-msgstr "Retpoŝto estas ricevata"
-
-#: ../mail/em-account-editor.c:2882
-msgid "Please configure the following account settings."
-msgstr ""
-
-#: ../mail/em-account-editor.c:2884 ../mail/em-account-editor.c:3680
-msgid "Sending Email"
-msgstr "Retpoŝto estas sendata"
-
-#: ../mail/em-account-editor.c:2885
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-
-#: ../mail/em-account-editor.c:2887
-msgid "Account Summary"
-msgstr ""
-
-#: ../mail/em-account-editor.c:2888
-msgid ""
-"This is a summary of the settings which will be used to access your mail."
-msgstr ""
-
-#: ../mail/em-account-editor.c:2892
-msgid "Done"
-msgstr "Farite"
-
-#: ../mail/em-account-editor.c:2893
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-
-#: ../mail/em-account-editor.c:3438
-msgid "Check for _new messages every"
-msgstr ""
-
-#: ../mail/em-account-editor.c:3446
-msgid "minu_tes"
-msgstr "minu_toj"
-
-#: ../mail/em-account-editor.c:4143 ../mail/mail-config.ui.h:109
-msgid "Security"
-msgstr "Sekureco"
-
-#. Most sections for this is auto-generated from the camel config
-#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:4198 ../mail/em-account-editor.c:4300
-msgid "Receiving Options"
-msgstr ""
-
-#: ../mail/em-account-editor.c:4199 ../mail/em-account-editor.c:4301
-msgid "Checking for New Messages"
-msgstr ""
-
-#: ../mail/em-account-editor.c:4684 ../mail/em-account-editor.c:4709
-msgid "Always (SSL)"
-msgstr "Ĉiam (SSL)"
-
-#: ../mail/em-account-editor.c:4686 ../mail/em-account-editor.c:4711
-msgid "When possible (TLS)"
-msgstr ""
-
-#: ../mail/em-account-editor.c:4733
-msgid "Setup Google con_tacts with Evolution"
-msgstr ""
-
-#: ../mail/em-account-editor.c:4734
-#, fuzzy
-msgid "Setup Google ca_lendar with Evolution"
-msgstr "Aldoni lokan kalendaron al Evolucio."
-
-#: ../mail/em-account-editor.c:4766
-#, fuzzy
-msgid "Setup _Yahoo calendar with Evolution"
-msgstr "Aldoni veter-kalendaroj al Evolucio."
-
-#: ../mail/em-account-editor.c:4792
-msgid "Yahoo Calen_dar name:"
+msgid "No data source found for UID '%s'"
 msgstr ""
 
 #. Note to translators: this is the attribution string used
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1213
+#: ../mail/em-composer-utils.c:1538
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:1224
+#: ../mail/em-composer-utils.c:1544
+msgid "-------- Forwarded Message --------"
+msgstr "-------- plusendita mesaĝo --------"
+
+#: ../mail/em-composer-utils.c:1549
 msgid "-----Original Message-----"
-msgstr "-----originala mesaĝo-----"
+msgstr "-----Originala mesaĝo-----"
 
-#: ../mail/em-composer-utils.c:2416
+#: ../mail/em-composer-utils.c:2702
 msgid "an unknown sender"
 msgstr "nekonata sendinto"
 
-#: ../mail/em-composer-utils.c:2811
+#. FIXME GTK_WINDOW (composer)
+#: ../mail/em-composer-utils.c:3141
 msgid "Posting destination"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:2812
+#: ../mail/em-composer-utils.c:3146
 msgid "Choose folders to post the message to."
 msgstr ""
 
-#: ../mail/em-filter-folder-element.c:243
+#: ../mail/em-filter-editor-folder-element.c:153
 msgid "Select Folder"
 msgstr "Elekti dosierujon"
 
-#. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:2
-msgid "Adjust Score"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:3
-msgid "Assign Color"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:4
-msgid "Assign Score"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:7
-msgid "Beep"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:9
-msgid "Completed On"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:12
-msgid "Date received"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:13
-msgid "Date sent"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:15
-msgid "Deleted"
-msgstr "Forigite"
-
-#: ../mail/em-filter-i18n.h:17
-msgid "does not end with"
-msgstr "ne finas per"
-
-#: ../mail/em-filter-i18n.h:18
-msgid "does not exist"
-msgstr "ne ekzistas"
-
-#: ../mail/em-filter-i18n.h:19
-msgid "does not return"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:20
-msgid "does not sound like"
-msgstr "ne sonas kiel"
-
-#: ../mail/em-filter-i18n.h:21
-msgid "does not start with"
-msgstr "ne komencas per"
-
-#: ../mail/em-filter-i18n.h:23
-msgid "Draft"
-msgstr "Malneto"
-
-#: ../mail/em-filter-i18n.h:24
-msgid "ends with"
-msgstr "finas per"
-
-#: ../mail/em-filter-i18n.h:26
-msgid "exists"
-msgstr "ekzistas"
-
-#: ../mail/em-filter-i18n.h:27
-msgid "Expression"
-msgstr "Esprimo"
-
-#: ../mail/em-filter-i18n.h:28
-msgid "Follow Up"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:29
-msgid "Forward to"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "Grave"
-
-#: ../mail/em-filter-i18n.h:32
-msgid "is after"
-msgstr "estas post"
-
-#: ../mail/em-filter-i18n.h:33
-msgid "is before"
-msgstr "estas antaŭ"
-
-#: ../mail/em-filter-i18n.h:34
-msgid "is Flagged"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:38
-msgid "is not Flagged"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:39
-msgid "is not set"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:40
-msgid "is set"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:67
-msgid "Junk"
-msgstr "Rubaĵo"
-
-#: ../mail/em-filter-i18n.h:42
-msgid "Junk Test"
-msgstr "Rubaĵtesto"
-
-#: ../mail/em-filter-i18n.h:43
-msgid "Label"
-msgstr "Etikedo"
-
-#: ../mail/em-filter-i18n.h:44
-msgid "Mailing list"
-msgstr "Dissendolisto"
-
-#: ../mail/em-filter-i18n.h:45
-msgid "Match All"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:46
-msgid "Message Body"
-msgstr "Mesaĝokorpo"
-
-#: ../mail/em-filter-i18n.h:47
-msgid "Message Header"
-msgstr "Mesaĝokapo"
-
-#: ../mail/em-filter-i18n.h:48
-msgid "Message is Junk"
-msgstr "Mesaĝo estas rubaĵo"
-
-#: ../mail/em-filter-i18n.h:49
-msgid "Message is not Junk"
-msgstr "Mesaĝo ne estas rubaĵo"
-
-#: ../mail/em-filter-i18n.h:50
-msgid "Message Location"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:52
-msgid "Pipe to Program"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:53
-msgid "Play Sound"
-msgstr "Ludi sonon"
-
-#. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
-msgid "Read"
-msgstr "Legite"
-
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
-msgid "Recipients"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:56
-msgid "Regex Match"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:57
-msgid "Replied to"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:58
-msgid "returns"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:59
-msgid "returns greater than"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:60
-msgid "returns less than"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:61
-msgid "Run Program"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
-msgid "Score"
-msgstr "Poentoj"
-
-#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
-msgid "Sender"
-msgstr "Sendinto"
-
-#: ../mail/em-filter-i18n.h:64
-msgid "Sender or Recipients"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:65
-msgid "Set Label"
-msgstr "Agordi etikedojn"
-
-#: ../mail/em-filter-i18n.h:66
-msgid "Set Status"
-msgstr "Agordi staton"
-
-#: ../mail/em-filter-i18n.h:67
-msgid "Size (kB)"
-msgstr "Grando (kB)"
-
-#: ../mail/em-filter-i18n.h:68
-msgid "sounds like"
-msgstr "sonas kiel"
-
-#: ../mail/em-filter-i18n.h:69
-msgid "Source Account"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:70
-msgid "Specific header"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:71
-msgid "starts with"
-msgstr "komencas per"
-
-#: ../mail/em-filter-i18n.h:73
-msgid "Stop Processing"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:75
-msgid "Unset Status"
-msgstr ""
-
 #. and now for the action area
-#: ../mail/em-filter-rule.c:521
+#: ../mail/em-filter-rule.c:587
 msgid "Then"
 msgstr "Tiam"
 
-#: ../mail/em-filter-rule.c:552
+#: ../mail/em-filter-rule.c:652
 msgid "Add Ac_tion"
 msgstr "Aldoni _agon"
 
-#: ../mail/em-folder-properties.c:142
+#: ../mail/em-folder-properties.c:177
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Nelegitaj mesaĝoj:"
 msgstr[1] "Nelegitaj mesaĝoj:"
 
-#: ../mail/em-folder-properties.c:153
+#: ../mail/em-folder-properties.c:188
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:209
 #, c-format
 msgid "Quota usage (%s):"
 msgstr ""
 
-#: ../mail/em-folder-properties.c:176
+#: ../mail/em-folder-properties.c:211
 #, c-format
 msgid "Quota usage"
 msgstr ""
 
-#: ../mail/em-folder-properties.c:313
+#. Translators: Label of a combo with a list of configured accounts where a user can
+#. choose which account to use as the sender when composing a message in this folder
+#: ../mail/em-folder-properties.c:286
+msgid "_Send Account Override:"
+msgstr ""
+
+#: ../mail/em-folder-properties.c:415
 msgid "Folder Properties"
 msgstr ""
 
-#: ../mail/em-folder-selection-button.c:79
+#: ../mail/em-folder-selection-button.c:76
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: ../mail/em-folder-selector.c:388
-msgid "C_reate"
-msgstr "K_rei"
-
-#: ../mail/em-folder-selector.c:394
-msgid "Folder _name:"
-msgstr "Dosieruj_nomo:"
+#: ../mail/em-folder-selector.c:398
+#, fuzzy
+#| msgid "Create folder"
+msgid "Create a new folder"
+msgstr "Krei dosierujon"
 
-#: ../mail/em-folder-tree.c:642
+#: ../mail/em-folder-tree.c:682
 msgid "Folder names cannot contain '/'"
 msgstr "Nomoj de dosierujoj ne povas enhavi '/'"
 
-#: ../mail/em-folder-tree.c:778
+#: ../mail/em-folder-tree.c:819
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1601
+#: ../mail/em-folder-tree.c:1668
 msgid "Mail Folder Tree"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2091 ../mail/em-folder-utils.c:113
+#: ../mail/em-folder-tree.c:2216 ../mail/em-folder-utils.c:82
 #, c-format
 msgid "Moving folder %s"
 msgstr "Movi dosierujon %s"
 
-#: ../mail/em-folder-tree.c:2094 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2219 ../mail/em-folder-utils.c:84
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopii dosierujon %s"
 
-#: ../mail/em-folder-tree.c:2101 ../mail/message-list.c:2296
+#: ../mail/em-folder-tree.c:2226 ../mail/message-list.c:2477
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2105 ../mail/message-list.c:2298
+#: ../mail/em-folder-tree.c:2230 ../mail/message-list.c:2479
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2124
+#: ../mail/em-folder-tree.c:2249
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:157 ../mail/em-folder-tree-model.c:159
+#: ../mail/em-folder-tree-model.c:430 ../mail/em-folder-tree-model.c:432
 msgid "UNMATCHED"
 msgstr ""
 
-#: ../mail/em-folder-tree-model.c:784 ../mail/em-folder-tree-model.c:1072
+#: ../mail/em-folder-tree-model.c:1258 ../mail/em-folder-tree-model.c:1634
 msgid "Loading..."
 msgstr "Ŝargante..."
 
-#: ../mail/em-folder-utils.c:487
+#: ../mail/em-folder-utils.c:488
 msgid "Move Folder To"
 msgstr "Movi dosierujon al"
 
-#: ../mail/em-folder-utils.c:487
+#: ../mail/em-folder-utils.c:488
 msgid "Copy Folder To"
 msgstr "Kopii dosierujon al"
 
-#: ../mail/em-folder-utils.c:599
-msgid "Create Folder"
-msgstr "Krei dosierujon"
-
-#: ../mail/em-folder-utils.c:600
-msgid "Specify where to create the folder:"
-msgstr ""
-
-#: ../mail/em-format-html.c:171
-msgid "Formatting message"
-msgstr ""
-
-#: ../mail/em-format-html.c:385
-msgid "Formatting Message..."
-msgstr ""
-
-#: ../mail/em-format-html.c:1633 ../mail/em-format-html.c:1643
-#, c-format
-msgid "Retrieving '%s'"
-msgstr ""
-
-#: ../mail/em-format-html.c:1794 ../mail/em-format-html-display.c:93
-msgid "Unsigned"
-msgstr ""
-
-#: ../mail/em-format-html.c:1795 ../mail/em-format-html-display.c:94
-msgid "Valid signature"
-msgstr ""
-
-#: ../mail/em-format-html.c:1796 ../mail/em-format-html-display.c:95
-msgid "Invalid signature"
-msgstr "Nevalida subskribo"
-
-#: ../mail/em-format-html.c:1797 ../mail/em-format-html-display.c:96
-msgid "Valid signature, but cannot verify sender"
-msgstr ""
-
-#: ../mail/em-format-html.c:1798 ../mail/em-format-html-display.c:97
-msgid "Signature exists, but need public key"
-msgstr ""
-
-#: ../mail/em-format-html.c:1804 ../mail/em-format-html-display.c:104
-msgid "Unencrypted"
-msgstr "Neĉifrite"
-
-#: ../mail/em-format-html.c:1805 ../mail/em-format-html-display.c:105
-msgid "Encrypted, weak"
-msgstr ""
-
-#: ../mail/em-format-html.c:1806 ../mail/em-format-html-display.c:106
-msgid "Encrypted"
-msgstr "Ĉifrite"
-
-#: ../mail/em-format-html.c:1807 ../mail/em-format-html-display.c:107
-msgid "Encrypted, strong"
-msgstr "Ĉifrite, forte"
-
-#: ../mail/em-format-html.c:2207
-msgid "Unknown external-body part."
-msgstr ""
-
-#: ../mail/em-format-html.c:2217
-msgid "Malformed external-body part."
-msgstr ""
-
-#: ../mail/em-format-html.c:2248
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr ""
-
-#: ../mail/em-format-html.c:2259
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr ""
-
-#: ../mail/em-format-html.c:2261
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr ""
-
-#: ../mail/em-format-html.c:2282
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr ""
-
-#: ../mail/em-format-html.c:2297
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
-
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user example com"
-#: ../mail/em-format-html.c:3005
-#: ../plugins/mail-notification/mail-notification.c:395
-#, c-format
-msgid "From: %s"
-msgstr "De: %s"
-
-#: ../mail/em-format-html.c:3027
-msgid "(no subject)"
-msgstr "<sen nomo>"
-
-#: ../mail/em-format-html.c:3103
-#, c-format
-msgid "This message was sent by %s on behalf of %s"
-msgstr ""
-
-#: ../mail/em-format-html-display.c:93
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-
-#: ../mail/em-format-html-display.c:94
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-
-#: ../mail/em-format-html-display.c:95
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-
-#: ../mail/em-format-html-display.c:96
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr ""
-
-#: ../mail/em-format-html-display.c:97
-msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
-msgstr ""
-
-#: ../mail/em-format-html-display.c:104
-msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
-msgstr ""
-
-#: ../mail/em-format-html-display.c:105
-msgid ""
-"This message is encrypted, but with a weak encryption algorithm. It would be "
-"difficult, but not impossible for an outsider to view the content of this "
-"message in a practical amount of time."
-msgstr ""
-
-#: ../mail/em-format-html-display.c:106
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
-
-#: ../mail/em-format-html-display.c:107
-msgid ""
-"This message is encrypted, with a strong encryption algorithm. It would be "
-"very difficult for an outsider to view the content of this message in a "
-"practical amount of time."
-msgstr ""
-
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
-msgid "_View Certificate"
-msgstr "_Montri ateston"
-
-#: ../mail/em-format-html-display.c:261
-msgid "This certificate is not viewable"
-msgstr ""
-
-#: ../mail/em-format-html-display.c:575
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
-msgstr ""
-
-#: ../mail/em-format-html-display.c:765
-msgid "Save Image"
-msgstr "Konservi bildon"
-
-#: ../mail/em-format-html-display.c:813
-msgid "Save _Image..."
-msgstr "Konservi b_ildon..."
-
-#: ../mail/em-format-html-display.c:815
-msgid "Save the image to a file"
-msgstr "Konservi la bildon al dosiero"
-
-#: ../mail/em-format-html-display.c:1016
-msgid "Completed on"
-msgstr ""
-
-#: ../mail/em-format-html-display.c:1028
-msgid "Overdue:"
-msgstr "Posttempe:"
-
-#: ../mail/em-format-html-display.c:1036
-msgid "by"
-msgstr "de"
-
-#: ../mail/em-format-html-display.c:1317 ../mail/em-format-html-display.c:1368
-msgid "View _Unformatted"
-msgstr ""
-
-#: ../mail/em-format-html-display.c:1319
-msgid "Hide _Unformatted"
-msgstr ""
-
-#: ../mail/em-format-html-display.c:1390
-msgid "O_pen With"
-msgstr "_Malfermi per"
-
-#: ../mail/em-format-html-print.c:155
-#, c-format
-msgid "Page %d of %d"
-msgstr "Paĝo %d de %d"
-
-#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
-#: ../mail/em-html-stream.c:122
-#, c-format
-msgid "No HTML stream available"
-msgstr ""
-
-#: ../mail/em-subscription-editor.c:853
+#: ../mail/em-subscription-editor.c:855
 msgid "_Subscribe"
 msgstr "_Aboni"
 
-#: ../mail/em-subscription-editor.c:862
+#: ../mail/em-subscription-editor.c:864
 msgid "Su_bscribe To Shown"
 msgstr "_Aboni montratajn"
 
-#: ../mail/em-subscription-editor.c:870
+#: ../mail/em-subscription-editor.c:872
 msgid "Subscribe To _All"
 msgstr "_Aboni ĉiujn"
 
-#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1823
-#: ../modules/mail/e-mail-shell-view-actions.c:1252
+#: ../mail/em-subscription-editor.c:969 ../mail/em-subscription-editor.c:1867
+#: ../modules/mail/e-mail-shell-view-actions.c:1693
 msgid "_Unsubscribe"
 msgstr "_Malaboni"
 
-#: ../mail/em-subscription-editor.c:979
+#: ../mail/em-subscription-editor.c:978
 msgid "Unsu_bscribe From Hidden"
 msgstr "_Malaboni kaŝitajn"
 
-#: ../mail/em-subscription-editor.c:987
+#: ../mail/em-subscription-editor.c:986
 msgid "Unsubscribe From _All"
 msgstr "_Malaboni ĉiujn"
 
-#: ../mail/em-subscription-editor.c:1658
+#: ../mail/em-subscription-editor.c:1704
 msgid "Folder Subscriptions"
 msgstr ""
 
-#: ../mail/em-subscription-editor.c:1698
+#: ../mail/em-subscription-editor.c:1743
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../mail/em-subscription-editor.c:1713
+#: ../mail/em-subscription-editor.c:1756
 msgid "Clear Search"
 msgstr "Vakigi serĉon"
 
-#: ../mail/em-subscription-editor.c:1731
+#: ../mail/em-subscription-editor.c:1773
 msgid "Sho_w items that contain:"
 msgstr "_Montri erojn kiuj entenas:"
 
-#: ../mail/em-subscription-editor.c:1776
+#: ../mail/em-subscription-editor.c:1820
 msgid "Subscribe to the selected folder"
 msgstr "Aboni la elektitan dosierujon"
 
-#: ../mail/em-subscription-editor.c:1777
+#: ../mail/em-subscription-editor.c:1821
 msgid "Su_bscribe"
 msgstr "_Aboni"
 
-#: ../mail/em-subscription-editor.c:1822
-#: ../modules/mail/e-mail-shell-view-actions.c:1254
+#: ../mail/em-subscription-editor.c:1866
+#: ../modules/mail/e-mail-shell-view-actions.c:1695
 msgid "Unsubscribe from the selected folder"
 msgstr "Malaboni de la elektita dosierujo"
 
-#: ../mail/em-subscription-editor.c:1862
+#: ../mail/em-subscription-editor.c:1906
 msgid "Collapse all folders"
 msgstr "Maletendi ĉiujn dosierujon"
 
-#: ../mail/em-subscription-editor.c:1863
+#: ../mail/em-subscription-editor.c:1907
 msgid "C_ollapse All"
 msgstr "_Maletendi ĉiujn"
 
-#: ../mail/em-subscription-editor.c:1873
+#: ../mail/em-subscription-editor.c:1917
 msgid "Expand all folders"
 msgstr "Maletendi ĉiujn dosierujon"
 
-#: ../mail/em-subscription-editor.c:1874
+#: ../mail/em-subscription-editor.c:1918
 msgid "E_xpand All"
 msgstr "_Etendi ĉiujn"
 
-#: ../mail/em-subscription-editor.c:1884
+#: ../mail/em-subscription-editor.c:1928
 msgid "Refresh the folder list"
 msgstr "Aktualigi la dosierujoliston"
 
-#: ../mail/em-subscription-editor.c:1896
+#: ../mail/em-subscription-editor.c:1929
+#: ../modules/mail/e-mail-shell-view-actions.c:1594
+#: ../modules/mail/e-mail-shell-view-actions.c:1665
+#| msgctxt "Meeting"
+#| msgid "Refresh"
+msgid "_Refresh"
+msgstr "_Aktualigi"
+
+#: ../mail/em-subscription-editor.c:1940
 msgid "Stop the current operation"
 msgstr "Haltigi la aktualan agon"
 
+#: ../mail/em-subscription-editor.c:1941
+#: ../modules/addressbook/e-book-shell-view-actions.c:979
+msgid "_Stop"
+msgstr ""
+
 #. Translators: This message is shown only for ten or more
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:108
+#: ../mail/em-utils.c:75
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/em-utils.c:164
-#: ../modules/mailto-handler/evolution-mailto-handler.c:154
-msgid "_Do not show this message again"
-msgstr "Ne _plu montri ĉi tiun mesaĝon"
-
-#: ../mail/em-utils.c:316
+#: ../mail/em-utils.c:176
 msgid "Message Filters"
 msgstr "Mesaĝfiltriloj"
 
-#: ../mail/em-utils.c:976
+#: ../mail/em-utils.c:918
 #, c-format
 msgid "Messages from %s"
 msgstr "Mesaĝoj de %s"
 
-#: ../mail/em-vfolder-editor.c:105
+#: ../mail/em-vfolder-editor.c:104
 msgid "Search _Folders"
 msgstr "Serĉ_dosierujoj"
 
-#: ../mail/em-vfolder-rule.c:595
+#: ../mail/em-vfolder-editor-rule.c:392
 msgid "Add Folder"
 msgstr "Aldoni dosierujon"
 
-#: ../mail/evolution-mail.schemas.in.h:1
-msgid "\"Filter Editor\" window height"
+#: ../mail/em-vfolder-editor-rule.c:521
+msgid "Search Folder Sources"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:2
-msgid "\"Filter Editor\" window maximize state"
+#: ../mail/em-vfolder-editor-rule.c:553
+msgid "Automatically update on any _source folder change"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:3
-msgid "\"Filter Editor\" window width"
-msgstr ""
+#: ../mail/em-vfolder-editor-rule.c:565
+msgid "All local folders"
+msgstr "Ĉiuj lokaj dosierujoj"
 
-#: ../mail/evolution-mail.schemas.in.h:4
-msgid "\"Folder Subscriptions\" window height"
+#: ../mail/em-vfolder-editor-rule.c:566
+msgid "All active remote folders"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:5
-msgid "\"Folder Subscriptions\" window maximize state"
+#: ../mail/em-vfolder-editor-rule.c:567
+msgid "All local and active remote folders"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:6
-msgid "\"Folder Subscriptions\" window width"
+#: ../mail/em-vfolder-editor-rule.c:568
+msgid "Specific folders"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:7
-msgid "\"Search Folder Editor\" window height"
+#: ../mail/em-vfolder-editor-rule.c:606
+msgid "include subfolders"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:8
-msgid "\"Search Folder Editor\" window maximize state"
-msgstr ""
+#: ../mail/filtertypes.xml.in.h:1 ../mail/message-list.etspec.h:15
+#: ../mail/searchtypes.xml.in.h:1 ../mail/vfoldertypes.xml.in.h:1
+msgid "Sender"
+msgstr "Sendinto"
 
-#: ../mail/evolution-mail.schemas.in.h:9
-msgid "\"Search Folder Editor\" window width"
-msgstr ""
+#: ../mail/filtertypes.xml.in.h:6 ../mail/searchtypes.xml.in.h:6
+#: ../mail/vfoldertypes.xml.in.h:6
+msgid "starts with"
+msgstr "komencas per"
 
-#: ../mail/evolution-mail.schemas.in.h:10
-msgid "\"Send and Receive Mail\" window height"
-msgstr ""
+#: ../mail/filtertypes.xml.in.h:7 ../mail/searchtypes.xml.in.h:7
+#: ../mail/vfoldertypes.xml.in.h:7
+msgid "does not start with"
+msgstr "ne komencas per"
 
-#: ../mail/evolution-mail.schemas.in.h:11
-msgid "\"Send and Receive Mail\" window maximize state"
-msgstr ""
+#: ../mail/filtertypes.xml.in.h:8 ../mail/searchtypes.xml.in.h:8
+#: ../mail/vfoldertypes.xml.in.h:8
+msgid "ends with"
+msgstr "finas per"
 
-#: ../mail/evolution-mail.schemas.in.h:12
-msgid "\"Send and Receive Mail\" window width"
-msgstr ""
+#: ../mail/filtertypes.xml.in.h:9 ../mail/searchtypes.xml.in.h:9
+#: ../mail/vfoldertypes.xml.in.h:9
+msgid "does not end with"
+msgstr "ne finas per"
 
-#: ../mail/evolution-mail.schemas.in.h:16
-msgid "Attribute message."
-msgstr ""
+#: ../mail/filtertypes.xml.in.h:10 ../mail/searchtypes.xml.in.h:12
+#: ../mail/vfoldertypes.xml.in.h:12
+msgid "sounds like"
+msgstr "sonas kiel"
 
-#: ../mail/evolution-mail.schemas.in.h:25
-msgid "Composer Window default height"
-msgstr ""
+#: ../mail/filtertypes.xml.in.h:11 ../mail/searchtypes.xml.in.h:13
+#: ../mail/vfoldertypes.xml.in.h:13
+msgid "does not sound like"
+msgstr "ne sonas kiel"
 
-#: ../mail/evolution-mail.schemas.in.h:26
-msgid "Composer Window default width"
+#: ../mail/filtertypes.xml.in.h:12 ../mail/message-list.etspec.h:16
+#: ../mail/searchtypes.xml.in.h:10 ../mail/vfoldertypes.xml.in.h:10
+msgid "Recipients"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:37
-msgid "Default height of the Composer Window."
+#: ../mail/filtertypes.xml.in.h:13 ../mail/searchtypes.xml.in.h:14
+#: ../mail/vfoldertypes.xml.in.h:14
+msgid "CC"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:38
-msgid "Default height of the mail browser window."
+#: ../mail/filtertypes.xml.in.h:14 ../mail/searchtypes.xml.in.h:15
+#: ../mail/vfoldertypes.xml.in.h:15
+msgid "BCC"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:39
-msgid "Default maximized state of the mail browser window."
+#: ../mail/filtertypes.xml.in.h:15 ../mail/searchtypes.xml.in.h:16
+#: ../mail/vfoldertypes.xml.in.h:16
+msgid "Sender or Recipients"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:40
-msgid "Default reply style"
-msgstr ""
+#: ../mail/filtertypes.xml.in.h:17 ../mail/searchtypes.xml.in.h:18
+#: ../mail/vfoldertypes.xml.in.h:18
+#| msgid "Password:"
+msgid "has words"
+msgstr "havas vortojn"
 
-#: ../mail/evolution-mail.schemas.in.h:42
-msgid "Default width of the Composer Window."
-msgstr ""
+#: ../mail/filtertypes.xml.in.h:18 ../mail/searchtypes.xml.in.h:19
+#: ../mail/vfoldertypes.xml.in.h:19
+#, fuzzy
+#| msgid "does not end with"
+msgid "does not have words"
+msgstr "ne finas per"
 
-#: ../mail/evolution-mail.schemas.in.h:43
-msgid "Default width of the mail browser window."
+#: ../mail/filtertypes.xml.in.h:19 ../mail/searchtypes.xml.in.h:20
+#: ../mail/vfoldertypes.xml.in.h:20
+msgid "Specific header"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:44
-msgid ""
-"Define the email export format when doing drag'n'drop. Possible values are : "
-"mbox or pdf"
-msgstr ""
+#: ../mail/filtertypes.xml.in.h:20 ../mail/searchtypes.xml.in.h:21
+#: ../mail/vfoldertypes.xml.in.h:21
+msgid "exists"
+msgstr "ekzistas"
 
-#: ../mail/evolution-mail.schemas.in.h:45
-msgid ""
-"Describes whether message headers in paned view should be collapsed or "
-"expanded by default. \"0\" = expanded \"1\" = collapsed"
-msgstr ""
+#: ../mail/filtertypes.xml.in.h:21 ../mail/searchtypes.xml.in.h:22
+#: ../mail/vfoldertypes.xml.in.h:22
+msgid "does not exist"
+msgstr "ne ekzistas"
 
-#: ../mail/evolution-mail.schemas.in.h:52
-msgid "Digitally sign messages when original message signed (PGP or S/MIME)"
-msgstr ""
+#: ../mail/filtertypes.xml.in.h:22 ../mail/searchtypes.xml.in.h:24
+#: ../mail/vfoldertypes.xml.in.h:24
+msgid "Message Body"
+msgstr "Mesaĝokorpo"
 
-#: ../mail/evolution-mail.schemas.in.h:57
-msgid "Drag'n'drop export format"
-msgstr ""
+#: ../mail/filtertypes.xml.in.h:23 ../mail/searchtypes.xml.in.h:25
+#: ../mail/vfoldertypes.xml.in.h:25
+msgid "Expression"
+msgstr "Esprimo"
 
-#: ../mail/evolution-mail.schemas.in.h:79
-msgid ""
-"Exported file name will be : YYYmmDDHHMMSS_email_title Possible values : 1 "
-"(: email sent date), 2 (: drag'n'drop date)"
-msgstr ""
+#: ../mail/filtertypes.xml.in.h:24 ../mail/searchtypes.xml.in.h:26
+#: ../mail/vfoldertypes.xml.in.h:26
+#, fuzzy
+#| msgid "Expression"
+msgid "Free Form Expression"
+msgstr "Esprimo"
 
-#: ../mail/evolution-mail.schemas.in.h:81
-msgid "Format of the drag'n'drop export filename"
+#: ../mail/filtertypes.xml.in.h:25 ../mail/searchtypes.xml.in.h:27
+#: ../mail/vfoldertypes.xml.in.h:27
+msgid "Date sent"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:82
-msgid "Forward message."
-msgstr ""
+#: ../mail/filtertypes.xml.in.h:26 ../mail/searchtypes.xml.in.h:28
+#: ../mail/vfoldertypes.xml.in.h:28
+msgid "is before"
+msgstr "estas antaŭ"
 
-#: ../mail/evolution-mail.schemas.in.h:90
-msgid ""
-"Initial height of the \"Filter Editor\" window. The value updates as the "
-"user resizes the window vertically."
-msgstr ""
+#: ../mail/filtertypes.xml.in.h:27 ../mail/searchtypes.xml.in.h:29
+#: ../mail/vfoldertypes.xml.in.h:29
+msgid "is after"
+msgstr "estas post"
 
-#: ../mail/evolution-mail.schemas.in.h:91
-msgid ""
-"Initial height of the \"Folder Subscriptions\" window. The value updates as "
-"the user resizes the window vertically."
+#: ../mail/filtertypes.xml.in.h:28 ../mail/searchtypes.xml.in.h:30
+#: ../mail/vfoldertypes.xml.in.h:30
+msgid "Date received"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:92
-msgid ""
-"Initial height of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window vertically."
+#: ../mail/filtertypes.xml.in.h:29 ../mail/searchtypes.xml.in.h:31
+#: ../mail/vfoldertypes.xml.in.h:31
+msgid "Label"
+msgstr "Etikedo"
+
+#: ../mail/filtertypes.xml.in.h:30 ../mail/message-list.etspec.h:3
+#: ../mail/searchtypes.xml.in.h:32 ../mail/vfoldertypes.xml.in.h:32
+msgid "Score"
+msgstr "Poentoj"
+
+#: ../mail/filtertypes.xml.in.h:33 ../mail/searchtypes.xml.in.h:35
+#: ../mail/vfoldertypes.xml.in.h:35
+msgid "Size (kB)"
+msgstr "Grando (kB)"
+
+#: ../mail/filtertypes.xml.in.h:35 ../mail/searchtypes.xml.in.h:37
+#: ../mail/vfoldertypes.xml.in.h:37
+msgid "Replied to"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:93
-msgid ""
-"Initial height of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window vertically."
+#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:40
+#: ../mail/vfoldertypes.xml.in.h:40
+msgid "Important"
+msgstr "Grave"
+
+#. Past tense, as in "has been read".
+#: ../mail/filtertypes.xml.in.h:38 ../mail/mail-dialogs.ui.h:15
+#: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
+msgid "Read"
+msgstr "Legite"
+
+#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:121
+#: ../mail/vfoldertypes.xml.in.h:42
+msgid "Junk"
+msgstr "Rubaĵo"
+
+#: ../mail/filtertypes.xml.in.h:40 ../mail/searchtypes.xml.in.h:42
+#: ../mail/vfoldertypes.xml.in.h:43
+msgid "Follow Up"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:94
-msgid ""
-"Initial maximize state of the \"Filter Editor\" window. The value updates "
-"when the user maximizes or unmaximizes the window. Note, this particular "
-"value is not used by Evolution since the \"Filter Editor\" window cannot be "
-"maximized. This key exists only as an implementation detail."
+#: ../mail/filtertypes.xml.in.h:41 ../mail/searchtypes.xml.in.h:43
+#: ../mail/vfoldertypes.xml.in.h:44
+msgid "is Flagged"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:95
-msgid ""
-"Initial maximize state of the \"Folder Subscriptions\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Folder Subscriptions\" "
-"window cannot be maximized. This key exists only as an implementation detail."
+#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
+#: ../mail/vfoldertypes.xml.in.h:45
+msgid "is not Flagged"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:96
-msgid ""
-"Initial maximize state of the \"Search Folder Editor\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Search Folder Editor\" "
-"window cannot be maximized. This key exists only as an implementation detail."
+#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
+#: ../mail/vfoldertypes.xml.in.h:46
+#| msgid "% Completed"
+msgid "is Completed"
+msgstr "plenumite"
+
+#: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
+#: ../mail/vfoldertypes.xml.in.h:47
+#| msgid "% Completed"
+msgid "is not Completed"
+msgstr "ne plenumite"
+
+#: ../mail/filtertypes.xml.in.h:48 ../mail/searchtypes.xml.in.h:50
+#: ../mail/vfoldertypes.xml.in.h:51
+msgid "Mailing list"
+msgstr "Dissendolisto"
+
+#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
+#: ../mail/vfoldertypes.xml.in.h:52
+msgid "Regex Match"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:97
-msgid ""
-"Initial maximize state of the \"Send and Receive Mail\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximized. This key exists only as an implementation "
-"detail."
+#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
+#: ../mail/vfoldertypes.xml.in.h:53
+msgid "Message Header"
+msgstr "Mesaĝokapo"
+
+#: ../mail/filtertypes.xml.in.h:51
+msgid "Source Account"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:98
-msgid ""
-"Initial width of the \"Filter Editor\" window. The value updates as the user "
-"resizes the window horizontally."
+#: ../mail/filtertypes.xml.in.h:52
+msgid "Pipe to Program"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:99
-msgid ""
-"Initial width of the \"Folder Subscriptions\" window. The value updates as "
-"the user resizes the window horizontally."
+#: ../mail/filtertypes.xml.in.h:53
+msgid "returns"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:100
-msgid ""
-"Initial width of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window horizontally."
+#: ../mail/filtertypes.xml.in.h:54
+msgid "does not return"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:101
-msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window horizontally."
+#: ../mail/filtertypes.xml.in.h:55
+msgid "returns greater than"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:114
-msgid "List of accepted licenses"
+#: ../mail/filtertypes.xml.in.h:56
+msgid "returns less than"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid "List of accounts"
-msgstr "Listo de kontoj"
+#: ../mail/filtertypes.xml.in.h:57
+msgid "Junk Test"
+msgstr "Rubaĵtesto"
 
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid ""
-"List of accounts known to the mail component of Evolution. The list contains "
-"strings naming subdirectories relative to /apps/evolution/mail/accounts."
-msgstr ""
+#: ../mail/filtertypes.xml.in.h:58
+msgid "Message is Junk"
+msgstr "Mesaĝo estas rubaĵo"
 
-#: ../mail/evolution-mail.schemas.in.h:120
-msgid "List of protocol names whose license has been accepted."
-msgstr ""
+#: ../mail/filtertypes.xml.in.h:59
+msgid "Message is not Junk"
+msgstr "Mesaĝo ne estas rubaĵo"
 
-#: ../mail/evolution-mail.schemas.in.h:127
-msgid "Mail browser height"
+#: ../mail/filtertypes.xml.in.h:60 ../mail/vfoldertypes.xml.in.h:54
+msgid "Message Location"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:128
-msgid "Mail browser maximized"
+#: ../mail/filtertypes.xml.in.h:61 ../mail/searchtypes.xml.in.h:53
+#: ../mail/vfoldertypes.xml.in.h:55
+msgid "Match All"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:129
-msgid "Mail browser width"
+#: ../mail/filtertypes.xml.in.h:65
+msgid "Stop Processing"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Original message."
-msgstr "Originala mesaĝo."
+#: ../mail/filtertypes.xml.in.h:66
+msgid "Set Label"
+msgstr "Agordi etikedojn"
 
-#: ../mail/evolution-mail.schemas.in.h:143
-msgid ""
-"Possible values are: never - to never close browser window always - to "
-"always close browser window ask - (or any other value) will ask user"
+#: ../mail/filtertypes.xml.in.h:67
+msgid "Assign Color"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:199
-msgid ""
-"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
-"true accounts are sorted alphabetically, with an exception of On This "
-"Computer and Search folders, otherwise accounts are sorted based on an order "
-"given by a user."
-msgstr ""
+#: ../mail/filtertypes.xml.in.h:68
+#, fuzzy
+#| msgid "Color"
+msgid "Unset Color"
+msgstr "Koloro"
 
-#: ../mail/evolution-mail.schemas.in.h:206
-msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows."
+#: ../mail/filtertypes.xml.in.h:69
+msgid "Assign Score"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:207
-msgid ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows."
+#: ../mail/filtertypes.xml.in.h:70
+msgid "Adjust Score"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:208
-msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author."
+#: ../mail/filtertypes.xml.in.h:71
+msgid "Set Status"
+msgstr "Agordi staton"
+
+#: ../mail/filtertypes.xml.in.h:72 ../mail/searchtypes.xml.in.h:38
+#: ../mail/vfoldertypes.xml.in.h:38
+msgid "Deleted"
+msgstr "Forigite"
+
+#: ../mail/filtertypes.xml.in.h:73
+msgid "Unset Status"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:218
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Requires a restart to apply."
+#: ../mail/filtertypes.xml.in.h:74
+msgid "Beep"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:220
-msgid ""
-"This value can be an empty string, which means it'll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder."
+#: ../mail/filtertypes.xml.in.h:75
+msgid "Play Sound"
+msgstr "Ludi sonon"
+
+#: ../mail/filtertypes.xml.in.h:76
+msgid "Run Program"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:238
-msgid "Whether to show local folders (On This Computer) in a folder tree."
+#: ../mail/filtertypes.xml.in.h:77
+msgid "Forward to"
 msgstr ""
 
-#: ../mail/importers/elm-importer.c:181
+#: ../mail/importers/elm-importer.c:173
 msgid "Importing Elm data"
 msgstr ""
 
-#: ../mail/importers/elm-importer.c:351 ../mail/importers/pine-importer.c:451
-#: ../modules/mail/e-mail-shell-view.c:1035
-#: ../widgets/misc/e-send-options.c:520
-msgid "Mail"
-msgstr "Retpoŝto"
-
-#: ../mail/importers/elm-importer.c:396
+#: ../mail/importers/elm-importer.c:374
 msgid "Evolution Elm importer"
 msgstr "Evolucio-Elm-enportilo"
 
-#: ../mail/importers/elm-importer.c:397
+#: ../mail/importers/elm-importer.c:375
 msgid "Import mail from Elm."
-msgstr "Enportu poŝtaĵojn de Elm"
+msgstr "Enportu poŝtaĵojn de Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:142
-#: ../plugins/dbx-import/dbx-importer.c:259
+#: ../mail/importers/evolution-mbox-importer.c:134
+#: ../mail/importers/kmail-importer.c:210
+#: ../plugins/dbx-import/dbx-importer.c:246
 msgid "_Destination folder:"
 msgstr "_Celdosierujo:"
 
-#: ../mail/importers/evolution-mbox-importer.c:148
-#: ../plugins/dbx-import/dbx-importer.c:265
-#: ../plugins/pst-import/pst-importer.c:554
+#: ../mail/importers/evolution-mbox-importer.c:140
+#: ../mail/importers/kmail-importer.c:216
+#: ../plugins/dbx-import/dbx-importer.c:252
+#: ../plugins/pst-import/pst-importer.c:541
 msgid "Select folder"
 msgstr "Elekti dosierujon"
 
-#: ../mail/importers/evolution-mbox-importer.c:149
-#: ../plugins/dbx-import/dbx-importer.c:266
-#: ../plugins/pst-import/pst-importer.c:555
+#: ../mail/importers/evolution-mbox-importer.c:141
+#: ../mail/importers/kmail-importer.c:217
+#: ../plugins/dbx-import/dbx-importer.c:253
+#: ../plugins/pst-import/pst-importer.c:542
 msgid "Select folder to import into"
 msgstr "Elektu mesaĝujon, en kiun enporti"
 
-#: ../mail/importers/evolution-mbox-importer.c:436
+#: ../mail/importers/evolution-mbox-importer.c:509
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Temo"
 
-#: ../mail/importers/evolution-mbox-importer.c:441
+#: ../mail/importers/evolution-mbox-importer.c:514
 msgctxt "mboxImp"
 msgid "From"
 msgstr "De"
 
-#: ../mail/importers/evolution-mbox-importer.c:485
-#: ../shell/e-shell-utils.c:195
+#: ../mail/importers/evolution-mbox-importer.c:568
+#: ../shell/e-shell-utils.c:171
 msgid "Berkeley Mailbox (mbox)"
 msgstr ""
 
-#: ../mail/importers/evolution-mbox-importer.c:486
+#: ../mail/importers/evolution-mbox-importer.c:569
 msgid "Importer Berkeley Mailbox format folders"
 msgstr ""
 
-#: ../mail/importers/mail-importer.c:63
+#: ../mail/importers/kmail-importer.c:263
+#, c-format
+#| msgid "Address"
+msgid "%d Address"
+msgid_plural "%d Addresses"
+msgstr[0] "%d adreso"
+msgstr[1] "%d adresoj"
+
+#: ../mail/importers/kmail-importer.c:354
+#, fuzzy
+#| msgid "Evolution Elm importer"
+msgid "Evolution KMail importer"
+msgstr "Evolucio-Elm-enportilo"
+
+#: ../mail/importers/kmail-importer.c:355
+#, fuzzy
+#| msgid "Import mail from Elm."
+msgid "Import mail and contacts from KMail."
+msgstr "Enporti poŝtaĵojn kaj kontaktojn de KMail."
+
+#: ../mail/importers/kmail-libs.c:152
+#: ../modules/mail/e-mail-shell-view-private.c:1082
+msgid "Trash"
+msgstr "Rubujo"
+
+#: ../mail/importers/mail-importer.c:55
 msgid "Importing mailbox"
 msgstr ""
 
+#: ../mail/importers/mail-importer.c:61
+#| msgid "Import mail from Elm."
+msgid "Importing mail and contacts from KMail"
+msgstr "Enportante poŝtaĵojn kaj kontaktojn de KMail"
+
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:153
-#: ../plugins/dbx-import/dbx-importer.c:615
-#: ../plugins/pst-import/pst-importer.c:761
+#: ../mail/importers/mail-importer.c:187 ../mail/importers/mail-importer.c:314
+#: ../plugins/dbx-import/dbx-importer.c:609
+#: ../plugins/pst-import/pst-importer.c:760
 #, c-format
 msgid "Importing '%s'"
-msgstr "Enportado de \"%s\""
+msgstr "Enportante '%s'"
 
-#: ../mail/importers/mail-importer.c:316
+#: ../mail/importers/mail-importer.c:570
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../mail/importers/pine-importer.c:253
+#: ../mail/importers/pine-importer.c:247
 msgid "Importing Pine data"
 msgstr ""
 
-#: ../mail/importers/pine-importer.c:456
-#: ../modules/addressbook/addressbook-config.c:1083
-msgid "Address Book"
-msgstr "Adresaro"
-
-#: ../mail/importers/pine-importer.c:502
+#: ../mail/importers/pine-importer.c:475
 msgid "Evolution Pine importer"
 msgstr "Evolucio-Pine-enportilo"
 
-#: ../mail/importers/pine-importer.c:503
+#: ../mail/importers/pine-importer.c:476
 msgid "Import mail from Pine."
 msgstr ""
 
-#: ../mail/mail-autofilter.c:72
+#: ../mail/mail-autofilter.c:63
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: ../mail/mail-autofilter.c:228 ../mail/mail-autofilter.c:271
+#: ../mail/mail-autofilter.c:219 ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Mail from %s"
 msgstr "Poŝtaĵo de %s"
 
-#: ../mail/mail-autofilter.c:254
+#: ../mail/mail-autofilter.c:245
 #, c-format
 msgid "Subject is %s"
 msgstr "Temo estas %s"
 
-#: ../mail/mail-autofilter.c:295
+#: ../mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
-msgstr "Adresolisto %s"
+msgstr "%s disendolisto"
 
-#: ../mail/mail-autofilter.c:404
+#: ../mail/mail-autofilter.c:396
 msgid "Add Filter Rule"
 msgstr "Aldoni filtran regulon"
 
@@ -12667,7 +16750,7 @@ msgstr "Aldoni filtran regulon"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:511
+#: ../mail/mail-autofilter.c:505
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -12680,15 +16763,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "Kontoinformoj"
-
-#: ../mail/mail-config.ui.h:2
-msgid "Add Ne_w Signature..."
-msgstr "Aldoni no_van subskribon..."
-
-#: ../mail/mail-config.ui.h:3
-msgid "Al_ways sign outgoing messages when using this account"
+msgid "Set custom junk header"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:4
@@ -12697,681 +16772,466 @@ msgid ""
 "filtered as junk"
 msgstr ""
 
-#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:5
+msgid "Header name"
+msgstr "Paĝokapa nomo"
+
 #: ../mail/mail-config.ui.h:6
-msgid "Allowing a _mailing list to redirect a private reply to the list"
-msgstr ""
+msgid "Header content"
+msgstr "Paĝokapa enhavo"
 
 #: ../mail/mail-config.ui.h:7
-msgid "Also encrypt to sel_f when sending encrypted messages"
-msgstr ""
+msgid "Default Behavior"
+msgstr "Defaŭlta konduto"
 
 #: ../mail/mail-config.ui.h:8
-msgid "Alway_s carbon-copy (cc) to:"
+msgid "For_mat messages in HTML"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:9
-msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "Ĉiam sendu kaŝitan kopion al:"
+#, fuzzy
+#| msgid "Automatic link recognition"
+msgid "Automatically insert _emoticons"
+msgstr "Aŭtomata enmeti _miensimboloj"
 
 #: ../mail/mail-config.ui.h:10
-msgid "Always _trust keys in my keyring when encrypting"
+msgid "Use Unicode characters for smile_ys"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:11
-msgid "Always encrypt to _myself when sending encrypted messages"
-msgstr ""
+msgid "Always request rea_d receipt"
+msgstr "Ĉiam peti kvitancon pri _legado"
 
 #: ../mail/mail-config.ui.h:12
-msgid "Always request rea_d receipt"
-msgstr "Ĉiam petu kvitancon pri legado"
+msgid "Encode filenames in an _Outlook/GMail way"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:13
-msgid "Apply the same _view settings to all folders"
+#, fuzzy
+#| msgid "Saving message to Outbox."
+msgid "Send messages through Outbo_x folder"
+msgstr "Konservi mesaĝon en sendit_ujo"
+
+#: ../mail/mail-config.ui.h:14
+msgid "Number of characters for word w_rapping:"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:15
-#: ../modules/addressbook/addressbook-config.c:1090
-msgid "Authentication"
-msgstr "Aŭtentokontrolo"
+#, fuzzy
+#| msgid "C_haracter set:"
+msgid "Ch_aracter encoding:"
+msgstr "_Signaro:"
 
 #: ../mail/mail-config.ui.h:16
-msgid "Automatically insert _emoticon images"
+msgid "Replies and Forwards"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:17
-msgid "C_haracter set:"
-msgstr "_Signaro:"
+msgid "_Reply style:"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:18
-msgid "Ch_eck for Supported Types"
+msgid "_Forward style:"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:19
-msgid "Check cu_stom headers for junk"
+msgid "Start _typing at the bottom on replying"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:20
-msgid "Check for new _messages on start"
+msgid "_Keep signature above the original message on replying"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:21
-msgid "Check for new messa_ges in all active accounts"
+msgid "Ig_nore Reply-To: for mailing lists"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:22
-msgid "Check incoming _messages for junk"
+msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:23
-msgid "Check spelling while I _type"
-msgstr "Kontrolu la ortografion dum _tajpado"
+msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:24
-msgid "Cle_ar"
-msgstr "V_akigi"
+#| msgid "Attachment"
+#| msgid_plural "Attachments"
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "Aldonaĵo"
 
 #: ../mail/mail-config.ui.h:25
-msgid "Clea_r"
-msgstr "_Vakigi"
+msgctxt "ReplyForward"
+msgid "Inline (Outlook style)"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:26
-msgid "Color for _misspelled words:"
-msgstr "Koloro por _misliterumitaj vortoj:"
+msgctxt "ReplyForward"
+msgid "Quoted"
+msgstr "Citita"
 
 #: ../mail/mail-config.ui.h:27
-msgid "Composing Messages"
-msgstr "Kreado de mesaĝoj"
+#| msgid "Do _Not Delete"
+msgctxt "ReplyForward"
+msgid "Do Not Quote"
+msgstr "Ne citi"
 
 #: ../mail/mail-config.ui.h:28
-#: ../modules/plugin-manager/evolution-plugin-manager.c:160
-msgid "Configuration"
-msgstr "Agordo"
-
-#: ../mail/mail-config.ui.h:29
-msgid "Confirm _when expunging a folder"
+msgctxt "ReplyForward"
+msgid "Inline"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:30
-msgid "Confirmations"
-msgstr "Konfirmoj"
+msgid "Sig_natures"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:31
-#: ../modules/addressbook/autocompletion-config.c:188
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
-msgid "Date/Time Format"
-msgstr "Dato/tempo-aranĝo"
+msgid "Signatures"
+msgstr "Subskriboj"
+
+#: ../mail/mail-config.ui.h:32
+msgid "_Languages"
+msgstr "_Lingvoj"
 
 #: ../mail/mail-config.ui.h:33
-msgid "Default Behavior"
-msgstr "Defaŭlta konduto"
+msgid "Languages Table"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:34
-msgid "Default character e_ncoding:"
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
 msgstr ""
 
-#: ../mail/mail-config.ui.h:35
-msgid "Delete Mail"
-msgstr "Forigi mesaĝon"
-
 #: ../mail/mail-config.ui.h:36
-msgid "Delete junk messages on e_xit"
-msgstr ""
+msgid "Check spelling while I _type"
+msgstr "Kontrolu la ortografion dum _tajpado"
 
-#: ../mail/mail-config.ui.h:39
-msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
+#: ../mail/mail-config.ui.h:38
+msgid ""
+"To help avoid email accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
 msgstr ""
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:40
-msgid "Digitally sign o_utgoing messages (by default)"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:41
-msgid "Displayed Message Headers"
+msgid "Sending a message with an _empty subject line"
 msgstr ""
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:42
-msgid "Do not mar_k messages as junk if sender is in my address book"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:43
-msgid "Do not quote"
+msgid "Sending a message with only _Bcc recipients defined"
 msgstr ""
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:44
-msgid "Drafts _Folder:"
-msgstr "Malnet_dosierujo:"
-
-#: ../mail/mail-config.ui.h:45
-msgid "Email _Address:"
-msgstr "Retpoŝt_adreso:"
+msgid "Sending a _private reply to a mailing list message"
+msgstr ""
 
-#: ../mail/mail-config.ui.h:47
-msgid "Empty trash folders on e_xit"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:46
+msgid "Sending a reply to a large _number of recipients"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:49
-msgid "Encry_ption certificate:"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:48
+msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr ""
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:50
-msgid "Encrypt out_going messages (by default)"
+msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:51
-msgid "Encryption:"
-msgstr "Ĉifrado:"
-
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:52
-msgid "F_all back to threading messages by subject"
+msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:53
-msgid "Fix_ed Width Font:"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:54
-msgid "Format messages in _HTML"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:55
-msgid "Full Nam_e:"
-msgstr "Tuta _nomo:"
+msgid "Confirmations"
+msgstr "Konfirmoj"
 
+#. Translators: Label of a frame with a list of folders for which to use selected account in Send account 
overrides
 #: ../mail/mail-config.ui.h:57
-msgid "Group Reply goes only to mailing list, if possible"
-msgstr ""
+#, fuzzy
+#| msgid "Search Folders"
+msgid "Use for Folders"
+msgstr "Serĉdosierujoj"
 
 #: ../mail/mail-config.ui.h:58
-msgid "HTML Messages"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:59
-msgid "H_TTP Proxy:"
-msgstr ""
+msgid "A_dd"
+msgstr "_Aldoni"
 
 #: ../mail/mail-config.ui.h:60
-msgid "Header content"
-msgstr "Paĝokapa enhavo"
-
-#: ../mail/mail-config.ui.h:61
-msgid "Header name"
-msgstr "Paĝokapa nomo"
+#| msgid "_Remove"
+msgid "Re_move"
+msgstr "_Forigi"
 
+#. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account 
overrides
 #: ../mail/mail-config.ui.h:62
-msgid "Headers"
-msgstr "Kaplinioj"
-
-#: ../mail/mail-config.ui.h:63
-msgid "Highlight _quotations with"
+msgid "Use for Recipients"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:64
-msgid "Ignore Reply-To: for mailing lists"
-msgstr ""
+#. Translators: Label of a frame with a list of configured accounts in Send account overrides
+#: ../mail/mail-config.ui.h:64 ../modules/mail/em-composer-prefs.c:863
+#| msgid "_Account:"
+msgid "Account"
+msgstr "Konto"
 
 #: ../mail/mail-config.ui.h:65
-msgid "Inline"
+msgid "Send account overrides"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:66
-msgid "Inline (Outlook style)"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
-msgid "Labels"
-msgstr "Etikedoj"
-
-#: ../mail/mail-config.ui.h:69
-msgid "Languages Table"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:70
-msgid "Loading Images"
+msgid ""
+"Assign which account should be used as a send account for respective folders "
+"or recipients, an override for usual send account detection. List of "
+"recipients can contain partial addresses or names. The name and the address "
+"parts are compared separately."
 msgstr ""
 
-#: ../mail/mail-config.ui.h:71
-msgid "Mail Headers Table"
+#: ../mail/mail-config.ui.h:67
+msgid "_Folder override has precedence over Recipient override"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:72
-msgid "Mailbox location"
-msgstr ""
+#: ../mail/mail-config.ui.h:68
+#, fuzzy
+#| msgid "Current Account"
+msgid "Send Account"
+msgstr "Aktualo konto"
 
-#: ../mail/mail-config.ui.h:73
-msgid "Message Display"
-msgstr ""
+#: ../mail/mail-config.ui.h:74 ../smime/gui/smime-ui.ui.h:1
+msgid "a"
+msgstr "a"
 
-#: ../mail/mail-config.ui.h:74
-msgid "Message Receipts"
-msgstr ""
+#: ../mail/mail-config.ui.h:75 ../smime/gui/smime-ui.ui.h:2
+msgid "b"
+msgstr "b"
 
 #: ../mail/mail-config.ui.h:76
-msgid "No _Proxy for:"
+msgid "Start up"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:77 ../modules/addressbook/ldap-config.ui.h:9
-msgid "No encryption"
+#: ../mail/mail-config.ui.h:77
+msgid "Check for new _messages on start"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:78
-msgid "Option is ignored if a match for custom junk headers is found."
+msgid "Check for new messa_ges in all active accounts"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:79
-#: ../plugins/publish-calendar/publish-calendar.ui.h:10
-msgid "Optional Information"
-msgstr "Nedeviga informo"
+msgid "Message Display"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:80
+msgid "_Use the same fonts as other applications"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:81
-msgid "Or_ganization:"
-msgstr "Or_ganizo:"
+msgid "S_tandard Font:"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:82
-msgid "PGP/GPG _Key ID:"
+msgid "Select HTML fixed width font"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:83
-msgid "Pass_word:"
-msgstr "Pas_vorto:"
+msgid "Select HTML variable width font"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:84
-msgid "Personal Details:"
-msgstr "Persondetaloj:"
+msgid "Fix_ed Width Font:"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:85
-#: ../modules/calendar/e-calendar-preferences.ui.h:23
-msgid "Pick a color"
-msgstr "Elekti koloron"
-
-#: ../mail/mail-config.ui.h:86
-msgid "Port:"
-msgstr "Pordo:"
+#, fuzzy
+#| msgid "Mark Me_ssages as Read"
+msgid "_Mark messages as read after"
+msgstr "Marki me_saĝojn kiel legite"
 
 #: ../mail/mail-config.ui.h:87
-msgid "Pretty Good Privacy (PGP/GPG)"
+msgid "Highlight _quotations with"
 msgstr ""
 
+#: ../mail/mail-config.ui.h:88
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
+msgid "Pick a color"
+msgstr "Elekti koloron"
+
 #: ../mail/mail-config.ui.h:89
-msgid "Proxy Settings"
-msgstr "Prokurilagordo"
+msgid "color"
+msgstr "koloro"
 
 #: ../mail/mail-config.ui.h:90
-msgid "Quoted"
+msgid "Default character e_ncoding:"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:91
-msgid "Re_member password"
+msgid "Apply the same _view settings to all folders"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:92
-msgid "Re_ply-To:"
+msgid "F_all back to threading messages by subject"
 msgstr ""
 
+#: ../mail/mail-config.ui.h:93
+msgid "Delete Mail"
+msgstr "Forigi mesaĝon"
+
 #: ../mail/mail-config.ui.h:94
-msgid "Remember _password"
-msgstr ""
+#, fuzzy
+#| msgid "Empty _Trash"
+msgid "Empty _trash folders"
+msgstr "Malplenigi _rubujon"
 
 #: ../mail/mail-config.ui.h:95
-msgid "Replies and Forwards"
+msgid "Confirm _when expunging a folder"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:96
-msgid "Required Information"
+msgid "Archive Mail"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:97
-msgid "SHA1"
-msgstr "SHA1"
+#, fuzzy
+#| msgid "On This Computer"
+msgid "On This Computer A_rchive folder:"
+msgstr "En ĉi tiu komputilo a_rkivo-dosierujo:"
 
 #: ../mail/mail-config.ui.h:98
-msgid "SHA256"
-msgstr "SHA256"
-
-#: ../mail/mail-config.ui.h:99
-msgid "SHA384"
-msgstr "SHA384"
+msgid "Archive folder to use for On This Computer messages"
+msgstr ""
 
+#. If enabled, show animation; if disabled, only display a static image without any animation
 #: ../mail/mail-config.ui.h:100
-msgid "SHA512"
-msgstr "SHA512"
+msgid "_Show animated images"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:101
-msgid "SOC_KS Proxy:"
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:102 ../modules/addressbook/ldap-config.ui.h:12
-msgid "SSL encryption"
+#: ../mail/mail-config.ui.h:102
+msgid "Loading Images"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:103
-msgid "SSL is not supported in this build of Evolution"
+msgid "_Never load images from the Internet"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:104
-msgid "S_earch for sender photograph only in local address books"
+msgid "_Load images only in messages from contacts"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:105
-msgid "S_elect..."
-msgstr "_Elekti..."
+msgid "_Always load images from the Internet"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:106
-msgid "S_end message receipts:"
-msgstr ""
+msgid "HTML Messages"
+msgstr "HTML-mesaĝoj"
 
-#: ../mail/mail-config.ui.h:107
-msgid "S_tandard Font:"
-msgstr ""
+#: ../mail/mail-config.ui.h:107 ../mail/message-list.etspec.h:19
+msgid "Labels"
+msgstr "Etikedoj"
 
 #: ../mail/mail-config.ui.h:108
-msgid "Secure MIME (S/MIME)"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:110
-msgid "Select HTML fixed width font"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:111
-msgid "Select HTML variable width font"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:112
 msgid "Sender Photograph"
 msgstr ""
 
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:115
-msgid "Sending a _private reply to a mailing list message"
-msgstr ""
-
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:117
-msgid "Sending a message with _recipients not entered as mail addresses"
-msgstr ""
-
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:119
-msgid "Sending a message with an _empty subject line"
-msgstr ""
-
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:121
-msgid "Sending a message with only _Bcc recipients defined"
-msgstr ""
-
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:123
-msgid "Sending a reply to a large _number of recipients"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:124
-msgid "Sent _Messages Folder:"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:125
-msgid "Ser_ver requires authentication"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:126
-msgid "Server Configuration"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:127
-msgid "Server _Type:"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:130
-msgid "Set custom junk header"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:131
-msgid "Si_gning algorithm:"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:132
-msgid "Sig_natures"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:133
-msgid "Sig_ning certificate:"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:134
-msgid "Signat_ure:"
-msgstr "S_ubskribo:"
-
-#: ../mail/mail-config.ui.h:135
-msgid "Signatures"
-msgstr "Subskriboj"
-
-#: ../mail/mail-config.ui.h:136
-msgid "Signing _algorithm:"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:137
-msgid "Special Folders"
-msgstr "Specialaj dosierujoj"
-
-#: ../mail/mail-config.ui.h:138
-msgid "Spell Checking"
-msgstr "Literumkontrolo"
-
-#: ../mail/mail-config.ui.h:139
-msgid "Start _typing at the bottom on replying"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:140
-msgid "Start up"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:141 ../modules/addressbook/ldap-config.ui.h:21
-msgid "TLS encryption"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:142
-msgid "T_ype:"
-msgstr "T_ipo:"
-
-#: ../mail/mail-config.ui.h:143
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-
-#: ../mail/mail-config.ui.h:144
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
-msgstr ""
-
-#: ../mail/mail-config.ui.h:147
-msgid ""
-"To help avoid email accidents and embarrassments, ask for confirmation "
-"before taking the following checkmarked actions:"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:148
-msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example: \"Work\" or \"Personal\""
-msgstr ""
-
-#: ../mail/mail-config.ui.h:150
-msgid "Us_ername:"
-msgstr "U_zantonomo:"
-
-#: ../mail/mail-config.ui.h:151
-msgid "Use Authe_ntication"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:152
-msgid "User _Name:"
-msgstr "Uzanto_nomo:"
-
-#: ../mail/mail-config.ui.h:154
-msgid "_Add Signature"
-msgstr "_Aldoni subskribon"
-
-#: ../mail/mail-config.ui.h:155
-msgid "_Always load images from the Internet"
+#: ../mail/mail-config.ui.h:109
+msgid "_Show the photograph of sender in the message preview"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:156
-msgid "_Authentication Type"
+#: ../mail/mail-config.ui.h:110
+msgid "Search gra_vatar.com for the photograph of sender"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:157
-msgid "_Direct connection to the Internet"
+#: ../mail/mail-config.ui.h:111
+msgid "Displayed Message Headers"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:158
-msgid "_Do not sign meeting requests (for Outlook compatibility)"
+#: ../mail/mail-config.ui.h:112
+msgid "Mail Headers Table"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:159
-msgid "_Forward style:"
-msgstr ""
+#: ../mail/mail-config.ui.h:113
+#: ../modules/addressbook/autocompletion-config.c:117
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
+msgid "Date/Time Format"
+msgstr "Dato/tempo-aranĝo"
 
-#: ../mail/mail-config.ui.h:160
-msgid "_Junk Folder:"
+#: ../mail/mail-config.ui.h:115
+msgid "Check incoming _messages for junk"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:161
-msgid "_Keep signature above the original message on replying"
-msgstr ""
+#: ../mail/mail-config.ui.h:116
+#, fuzzy
+#| msgid "_Delete Message"
+msgid "_Delete junk messages"
+msgstr "_Forigi mesaĝojn"
 
-#: ../mail/mail-config.ui.h:162
-msgid "_Languages"
-msgstr "_Lingvoj"
+#: ../mail/mail-config.ui.h:117
+#, fuzzy
+#| msgid "Send Options"
+msgid "Junk Test Options"
+msgstr "Send-agordoj"
 
-#: ../mail/mail-config.ui.h:163
-msgid "_Load images only in messages from contacts"
+#: ../mail/mail-config.ui.h:118
+msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:119
 msgid "_Lookup in local address book only"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:165
-msgid "_Make this my default account"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:166
-msgid "_Manual proxy configuration:"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:168
-msgid "_Never load images from the Internet"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:170 ../modules/addressbook/ldap-config.ui.h:29
-msgid "_Port:"
-msgstr "_Pordo:"
-
-#: ../mail/mail-config.ui.h:171
-msgid "_Prompt on sending HTML mail to contacts that do not want them"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:172
-msgid "_Reply style:"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:173
-msgid "_Script:"
-msgstr "_Skripto:"
-
-#: ../mail/mail-config.ui.h:174
-msgid "_Secure HTTP Proxy:"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:176
-#: ../plugins/publish-calendar/publish-calendar.ui.h:28
-msgid "_Server:"
-msgstr "_Servilo:"
-
-#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:178
-msgid "_Show animated images"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:179
-msgid "_Show the photograph of sender in the message preview"
+#: ../mail/mail-config.ui.h:120
+msgid "Check cu_stom headers for junk"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:180
-msgid "_Trash Folder:"
-msgstr ""
+#: ../mail/mail-config.ui.h:122
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:224
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:174
+msgid "No encryption"
+msgstr "Nenia ĉifro"
 
-#: ../mail/mail-config.ui.h:181
-msgid "_Use secure connection:"
+#: ../mail/mail-config.ui.h:123
+msgid "TLS encryption"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:182
-msgid "_Use system defaults"
-msgstr "_Uzi sistemdefaŭltojn"
-
-#: ../mail/mail-config.ui.h:183
-msgid "_Use the same fonts as other applications"
+#: ../mail/mail-config.ui.h:124
+msgid "SSL encryption"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:48
-msgid "a"
-msgstr "a"
-
-#: ../mail/mail-config.ui.h:185 ../smime/gui/smime-ui.ui.h:49
-msgid "b"
-msgstr "b"
-
-#: ../mail/mail-config.ui.h:186
-msgid "color"
-msgstr "koloro"
-
-#: ../mail/mail-config.ui.h:187
-msgid "description"
-msgstr "priskribo"
-
-#: ../mail/mail-config.ui.h:188
-msgid "label"
-msgstr "etikedo"
-
-#: ../mail/mail-config.ui.h:189
-msgid "none"
-msgstr "neniu"
-
 #: ../mail/mail-dialogs.ui.h:1
-msgid "All active remote folders"
-msgstr ""
-
-#: ../mail/mail-dialogs.ui.h:2
-msgid "All local and active remote folders"
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
 msgstr ""
 
 #: ../mail/mail-dialogs.ui.h:3
-msgid "All local folders"
-msgstr "Ĉiuj lokaj dosierujoj"
+msgid "_Flag:"
+msgstr ""
 
 #: ../mail/mail-dialogs.ui.h:4
-msgid "Call"
-msgstr "Voko"
-
-#. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:6
-msgid "Co_mpleted"
+msgid "_Due By:"
 msgstr ""
 
+#. Translators: Flag Completed
 #: ../mail/mail-dialogs.ui.h:7
-msgid "Digital Signature"
+msgid "Co_mpleted"
 msgstr ""
 
 #: ../mail/mail-dialogs.ui.h:8
-msgid "Do Not Forward"
-msgstr ""
+msgid "Call"
+msgstr "Voko"
 
 #: ../mail/mail-dialogs.ui.h:9
-msgid "Encryption"
-msgstr "Ĉifrado"
+msgid "Do Not Forward"
+msgstr ""
 
 #: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
@@ -13386,87 +17246,74 @@ msgid "Forward"
 msgstr "Antaŭen"
 
 #: ../mail/mail-dialogs.ui.h:13
-msgid "License Agreement"
-msgstr "Permesilo"
-
-#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:17
 msgid "Reply to All"
 msgstr "Respondy al ĉiuj"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Review"
 msgstr ""
 
+#: ../mail/mail-dialogs.ui.h:19
+msgid "License Agreement"
+msgstr "Permesilo"
+
 #: ../mail/mail-dialogs.ui.h:20
-msgid "Search Folder Sources"
+msgid "_Tick this to accept the license agreement"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:21
-msgid "Security Information"
-msgstr "Sekurecinformo"
-
 #: ../mail/mail-dialogs.ui.h:22
-msgid "Specific folders"
-msgstr ""
-
-#: ../mail/mail-dialogs.ui.h:23
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-
-#: ../mail/mail-dialogs.ui.h:25
 msgid "_Accept License"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:26
-msgid "_Due By:"
-msgstr ""
+#: ../mail/mail-dialogs.ui.h:23
+msgid "Security Information"
+msgstr "Sekurecinformo"
 
-#: ../mail/mail-dialogs.ui.h:27
-msgid "_Flag:"
+#: ../mail/mail-dialogs.ui.h:24
+msgid "Digital Signature"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:28
-msgid "_Tick this to accept the license agreement"
-msgstr ""
+#: ../mail/mail-dialogs.ui.h:25
+msgid "Encryption"
+msgstr "Ĉifrado"
 
 #: ../mail/mail.error.xml.h:1
-msgid "\"Check Junk\" Failed"
-msgstr ""
+msgid "Invalid authentication"
+msgstr "Nevalida aŭtentigo"
 
 #: ../mail/mail.error.xml.h:2
-msgid "\"Report Junk\" Failed"
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:3
-msgid "\"Report Not Junk\" Failed"
-msgstr ""
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "Via ensaluto al via servilo \"{0}\" kiel \"{0}\" malsukcesis."
 
 #: ../mail/mail.error.xml.h:4
-msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:5
-msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgid "Are you sure you want to send a message in HTML format?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A non-empty folder at \"{1}\" already exists.\n"
-"\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit."
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:9
-msgid ""
-"A signature already exists with the name \"{0}\". Please specify a different "
-"name."
+msgid "Are you sure you want to send a message without a subject?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:10
@@ -13476,2121 +17323,2153 @@ msgid ""
 msgstr ""
 
 #: ../mail/mail.error.xml.h:11
-msgid "Are you sure you want to delete this account and all its proxies?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to delete this account?"
-msgstr "Ĉu vi certe volas forigi ĉi tiun konton?"
-
-#: ../mail/mail.error.xml.h:13
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
-msgstr ""
-
-#: ../mail/mail.error.xml.h:14
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
 msgstr ""
-"Ĉu vi certe volas daŭre forigi ĉiujn forigitaj mesaĝoj en ĉiuj mesaĝujoj?"
 
 #: ../mail/mail.error.xml.h:15
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in "
-"folder \"{0}\"?"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:16
-msgid "Are you sure you want to send a message in HTML format?"
-msgstr ""
-
-#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:18
-msgid "Are you sure you want to send a message with invalid addresses?"
+#: ../mail/mail.error.xml.h:17
+msgid ""
+"The following recipient was not recognized as a valid mail address:\n"
+"{0}"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:19
-msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:20
-msgid "Are you sure you want to send a message without a subject?"
-msgstr ""
-
-#: ../mail/mail.error.xml.h:21
-msgid "Blank Signature"
+msgid ""
+"The following recipients were not recognized as valid mail addresses:\n"
+"{0}"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder \"{0}\"."
+msgid "Send private reply?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Ne eblis kopii dosierujon \"{0}\" al \"{1}\"."
+msgid ""
+"You are replying privately to a message which arrived via a mailing list, "
+"but the list is trying to redirect your reply to go back to the list. Are "
+"you sure you want to proceed?"
+msgstr ""
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder \"{0}\"."
-msgstr "Ne eblis kreii dosierujon \"{0}\"."
-
-#: ../mail/mail.error.xml.h:25
-msgid "Cannot create temporary save directory."
+msgid "Reply _Privately"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because \"{1}\""
+msgid ""
+"You are replying to a message which arrived via a mailing list, but you are "
+"replying privately to the sender; not to the list. Are you sure you want to "
+"proceed?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder \"{0}\"."
-msgstr "Ne eblis forigi dosierujon \"{0}\"."
-
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Ne eblis forigi sistemdosierujon \"{0}\"."
+msgid "Send reply to all recipients?"
+msgstr ""
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgid ""
+"You are replying to a message which was sent to many recipients. Are you "
+"sure you want to reply to ALL of them?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Ne eblis movi dosieron \"{0}\" al \"{1}\"."
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
+msgstr ""
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source \"{1}\"."
-msgstr "Ne eblis malfermi fonton \"{1}\"."
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source \"{2}\"."
-msgstr "Ne eblis malfermi fonton \"{2}\"."
+msgid "Use default drafts folder?"
+msgstr "Ĉu uzi defaŭltan malnet-dosierujon?"
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target \"{2}\"."
-msgstr "Ne eblis malfermi celon \"{2}\"."
-
-#: ../mail/mail.error.xml.h:34
 msgid ""
-"Cannot read the license file \"{0}\", due to an installation problem. You "
-"will not be able to use this provider until you can accept its license."
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
 msgstr ""
 
+#: ../mail/mail.error.xml.h:34
+msgid "Use _Default"
+msgstr "Uzi _defaŭlton"
+
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "Ne eblis alinomi \"{0}\" al \"{1}\"."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder \"{0}\"?"
+msgstr ""
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder \"{0}\"."
+msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:37
-msgid "Cannot save changes to account."
+msgid "_Expunge"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory \"{0}\"."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
 msgstr ""
+"Ĉu vi certe volas daŭre forigi ĉiujn forigitaj mesaĝoj en ĉiuj mesaĝujoj?"
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file \"{0}\"."
-msgstr ""
+#: ../modules/mail/e-mail-shell-view-actions.c:1580
+msgid "_Empty Trash"
+msgstr "_Malplenigi rubujon"
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script \"{0}\"."
+msgid "Opening too many messages at once may take a long time."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:41
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
+msgid "_Open Messages"
+msgstr "_Malfermi mesaĝoj"
 
 #: ../mail/mail.error.xml.h:42
-msgid "Close message window."
-msgstr "Fermi mesaĝfenestron."
-
-#: ../mail/mail.error.xml.h:43
-msgid "Could not save signature file."
-msgstr ""
-
-#: ../mail/mail.error.xml.h:45
-msgid "Do _Not Disable"
+msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:46
-msgid "Do _Not Synchronize"
+#: ../mail/mail.error.xml.h:43
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
 msgstr ""
 
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
 #: ../mail/mail.error.xml.h:47
-msgid ""
-"Do you want to locally synchronize the folders that are marked for offline "
-"usage?"
-msgstr ""
+msgid "Error while {0}."
+msgstr "Eraro dum {0}."
 
 #: ../mail/mail.error.xml.h:48
-msgid "Do you want to mark all messages as read?"
+msgid "Error while performing operation."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:49
-msgid "Do you wish to save your changes?"
-msgstr ""
-
-#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "Enigi pasvorton."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Error loading filter definitions."
 msgstr ""
 
+#: ../mail/mail.error.xml.h:51
+msgid "Cannot save to directory \"{0}\"."
+msgstr ""
+
 #: ../mail/mail.error.xml.h:52
-msgid "Error while performing operation."
+msgid "Cannot save to file \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:53
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr ""
+
+#: ../mail/mail.error.xml.h:54
+msgid "Cannot create temporary save directory."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:55
+msgid "File exists but cannot overwrite it."
 msgstr ""
 
-#. Translators: the {0} is replaced with an operation name, which failed.
-#. It can be basically anything run asynchronously, like "Fetching Mail",
-#. "Sending message" and others, mostly from mail-ops.c file.
 #: ../mail/mail.error.xml.h:56
-msgid "Error while {0}."
-msgstr "Eraro dum {0}."
+msgid "File exists but is not a regular file."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:57
+msgid "Cannot delete folder \"{0}\"."
+msgstr "Ne eblis forigi dosierujon \"{0}\"."
+
+#: ../mail/mail.error.xml.h:58
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Ne eblis forigi sistemdosierujon \"{0}\"."
+
+#: ../mail/mail.error.xml.h:59
 msgid ""
-"Evolution's local mail format has changed from mbox to Maildir. Your local "
-"mail must be migrated to the new format before Evolution can proceed. Do you "
-"want to migrate now?\n"
-"\n"
-"An mbox account will be created to preserve the old mbox folders. You can "
-"delete the account after ensuring the data is safely migrated. Please make "
-"sure there is enough disk space if you choose to migrate now."
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:60
-msgid "Evolution's local mail format has changed."
-msgstr ""
-
-#: ../mail/mail.error.xml.h:61
-msgid "Failed to download messages for offline viewing."
-msgstr ""
+#, fuzzy
+#| msgid "Failed to open folder."
+msgid "Failed to expunge folder &quot;{0}&quot;."
+msgstr "Malsukcesis malfermi dosierujon &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:62
-msgid "Failed to find duplicate messages."
-msgstr ""
+#| msgid "Failed to open folder."
+msgid "Failed to refresh folder &quot;{0}&quot;."
+msgstr "Malsukcesis aktualigi dosierujon &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:63
-msgid "Failed to open folder."
-msgstr "Fiaskis malfermi dosierujon."
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:64
-msgid ""
-"Failed to query server for a list of supported authentication mechanisms."
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:65
-msgid "Failed to remove attachments from messages."
-msgstr ""
-
-#: ../mail/mail.error.xml.h:66
-msgid "Failed to retrieve messages."
+msgid ""
+"If you delete the folder, all of its contents and its subfolders' contents "
+"will be deleted permanently."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:67
-msgid "Failed to save messages to disk."
-msgstr ""
+msgid "Really delete folder \"{0}\"?"
+msgstr "Ĉu certe forigi dosierujon \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:68
-msgid "Failed to unsubscribe from folder."
-msgstr "Fiaskis malabono de dosierujo."
+msgid ""
+"If you delete the folder, all of its contents will be deleted permanently."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:69
-msgid "File exists but cannot overwrite it."
+msgid "These messages are not copies."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:70
-msgid "File exists but is not a regular file."
+msgid ""
+"Messages shown in Search Folders are not copies. Deleting them from a Search "
+"Folder will delete the actual messages from the folder or folders in which "
+"they physically reside. Do you really want to delete these messages?"
 msgstr ""
 
-#. Translators: {0} is replaced with a folder name
+#: ../mail/mail.error.xml.h:71
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "Ne eblis alinomi \"{0}\" al \"{1}\"."
+
 #: ../mail/mail.error.xml.h:72
-msgid "Folder '{0}' doesn't contain any duplicate message."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:73
-msgid "Hidden file is attached."
-msgstr ""
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Ne eblis movi dosieron \"{0}\" al \"{1}\"."
 
 #: ../mail/mail.error.xml.h:74
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+#| msgid "Cannot open source \"{2}\"."
+msgid "Cannot open source folder. Error: {2}"
+msgstr "Ne eblis malfermi font-dosierujon. Eraro: {2}"
 
 #: ../mail/mail.error.xml.h:75
-msgid ""
-"If you delete the folder, all of its contents and its subfolders' contents "
-"will be deleted permanently."
-msgstr ""
+#| msgid "Cannot open target \"{2}\"."
+msgid "Cannot open target folder. Error: {2}"
+msgstr "Ne eblis malfermi cel-dosierujon. Eraro: {2}"
 
 #: ../mail/mail.error.xml.h:76
-msgid ""
-"If you delete the folder, all of its contents will be deleted permanently."
-msgstr ""
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Ne eblis kopii dosierujon \"{0}\" al \"{1}\"."
 
 #: ../mail/mail.error.xml.h:77
-msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr ""
+msgid "Cannot create folder \"{0}\"."
+msgstr "Ne eblis kreii dosierujon \"{0}\"."
 
 #: ../mail/mail.error.xml.h:78
-msgid ""
-"If you proceed, the account information and\n"
-"all proxy information will be deleted permanently."
+#| msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgid "Cannot open folder. Error: {1}"
+msgstr "Ne eblis malfermi dosierujon. Eraro {1}"
+
+#: ../mail/mail.error.xml.h:79
+msgid "Cannot save changes to account."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:80
-msgid "If you proceed, the account information will be deleted permanently."
+msgid "You have not filled in all of the required information."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:81
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+msgid "You may not create two accounts with the same name."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:82
-msgid "Ignore"
-msgstr "Ignori"
+msgid "Are you sure you want to delete this account?"
+msgstr "Ĉu vi certe volas forigi ĉi tiun konton?"
 
 #: ../mail/mail.error.xml.h:83
-msgid "Invalid authentication"
-msgstr "Nevalida aŭtentigo"
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:84
-msgid "Mail Deletion Failed"
+msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:85
-msgid "Mail filters automatically updated."
-msgstr ""
-
-#: ../mail/mail.error.xml.h:86
 msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
+"If you proceed, the account information and\n"
+"all proxy information will be deleted permanently."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:87
 msgid ""
-"Messages shown in Search Folders are not copies. Deleting them from a Search "
-"Folder will delete the actual messages from the folder or folders in which "
-"they physically reside. Do you really want to delete these messages?"
+"Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:88
-msgid "Missing folder."
+msgid "If you proceed, all proxy accounts will be deleted permanently."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:89
+msgid "Do _Not Disable"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:90
-msgid "N_ever"
-msgstr "N_eniam"
+#: ../plugins/publish-calendar/publish-calendar.c:655
+msgid "_Disable"
+msgstr "_Elŝalti"
 
 #: ../mail/mail.error.xml.h:91
-msgid "No duplicate messages found."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:92
-msgid "No sources selected."
-msgstr ""
-
-#: ../mail/mail.error.xml.h:93
-msgid "Opening too many messages at once may take a long time."
+msgid ""
+"This folder may have been added implicitly,\n"
+"go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:94
-msgid "Please check your account settings and try again."
+msgid "Cannot add Search Folder \"{0}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:95
-msgid "Please enable the account or send using another account."
+msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:96
-msgid ""
-"Please enter a valid email address in the To: field. You can search for "
-"email addresses by clicking on the To: button next to the entry box."
+msgid "Search Folders automatically updated."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:97
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
-"{0}"
+msgid "Mail filters automatically updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:99
-msgid "Please provide an unique name to identify this signature."
+#: ../mail/mail.error.xml.h:98
+msgid "Missing folder."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:100
-msgid "Please wait."
-msgstr "Bonvole atendu."
+#: ../mail/mail.error.xml.h:99
+msgid "You must specify a folder."
+msgstr "Vi devas specifi dosierujon."
 
 #: ../mail/mail.error.xml.h:101
-msgid "Problem migrating old mail folder \"{0}\"."
-msgstr ""
+msgid "You must name this Search Folder."
+msgstr "Vi devas nomi tiun serĉdosierujon."
 
 #: ../mail/mail.error.xml.h:102
-msgid "Querying server for a list of supported authentication mechanisms."
-msgstr ""
+#| msgid "%d selected"
+msgid "No folder selected."
+msgstr "Neniu dosierujo estas elektita."
 
 #: ../mail/mail.error.xml.h:103
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:104
-msgid "Really delete folder \"{0}\"?"
-msgstr "Ĉu certe forigi dosierujon \"{0}\"?"
-
 #: ../mail/mail.error.xml.h:105
-msgid "Remove duplicate messages?"
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:106
-msgid "Reply _Privately"
-msgstr ""
-
-#: ../mail/mail.error.xml.h:109
-msgid "Search Folders automatically updated."
+msgid ""
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:110
-msgid "Send private reply?"
-msgstr ""
+msgid "_Overwrite"
+msgstr "_Anstataŭigi"
 
 #: ../mail/mail.error.xml.h:111
-msgid "Send reply to all recipients?"
-msgstr ""
+msgid "_Append"
+msgstr "_Postglui"
 
 #: ../mail/mail.error.xml.h:112
-msgid "Signature Already Exists"
-msgstr "Subskribo jam ekzistas"
-
-#: ../mail/mail.error.xml.h:113
-msgid "Synchronize folders locally for offline usage?"
-msgstr ""
-
-#: ../mail/mail.error.xml.h:114
-msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+msgid "Evolution's local mail format has changed."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:113
 msgid ""
-"The attachment named {0} is a hidden file and may contain sensitive data. "
-"Please review it before sending."
+"Evolution's local mail format has changed from mbox to Maildir. Your local "
+"mail must be migrated to the new format before Evolution can proceed. Do you "
+"want to migrate now?\n"
+"\n"
+"An mbox account will be created to preserve the old mbox folders. You can "
+"delete the account after ensuring the data is safely migrated. Please make "
+"sure there is enough disk space if you choose to migrate now."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:116
-msgid ""
-"The contact list you are sending to is configured to hide list recipients.\n"
-"\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+msgid "_Exit Evolution"
+msgstr "Ĉ_esi Evolutionon"
+
+#: ../mail/mail.error.xml.h:117
+msgid "_Migrate Now"
 msgstr ""
 
+#: ../mail/mail.error.xml.h:118
+msgid "Unable to read license file."
+msgstr "Ne eblis legi permesildosieron."
+
 #: ../mail/mail.error.xml.h:119
 msgid ""
-"The following recipient was not recognized as a valid mail address:\n"
-"{0}"
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
 msgstr ""
 
+#: ../mail/mail.error.xml.h:120
+msgid "Please wait."
+msgstr "Bonvole atendu."
+
 #: ../mail/mail.error.xml.h:121
+msgid "Querying server for a list of supported authentication mechanisms."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:122
 msgid ""
-"The following recipients were not recognized as valid mail addresses:\n"
-"{0}"
+"Failed to query server for a list of supported authentication mechanisms."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:123
+msgid "Synchronize folders locally for offline usage?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:124
-msgid "The script file must exist and be executable."
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:125
-msgid "These messages are not copies."
+msgid "Do _Not Synchronize"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:126
-msgid ""
-"This folder may have been added implicitly,\n"
-"go to the Search Folder editor to add it explicitly, if required."
+msgid "_Synchronize"
+msgstr "_Sinkronigi"
+
+#: ../mail/mail.error.xml.h:127
+msgid "Do you want to mark all messages as read?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:128
-msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
+msgid "This will mark all messages as read in the selected folder."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:129
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
+msgid "Also mark messages in subfolders?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:130
 msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:131
-msgid "This signature has been changed, but has not been saved."
+msgid "In Current Folder and _Subfolders"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:132
-msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
+msgid "In Current _Folder Only"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:133
-msgid "This will mark all messages as read in the selected folder."
+msgid "Should Evolution close this window when replying or forwarding?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:134
-msgid "Unable to connect to the GroupWise server."
-msgstr ""
+#, fuzzy
+#| msgid "_Always"
+msgid "_Yes, Always"
+msgstr "Ĉi_am"
 
 #: ../mail/mail.error.xml.h:135
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
+#| msgid "Never"
+msgid "_No, Never"
+msgstr "_Ne, Neniam"
 
 #: ../mail/mail.error.xml.h:136
-msgid "Unable to read license file."
-msgstr "Ne eblis legi permesildosieron"
+#, fuzzy
+#| msgid "Copying folder %s"
+msgid "Copy folder in folder tree."
+msgstr "Kopii dosierujon."
 
 #: ../mail/mail.error.xml.h:137
-msgid "Unable to retrieve message."
-msgstr ""
-
-#: ../mail/mail.error.xml.h:138
-msgid "Use _Default"
-msgstr "Uzi _defaŭlton"
-
-#: ../mail/mail.error.xml.h:139
-msgid "Use default drafts folder?"
-msgstr "Ĉu uzi defaŭltan malnet-dosierujon?"
+#| msgid "Are you sure you want to delete the memo '{0}'?"
+msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
+msgstr "Ĉu vi certe volas kopii dosierujon '{0}' al dosierujo '{1}'?"
 
 #: ../mail/mail.error.xml.h:140
-msgid "Would you like to close the message window?"
-msgstr ""
+msgid "_Always"
+msgstr "Ĉi_am"
 
 #: ../mail/mail.error.xml.h:141
-msgid ""
-"You are replying privately to a message which arrived via a mailing list, "
-"but the list is trying to redirect your reply to go back to the list. Are "
-"you sure you want to proceed?"
-msgstr ""
+msgid "N_ever"
+msgstr "N_eniam"
 
 #: ../mail/mail.error.xml.h:142
-msgid ""
-"You are replying to a message which arrived via a mailing list, but you are "
-"replying privately to the sender; not to the list. Are you sure you want to "
-"proceed?"
-msgstr ""
+#, fuzzy
+#| msgid "Moving folder %s"
+msgid "Move folder in folder tree."
+msgstr "Movi dosierujon."
 
 #: ../mail/mail.error.xml.h:143
-msgid ""
-"You are replying to a message which was sent to many recipients. Are you "
-"sure you want to reply to ALL of them?"
-msgstr ""
+#| msgid "Are you sure you want to delete the '{0}' task?"
+msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
+msgstr "Ĉu vi certe volas movi dosierujon '{0}' al dosierujo '{1}'?"
 
 #: ../mail/mail.error.xml.h:144
-msgid "You do not have sufficient permissions to delete this mail."
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:145
-msgid "You have not filled in all of the required information."
+msgid "Please enable the account or send using another account."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:146
-msgid "You have unsent messages, do you wish to quit anyway?"
+msgid "Mail Deletion Failed"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:147
-msgid "You may not create two accounts with the same name."
+msgid "You do not have sufficient permissions to delete this mail."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:148
-msgid "You must name this Search Folder."
-msgstr "Vi devas nomi tiun serĉdosierujon."
+msgid "\"Check Junk\" Failed"
+msgstr ""
 
 #: ../mail/mail.error.xml.h:149
-msgid "You must specify a folder."
-msgstr "Vi devas specifi dosierujon."
+msgid "\"Report Junk\" Failed"
+msgstr ""
 
 #: ../mail/mail.error.xml.h:150
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local "
-"folders, all remote folders, or both."
+msgid "\"Report Not Junk\" Failed"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:152
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "Via ensaluto al via servilo \"{0}\" kiel \"{0}\" fiaskis."
+#: ../mail/mail.error.xml.h:151
+msgid "Remove duplicate messages?"
+msgstr ""
 
-#: ../mail/mail.error.xml.h:153
-msgid "_Always"
-msgstr "Ĉi_am"
+#: ../mail/mail.error.xml.h:152
+msgid "No duplicate messages found."
+msgstr ""
 
+#. Translators: {0} is replaced with a folder name
 #: ../mail/mail.error.xml.h:154
-msgid "_Append"
-msgstr "_Postglui"
+msgid "Folder '{0}' doesn't contain any duplicate message."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:155
-#: ../plugins/publish-calendar/publish-calendar.c:611
-msgid "_Disable"
-msgstr "_Elŝalti"
+#| msgid "Because &quot;{1}&quot;."
+msgid "Failed to connect account &quot;{0}&quot;."
+msgstr "Malsukcesis konekti konton &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:156
-msgid "_Discard changes"
-msgstr "_Ignori ŝanĝojn"
+msgid "Failed to disconnect account &quot;{0}&quot;."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:157
-#: ../modules/mail/e-mail-shell-view-actions.c:1154
-msgid "_Empty Trash"
-msgstr "_Malplenigi rubujon"
+msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
+msgstr "Malsukcesis malaboni de dosierujo &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:158
-msgid "_Exit Evolution"
-msgstr "Ĉ_esi Evolutionon"
+msgid "Unable to retrieve message."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:159
-msgid "_Expunge"
-msgstr ""
+msgid "{0}"
+msgstr "{0}"
 
 #: ../mail/mail.error.xml.h:160
-msgid "_Migrate Now"
+msgid "Message is not available in offline mode."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:161
-msgid "_No"
-msgstr "_Ne"
+msgid ""
+"This can be due to the message not being downloaded yet. The folder, or the "
+"account, can be marked for offline synchronization. Then, once the account "
+"is online again, use File-&gt;Download Messages for Offline Usage, when this "
+"folder is selected, to make sure that all the messages in the folder will be "
+"available in offline mode."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:162
-msgid "_Open Messages"
-msgstr "_Malfermi mesaĝoj"
+msgid "Failed to open folder."
+msgstr "Malsukcesis malfermi dosierujon."
+
+#: ../mail/mail.error.xml.h:164
+msgid "Failed to find duplicate messages."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:165
-msgid "_Synchronize"
-msgstr "_Sinkronigi"
+msgid "Failed to retrieve messages."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:166
-msgid "_Yes"
-msgstr "_Jes"
+#, fuzzy
+#| msgid "Timeout for marking message as seen."
+msgid "Failed to mark messages as read."
+msgstr "Tempolimo, post kiu mesaĝo estas markita kiel \"legita\"."
 
 #: ../mail/mail.error.xml.h:167
-msgid "{0}"
-msgstr "{0}"
-
-#: ../mail/mail-folder-cache.c:885
-#, c-format
-msgid "Pinging %s"
+msgid "Failed to remove attachments from messages."
 msgstr ""
 
-#: ../mail/mail-ops.c:85
-msgid "Filtering Selected Messages"
+#: ../mail/mail.error.xml.h:168
+msgid "Failed to download messages for offline viewing."
 msgstr ""
 
-#: ../mail/mail-ops.c:205
-msgid "Fetching Mail"
+#: ../mail/mail.error.xml.h:169
+msgid "Failed to save messages to disk."
 msgstr ""
 
-#: ../mail/mail-ops.c:821
-#, c-format
-msgid "Sending message %d of %d"
+#: ../mail/mail.error.xml.h:170
+msgid "Hidden file is attached."
 msgstr ""
 
-#: ../mail/mail-ops.c:869
-#, c-format
-msgid "Failed to send %d of %d messages"
+#: ../mail/mail.error.xml.h:171
+msgid ""
+"The attachment named {0} is a hidden file and may contain sensitive data. "
+"Please review it before sending."
 msgstr ""
 
-#: ../mail/mail-ops.c:873 ../mail/mail-send-recv.c:872
-msgid "Canceled."
-msgstr "Nuligite."
-
-#: ../mail/mail-ops.c:875 ../mail/mail-send-recv.c:874
-msgid "Complete."
-msgstr "Plenumite."
-
-#: ../mail/mail-ops.c:987
-#, c-format
-msgid "Moving messages to '%s'"
-msgstr ""
+#: ../mail/mail.error.xml.h:172
+#, fuzzy
+#| msgid "Print this calendar"
+msgid "Printing failed."
+msgstr "Presi tiun kalendaron"
 
-#: ../mail/mail-ops.c:988
-#, c-format
-msgid "Copying messages to '%s'"
-msgstr ""
+#: ../mail/mail.error.xml.h:173
+#, fuzzy
+#| msgid "Because &quot;{1}&quot;."
+msgid "The printer replied &quot;{0}&quot;."
+msgstr "La presilo respondis &quot;{0}&quot;."
 
-#: ../mail/mail-ops.c:1105
-#, c-format
-msgid "Storing folder '%s'"
-msgstr ""
+#: ../mail/mail.error.xml.h:174
+#, fuzzy
+#| msgid "Could not open destination"
+msgid "Could not perform this operation on {0}."
+msgstr "Ne eblis malfermi celon {0}."
 
-#: ../mail/mail-ops.c:1178
-#, c-format
-msgid "Expunging and storing account '%s'"
+#: ../mail/mail.error.xml.h:175
+msgid "You must be working online to complete this operation."
 msgstr ""
 
-#: ../mail/mail-ops.c:1179
-#, c-format
-msgid "Storing account '%s'"
+#: ../mail/mail.error.xml.h:176
+msgid "Message from &quot;{0}&quot; account:"
 msgstr ""
 
-#: ../mail/mail-ops.c:1241
-#, c-format
-msgid "Refreshing folder '%s'"
+#: ../mail/mail.error.xml.h:177
+msgid "Failed to mark thread to be ignored in folder '{0}'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1457
-#, c-format
-msgid "Expunging folder '%s'"
+#: ../mail/mail.error.xml.h:178
+msgid "Failed to unmark thread from being ignored in folder '{0}'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1550
-#, c-format
-msgid "Emptying trash in '%s'"
+#: ../mail/mail.error.xml.h:179
+msgid "Failed to mark subthread to be ignored in folder '{0}'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1646
-#, c-format
-msgid "Disconnecting %s"
-msgstr ""
+#: ../mail/mail.error.xml.h:180
+#, fuzzy
+#| msgid "Failed to unsubscribe from folder."
+msgid "Failed to unmark subthread from being ignored in folder '{0}'"
+msgstr "Malsukcesis malmarki de dosierujo '{0}'"
 
-#: ../mail/mail-send-recv.c:200
+#: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
-msgstr ""
+msgstr "Nuligante..."
 
-#: ../mail/mail-send-recv.c:523
+#: ../mail/mail-send-recv.c:631
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:539
+#: ../mail/mail-send-recv.c:645
 msgid "Cancel _All"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:639 ../mail/mail-send-recv.c:1016
+#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:1249
 msgid "Updating..."
 msgstr "Ĝisdatigante..."
 
-#: ../mail/mail-send-recv.c:639 ../mail/mail-send-recv.c:725
+#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:817
 msgid "Waiting..."
 msgstr "Atendante..."
 
-#: ../mail/mail-send-recv.c:996
+#: ../mail/mail-send-recv.c:1220
 #, c-format
-msgid "Checking for new mail"
+msgid "Checking for new mail at '%s'"
 msgstr ""
 
-#: ../mail/mail-tools.c:72
+#: ../mail/mail-send-recv.c:1434
 #, c-format
-msgid "Could not create spool directory '%s': %s"
+msgid "Deleting junk and expunging trash at '%s'"
 msgstr ""
 
-#: ../mail/mail-tools.c:113
+#: ../mail/mail-send-recv.c:1436
 #, c-format
-msgid "Trying to movemail a non-mbox source '%s'"
-msgstr ""
+#| msgid "Meeting - %s"
+msgid "Deleting junk at '%s'"
+msgstr "Forigante trudaĵon ĉe '%s'"
 
-#: ../mail/mail-tools.c:225
-#, c-format
-msgid "Forwarded message - %s"
-msgstr ""
+#: ../mail/mail-send-recv.c:1438
+#, fuzzy, c-format
+#| msgid "Opening tasks at %s"
+msgid "Expunging trash at '%s'"
+msgstr "Malfermante rubaĵon ĉe '%s'"
 
-#: ../mail/mail-tools.c:227
-msgid "Forwarded message"
-msgstr ""
-
-#: ../mail/mail-vfolder.c:79
-#, c-format
-msgid "Setting up Search Folder: %s"
-msgstr ""
-
-#: ../mail/mail-vfolder.c:216
-#, c-format
-msgid "Updating Search Folders for '%s' : %s"
-msgstr ""
-
-#. Translators: The first %s is name of the affected
-#. * search folder(s), the second %s is the URI of the
-#. * removed folder. For more than one search folder is
-#. * each of them on a separate line, with four spaces
-#. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:558
-#, c-format
-msgid ""
-"The Search Folder \"%s\" has been modified to account for the deleted "
-"folder\n"
-"\"%s\"."
-msgid_plural ""
-"The following Search Folders\n"
-"%s have been modified to account for the deleted folder\n"
-"\"%s\"."
-msgstr[0] ""
-msgstr[1] ""
+#: ../mail/mail-vfolder-ui.c:66
+msgid "Search Folders"
+msgstr "Serĉdosierujoj"
 
-#: ../mail/mail-vfolder.c:1183
+#: ../mail/mail-vfolder-ui.c:146
 msgid "Edit Search Folder"
 msgstr ""
 
-#: ../mail/mail-vfolder.c:1288
+#: ../mail/mail-vfolder-ui.c:267
 msgid "New Search Folder"
 msgstr ""
 
-#: ../mail/message-list.c:1269
+#: ../mail/message-list.c:291
 msgid "Unseen"
 msgstr "Nevidite"
 
-#: ../mail/message-list.c:1270
+#: ../mail/message-list.c:292
 msgid "Seen"
 msgstr "Vidite"
 
-#: ../mail/message-list.c:1271
+#: ../mail/message-list.c:293
 msgid "Answered"
 msgstr "Respondite"
 
-#: ../mail/message-list.c:1272
+#: ../mail/message-list.c:294
 msgid "Forwarded"
 msgstr "Plusendite"
 
-#: ../mail/message-list.c:1273
+#: ../mail/message-list.c:295
 msgid "Multiple Unseen Messages"
 msgstr "Multaj neviditaj mesaĝoj"
 
-#: ../mail/message-list.c:1274
+#: ../mail/message-list.c:296
 msgid "Multiple Messages"
 msgstr ""
 
-#: ../mail/message-list.c:1278
+#: ../mail/message-list.c:309
 msgid "Lowest"
 msgstr "Plej malalte"
 
-#: ../mail/message-list.c:1279
+#: ../mail/message-list.c:310
 msgid "Lower"
 msgstr "Pli malalte"
 
-#: ../mail/message-list.c:1283
+#: ../mail/message-list.c:314
 msgid "Higher"
 msgstr "Pli alte"
 
-#: ../mail/message-list.c:1284
+#: ../mail/message-list.c:315
 msgid "Highest"
 msgstr "Plej alte"
 
-#: ../mail/message-list.c:1901 ../widgets/table/e-cell-date.c:51
-msgid "?"
-msgstr "?"
+#: ../mail/message-list.c:459 ../mail/message-list.c:6043
+msgid "Generating message list"
+msgstr ""
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1908 ../plugins/itip-formatter/itip-view.c:204
+#: ../mail/message-list.c:2041 ../modules/itip-formatter/itip-view.c:237
 msgid "Today %l:%M %p"
 msgstr "Hodiaŭ %l:%M %p"
 
-#: ../mail/message-list.c:1917
+#: ../mail/message-list.c:2050
 msgid "Yesterday %l:%M %p"
 msgstr "Hieraŭ %l:%M %p"
 
-#: ../mail/message-list.c:1929
+#: ../mail/message-list.c:2062
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1937
+#: ../mail/message-list.c:2070
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1939
+#: ../mail/message-list.c:2072
 msgid "%b %d %Y"
 msgstr "%d-an de %b %Y"
 
-#: ../mail/message-list.c:2738
+#: ../mail/message-list.c:2967
 msgid "Select all visible messages"
 msgstr "Elekti ĉiujn videblajn mesaĝojn"
 
-#: ../mail/message-list.c:2874 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:3629 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Mesaĝoj"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4087
+#: ../mail/message-list.c:4985
 msgid "Follow-up"
 msgstr ""
 
-#. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4602 ../mail/message-list.c:5022
-msgid "Generating message list"
-msgstr ""
-
-#: ../mail/message-list.c:4839
+#: ../mail/message-list.c:5980
 msgid ""
-"No message satisfies your search criteria. Either clear search with Search-"
-">Clear menu item or change it."
+"No message satisfies your search criteria. Change search criteria by "
+"selecting a new Show message filter from the drop down list above or by "
+"running a new search either by clearing it with Search->Clear menu item or "
+"by changing the query above."
 msgstr ""
 
-#: ../mail/message-list.c:4841
+#: ../mail/message-list.c:5988
 msgid "There are no messages in this folder."
 msgstr ""
 
-#: ../mail/message-list.etspec.h:3
-msgid "Due By"
+#: ../mail/message-list.etspec.h:2
+msgid "Flagged"
 msgstr ""
 
-#: ../mail/message-list.etspec.h:4
-msgid "Flag Status"
+#: ../mail/message-list.etspec.h:8
+msgid "Received"
 msgstr ""
 
-#: ../mail/message-list.etspec.h:5
-msgid "Flagged"
+#: ../mail/message-list.etspec.h:11
+msgid "Flag Status"
 msgstr ""
 
-#: ../mail/message-list.etspec.h:6
+#: ../mail/message-list.etspec.h:12
 msgid "Follow Up Flag"
 msgstr ""
 
-#: ../mail/message-list.etspec.h:11
-msgid "Received"
+#: ../mail/message-list.etspec.h:13
+msgid "Due By"
 msgstr ""
 
-#: ../mail/message-list.etspec.h:15
-msgid "Sent Messages"
-msgstr "Senditaj mesaĝoj"
-
-#: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:572
-msgid "Size"
-msgstr "Grando"
+#: ../mail/message-list.etspec.h:18
+#, fuzzy
+#| msgid "Messages"
+msgid "Messages To"
+msgstr "Mesaĝoj"
 
-#: ../mail/message-list.etspec.h:19
+#: ../mail/message-list.etspec.h:20
 msgid "Subject - Trimmed"
 msgstr ""
 
-#: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1594
-msgid "Body contains"
-msgstr ""
+#: ../mail/searchtypes.xml.in.h:23 ../mail/vfoldertypes.xml.in.h:23
+#, fuzzy
+#| msgid "Any Category"
+msgid "Any header"
+msgstr "Iu kategorio"
 
-#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1601
-msgid "Message contains"
+#: ../mail/searchtypes.xml.in.h:54
+msgid "Subject or Addresses contains"
 msgstr ""
 
-#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1608
+#: ../mail/searchtypes.xml.in.h:55
+#: ../modules/mail/e-mail-shell-view-actions.c:2071
 msgid "Recipients contain"
 msgstr ""
 
-#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1615
-msgid "Sender contains"
+#: ../mail/searchtypes.xml.in.h:56
+#: ../modules/mail/e-mail-shell-view-actions.c:2064
+msgid "Message contains"
 msgstr ""
 
-#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1622
+#: ../mail/searchtypes.xml.in.h:57
+#: ../modules/mail/e-mail-shell-view-actions.c:2085
 msgid "Subject contains"
 msgstr ""
 
-#: ../mail/searchtypes.xml.h:6
-msgid "Subject or Addresses contains"
-msgstr ""
-
-#: ../modules/addressbook/addressbook-config.c:204
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-
-#: ../modules/addressbook/addressbook-config.c:206
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-
-#: ../modules/addressbook/addressbook-config.c:208
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-
-#: ../modules/addressbook/addressbook-config.c:643
-msgid "U_se in Birthday & Anniversaries calendar"
-msgstr ""
-
-#: ../modules/addressbook/addressbook-config.c:685
-msgid "Copy _book content locally for offline operation"
-msgstr ""
-
-#: ../modules/addressbook/addressbook-config.c:800
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-
-#: ../modules/addressbook/addressbook-config.c:881
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
-msgstr ""
-
-#: ../modules/addressbook/addressbook-config.c:964
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-
-#: ../modules/addressbook/addressbook-config.c:1088
-msgid "Server Information"
-msgstr "Servilo-informo"
-
-#: ../modules/addressbook/addressbook-config.c:1093
-#: ../smime/gui/smime-ui.ui.h:13
-msgid "Details"
-msgstr "Detaloj"
-
-#: ../modules/addressbook/addressbook-config.c:1094
-#: ../modules/mail/e-mail-shell-view.c:58
-msgid "Searching"
-msgstr "Serĉante"
-
-#: ../modules/addressbook/addressbook-config.c:1096
-msgid "Downloading"
-msgstr "Elŝutante"
-
-#: ../modules/addressbook/addressbook-config.c:1311
-msgid "Address Book Properties"
-msgstr "Adresaro-agordoj"
-
-#: ../modules/addressbook/addressbook-config.c:1313
-msgid "New Address Book"
-msgstr "Nova adresaro"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
-msgid "EFolderList XML for the list of completion URIs"
-msgstr ""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
-msgid "EFolderList XML for the list of completion URIs."
-msgstr ""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
-msgid ""
-"The UID of the selected (or \"primary\") address book in the sidebar of the "
-"\"Contacts\" view."
+#: ../mail/searchtypes.xml.in.h:58
+#: ../modules/mail/e-mail-shell-view-actions.c:2078
+msgid "Sender contains"
 msgstr ""
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
-msgid ""
-"Whether addresses should be formatted according to standard in their "
-"destination country."
+#: ../mail/searchtypes.xml.in.h:59
+#: ../modules/mail/e-mail-shell-view-actions.c:2050
+msgid "Body contains"
 msgstr ""
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:21
-msgid "Whether to show maps in preview pane."
-msgstr ""
+#: ../mail/searchtypes.xml.in.h:60
+#: ../modules/mail/e-mail-shell-view-actions.c:2057
+#, fuzzy
+#| msgid "Expression"
+msgid "Free form expression"
+msgstr "Esprimo"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
-#: ../modules/addressbook/autocompletion-config.c:194
-#: ../modules/mail/em-mailer-prefs.c:1046
+#: ../modules/addressbook/autocompletion-config.c:123
+#: ../modules/mail/em-mailer-prefs.c:1234
 msgid "_Table column:"
 msgstr ""
 
-#: ../modules/addressbook/autocompletion-config.c:197
+#: ../modules/addressbook/autocompletion-config.c:126
 msgid "Address formatting"
 msgstr ""
 
-#: ../modules/addressbook/autocompletion-config.c:200
+#: ../modules/addressbook/autocompletion-config.c:129
 msgid "_Format address according to standard of its destination country"
 msgstr ""
 
-#: ../modules/addressbook/autocompletion-config.c:209
+#: ../modules/addressbook/autocompletion-config.c:137
 msgid "Autocompletion"
 msgstr "Aŭtomata kompletigo"
 
-#: ../modules/addressbook/autocompletion-config.c:212
+#: ../modules/addressbook/autocompletion-config.c:140
 msgid "Always _show address of the autocompleted contact"
 msgstr ""
 
-#: ../modules/addressbook/eab-composer-util.c:149
+#: ../modules/addressbook/eab-composer-util.c:147
 msgid "Multiple vCards"
 msgstr ""
 
-#: ../modules/addressbook/eab-composer-util.c:157
+#: ../modules/addressbook/eab-composer-util.c:155
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard por %s"
 
-#: ../modules/addressbook/eab-composer-util.c:169
-#: ../modules/addressbook/eab-composer-util.c:196
+#: ../modules/addressbook/eab-composer-util.c:167
+#: ../modules/addressbook/eab-composer-util.c:194
 #, c-format
 msgid "Contact information"
 msgstr "Kontaktinformo"
 
-#: ../modules/addressbook/eab-composer-util.c:198
+#: ../modules/addressbook/eab-composer-util.c:196
 #, c-format
 msgid "Contact information for %s"
 msgstr "Kontaktinformo por %s"
 
-#. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:108
-#: ../modules/addressbook/e-book-shell-migrate.c:154
-msgid "On LDAP Servers"
-msgstr "En LDAP-serviloj"
+#: ../modules/addressbook/e-book-shell-backend.c:258
+#: ../modules/addressbook/e-book-shell-view-actions.c:124
+msgid "New Address Book"
+msgstr "Nova adresaro"
 
-#: ../modules/addressbook/e-book-shell-backend.c:309
+#: ../modules/addressbook/e-book-shell-backend.c:267
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakto"
 
-#: ../modules/addressbook/e-book-shell-backend.c:311
-#: ../modules/addressbook/e-book-shell-view-actions.c:909
+#: ../modules/addressbook/e-book-shell-backend.c:269
+#: ../modules/addressbook/e-book-shell-view-actions.c:1023
 msgid "Create a new contact"
 msgstr "Krei novan kontakton"
 
-#: ../modules/addressbook/e-book-shell-backend.c:316
+#: ../modules/addressbook/e-book-shell-backend.c:274
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Kontakt_listo"
 
-#: ../modules/addressbook/e-book-shell-backend.c:318
-#: ../modules/addressbook/e-book-shell-view-actions.c:916
+#: ../modules/addressbook/e-book-shell-backend.c:276
+#: ../modules/addressbook/e-book-shell-view-actions.c:1030
 msgid "Create a new contact list"
 msgstr "Krei novan kontaktliston"
 
-#: ../modules/addressbook/e-book-shell-backend.c:326
+#: ../modules/addressbook/e-book-shell-backend.c:284
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Adresaro"
 
-#: ../modules/addressbook/e-book-shell-backend.c:328
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-backend.c:286
+#: ../modules/addressbook/e-book-shell-view-actions.c:946
 msgid "Create a new address book"
 msgstr "Krei novan adresaron"
 
-#. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:345
-#: ../modules/addressbook/e-book-shell-view.c:402
-#: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:63
-#: ../modules/online-accounts/e-online-accounts-google.c:376
-msgid "Contacts"
-msgstr "Kontaktoj"
-
-#: ../modules/addressbook/e-book-shell-backend.c:355
+#: ../modules/addressbook/e-book-shell-backend.c:314
 msgid "Certificates"
 msgstr "Atestiloj"
 
+#: ../modules/addressbook/e-book-shell-view-actions.c:197
+msgid "Address Book Properties"
+msgstr "Adresaro-agordoj"
+
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:391
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
+#: ../modules/addressbook/e-book-shell-view-actions.c:520
+#: ../modules/addressbook/e-book-shell-view-actions.c:816
 msgid "Save as vCard"
 msgstr "Konservi kiel vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:816
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
 msgid "Co_py All Contacts To..."
 msgstr "Ko_pii ĉiujn kontaktojn al..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:818
+#: ../modules/addressbook/e-book-shell-view-actions.c:925
 msgid "Copy the contacts of the selected address book to another"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:823
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "D_elete Address Book"
 msgstr "_Forigi adresaron"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:825
+#: ../modules/addressbook/e-book-shell-view-actions.c:932
 msgid "Delete the selected address book"
 msgstr "Forigi la elektitan adresaron"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:830
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Mo_ve All Contacts To..."
 msgstr "Mo_vi ĉiujn kontaktojn al..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:832
+#: ../modules/addressbook/e-book-shell-view-actions.c:939
 msgid "Move the contacts of the selected address book to another"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:837
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "_New Address Book"
 msgstr "_Nova adresaro"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:844
+#: ../modules/addressbook/e-book-shell-view-actions.c:951
 msgid "Address _Book Properties"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:846
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "Show properties of the selected address book"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:851
+#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/calendar/e-cal-shell-view-actions.c:1254
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-task-shell-view-actions.c:703
+msgid "Re_fresh"
+msgstr "_Aktualigi"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
+#, fuzzy
+#| msgid "Rename the selected address book"
+msgid "Refresh the selected address book"
+msgstr "Alinomi la elektitan adresaron"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:965
 msgid "Address Book _Map"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:853
+#: ../modules/addressbook/e-book-shell-view-actions.c:967
 msgid "Show map with all contacts from selected address book"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:858
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/calendar/e-memo-shell-view-actions.c:640
-#: ../modules/calendar/e-task-shell-view-actions.c:764
-#: ../modules/mail/e-mail-shell-view-actions.c:1231
+#: ../modules/addressbook/e-book-shell-view-actions.c:972
+#: ../modules/calendar/e-cal-shell-view-actions.c:1261
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
+#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../modules/mail/e-mail-shell-view-actions.c:1672
 msgid "_Rename..."
 msgstr "_Alinomigi..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:974
 msgid "Rename the selected address book"
 msgstr "Alinomi la elektitan adresaron"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
+#: ../modules/addressbook/e-book-shell-view-actions.c:981
 msgid "Stop loading"
 msgstr "Ĉesigi ŝargadon"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:872
+#: ../modules/addressbook/e-book-shell-view-actions.c:986
 msgid "_Copy Contact To..."
 msgstr "_Kopii kontakton al..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:874
+#: ../modules/addressbook/e-book-shell-view-actions.c:988
 msgid "Copy selected contacts to another address book"
 msgstr "Kopii elektitajn kontaktojn al alia adresaro"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:879
+#: ../modules/addressbook/e-book-shell-view-actions.c:993
 msgid "_Delete Contact"
 msgstr "_Forigi kontakton"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:886
+#: ../modules/addressbook/e-book-shell-view-actions.c:1000
 msgid "_Find in Contact..."
 msgstr "_Serĉi en kontakto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
+#: ../modules/addressbook/e-book-shell-view-actions.c:1002
 msgid "Search for text in the displayed contact"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:893
+#: ../modules/addressbook/e-book-shell-view-actions.c:1007
 msgid "_Forward Contact..."
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:895
+#: ../modules/addressbook/e-book-shell-view-actions.c:1009
 msgid "Send selected contacts to another person"
 msgstr "Sendi elektitajn kontaktojn al alia persono"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:900
+#: ../modules/addressbook/e-book-shell-view-actions.c:1014
 msgid "_Move Contact To..."
 msgstr "_Movi kontakton al..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:902
+#: ../modules/addressbook/e-book-shell-view-actions.c:1016
 msgid "Move selected contacts to another address book"
 msgstr "Movi elektitajn kontaktojn al alia adresaro"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:907
+#: ../modules/addressbook/e-book-shell-view-actions.c:1021
 msgid "_New Contact..."
 msgstr "_Nova kontakto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:914
+#: ../modules/addressbook/e-book-shell-view-actions.c:1028
 msgid "New Contact _List..."
 msgstr "Nova kontakt_listo..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:921
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
 msgid "_Open Contact"
 msgstr "_Malfermi kontakton"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
+#: ../modules/addressbook/e-book-shell-view-actions.c:1037
 msgid "View the current contact"
 msgstr "Montri la aktualan kontakton"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:928
+#: ../modules/addressbook/e-book-shell-view-actions.c:1042
 msgid "_Send Message to Contact..."
 msgstr "_Sendi mesaĝon al kontakto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:930
+#: ../modules/addressbook/e-book-shell-view-actions.c:1044
 msgid "Send a message to the selected contacts"
 msgstr "Sendi mesaĝon al la elektitaj kontaktoj"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:937
-#: ../modules/calendar/e-cal-shell-view-actions.c:1540
-#: ../modules/calendar/e-task-shell-view-actions.c:822
+#: ../modules/addressbook/e-book-shell-view-actions.c:1051
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "_Actions"
 msgstr "_Agoj"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:944
-#: ../modules/calendar/e-memo-shell-view-actions.c:677
-#: ../modules/calendar/e-task-shell-view-actions.c:829
-#: ../modules/mail/e-mail-shell-view-actions.c:1389
+#: ../modules/addressbook/e-book-shell-view-actions.c:1058
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-task-shell-view-actions.c:775
+#: ../modules/mail/e-mail-shell-view-actions.c:1837
 msgid "_Preview"
 msgstr "_Antaŭrigardi"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:953
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
-#: ../modules/calendar/e-memo-shell-view-actions.c:690
-#: ../modules/calendar/e-task-shell-view-actions.c:842
-msgid "_Delete"
-msgstr "_Forigi"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:957
-msgid "_Properties"
-msgstr "_Ecoj"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:961
+#: ../modules/addressbook/e-book-shell-view-actions.c:1079
 msgid "Address Book Map"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:993
+#: ../modules/addressbook/e-book-shell-view-actions.c:1111
 msgid "Contact _Preview"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:995
+#: ../modules/addressbook/e-book-shell-view-actions.c:1113
 msgid "Show contact preview window"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1001
+#: ../modules/addressbook/e-book-shell-view-actions.c:1119
 msgid "Show _Maps"
 msgstr "Montri _mapojn"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1003
+#: ../modules/addressbook/e-book-shell-view-actions.c:1121
 msgid "Show maps in contact preview window"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1022
-#: ../modules/calendar/e-memo-shell-view-actions.c:747
-#: ../modules/calendar/e-task-shell-view-actions.c:911
-#: ../modules/mail/e-mail-shell-view-actions.c:1504
+#: ../modules/addressbook/e-book-shell-view-actions.c:1140
+#: ../modules/calendar/e-memo-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:1967
 msgid "_Classic View"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1024
+#: ../modules/addressbook/e-book-shell-view-actions.c:1142
 msgid "Show contact preview below the contact list"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1029
-#: ../modules/calendar/e-memo-shell-view-actions.c:754
-#: ../modules/calendar/e-task-shell-view-actions.c:918
-#: ../modules/mail/e-mail-shell-view-actions.c:1511
+#: ../modules/addressbook/e-book-shell-view-actions.c:1147
+#: ../modules/calendar/e-memo-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:1974
 msgid "_Vertical View"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1031
+#: ../modules/addressbook/e-book-shell-view-actions.c:1149
 msgid "Show contact preview alongside the contact list"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1039
-#: ../modules/calendar/e-cal-shell-view-actions.c:1696
-#: ../modules/calendar/e-memo-shell-view-actions.c:764
-#: ../modules/calendar/e-task-shell-view-actions.c:935
-msgid "Any Category"
-msgstr "Iu kategorio"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:1046
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
-#: ../modules/calendar/e-memo-shell-view-actions.c:771
-#: ../modules/calendar/e-task-shell-view-actions.c:970
+#: ../modules/addressbook/e-book-shell-view-actions.c:1164
+#: ../modules/calendar/e-cal-shell-view-actions.c:1594
+#: ../modules/calendar/e-memo-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-view-actions.c:916
 msgid "Unmatched"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1056
-#: ../modules/calendar/e-cal-shell-view-actions.c:1727
-#: ../modules/calendar/e-memo-shell-view-actions.c:781
-#: ../modules/calendar/e-task-shell-view-actions.c:980
-#: ../modules/mail/e-mail-shell-view-actions.c:1587
-#: ../shell/e-shell-content.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:1174
+#: ../modules/calendar/e-cal-shell-view-actions.c:1604
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/mail/e-mail-shell-view-actions.c:2043
+#: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Detala sercô"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1089
+#: ../modules/addressbook/e-book-shell-view-actions.c:1207
 msgid "Print all shown contacts"
 msgstr "Presi ĉiujn montratajn kontaktojn"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1096
+#: ../modules/addressbook/e-book-shell-view-actions.c:1214
 msgid "Preview the contacts to be printed"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1103
+#: ../modules/addressbook/e-book-shell-view-actions.c:1221
 msgid "Print selected contacts"
 msgstr "Presi elektitajn kontaktojn"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1118
+#: ../modules/addressbook/e-book-shell-view-actions.c:1236
 msgid "S_ave Address Book as vCard"
 msgstr "_Konservi adresaron kiel vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1120
+#: ../modules/addressbook/e-book-shell-view-actions.c:1238
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Konservi la kontaktoj de la elektita adresaro kiel vCard"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1126
-#: ../modules/addressbook/e-book-shell-view-actions.c:1136
+#: ../modules/addressbook/e-book-shell-view-actions.c:1244
+#: ../modules/addressbook/e-book-shell-view-actions.c:1254
 msgid "_Save as vCard..."
 msgstr "_Konservi kiel vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1128
+#: ../modules/addressbook/e-book-shell-view-actions.c:1246
 msgid "Save selected contacts as a vCard"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view.c:346
+#: ../modules/addressbook/e-book-shell-view.c:313
 msgid "_Forward Contacts"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view.c:348
+#: ../modules/addressbook/e-book-shell-view.c:315
 msgid "_Forward Contact"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view.c:379
+#: ../modules/addressbook/e-book-shell-view.c:346
 msgid "_Send Message to Contacts"
 msgstr "_Sendi mesaĝon al kontaktoj"
 
-#: ../modules/addressbook/e-book-shell-view.c:381
+#: ../modules/addressbook/e-book-shell-view.c:348
 msgid "_Send Message to List"
 msgstr "_Sendi mesaĝon al listo"
 
-#: ../modules/addressbook/e-book-shell-view.c:383
+#: ../modules/addressbook/e-book-shell-view.c:350
 msgid "_Send Message to Contact"
 msgstr "_Sendi mesaĝon al kontakto"
 
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "1"
-msgstr "1"
-
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../modules/addressbook/ldap-config.ui.h:4
-msgid "5"
-msgstr "5"
-
-#: ../modules/addressbook/ldap-config.ui.h:5
-msgid "Anonymously"
-msgstr "Anonime"
-
-#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time 
limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:7
-msgid "B_rowse this book until limit reached"
+#: ../modules/backup-restore/e-mail-config-restore-page.c:163
+msgid ""
+"You can restore Evolution from a backup file.\n"
+"\n"
+"This will restore all your personal data, settings mail filters, etc."
 msgstr ""
 
-#: ../modules/addressbook/ldap-config.ui.h:8
-msgid "Lo_gin:"
-msgstr "E_nsaluti:"
+#: ../modules/backup-restore/e-mail-config-restore-page.c:178
+msgid "_Restore from a backup file:"
+msgstr ""
 
-#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this 
file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:11
-msgid "One"
-msgstr "Unu"
+#: ../modules/backup-restore/e-mail-config-restore-page.c:189
+msgid "Choose a backup file to restore"
+msgstr ""
 
-#: ../modules/addressbook/ldap-config.ui.h:13
-msgid "S_earch filter:"
-msgstr "S_erĉfiltrilo:"
+#. Keep the title identical to EMailConfigRestorePage
+#. * so it's only shown once in the assistant sidebar.
+#: ../modules/backup-restore/e-mail-config-restore-page.c:309
+#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:56
+#| msgid "_Restore Default"
+msgid "Restore from Backup"
+msgstr "Restaŭri de savkopio"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
-msgid "Search Filter"
-msgstr "Serĉfiltrilo"
+#: ../modules/backup-restore/evolution-backup-restore.c:216
+msgid "Select name of the Evolution backup file"
+msgstr ""
 
-#: ../modules/addressbook/ldap-config.ui.h:15
-msgid "Search _base:"
-msgstr "Serĉ_bazo:"
+#: ../modules/backup-restore/evolution-backup-restore.c:249
+msgid "_Restart Evolution after backup"
+msgstr ""
 
-#: ../modules/addressbook/ldap-config.ui.h:16
-msgid ""
-"Search filter is the type of object to be searched for. If this is not "
-"modified, the default search will be performed on the type \"person\"."
+#: ../modules/backup-restore/evolution-backup-restore.c:276
+msgid "Select name of the Evolution backup file to restore"
 msgstr ""
 
-#: ../modules/addressbook/ldap-config.ui.h:17
-msgid "Ser_ver:"
-msgstr "Ser_vilo:"
+#: ../modules/backup-restore/evolution-backup-restore.c:289
+#| msgid "Restart Evolution"
+msgid "Re_start Evolution after restore"
+msgstr "Re_startigi Evolucion post restaŭro"
 
-#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this 
file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:19
-msgid "Sub"
+#: ../modules/backup-restore/evolution-backup-restore.c:307
+msgid "_Back up Evolution Data..."
 msgstr ""
 
-#: ../modules/addressbook/ldap-config.ui.h:20
-msgid "Supported Search Bases"
+#: ../modules/backup-restore/evolution-backup-restore.c:309
+msgid "Back up Evolution data and settings to an archive file"
 msgstr ""
 
-#: ../modules/addressbook/ldap-config.ui.h:22
-msgid "Use secure _connection:"
-msgstr "Uzi sekura _konekton:"
-
-#: ../modules/addressbook/ldap-config.ui.h:23
-msgid "Using distinguished name (DN)"
+#: ../modules/backup-restore/evolution-backup-restore.c:314
+msgid "R_estore Evolution Data..."
 msgstr ""
 
-#: ../modules/addressbook/ldap-config.ui.h:24
-msgid "Using email address"
-msgstr "Uzas retpoŝtadreson"
-
-#: ../modules/addressbook/ldap-config.ui.h:25
-msgid "_Download limit:"
+#: ../modules/backup-restore/evolution-backup-restore.c:316
+msgid "Restore Evolution data and settings from an archive file"
 msgstr ""
 
-#: ../modules/addressbook/ldap-config.ui.h:26
-msgid "_Find Possible Search Bases"
+#: ../modules/backup-restore/evolution-backup-tool.c:75
+msgid "Back up Evolution directory"
 msgstr ""
 
-#: ../modules/addressbook/ldap-config.ui.h:27
-msgid "_Login method:"
-msgstr "_Ensalutmetodo:"
+#: ../modules/backup-restore/evolution-backup-tool.c:77
+msgid "Restore Evolution directory"
+msgstr ""
 
-#: ../modules/addressbook/ldap-config.ui.h:30
-msgid "_Search scope:"
+#: ../modules/backup-restore/evolution-backup-tool.c:79
+msgid "Check Evolution Back up"
 msgstr ""
 
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Timeout:"
-msgstr "_Tempolimo:"
+#: ../modules/backup-restore/evolution-backup-tool.c:81
+msgid "Restart Evolution"
+msgstr "Restartigi Evolucion"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
-msgid "cards"
-msgstr "kartoj"
+#: ../modules/backup-restore/evolution-backup-tool.c:83
+msgid "With Graphical User Interface"
+msgstr "Per grafika interfaco"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:145
-#, c-format
-msgid "Failed to spawn Bogofilter (%s): "
-msgstr ""
+#. FIXME Will the versioned setting always work?
+#: ../modules/backup-restore/evolution-backup-tool.c:281
+#: ../modules/backup-restore/evolution-backup-tool.c:485
+msgid "Shutting down Evolution"
+msgstr "Elŝalti Evolucion"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:163
-msgid "Failed to stream mail message content to Bogofilter: "
+#: ../modules/backup-restore/evolution-backup-tool.c:290
+msgid "Backing Evolution accounts and settings"
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:212
-msgid "Bogofilter either crashed or failed to process a mail message"
+#: ../modules/backup-restore/evolution-backup-tool.c:307
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:311
-msgid "Bogofilter Options"
+#: ../modules/backup-restore/evolution-backup-tool.c:323
+msgid "Back up complete"
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:320
-msgid "Convert message text to _Unicode"
-msgstr ""
+#: ../modules/backup-restore/evolution-backup-tool.c:330
+#: ../modules/backup-restore/evolution-backup-tool.c:679
+msgid "Restarting Evolution"
+msgstr "Restartante Evolucion"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:476
-msgid "Bogofilter"
+#: ../modules/backup-restore/evolution-backup-tool.c:491
+msgid "Back up current Evolution data"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
-msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+#: ../modules/backup-restore/evolution-backup-tool.c:498
+msgid "Extracting files from back up"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
-msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr ""
+#: ../modules/backup-restore/evolution-backup-tool.c:580
+msgid "Loading Evolution settings"
+msgstr "Ŝargante Evolucio-agordojn"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
-msgid "Calendars to run reminders for"
+#: ../modules/backup-restore/evolution-backup-tool.c:650
+msgid "Removing temporary back up files"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+#: ../modules/backup-restore/evolution-backup-tool.c:664
+msgid "Reloading registry service"
 msgstr ""
-"Koloro por kolori la nunhoromontrilan linion en la tempa tabulbarilo "
-"(malplenigu la kampon elektos la aprioran koloron)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
-msgid "Color to draw the Marcus Bains line in the Day View."
+#: ../modules/backup-restore/evolution-backup-tool.c:867
+msgid "Evolution Back Up"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
-msgid "Days on which the start and end of work hours should be indicated."
+#: ../modules/backup-restore/evolution-backup-tool.c:868
+#, c-format
+msgid "Backing up to the folder %s"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
-msgid "Free/busy server URLs"
+#: ../modules/backup-restore/evolution-backup-tool.c:872
+msgid "Evolution Restore"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
-msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+#: ../modules/backup-restore/evolution-backup-tool.c:873
+#, c-format
+msgid "Restoring from the folder %s"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
-msgid "If \"true\", show the memo preview pane in the main window."
+#: ../modules/backup-restore/evolution-backup-tool.c:942
+msgid "Backing up Evolution Data"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
-msgid "If \"true\", show the task preview pane in the main window."
+#: ../modules/backup-restore/evolution-backup-tool.c:943
+msgid "Please wait while Evolution is backing up your data."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
-msgid "Intervals shown in Day and Work Week views, in minutes."
+#: ../modules/backup-restore/evolution-backup-tool.c:945
+msgid "Restoring Evolution Data"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
-msgid "List of recently used second time zones in a Day View."
+#: ../modules/backup-restore/evolution-backup-tool.c:946
+msgid "Please wait while Evolution is restoring your data."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
-msgid "List of server URLs for free/busy publishing."
+#: ../modules/backup-restore/evolution-backup-tool.c:968
+msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
-msgid ""
-"Maximum number of recently used timezones to remember in a "
-"'day_second_zones' list."
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:1
+msgid "Invalid Evolution backup file"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
-msgid "Maximum number of recently used timezones to remember."
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
+msgid "Please select a valid backup file to restore."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
-msgid "Number of units for determining a birthday or anniversary reminder."
-msgstr ""
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid "Are you sure you want to close Evolution?"
+msgstr "Ĉu vi vere volas fermi Evolucion?"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
-msgid "Number of units for determining a default reminder."
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid ""
+"To back up your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
-msgid "Number of units for determining when to hide tasks."
-msgstr ""
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Close and _Back up Evolution"
+msgstr "Fermi kaj _savkopii Evolucion"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels."
+"Are you sure you want to restore Evolution from the selected backup file?"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:7
 msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
+"To restore your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding. This will delete "
+"all your current Evolution data and settings and restore them from your "
+"backup."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
-msgid "Position of the memo preview pane when oriented vertically."
-msgstr ""
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
+#, fuzzy
+msgid "Close and _Restore Evolution"
+msgstr "Fermi kaj _restaŭri Evolucion"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
-msgid "Position of the task preview pane when oriented horizontally."
-msgstr ""
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
+msgid "Insufficient Permissions"
+msgstr "Nesufiĉaj permesoj"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
-msgid "Position of the task preview pane when oriented vertically."
-msgstr ""
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:10
+msgid "The selected folder is not writable."
+msgstr "La elektita dosierujo ne estas skribebla."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
+#: ../modules/bogofilter/evolution-bogofilter.c:160
+#, c-format
+msgid "Failed to spawn Bogofilter (%s): "
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
+#: ../modules/bogofilter/evolution-bogofilter.c:178
+msgid "Failed to stream mail message content to Bogofilter: "
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list when not in the month view, in pixels."
+#: ../modules/bogofilter/evolution-bogofilter.c:227
+msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
-msgid "Programs that are allowed to be run by reminders."
+#: ../modules/bogofilter/evolution-bogofilter.c:372
+msgid "Bogofilter Options"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
-msgid "Scroll Month View by a week"
+#: ../modules/bogofilter/evolution-bogofilter.c:381
+msgid "Convert message text to _Unicode"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
-msgid "Show days with recurrent events in italic font in bottom left calendar."
+#: ../modules/bogofilter/evolution-bogofilter.c:539
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
+msgid "Bogofilter"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
-msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key."
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
+msgid "Junk filter using Bogofilter"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
-msgid ""
-"The UID of the selected (or \"primary\") calendar in the sidebar of the "
-"\"Calendar\" view."
-msgstr ""
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:440
+#, fuzzy
+#| msgid "Standard"
+msgid "Standard LDAP Port"
+msgstr "Norma LDAP-pordo"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
-msgid ""
-"The UID of the selected (or \"primary\") memo list in the sidebar of the "
-"\"Memos\" view."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:618
+msgid "LDAP over SSL (deprecated)"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
-msgid ""
-"The UID of the selected (or \"primary\") task list in the sidebar of the "
-"\"Tasks\" view."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
+msgid "Microsoft Global Catalog"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
-#, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
+msgid "Microsoft Global Catalog over SSL"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
+#. Page 1
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:563
+msgid "Connecting to LDAP"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list."
-msgstr ""
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:580
+msgid "Server Information"
+msgstr "Servilo-informo"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list."
-msgstr ""
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
+msgid "Port:"
+msgstr "Pordo:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
-msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
+msgid "StartTLS (recommended)"
 msgstr ""
-"Tio povas havi tri eblajn valorojn: 0 por eraroj. 1 por avertoj. 2 por "
-"sencimigaj mesaĝoj."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Time the last reminder ran, in time_t."
-msgstr ""
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:623
+msgid "Encryption:"
+msgstr "Ĉifrado:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
-msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\"."
-msgstr ""
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:647
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:195
+msgid "Authentication"
+msgstr "Aŭtentokontrolo"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
-msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:670
+#| msgid "Anonymously"
+msgid "Anonymous"
+msgstr "Anonime"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:673
+msgid "Using email address"
+msgstr "Uzas retpoŝtadreson"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
+msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:678
+#| msgid "Input Methods"
+msgid "Method:"
+msgstr "Metodo:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
 msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Using email address\" requires anonymous access to your "
+"LDAP server."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
-msgid "Use the system timezone instead of the timezone selected in Evolution."
+#. Page 2
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:698
+msgid "Using LDAP"
 msgstr ""
-"Uzi la sisteman horzonon anstataŭ la horzono kiu estas elektita en Evolucio."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:102
-msgid "Vertical pane position"
-msgstr ""
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:715
+#: ../modules/mail/e-mail-shell-view.c:120
+msgid "Searching"
+msgstr "Serĉante"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr ""
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:737
+#, fuzzy
+#| msgid "Search _base:"
+msgid "Search Base:"
+msgstr "Serĉbazo:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether or not to use the notification tray for display reminders."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:741
+msgid "Find Possible Search Bases"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
-msgid "Whether to ask for confirmation when deleting an appointment or task."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:763
+msgid "One Level"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
-msgid "Whether to ask for confirmation when expunging appointments and tasks."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:765
+msgid "Subtree"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:767
+#, fuzzy
+#| msgid "Search _base:"
+msgid "Search Scope:"
+msgstr "Serĉbazo:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:772
 msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree.  A search scope of \"Subtree\" will include all entries "
+"below your search base.  A search scope of \"One Level\" will only include "
+"the entries one level beneath your search base."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
-msgid "Whether to display the end time of events in the week and month views."
-msgstr ""
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:781
+#| msgid "Search Filter"
+msgid "Search Filter:"
+msgstr "Serĉfiltrilo:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr ""
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:793
+msgid "Downloading"
+msgstr "Elŝutante"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
-msgid "Whether to hide completed tasks in the tasks view."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:814
+msgid "Limit:"
+msgstr "Limo:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
+#| msgid "Contacts"
+msgid "contacts"
+msgstr "kontaktoj"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:830
+msgid "Browse until limit is reached"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
-msgid "Whether to scroll a Month View by a week, not by a month."
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:135
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:298
+#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
+msgid "URL:"
+msgstr "URL:"
+
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:145
+msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
-msgid "Whether to set a default reminder for appointments."
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:112
+#: ../modules/cal-config-google/e-google-chooser-button.c:213
+#, fuzzy
+#| msgid "Choose calendar file"
+msgid "Choose a Calendar"
+msgstr "Elekti kalendardosieron"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:116
+#: ../modules/cal-config-google/e-google-chooser-button.c:217
+#, fuzzy
+#| msgid "New Memo List"
+msgid "Choose a Memo List"
+msgstr "Nova notolisto"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:120
+#: ../modules/cal-config-google/e-google-chooser-button.c:221
+#, fuzzy
+#| msgid "Select a Task List"
+msgid "Choose a Task List"
+msgstr "Elekti taskliston"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:312
+#, fuzzy
+#| msgid "Web Calendars"
+msgid "Find Calendars"
+msgstr "Retaj kalendaroj"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:315
+#, fuzzy
+#| msgid "Memo List"
+msgid "Find Memo Lists"
+msgstr "Notolisto"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:318
+#, fuzzy
+#| msgid "Task List"
+msgid "Find Task Lists"
+msgstr "Tasklisto"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:336
+msgid "Email:"
+msgstr "Retpoŝtadreso:"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:341
+msgid "Server handles meeting invitations"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
-msgid "Whether to set a reminder for birthdays and anniversaries."
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:70
+#, fuzzy
+#| msgid "Add local address books to Evolution."
+msgid "Choose which address books to use."
+msgstr "Aldoni lokan adresaron al Evolucio."
+
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
+msgid "Use in Birthdays & Anniversaries calendar"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
+#: ../modules/cal-config-google/e-google-chooser-button.c:145
+#| msgid "D_elete Calendar"
+msgid "Default User Calendar"
+msgstr "Defaŭlta uzanto-kalendaro"
+
+#: ../modules/cal-config-local/evolution-cal-config-local.c:158
+msgid "Use an existing iCalendar (ics) file"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
-msgid "Whether to show week numbers in various places in the Calendar."
+#: ../modules/cal-config-local/evolution-cal-config-local.c:183
+#| msgid "iCalendar (.ics)"
+msgid "iCalendar File"
+msgstr "iCalendar-dosiero"
+
+#: ../modules/cal-config-local/evolution-cal-config-local.c:195
+#, fuzzy
+#| msgid "Choose calendar file"
+msgid "Choose an iCalendar file"
+msgstr "Elekti kalendardosieron"
+
+#: ../modules/cal-config-local/evolution-cal-config-local.c:198
+#| msgid "_File:"
+msgid "File:"
+msgstr "Dosiero:"
+
+#: ../modules/cal-config-local/evolution-cal-config-local.c:213
+msgid "Allow Evolution to update the file"
 msgstr ""
 
-#: ../modules/calendar/e-cal-attachment-handler.c:312
-#: ../smime/gui/smime-ui.ui.h:22
+#. Translators: Please indicate whether your locale uses the
+#. * metric or imperial measurement system by changing this to
+#. * either "default:mm" or "default:inch", respectively.
+#. *
+#. * This string is just a fallback mechanism for systems on
+#. * which _NL_MEASUREMENT_MEASUREMENT is not available.
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:186
+#| msgid "Default"
+msgctxt "locale-metric"
+msgid "default:mm"
+msgstr "defaŭlto:mm"
+
+#. Translators: This is the temperature in degrees
+#. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:258
+msgid "Fahrenheit (°F)"
+msgstr "Farenhejta (°F)"
+
+#. Translators: This is the temperature in degrees
+#. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:263
+msgid "Centigrade (°C)"
+msgstr "Celcia (°C)"
+
+#. Translators: This is the temperature in kelvin.
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:267
+msgid "Kelvin (K)"
+msgstr "Kelvina (K)"
+
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:269
+#| msgid "_Units:"
+msgid "Units:"
+msgstr "Unuoj:"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:287
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
 msgstr "I_mporti"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:393
+#: ../modules/calendar/e-cal-attachment-handler.c:337
+#, fuzzy
+#| msgid "Important"
+msgid "Importing an event"
+msgstr "Grave"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+#, fuzzy
+#| msgid "Importing '%s'"
+msgid "Importing a memo"
+msgstr "Enportante noton"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:345
+#, fuzzy
+#| msgid "Importing '%s'"
+msgid "Importing a task"
+msgstr "Enportante taskon"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:403
 msgid "Select a Calendar"
 msgstr "Elekti kalendaron"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:420
+#: ../modules/calendar/e-cal-attachment-handler.c:410
+#| msgid "D_elete Memo List"
+msgid "Select a Memo List"
+msgstr "Elekti notoliston"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:417
 msgid "Select a Task List"
 msgstr "Elekti taskliston"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:430
+#: ../modules/calendar/e-cal-attachment-handler.c:424
 msgid "I_mport to Calendar"
 msgstr "I_mporti al kalendaro"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:437
-msgid "I_mport to Tasks"
+#: ../modules/calendar/e-cal-attachment-handler.c:431
+#, fuzzy
+#| msgid "I_mport to Tasks"
+msgid "I_mport to Memo List"
+msgstr "I_mporti al taskoj"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:438
+#, fuzzy
+#| msgid "I_mport to Tasks"
+msgid "I_mport to Task List"
 msgstr "I_mporti al taskoj"
 
-#: ../modules/calendar/e-calendar-preferences.c:461
-msgid "Selected Calendars for Reminders"
+#: ../modules/calendar/e-cal-base-shell-backend.c:186
+#: ../modules/calendar/e-cal-shell-view-actions.c:162
+msgid "New Calendar"
+msgstr "Nova kalendaro"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:190
+#: ../modules/calendar/e-memo-shell-view-actions.c:164
+msgid "New Memo List"
+msgstr "Nova notolisto"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:194
+#: ../modules/calendar/e-task-shell-view-actions.c:187
+msgid "New Task List"
+msgstr "Nova tasklisto"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:540
+#, fuzzy, c-format
+#| msgid "Unable to open the calendar '%s': %s"
+msgid "Copying an event into the calendar '%s'"
+msgstr "Ne eblis malfermi la kalendaron '%s'"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:541
+#, fuzzy, c-format
+#| msgid "Unable to open the calendar '%s': %s"
+msgid "Moving an event into the calendar '%s'"
+msgstr "Ne eblis malfermi la kalendaron '%s'"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:546
+#, c-format
+msgid "Copying a memo into the memo list '%s'"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.c:885
-msgid "Ti_me and date:"
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:547
+#, c-format
+msgid "Moving a memo into the memo list '%s'"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.c:886
-msgid "_Date only:"
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:552
+#, c-format
+msgid "Copying a task into the task list '%s'"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:2
-#, no-c-format
-msgid "%u and %d will be replaced by user and domain from the email address."
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:553
+#, c-format
+msgid "Moving a task into the task list '%s'"
 msgstr ""
 
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:650
+msgid "Calendar Selector"
+msgstr "Kalendar-elektilo"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:656
+msgid "Memo List Selector"
+msgstr "Memolist-elektilo"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:661
+msgid "Task List Selector"
+msgstr "Tasklist-elektilo"
+
+#: ../modules/calendar/e-calendar-preferences.c:516
+#, fuzzy
+#| msgid "Select a Calendar"
+msgid "Selected Calendars for Alarms"
+msgstr "Elekti kalendaron"
+
+#: ../modules/calendar/e-calendar-preferences.c:924
+msgid "Ti_me and date:"
+msgstr "T_empo kaj dato:"
+
+#: ../modules/calendar/e-calendar-preferences.c:925
+msgid "_Date only:"
+msgstr "Nur _dato:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:1
+msgid "Minutes"
+msgstr "Minutoj"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
+msgid "Hours"
+msgstr "Horoj"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:3
-msgid "(Shown in a Day View)"
-msgstr ""
+msgid "Days"
+msgstr "Tagoj"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:4
-msgid "05 minutes"
-msgstr "05 minutoj"
+msgid "60 minutes"
+msgstr "60 minutoj"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:5
-msgid "10 minutes"
-msgstr "10 minutoj"
+msgid "30 minutes"
+msgstr "30 minutoj"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:6
 msgid "15 minutes"
 msgstr "15 minutoj"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:7
-msgid "30 minutes"
-msgstr "30 minutoj"
+msgid "10 minutes"
+msgstr "10 minutoj"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:8
-msgid "60 minutes"
-msgstr "60 minutoj"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
-msgid "Alerts"
-msgstr "Avertoj"
+msgid "05 minutes"
+msgstr "05 minutoj"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
-msgid "Day _ends:"
-msgstr "Tago _finos:"
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
+msgid "Se_cond zone:"
+msgstr "_Dua zono:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:12
-msgid "Days"
-msgstr "Tagoj"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
-msgid "Default Free/Busy Server"
+msgid "(Shown in a Day View)"
 msgstr ""
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:14
-msgid "Display"
-msgstr "Montri"
+msgid "Use s_ystem time zone"
+msgstr "Uzi s_isteman horzonon"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:15
-msgid "Display reminders in _notification area only"
-msgstr ""
+msgid "Time format:"
+msgstr "Tempoaranĝo:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
-msgid "Highlight _overdue tasks"
-msgstr ""
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
+msgid "_12 hour (AM/PM)"
+msgstr "_12 hore (ATM/PTM)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:19
-msgid "Highlight t_asks due today"
-msgstr ""
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
+msgid "_24 hour"
+msgstr "_24 hore"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+msgid "Work Week"
+msgstr "Laborsemajno"
+
+#. A weekday like "Monday" follows
 #: ../modules/calendar/e-calendar-preferences.ui.h:20
-msgid "Hours"
-msgstr "Horoj"
+msgid "Wee_k starts on:"
+msgstr "Semajno _komencas je:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:21
-msgid "Minutes"
-msgstr "Minutoj"
+msgid "Work days:"
+msgstr "Labortagoj:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+msgid "_Day begins:"
+msgstr "_Tago komencas:"
 
+#. Monday
 #: ../modules/calendar/e-calendar-preferences.ui.h:24
-msgid "Publishing Information"
-msgstr ""
+msgid "_Mon"
+msgstr "_Lun"
 
-#. Sunday
+#. Tuesday
 #: ../modules/calendar/e-calendar-preferences.ui.h:27
-msgid "S_un"
-msgstr "_Dim"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
-msgid "Sc_roll Month View by a week"
-msgstr ""
+msgid "_Tue"
+msgstr "_Mar"
 
+#. Wednesday
 #: ../modules/calendar/e-calendar-preferences.ui.h:30
-msgid "Se_cond zone:"
-msgstr "_Dua zono:"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
-msgid "Select the calendars for reminder notification"
-msgstr ""
+msgid "_Wed"
+msgstr "_Mer"
 
-#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#. Thursday
 #: ../modules/calendar/e-calendar-preferences.ui.h:33
-msgid "Sh_ow a reminder"
-msgstr "M_ontri memorigilon"
-
-#. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:35
-msgid "Show a _reminder"
-msgstr "Montri memo_rigilon"
+msgid "T_hu"
+msgstr "Ĵ_aŭ"
 
+#. Friday
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
-msgid "Show r_ecurring events in italic in bottom left calendar"
-msgstr ""
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
-msgid "Show week _numbers"
-msgstr "Montri semajn_numerojn"
+msgid "_Fri"
+msgstr "_Ven"
 
-#. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
-msgid "T_hu"
-msgstr "Ĵ_aŭ"
+#. Saturday
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
+msgid "_Sat"
+msgstr "_Sab"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
-msgid "Template:"
-msgstr "Ŝablono:"
+#. Sunday
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
+msgid "S_un"
+msgstr "_Dim"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
-#: ../widgets/misc/e-dateedit.c:592
-msgid "Time"
-msgstr "Tempo"
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
+msgid "Day _ends:"
+msgstr "Tago _finos:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
-msgid "Time format:"
-msgstr "Tempoaranĝo:"
+#, fuzzy
+#| msgid "Send Options"
+msgid "View Options"
+msgstr "Send-agordoj"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
+msgid "_Time divisions:"
+msgstr ""
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:49
-msgid "Use s_ystem time zone"
-msgstr "Uzi s_isteman horzonon"
+msgid "_Show appointment end times in week and month view"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:50
+msgid "_Compress weekends in month view"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
+msgid "Show week _numbers"
+msgstr "Montri semajn_numerojn"
 
-#. A weekday like "Monday" follows
 #: ../modules/calendar/e-calendar-preferences.ui.h:52
-msgid "Wee_k starts on:"
-msgstr "Semajno _komencas je:"
+msgid "Show r_ecurring events in italic in bottom left calendar"
+msgstr ""
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:53
-#: ../modules/calendar/e-cal-shell-view-actions.c:1679
-msgid "Work Week"
-msgstr "Laborsemajno"
+msgid "Sc_roll Month View by a week"
+msgstr ""
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:54
-msgid "Work days:"
-msgstr "Labortagoj:"
+msgid "Alerts"
+msgstr "Avertoj"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:55
-msgid "_12 hour (AM/PM)"
-msgstr "_12 hore (ATM/PTM)"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:56
-msgid "_24 hour"
-msgstr "_24 hore"
+msgid "Display"
+msgstr "Montri"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:57
-msgid "_Ask for confirmation when deleting items"
-msgstr ""
+msgid "Task List"
+msgstr "Tasklisto"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:58
-msgid "_Compress weekends in month view"
+msgid "Highlight t_asks due today"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
-msgid "_Day begins:"
-msgstr "_Tago komencas:"
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
+msgid "Highlight _overdue tasks"
+msgstr ""
 
-#. Friday
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
-msgid "_Fri"
-msgstr "_Ven"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
 msgid "_Hide completed tasks after"
 msgstr "_Kaŝi plenumitaj taskoj poste"
 
-#. Monday
 #: ../modules/calendar/e-calendar-preferences.ui.h:64
-msgid "_Mon"
-msgstr "_Lun"
+msgid "Display reminders in _notification area only"
+msgstr ""
 
-#. Saturday
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
 #: ../modules/calendar/e-calendar-preferences.ui.h:66
-msgid "_Sat"
-msgstr "_Sab"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
-msgid "_Show appointment end times in week and month view"
-msgstr ""
+msgid "Sh_ow a reminder"
+msgstr "M_ontri memorigilon"
 
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
 #: ../modules/calendar/e-calendar-preferences.ui.h:68
-msgid "_Time divisions:"
+msgid "before every appointment"
 msgstr ""
 
-#. Tuesday
+#. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
 #: ../modules/calendar/e-calendar-preferences.ui.h:70
-msgid "_Tue"
-msgstr "_Mar"
-
-#. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:72
-msgid "_Wed"
-msgstr "_Mer"
+msgid "Show a _reminder"
+msgstr "Montri memo_rigilon"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "before every anniversary/birthday"
 msgstr ""
 
-#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
-msgid "before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
+msgid "Select the calendars for reminder notification"
 msgstr ""
 
-#. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:198
-#: ../modules/calendar/e-memo-shell-backend.c:110
-#: ../modules/calendar/e-memo-shell-migrate.c:152
-#: ../modules/calendar/e-task-shell-backend.c:110
-#: ../modules/calendar/e-task-shell-migrate.c:164
-msgid "On The Web"
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
+msgid "Default Free/Busy Server"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../plugins/calendar-weather/calendar-weather.c:127
-msgid "Weather"
-msgstr "Vetero"
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
+msgid "Template:"
+msgstr "Ŝablono:"
 
-#: ../modules/calendar/e-cal-shell-backend.c:212
-#: ../modules/calendar/e-cal-shell-migrate.c:66
-msgid "Birthdays & Anniversaries"
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#, no-c-format
+msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-backend.c:445
+#: ../modules/calendar/e-calendar-preferences.ui.h:78
+msgid "Publishing Information"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-backend.c:114
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Rendevuo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:447
-#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+#: ../modules/calendar/e-cal-shell-backend.c:116
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Create a new appointment"
 msgstr "Kreii novan rendevuon"
 
-#: ../modules/calendar/e-cal-shell-backend.c:452
+#: ../modules/calendar/e-cal-shell-backend.c:121
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Tuttaga _rendevuo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:454
+#: ../modules/calendar/e-cal-shell-backend.c:123
 msgid "Create a new all-day appointment"
 msgstr "Krei novan tuttagan rendevuon"
 
-#: ../modules/calendar/e-cal-shell-backend.c:459
+#: ../modules/calendar/e-cal-shell-backend.c:128
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Kunsido"
 
-#: ../modules/calendar/e-cal-shell-backend.c:461
+#: ../modules/calendar/e-cal-shell-backend.c:130
 msgid "Create a new meeting request"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-backend.c:469
+#: ../modules/calendar/e-cal-shell-backend.c:138
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_ndaro"
 
-#: ../modules/calendar/e-cal-shell-backend.c:471
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-backend.c:140
+#: ../modules/calendar/e-cal-shell-view-actions.c:1235
 msgid "Create a new calendar"
 msgstr "Krei novan kalendaron"
 
-#: ../modules/calendar/e-cal-shell-backend.c:794
+#: ../modules/calendar/e-cal-shell-backend.c:257
 msgid "Calendar and Tasks"
 msgstr "Kalendaro kaj taskoj"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:190
-msgid "Loading calendars"
-msgstr "Ŝarĝante kalendarojn"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:761
-msgid "_New Calendar..."
-msgstr "_Nova kalendaro..."
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:778
-msgid "Calendar Selector"
-msgstr "Kalendar-elektilo"
-
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1114
-#, c-format
-msgid "Opening calendar at %s"
-msgstr "Malfermante kalendaro ĉe %s"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:232
-#: ../modules/calendar/e-cal-shell-view-actions.c:261
+#: ../modules/calendar/e-cal-shell-view-actions.c:181
 msgid "Print"
 msgstr "Presi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:320
+#: ../modules/calendar/e-cal-shell-view-actions.c:267
+msgid "Calendar Properties"
+msgstr "Kalendar-ecoj"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:296
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -15599,543 +19478,581 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:337
+#: ../modules/calendar/e-cal-shell-view-actions.c:313
 msgid "Purge events older than"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:564
-msgid "Copying Items"
-msgstr ""
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:848
-msgid "Moving Items"
-msgstr ""
+#: ../modules/calendar/e-cal-shell-view-actions.c:895
+#| msgid "Make this Occurrence _Movable"
+msgid "Making an occurrence movable"
+msgstr "Igi okazon movebla"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1175
+#: ../modules/calendar/e-cal-shell-view-actions.c:1055
 msgid "event"
 msgstr "evento"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1177
-#: ../modules/calendar/e-cal-shell-view-memopad.c:219
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:286
-#: ../modules/calendar/e-memo-shell-view-actions.c:524
-#: ../modules/calendar/e-task-shell-view-actions.c:641
+#: ../modules/calendar/e-cal-shell-view-actions.c:1057
+#: ../modules/calendar/e-cal-shell-view-memopad.c:208
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:276
+#: ../modules/calendar/e-memo-shell-view-actions.c:469
+#: ../modules/calendar/e-task-shell-view-actions.c:587
 msgid "Save as iCalendar"
 msgstr "Konservi kiel iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-cal-shell-view-actions.c:1191
+#: ../modules/calendar/e-memo-shell-view-actions.c:550
+#: ../modules/calendar/e-task-shell-view-actions.c:675
 msgid "_Copy..."
 msgstr "_Kopii..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1198
 msgid "D_elete Calendar"
 msgstr "_Forigi kalendaron"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1200
 msgid "Delete the selected calendar"
 msgstr "Forigi la elektitan kalendaron"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1207
 msgid "Go Back"
 msgstr "Reen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-cal-shell-view-actions.c:1214
 msgid "Go Forward"
 msgstr "Antaŭen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1221
 msgid "Select today"
 msgstr "Elekti hodiaŭ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1226
 msgid "Select _Date"
 msgstr "Elekti _daton"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../modules/calendar/e-cal-shell-view-actions.c:1228
 msgid "Select a specific date"
 msgstr "Elekti specifan daton"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1233
 msgid "_New Calendar"
 msgstr "_Nova kalendaro"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
-#: ../modules/calendar/e-task-shell-view-actions.c:813
+#: ../modules/calendar/e-cal-shell-view-actions.c:1247
+#: ../modules/calendar/e-task-shell-view-actions.c:759
 msgid "Purg_e"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1249
 msgid "Purge old appointments and meetings"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
-#: ../modules/calendar/e-task-shell-view-actions.c:757
-msgid "Re_fresh"
-msgstr "_Aktualigi"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+#: ../modules/calendar/e-cal-shell-view-actions.c:1256
 msgid "Refresh the selected calendar"
 msgstr "Aktualigi la elektitan kalendaron"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../modules/calendar/e-cal-shell-view-actions.c:1263
 msgid "Rename the selected calendar"
-msgstr "alinomi la elektitan kalendaron"
+msgstr "Alinomi la elektitan kalendaron"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1268
+#| msgid "_Next"
+msgid "Find _Next"
+msgstr "Serĉi _sekvan"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1270
+msgid "Find next occurrence of the current search string"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1275
+#| msgid "_Previous"
+msgid "Find _Previous"
+msgstr "Serĉi _antaŭan"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1277
+msgid "Find previous occurrence of the current search string"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1282
+msgid "Stop _Running Search"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
+msgid "Stop currently running search"
+msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1289
 msgid "Show _Only This Calendar"
-msgstr "Montri nur tiun kalendaron"
+msgstr "Montri _nur tiun kalendaron"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1296
 msgid "Cop_y to Calendar..."
 msgstr "Kopi_i al kalendaro"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1303
 msgid "_Delegate Meeting..."
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-view-actions.c:1310
 msgid "_Delete Appointment"
 msgstr "_Forigi rendevuon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
 msgid "Delete selected appointments"
 msgstr "Forigi elektitajn rendevuojn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+#: ../modules/calendar/e-cal-shell-view-actions.c:1317
 msgid "Delete This _Occurrence"
 msgstr "Forigi tiun _okazon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Delete this occurrence"
 msgstr "Forigi tiun okazon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1324
 msgid "Delete All Occ_urrences"
 msgstr "Forigi ĉi_ujn okazojn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "Delete all occurrences"
 msgstr "Forigi ĉiujn okazojn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1454
+#: ../modules/calendar/e-cal-shell-view-actions.c:1331
 msgid "New All Day _Event..."
 msgstr "Nova tuttaga _evento..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+#: ../modules/calendar/e-cal-shell-view-actions.c:1333
 msgid "Create a new all day event"
 msgstr "Kreii novan tuttagan eventon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1461
-#: ../modules/calendar/e-cal-shell-view-memopad.c:253
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-memo-shell-view-actions.c:598
-#: ../modules/calendar/e-task-shell-view-actions.c:722
+#: ../modules/calendar/e-cal-shell-view-actions.c:1338
+#: ../modules/calendar/e-cal-shell-view-memopad.c:242
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
+#: ../modules/calendar/e-memo-shell-view-actions.c:543
+#: ../modules/calendar/e-task-shell-view-actions.c:668
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1468
+#: ../modules/calendar/e-cal-shell-view-actions.c:1345
 msgid "New _Meeting..."
 msgstr "Nova _kunsido..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
 msgid "Create a new meeting"
 msgstr "Kreii novan kunsidon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1475
+#: ../modules/calendar/e-cal-shell-view-actions.c:1352
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_vi al kalendaro..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
 msgid "New _Appointment..."
 msgstr "Nova _rendevuo..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1489
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Make this Occurrence _Movable"
 msgstr "Igi tiun okazon _movebla"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-cal-shell-view-actions.c:1373
 msgid "_Open Appointment"
 msgstr "_Malfermi rendevuon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1498
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "View the current appointment"
 msgstr "Montri la aktualan rendevuon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1503
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "_Reply"
 msgstr "_Respondi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1519
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Converts an appointment to a meeting"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1524
+#: ../modules/calendar/e-cal-shell-view-actions.c:1401
 msgid "Conv_ert to Appointment..."
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "Converts a meeting to an appointment"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1531
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 msgid "Quit"
 msgstr "Ĉesi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1651
+#: ../modules/calendar/e-cal-shell-view-actions.c:1528
 msgid "Day"
 msgstr "Tago"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1653
+#: ../modules/calendar/e-cal-shell-view-actions.c:1530
 msgid "Show one day"
 msgstr "Montri unu tagon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1658
+#: ../modules/calendar/e-cal-shell-view-actions.c:1535
 msgid "List"
 msgstr "Listo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1660
+#: ../modules/calendar/e-cal-shell-view-actions.c:1537
 msgid "Show as list"
 msgstr "Montri kiel listo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1665
+#: ../modules/calendar/e-cal-shell-view-actions.c:1542
 msgid "Month"
 msgstr "Monato"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1667
+#: ../modules/calendar/e-cal-shell-view-actions.c:1544
 msgid "Show one month"
 msgstr "Montri unu monaton"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1672
+#: ../modules/calendar/e-cal-shell-view-actions.c:1549
 msgid "Week"
 msgstr "Semajno"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1674
+#: ../modules/calendar/e-cal-shell-view-actions.c:1551
 msgid "Show one week"
 msgstr "Montri unu semajnon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1681
+#: ../modules/calendar/e-cal-shell-view-actions.c:1558
 msgid "Show one work week"
 msgstr "Montri unu laborsemajnon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1689
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
 msgid "Active Appointments"
 msgstr "Aktivaj rendevuoj"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1703
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
 msgid "Next 7 Days' Appointments"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
 msgid "Occurs Less Than 5 Times"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1741
-#: ../modules/calendar/e-memo-shell-view-actions.c:795
-#: ../modules/calendar/e-task-shell-view-actions.c:994
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-memo-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Description contains"
 msgstr "Priskripo enhavas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1748
-#: ../modules/calendar/e-memo-shell-view-actions.c:802
-#: ../modules/calendar/e-task-shell-view-actions.c:1001
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-view-actions.c:947
 msgid "Summary contains"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1760
+#: ../modules/calendar/e-cal-shell-view-actions.c:1635
+#: ../modules/calendar/e-cal-shell-view-actions.c:1649
+#: ../modules/calendar/e-cal-shell-view-memopad.c:273
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:971
+#| msgid "_Print..."
+msgid "Print..."
+msgstr "Presi..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1637
 msgid "Print this calendar"
 msgstr "Presi tiun kalendaron"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1767
+#: ../modules/calendar/e-cal-shell-view-actions.c:1644
 msgid "Preview the calendar to be printed"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1789
-#: ../modules/calendar/e-cal-shell-view-memopad.c:294
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:381
-#: ../modules/calendar/e-memo-shell-view-actions.c:843
-#: ../modules/calendar/e-task-shell-view-actions.c:1042
+#: ../modules/calendar/e-cal-shell-view-actions.c:1666
+#: ../modules/calendar/e-cal-shell-view-memopad.c:283
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:988
 msgid "_Save as iCalendar..."
 msgstr "_Konservi kiel iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1866
+#: ../modules/calendar/e-cal-shell-view-actions.c:1743
 msgid "Go To"
 msgstr "Iri al"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:217
-#: ../modules/calendar/e-memo-shell-view-actions.c:522
+#: ../modules/calendar/e-cal-shell-view-memopad.c:206
+#: ../modules/calendar/e-memo-shell-view-actions.c:467
 msgid "memo"
 msgstr "noto"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:260
-#: ../modules/calendar/e-memo-shell-view-actions.c:654
+#: ../modules/calendar/e-cal-shell-view-memopad.c:249
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "New _Memo"
 msgstr "Nova _noto"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:262
-#: ../modules/calendar/e-memo-shell-backend.c:306
-#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-memo-shell-backend.c:65
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Create a new memo"
 msgstr "Krei novan noton"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:267
-#: ../modules/calendar/e-memo-shell-view-actions.c:661
+#: ../modules/calendar/e-cal-shell-view-memopad.c:256
+#: ../modules/calendar/e-memo-shell-view-actions.c:606
 msgid "_Open Memo"
 msgstr "Malfermi n_oton"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:269
-#: ../modules/calendar/e-memo-shell-view-actions.c:663
+#: ../modules/calendar/e-cal-shell-view-memopad.c:258
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "View the selected memo"
 msgstr "Montri la elektitan noton"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-memo-shell-view-actions.c:668
-#: ../modules/calendar/e-task-shell-view-actions.c:806
+#: ../modules/calendar/e-cal-shell-view-memopad.c:263
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-task-shell-view-actions.c:752
 msgid "Open _Web Page"
 msgstr "Malfermi _retpaĝon"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:286
-#: ../modules/calendar/e-memo-shell-view-actions.c:828
+#: ../modules/calendar/e-cal-shell-view-memopad.c:275
+#: ../modules/calendar/e-memo-shell-view-actions.c:773
 msgid "Print the selected memo"
 msgstr "Presi la elektitan noton"
 
+#: ../modules/calendar/e-cal-shell-view-private.c:810
+#, fuzzy
+#| msgid "Print this event"
+msgid "Searching next matching event"
+msgstr "Presi tiun eventon"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:811
+msgid "Searching previous matching event"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-view-private.c:832
+#, c-format
+msgid "Cannot find matching event in the next %d year"
+msgid_plural "Cannot find matching event in the next %d years"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../modules/calendar/e-cal-shell-view-private.c:836
+#, c-format
+msgid "Cannot find matching event in the previous %d year"
+msgid_plural "Cannot find matching event in the previous %d years"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../modules/calendar/e-cal-shell-view-private.c:859
+msgid "Cannot search with no active calendar"
+msgstr ""
+
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:284
-#: ../modules/calendar/e-task-shell-view-actions.c:639
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:274
+#: ../modules/calendar/e-task-shell-view-actions.c:585
 msgid "task"
 msgstr "tasko"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
-#: ../modules/calendar/e-task-shell-view-actions.c:701
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:309
+#: ../modules/calendar/e-task-shell-view-actions.c:647
 msgid "_Assign Task"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:778
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
+#: ../modules/calendar/e-task-shell-view-actions.c:724
 msgid "_Mark as Complete"
 msgstr "_Marki kiel plenumite"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:335
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:325
+#: ../modules/calendar/e-task-shell-view-actions.c:726
 msgid "Mark selected tasks as complete"
 msgstr "Marki elektitajn taskojn kiel plenumite"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
 msgid "_Mark as Incomplete"
 msgstr "_Marki kiel neplenumite"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:342
-#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
+#: ../modules/calendar/e-task-shell-view-actions.c:733
 msgid "Mark selected tasks as incomplete"
 msgstr "Marki elektitajn taskojn kiel plenumite"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
+#: ../modules/calendar/e-task-shell-view-actions.c:738
 msgid "New _Task"
 msgstr "Nova _tasko"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:349
-#: ../modules/calendar/e-task-shell-backend.c:305
-#: ../modules/calendar/e-task-shell-view-actions.c:794
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
+#: ../modules/calendar/e-task-shell-backend.c:64
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "Create a new task"
 msgstr "Krei novan taskon"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
-#: ../modules/calendar/e-task-shell-view-actions.c:799
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "_Open Task"
 msgstr "_Malfermi taskon"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../modules/calendar/e-task-shell-view-actions.c:747
 msgid "View the selected task"
 msgstr "Montri la elektitan taskon"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
-#: ../modules/calendar/e-task-shell-view-actions.c:1027
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:363
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Print the selected task"
 msgstr "Presi la elektitajn taskojn"
 
-#: ../modules/calendar/e-memo-shell-backend.c:304
+#: ../modules/calendar/e-memo-shell-backend.c:63
 msgctxt "New"
 msgid "Mem_o"
 msgstr ""
 
-#: ../modules/calendar/e-memo-shell-backend.c:311
+#: ../modules/calendar/e-memo-shell-backend.c:70
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Komuna noto"
 
-#: ../modules/calendar/e-memo-shell-backend.c:313
+#: ../modules/calendar/e-memo-shell-backend.c:72
 msgid "Create a new shared memo"
 msgstr "Krei novan komunan noton"
 
-#: ../modules/calendar/e-memo-shell-backend.c:321
+#: ../modules/calendar/e-memo-shell-backend.c:80
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Notoli_sto"
 
-#: ../modules/calendar/e-memo-shell-backend.c:323
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-memo-shell-backend.c:82
+#: ../modules/calendar/e-memo-shell-view-actions.c:566
 msgid "Create a new memo list"
 msgstr "Krei novan notoliston"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:186
-msgid "Loading memos"
-msgstr "Ŝargante notojn"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:703
-msgid "Memo List Selector"
-msgstr "Memolist-elektilo"
-
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:1001
-#, c-format
-msgid "Opening memos at %s"
-msgstr "Malfermante notajn je %s"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:231
-#: ../modules/calendar/e-memo-shell-view-actions.c:246
+#: ../modules/calendar/e-memo-shell-view-actions.c:180
+#: ../modules/calendar/e-memo-shell-view-actions.c:195
 msgid "Print Memos"
 msgstr "Presi notojn"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-memo-shell-view-actions.c:236
+msgid "Memo List Properties"
+msgstr "Ecoj de notlisto"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:529
 msgid "_Delete Memo"
 msgstr "_Forigi notojn"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-memo-shell-view-actions.c:536
 msgid "_Find in Memo..."
 msgstr "_Serĉi en noto..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:593
+#: ../modules/calendar/e-memo-shell-view-actions.c:538
 msgid "Search for text in the displayed memo"
 msgstr "Serĉi tekston en la montrata noto"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:557
 msgid "D_elete Memo List"
 msgstr "_Forigi la notoliston"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#: ../modules/calendar/e-memo-shell-view-actions.c:559
 msgid "Delete the selected memo list"
 msgstr "Forigi la elektitan notoliston"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:619
+#: ../modules/calendar/e-memo-shell-view-actions.c:564
 msgid "_New Memo List"
 msgstr "_Nova notolisto"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#: ../modules/calendar/e-memo-shell-view-actions.c:580
 msgid "Refresh the selected memo list"
 msgstr "Aktualigi la elektitan notoliston"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "Rename the selected memo list"
 msgstr "Alinomi la elektitan notoliston"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "Show _Only This Memo List"
-msgstr "Montri nur tiun notoliston"
+msgstr "Montri _nur tiun notoliston"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-memo-shell-view-actions.c:671
 msgid "Memo _Preview"
 msgstr "Noto-_antaŭrigardo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:673
 msgid "Show memo preview pane"
 msgstr ""
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:749
+#: ../modules/calendar/e-memo-shell-view-actions.c:694
 msgid "Show memo preview below the memo list"
 msgstr ""
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:756
+#: ../modules/calendar/e-memo-shell-view-actions.c:701
 msgid "Show memo preview alongside the memo list"
 msgstr ""
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:814
+#: ../modules/calendar/e-memo-shell-view-actions.c:759
 msgid "Print the list of memos"
 msgstr "Presi la liston de notoj"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:821
+#: ../modules/calendar/e-memo-shell-view-actions.c:766
 msgid "Preview the list of memos to be printed"
 msgstr "Antaŭrigardi la presotan liston de notoj"
 
-#: ../modules/calendar/e-memo-shell-view.c:227
+#: ../modules/calendar/e-memo-shell-view.c:212
 msgid "Delete Memos"
 msgstr "Forigi notojn"
 
-#: ../modules/calendar/e-memo-shell-view.c:229
+#: ../modules/calendar/e-memo-shell-view.c:214
 msgid "Delete Memo"
 msgstr "Forigi noton"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:424
+#: ../modules/calendar/e-memo-shell-view-private.c:369
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d noto"
 msgstr[1] "%d notoj"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:428
-#: ../modules/calendar/e-task-shell-view-private.c:603
+#: ../modules/calendar/e-memo-shell-view-private.c:373
+#: ../modules/calendar/e-task-shell-view-private.c:539
 #, c-format
 msgid "%d selected"
 msgstr "%d elektite"
 
-#: ../modules/calendar/e-task-shell-backend.c:303
+#: ../modules/calendar/e-task-shell-backend.c:62
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tasko"
 
-#: ../modules/calendar/e-task-shell-backend.c:310
+#: ../modules/calendar/e-task-shell-backend.c:69
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "_Atribuita tasko"
 
-#: ../modules/calendar/e-task-shell-backend.c:312
+#: ../modules/calendar/e-task-shell-backend.c:71
 msgid "Create a new assigned task"
 msgstr "Krei novan atribuitan taskon"
 
-#: ../modules/calendar/e-task-shell-backend.c:320
+#: ../modules/calendar/e-task-shell-backend.c:79
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Tas_klisto"
 
-#: ../modules/calendar/e-task-shell-backend.c:322
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-backend.c:81
+#: ../modules/calendar/e-task-shell-view-actions.c:691
 msgid "Create a new task list"
 msgstr "Krei novan taskliston"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:186
-msgid "Loading tasks"
-msgstr "Ŝargante taskojn"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:703
-msgid "Task List Selector"
-msgstr "Tasklist-elektilo"
-
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:1002
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Malfermante taskojn ĉe %s"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:254
-#: ../modules/calendar/e-task-shell-view-actions.c:269
+#: ../modules/calendar/e-task-shell-view-actions.c:203
+#: ../modules/calendar/e-task-shell-view-actions.c:218
 msgid "Print Tasks"
 msgstr "Presi taskojn"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:583
+#: ../modules/calendar/e-task-shell-view-actions.c:259
+msgid "Task List Properties"
+msgstr "Tasklist-ecoj"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:529
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -16147,621 +20064,1538 @@ msgstr ""
 "\n"
 "Ĉe certe forigi tiujn taskojn?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:590
+#: ../modules/calendar/e-task-shell-view-actions.c:536
 msgid "Do not ask me again"
 msgstr "Ne demandu min denove"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:654
 msgid "_Delete Task"
 msgstr "_Forigi taskon"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:661
 msgid "_Find in Task..."
 msgstr "_Serĉi en tasko..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:663
 msgid "Search for text in the displayed task"
 msgstr "Serĉi tekston en la montrita tasko"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
-msgid "Copy..."
-msgstr "Kopii..."
-
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:682
 msgid "D_elete Task List"
 msgstr "_Forigi taskliston"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../modules/calendar/e-task-shell-view-actions.c:684
 msgid "Delete the selected task list"
 msgstr "Forigi la elektitan taskliston"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:743
+#: ../modules/calendar/e-task-shell-view-actions.c:689
 msgid "_New Task List"
 msgstr "_Nova tasklisto"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:759
+#: ../modules/calendar/e-task-shell-view-actions.c:705
 msgid "Refresh the selected task list"
 msgstr "Aktualigi la elektitan taskliston"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:766
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "Rename the selected task list"
 msgstr "Alinomi la elektitan taskliston"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:717
 msgid "Show _Only This Task List"
 msgstr "Montri _nur tiun taskliston"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "Mar_k as Incomplete"
 msgstr "Mar_ki kiel neplenumite"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:815
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "Delete completed tasks"
 msgstr "Forigi plenumitaj taskoj"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:836
 msgid "Task _Preview"
 msgstr "Tasko_antaŭrigardo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:892
+#: ../modules/calendar/e-task-shell-view-actions.c:838
 msgid "Show task preview pane"
 msgstr ""
 
-#: ../modules/calendar/e-task-shell-view-actions.c:913
+#: ../modules/calendar/e-task-shell-view-actions.c:859
 msgid "Show task preview below the task list"
 msgstr ""
 
-#: ../modules/calendar/e-task-shell-view-actions.c:920
+#: ../modules/calendar/e-task-shell-view-actions.c:866
 msgid "Show task preview alongside the task list"
 msgstr ""
 
-#: ../modules/calendar/e-task-shell-view-actions.c:928
+#: ../modules/calendar/e-task-shell-view-actions.c:874
 msgid "Active Tasks"
 msgstr "Aktivaj taskoj"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:942
+#: ../modules/calendar/e-task-shell-view-actions.c:888
 msgid "Completed Tasks"
 msgstr "Plenumigitaj taskoj"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:949
+#: ../modules/calendar/e-task-shell-view-actions.c:895
 msgid "Next 7 Days' Tasks"
 msgstr ""
 
-#: ../modules/calendar/e-task-shell-view-actions.c:956
+#: ../modules/calendar/e-task-shell-view-actions.c:902
 msgid "Overdue Tasks"
 msgstr "Malfruaj taskoj"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:963
+#: ../modules/calendar/e-task-shell-view-actions.c:909
 msgid "Tasks with Attachments"
 msgstr "Taskoj kun aldonaĵoj"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
+#: ../modules/calendar/e-task-shell-view-actions.c:959
 msgid "Print the list of tasks"
 msgstr "Presi la liston de taskoj"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1020
+#: ../modules/calendar/e-task-shell-view-actions.c:966
 msgid "Preview the list of tasks to be printed"
 msgstr ""
 
-#: ../modules/calendar/e-task-shell-view.c:362
+#: ../modules/calendar/e-task-shell-view.c:316
 msgid "Delete Tasks"
 msgstr "Forigi taskojn"
 
-#: ../modules/calendar/e-task-shell-view.c:364
+#: ../modules/calendar/e-task-shell-view.c:318
 msgid "Delete Task"
 msgstr "Forigi taskon"
 
-#: ../modules/calendar/e-task-shell-view-private.c:492
-msgid "Expunging"
-msgstr ""
-
-#: ../modules/calendar/e-task-shell-view-private.c:599
+#: ../modules/calendar/e-task-shell-view-private.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tasko"
 msgstr[1] "%d taskoj"
 
-#: ../modules/mail/em-account-prefs.c:205
-msgid "Evolution Account Assistant"
-msgstr "Konto-asistanto de Evolucio"
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:149
+msgid "ITIP"
+msgstr ""
 
-#: ../modules/mail/em-account-prefs.c:249
-msgid "Account Editor"
-msgstr "Kontoredaktilo"
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:150
+msgid "Display part as an invitation"
+msgstr "Montri parton kiel invito"
+
+#. strftime format of a time,
+#. * in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:228
+msgid "Today %H:%M"
+msgstr "Hodiaŭ %H:%M"
 
-#. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:384
+#. strftime format of a time,
+#. * in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:232
+msgid "Today %H:%M:%S"
+msgstr "Hodiaŭ %H:%M:%S"
+
+#. strftime format of a time,
+#. * in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:241
+msgid "Today %l:%M:%S %p"
+msgstr "Hodiaŭ %l:%M:%S %p"
+
+#. strftime format of a time,
+#. * in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:256
+msgid "Tomorrow %H:%M"
+msgstr "Morgaŭ %H:%M"
+
+#. strftime format of a time,
+#. * in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:260
+msgid "Tomorrow %H:%M:%S"
+msgstr "Morgaŭ %H:%M:%S"
+
+#. strftime format of a time,
+#. * in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:265
+msgid "Tomorrow %l:%M %p"
+msgstr "Morgaŭ %l:%M %p"
+
+#. strftime format of a time,
+#. * in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:269
+msgid "Tomorrow %l:%M:%S %p"
+msgstr "Morgaŭ %l:%M:%S %p"
+
+#. strftime format of a weekday.
+#: ../modules/itip-formatter/itip-view.c:288
 #, c-format
-msgid "%d attached messages"
-msgstr "%d aldonitaj mesaĝoj"
+msgid "%A"
+msgstr "%A"
+
+#. strftime format of a weekday and a
+#. * time, in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:293
+msgid "%A %H:%M"
+msgstr "%A %H:%M"
+
+#. strftime format of a weekday and a
+#. * time, in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:297
+msgid "%A %H:%M:%S"
+msgstr "%A %H:%M:%S"
+
+#. strftime format of a weekday and a
+#. * time, in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:302
+msgid "%A %l:%M %p"
+msgstr "%A %l:%M %p"
+
+#. strftime format of a weekday and a
+#. * time, in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:306
+msgid "%A %l:%M:%S %p"
+msgstr "%A %l:%M:%S %p"
+
+#. strftime format of a weekday and a date
+#. * without a year.
+#: ../modules/itip-formatter/itip-view.c:315
+msgid "%A, %B %e"
+msgstr "%A, %B %e"
+
+#. strftime format of a weekday, a date
+#. * without a year and a time,
+#. * in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:321
+msgid "%A, %B %e %H:%M"
+msgstr "%A, %B %e %H:%M"
+
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:325
+msgid "%A, %B %e %H:%M:%S"
+msgstr "%A, %B %e %H:%M:%S"
+
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:330
+msgid "%A, %B %e %l:%M %p"
+msgstr "%A, %B %e %l:%M %p"
+
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:334
+msgid "%A, %B %e %l:%M:%S %p"
+msgstr "%A, %B %e %l:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: ../modules/itip-formatter/itip-view.c:340
+msgid "%A, %B %e, %Y"
+msgstr "%A, %B %e, %Y"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:345
+msgid "%A, %B %e, %Y %H:%M"
+msgstr "%A, %B %e, %Y %H:%M"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:349
+msgid "%A, %B %e, %Y %H:%M:%S"
+msgstr "%A, %B %e, %Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:354
+msgid "%A, %B %e, %Y %l:%M %p"
+msgstr "%A, %B %e, %Y %l:%M %p"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:358
+msgid "%A, %B %e, %Y %l:%M:%S %p"
+msgstr "%A, %B %e, %Y %l:%M:%S %p"
+
+#: ../modules/itip-formatter/itip-view.c:396
+#: ../modules/itip-formatter/itip-view.c:397
+#: ../modules/itip-formatter/itip-view.c:486
+#: ../modules/itip-formatter/itip-view.c:487
+#: ../modules/itip-formatter/itip-view.c:576
+msgid "An unknown person"
+msgstr "Nekonata persono"
+
+#: ../modules/itip-formatter/itip-view.c:401
+#: ../modules/itip-formatter/itip-view.c:491
+#: ../modules/itip-formatter/itip-view.c:580
+#, c-format
+msgid "Please respond on behalf of %s"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:403
+#: ../modules/itip-formatter/itip-view.c:493
+#: ../modules/itip-formatter/itip-view.c:582
+#, c-format
+msgid "Received on behalf of %s"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:408
+#, c-format
+msgid "%s through %s has published the following meeting information:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:410
+#, c-format
+msgid "%s has published the following meeting information:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:415
+#, c-format
+msgid "%s has delegated the following meeting to you:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:418
+#, c-format
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:420
+#, c-format
+msgid "%s requests your presence at the following meeting:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:426
+#, c-format
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:428
+#, c-format
+msgid "%s wishes to add to an existing meeting:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:432
+#, c-format
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:434
+#, c-format
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:438
+#, c-format
+msgid "%s through %s has sent back the following meeting response:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:440
+#, c-format
+msgid "%s has sent back the following meeting response:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:444
+#, c-format
+msgid "%s through %s has canceled the following meeting:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:446
+#, c-format
+msgid "%s has canceled the following meeting:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:450
+#, c-format
+msgid "%s through %s has proposed the following meeting changes."
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:452
+#, c-format
+msgid "%s has proposed the following meeting changes:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:456
+#, c-format
+msgid "%s through %s has declined the following meeting changes:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:458
+#, c-format
+msgid "%s has declined the following meeting changes:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:498
+#, c-format
+msgid "%s through %s has published the following task:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:500
+#, c-format
+msgid "%s has published the following task:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:505
+#, c-format
+msgid "%s requests the assignment of %s to the following task:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:508
+#, c-format
+msgid "%s through %s has assigned you a task:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:510
+#, c-format
+msgid "%s has assigned you a task:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:516
+#, c-format
+msgid "%s through %s wishes to add to an existing task:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:518
+#, c-format
+msgid "%s wishes to add to an existing task:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:522
+#, c-format
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:524
+#, c-format
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:528
+#, c-format
+msgid "%s through %s has sent back the following assigned task response:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:530
+#, c-format
+msgid "%s has sent back the following assigned task response:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:534
+#, c-format
+msgid "%s through %s has canceled the following assigned task:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:536
+#, c-format
+msgid "%s has canceled the following assigned task:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:540
+#, c-format
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:542
+#, c-format
+msgid "%s has proposed the following task assignment changes:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:546
+#, c-format
+msgid "%s through %s has declined the following assigned task:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:548
+#, c-format
+msgid "%s has declined the following assigned task:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:587
+#, c-format
+msgid "%s through %s has published the following memo:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:589
+#, c-format
+msgid "%s has published the following memo:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:594
+#, c-format
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:596
+#, c-format
+msgid "%s wishes to add to an existing memo:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:600
+#, c-format
+msgid "%s through %s has canceled the following shared memo:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:602
+#, c-format
+msgid "%s has canceled the following shared memo:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:676
+msgid "All day:"
+msgstr "Tuttage:"
+
+#: ../modules/itip-formatter/itip-view.c:682
+msgid "Start day:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:682
+#: ../modules/itip-formatter/itip-view.c:1517
+msgid "Start time:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:691
+msgid "End day:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:691
+#: ../modules/itip-formatter/itip-view.c:1518
+msgid "End time:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:1041
+#| msgid "_Open Calendar"
+msgid "Ope_n Calendar"
+msgstr "_Malfermi kalendaron"
+
+#: ../modules/itip-formatter/itip-view.c:1044
+msgid "_Decline all"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:1047
+msgid "_Decline"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:1050
+msgid "_Tentative all"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:1053
+msgid "_Tentative"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:1056
+#| msgid "A_ccept all"
+msgid "Acce_pt all"
+msgstr "Akce_pti ĉiujn"
+
+#: ../modules/itip-formatter/itip-view.c:1059
+#| msgid "Accept"
+msgid "Acce_pt"
+msgstr "Akce_pti"
+
+#: ../modules/itip-formatter/itip-view.c:1062
+#| msgid "Server Information"
+msgid "Send _Information"
+msgstr "Sendi _informon"
+
+#: ../modules/itip-formatter/itip-view.c:1065
+msgid "_Update Attendee Status"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:1068
+#: ../smime/gui/certificate-manager.c:1664
+msgid "_Update"
+msgstr "Ĝ_isdatigi"
+
+#: ../modules/itip-formatter/itip-view.c:1520
+#: ../modules/itip-formatter/itip-view.c:1568
+#: ../modules/itip-formatter/itip-view.c:1639
+msgid "Comment:"
+msgstr "Komento:"
+
+#. RSVP area
+#: ../modules/itip-formatter/itip-view.c:1556
+#| msgid "_Reply to Sender"
+msgid "Send reply to sender"
+msgstr "Sendi respondon al sendinto"
+
+#. Updates
+#: ../modules/itip-formatter/itip-view.c:1571
+msgid "Send _updates to attendees"
+msgstr ""
+
+#. The recurrence check button
+#: ../modules/itip-formatter/itip-view.c:1574
+msgid "_Apply to all instances"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:1575
+msgid "Show time as _free"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:1576
+msgid "_Preserve my reminder"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:1577
+msgid "_Inherit reminder"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:1911
+msgid "_Tasks:"
+msgstr "_Taskoj:"
+
+#: ../modules/itip-formatter/itip-view.c:1914
+msgid "_Memos:"
+msgstr "_Notoj:"
+
+#: ../modules/itip-formatter/itip-view.c:3220
+msgid "Sa_ve"
+msgstr "Kons_ervi"
+
+#: ../modules/itip-formatter/itip-view.c:3682
+#: ../modules/itip-formatter/itip-view.c:5131
+msgid "Attendee status updated"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:3862
+#, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:3891
+#, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:4004
+msgid "Unable to find any calendars"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:4012
+msgid "Unable to find this meeting in any calendar"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:4017
+msgid "Unable to find this task in any task list"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:4022
+msgid "Unable to find this memo in any memo list"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:4367
+msgid "Opening the calendar. Please wait..."
+msgstr "Malfermante la kalendaron. Bonvole atendu..."
+
+#: ../modules/itip-formatter/itip-view.c:4372
+msgid "Searching for an existing version of this appointment"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:4767
+#, c-format
+msgid "Unable to send item to calendar '%s'.  %s"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:4782
+#, c-format
+msgid "Sent to calendar '%s' as accepted"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:4787
+#, c-format
+msgid "Sent to calendar '%s' as tentative"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:4793
+#, c-format
+msgid "Sent to calendar '%s' as declined"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:4799
+#, c-format
+msgid "Sent to calendar '%s' as canceled"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:4820
+#: ../modules/itip-formatter/itip-view.c:5278
+#: ../modules/itip-formatter/itip-view.c:5384
+msgid "Saving changes to the calendar. Please wait..."
+msgstr "Konservante ŝanĝojn al kalendaro. Bonvole atendu..."
+
+#: ../modules/itip-formatter/itip-view.c:4861
+msgid "Unable to parse item"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5054
+#, c-format
+msgid "Organizer has removed the delegate %s "
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5071
+msgid "Sent a cancelation notice to the delegate"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5075
+msgid "Could not send the cancelation notice to the delegate"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5123
+#, c-format
+msgid "Unable to update attendee. %s"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5167
+msgid "The meeting is invalid and cannot be updated"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5243
+msgid "Attendee status could not be updated because the status is invalid"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5315
+#: ../modules/itip-formatter/itip-view.c:5354
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5417
+msgid "Meeting information sent"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5422
+msgid "Task information sent"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5427
+msgid "Memo information sent"
+msgstr "Noto-informoj estas sendite"
+
+#: ../modules/itip-formatter/itip-view.c:5438
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5443
+msgid "Unable to send task information, the task does not exist"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5448
+msgid "Unable to send memo information, the memo does not exist"
+msgstr ""
+
+#. Translators: This is a default filename for a calendar.
+#: ../modules/itip-formatter/itip-view.c:5513
+msgid "calendar.ics"
+msgstr "kalendaro.ics"
+
+#: ../modules/itip-formatter/itip-view.c:5518
+msgid "Save Calendar"
+msgstr "Konservi kalendaron"
+
+#: ../modules/itip-formatter/itip-view.c:5567
+#: ../modules/itip-formatter/itip-view.c:5580
+msgid "The calendar attached is not valid"
+msgstr "La aldonita kalendaro ne estas valida"
+
+#: ../modules/itip-formatter/itip-view.c:5568
+#: ../modules/itip-formatter/itip-view.c:5581
+msgid ""
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5623
+#: ../modules/itip-formatter/itip-view.c:5653
+#: ../modules/itip-formatter/itip-view.c:5754
+msgid "The item in the calendar is not valid"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5624
+#: ../modules/itip-formatter/itip-view.c:5654
+#: ../modules/itip-formatter/itip-view.c:5755
+msgid ""
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5669
+msgid "The calendar attached contains multiple items"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5670
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:6172
+msgctxt "cal-itip"
+msgid "None"
+msgstr "Nenio"
+
+#: ../modules/itip-formatter/itip-view.c:6188
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:6348
+msgid "This meeting recurs"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:6351
+msgid "This task recurs"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:6354
+msgid "This memo recurs"
+msgstr ""
+
+#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
+msgstr ""
+
+#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+msgid "This meeting has been delegated"
+msgstr ""
+
+#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgstr ""
+
+#: ../modules/itip-formatter/plugin/config-ui.c:81
+msgid "Meeting Invitations"
+msgstr ""
+
+#: ../modules/itip-formatter/plugin/config-ui.c:107
+msgid "_Delete message after acting"
+msgstr ""
+
+#: ../modules/itip-formatter/plugin/config-ui.c:121
+#: ../modules/itip-formatter/plugin/config-ui.c:152
+msgid "Conflict Search"
+msgstr ""
+
+#. Source selector
+#: ../modules/itip-formatter/plugin/config-ui.c:136
+msgid "Select the calendars to search for meeting conflicts"
+msgstr ""
+
+#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:1
+msgid "Itip Formatter"
+msgstr ""
+
+#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:2
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr ""
+
+#: ../modules/mail-config/e-mail-config-google-summary.c:250
+msgid "Google Features"
+msgstr ""
+
+#: ../modules/mail-config/e-mail-config-google-summary.c:259
+#| msgid "Add local calendars to Evolution."
+msgid "Add Google Ca_lendar to this account"
+msgstr "Aldoni Google-ka_lendaron al tiu konto"
+
+#: ../modules/mail-config/e-mail-config-google-summary.c:267
+msgid "Add Google Con_tacts to this account"
+msgstr ""
+
+#: ../modules/mail-config/e-mail-config-google-summary.c:275
+msgid "You may need to enable IMAP access"
+msgstr ""
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:245
+#: ../modules/mail-config/e-mail-config-local-accounts.c:291
+msgid "Mail _Directory:"
+msgstr ""
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:246
+#, fuzzy
+#| msgid "Choose a File"
+msgid "Choose a MH mail directory"
+msgstr "Elekti dosieron"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:268
+msgid "Local Delivery _File:"
+msgstr ""
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:269
+#, fuzzy
+#| msgid "Choose calendar file"
+msgid "Choose a local delivery file"
+msgstr "Elekti kalendardosieron"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+msgid "Choose a Maildir mail directory"
+msgstr ""
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:314
+#, fuzzy
+#| msgid "_File:"
+msgid "Spool _File:"
+msgstr "_Dosiero:"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+#, fuzzy
+#| msgid "Choose a File"
+msgid "Choose a mbox spool file"
+msgstr "Elekti dosieron"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:337
+msgid "Spool _Directory:"
+msgstr ""
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:338
+msgid "Choose a mbox spool directory"
+msgstr ""
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:136
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:92
+#: ../modules/plugin-manager/evolution-plugin-manager.c:158
+msgid "Configuration"
+msgstr "Agordo"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:154
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+msgid "_Server:"
+msgstr "_Servilo:"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:168
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
+msgid "_Port:"
+msgstr "_Pordo:"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:180
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:242
+msgid "User_name:"
+msgstr "Uzanto_nomo:"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:213
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
+#| msgid "Encryption:"
+msgid "Encryption _method:"
+msgstr "Ĉifrado-_metodo:"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:228
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:178
+msgid "STARTTLS after connecting"
+msgstr ""
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:232
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:182
+msgid "SSL on a dedicated port"
+msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
+msgid "_Use custom binary, instead of 'sendmail'"
+msgstr ""
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:74
+#, fuzzy
+#| msgid "Custom Alarm:"
+msgid "_Custom binary:"
+msgstr "_Propra alarm:"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
+#, fuzzy
+#| msgid "Use custom fonts"
+msgid "U_se custom arguments"
+msgstr "U_zi personecigitajn riparojn"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
+#, fuzzy
+#| msgid "Custom Alarm:"
+msgid "Cus_tom arguments:"
+msgstr "_Propra alarm:"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
+msgid ""
+"Default arguments are '-i -f %F -- %R', where\n"
+"   %F - stands for the From address\n"
+"   %R - stands for the recipient addresses"
+msgstr ""
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:128
+#, fuzzy
+#| msgid "Start in offline mode"
+msgid "Send mail also when in offline _mode"
+msgstr "Starti per nekonektita _reĝimo"
+
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:135
+msgid "Ser_ver requires authentication"
+msgstr "Ser_vilo bezonas aŭtentigon"
+
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:224
+msgid "T_ype:"
+msgstr "T_ipo:"
+
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:245
+msgid "Yahoo! Features"
+msgstr ""
+
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:254
+msgid "Add Yahoo! Ca_lendar and Tasks to this account"
+msgstr ""
+
+#: ../modules/mail/e-mail-attachment-handler.c:424
+#, fuzzy, c-format
+#| msgid "%d attached messages"
+msgid "%d attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "%d aldonitaj mesaĝoj"
+msgstr[1] "%d aldonitaj mesaĝoj"
+
+#: ../modules/mail/e-mail-shell-backend.c:349
 msgctxt "New"
 msgid "_Mail Message"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:201
+#: ../modules/mail/e-mail-shell-backend.c:351
 msgid "Compose a new mail message"
-msgstr ""
+msgstr "Krei novan retpoŝtan mesaĝon"
 
-#: ../modules/mail/e-mail-shell-backend.c:209
+#: ../modules/mail/e-mail-shell-backend.c:359
+#| msgid "Mail Accounts"
+msgctxt "New"
+msgid "Mail Acco_unt"
+msgstr "Retpoŝt_konto"
+
+#: ../modules/mail/e-mail-shell-backend.c:361
+#, fuzzy
+#| msgid "Create a new contact"
+msgid "Create a new mail account"
+msgstr "Krei novan kontakton"
+
+#: ../modules/mail/e-mail-shell-backend.c:366
 msgctxt "New"
 msgid "Mail _Folder"
-msgstr ""
+msgstr "Retpoŝta _dosierujo"
 
-#: ../modules/mail/e-mail-shell-backend.c:211
+#: ../modules/mail/e-mail-shell-backend.c:368
 msgid "Create a new mail folder"
-msgstr ""
+msgstr "Krei novan retpoŝtan dosierujon"
 
-#: ../modules/mail/e-mail-shell-backend.c:426
+#: ../modules/mail/e-mail-shell-backend.c:683
 msgid "Mail Accounts"
 msgstr "Retpoŝtkontoj"
 
-#: ../modules/mail/e-mail-shell-backend.c:434
+#: ../modules/mail/e-mail-shell-backend.c:692
 msgid "Mail Preferences"
-msgstr ""
+msgstr "Agordoj de retpoŝto"
 
-#: ../modules/mail/e-mail-shell-backend.c:442
+#: ../modules/mail/e-mail-shell-backend.c:701
 msgid "Composer Preferences"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:450
+#: ../modules/mail/e-mail-shell-backend.c:711
 msgid "Network Preferences"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
-#: ../modules/mail/e-mail-shell-view.c:944
+#. Translators: The first item in the list, to be
+#. * able to set rule: [Label] [is/is-not] [None]
+#: ../modules/mail/e-mail-shell-backend.c:1003
+#| msgid "None"
+msgctxt "label"
+msgid "None"
+msgstr "Neniu"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:713
+#| msgid "Mark Me_ssages as Read"
+msgid "Marking messages as read..."
+msgstr "Markante mesaĝojn kiel legite..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1573
 msgid "_Disable Account"
 msgstr "_Elŝalti konton"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
+#: ../modules/mail/e-mail-shell-view-actions.c:1575
 msgid "Disable this account"
 msgstr "Elŝalti tiun konton"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1582
 msgid "Permanently remove all the deleted messages from all folders"
-msgstr ""
+msgstr "Daŭre forigi ĉiujn forigitajn mesaĝojn el ĉiuj dosierujoj"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1589
+msgid "Edit properties of this account"
+msgstr "Redakti atribuojn de tiu ĉi konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1161
+#: ../modules/mail/e-mail-shell-view-actions.c:1596
+#, fuzzy
+#| msgid "Refresh the folder list"
+msgid "Refresh list of folders of this account"
+msgstr "Aktualigi la dosierujoliston"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1601
 msgid "_Download Messages for Offline Usage"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1163
+#: ../modules/mail/e-mail-shell-view-actions.c:1603
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
+#: ../modules/mail/e-mail-shell-view-actions.c:1608
 msgid "Fl_ush Outbox"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1175
+#: ../modules/mail/e-mail-shell-view-actions.c:1615
 msgid "_Copy Folder To..."
 msgstr "_Kopii dosierujon al..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1177
+#: ../modules/mail/e-mail-shell-view-actions.c:1617
 msgid "Copy the selected folder into another folder"
 msgstr "Kopii la elektitan dosierujon al alia dosierujo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1184
+#: ../modules/mail/e-mail-shell-view-actions.c:1624
 msgid "Permanently remove this folder"
 msgstr "Daŭre forigi tiun dosierujon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/mail/e-mail-shell-view-actions.c:1629
 msgid "E_xpunge"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1191
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Daŭre forigi ĉiujn forigitajn mesaĝojn de tiu dosierujo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/mail/e-mail-shell-view-actions.c:1636
+#: ../modules/mail/e-mail-shell-view-actions.c:1737
 msgid "Mar_k All Messages as Read"
 msgstr "Mar_ki ĉiujn mesaĝojn kiel legite"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1198
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../modules/mail/e-mail-shell-view-actions.c:1739
 msgid "Mark all messages in the folder as read"
-msgstr "Mar_ki ĉiujn mesaĝojn en la dosierujo kiel legite"
+msgstr "Marki ĉiujn mesaĝojn en la dosierujo kiel legite"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1203
+#: ../modules/mail/e-mail-shell-view-actions.c:1643
 msgid "_Move Folder To..."
 msgstr "_Movi dosierujon al..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../modules/mail/e-mail-shell-view-actions.c:1645
 msgid "Move the selected folder into another folder"
 msgstr "Movi la elektitan dosierujon al alia dosierujo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1210
+#. Translators: An action caption to create a new mail folder
+#: ../modules/mail/e-mail-shell-view-actions.c:1651
 msgid "_New..."
 msgstr "_Nova..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../modules/mail/e-mail-shell-view-actions.c:1653
 msgid "Create a new folder for storing mail"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1219
+#: ../modules/mail/e-mail-shell-view-actions.c:1660
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1226
+#: ../modules/mail/e-mail-shell-view-actions.c:1667
 msgid "Refresh the folder"
 msgstr "Aktualigi la dosierujon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/mail/e-mail-shell-view-actions.c:1674
 msgid "Change the name of this folder"
 msgstr "Ŝanĝi la nomon de la dosierujo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1238
+#: ../modules/mail/e-mail-shell-view-actions.c:1679
 msgid "Select Message _Thread"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1240
+#: ../modules/mail/e-mail-shell-view-actions.c:1681
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1245
+#: ../modules/mail/e-mail-shell-view-actions.c:1686
 msgid "Select Message S_ubthread"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1688
 msgid "Select all replies to the currently selected message"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1700
 msgid "Empty _Trash"
 msgstr "Malplenigi _rubujon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1702
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1707
 msgid "_New Label"
 msgstr "_Nova etikedo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1716
 msgid "N_one"
 msgstr "N_eniu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1730
 msgid "_Manage Subscriptions"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1291
-#: ../modules/mail/e-mail-shell-view-actions.c:1368
+#: ../modules/mail/e-mail-shell-view-actions.c:1732
+#: ../modules/mail/e-mail-shell-view-actions.c:1816
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
-#: ../modules/mail/e-mail-shell-view-actions.c:1317
+#: ../modules/mail/e-mail-shell-view-actions.c:1744
+#: ../modules/mail/e-mail-shell-view-actions.c:1765
 msgid "Send / _Receive"
-msgstr ""
+msgstr "Sendi / _Ricevi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1298
+#: ../modules/mail/e-mail-shell-view-actions.c:1746
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/mail/e-mail-shell-view-actions.c:1751
 msgid "R_eceive All"
 msgstr "R_icevi ĉiujn"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1305
+#: ../modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Receive new items from all accounts"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1758
 msgid "_Send All"
 msgstr "_Sendi ĉiujn"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1312
+#: ../modules/mail/e-mail-shell-view-actions.c:1760
 msgid "Send queued items in all accounts"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
-#: ../widgets/misc/e-activity-proxy.c:310
-msgid "Cancel"
-msgstr "Nuligi"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1340
+#: ../modules/mail/e-mail-shell-view-actions.c:1788
 msgid "Cancel the current mail operation"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1345
+#: ../modules/mail/e-mail-shell-view-actions.c:1793
 msgid "Collapse All _Threads"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1347
+#: ../modules/mail/e-mail-shell-view-actions.c:1795
 msgid "Collapse all message threads"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1352
+#: ../modules/mail/e-mail-shell-view-actions.c:1800
 msgid "E_xpand All Threads"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1354
+#: ../modules/mail/e-mail-shell-view-actions.c:1802
 msgid "Expand all message threads"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1359
+#: ../modules/mail/e-mail-shell-view-actions.c:1807
 msgid "_Message Filters"
 msgstr "_Mesaĝfiltriloj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1361
+#: ../modules/mail/e-mail-shell-view-actions.c:1809
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1366
+#: ../modules/mail/e-mail-shell-view-actions.c:1814
 msgid "_Subscriptions..."
 msgstr "_Subskriboj..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1375
+#: ../modules/mail/e-mail-shell-view-actions.c:1823
 msgid "F_older"
 msgstr "D_osierujo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1382
+#: ../modules/mail/e-mail-shell-view-actions.c:1830
 msgid "_Label"
 msgstr "_Etikedo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1399
+#: ../modules/mail/e-mail-shell-view-actions.c:1847
 msgid "C_reate Search Folder From Search..."
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1406
+#: ../modules/mail/e-mail-shell-view-actions.c:1854
 msgid "Search F_olders"
 msgstr "Serĉ_dosierujoj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1408
+#: ../modules/mail/e-mail-shell-view-actions.c:1856
 msgid "Create or edit search folder definitions"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1439
+#: ../modules/mail/e-mail-shell-view-actions.c:1895
 msgid "_New Folder..."
 msgstr "_Nova dosierujo..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1467
+#: ../modules/mail/e-mail-shell-view-actions.c:1923
 msgid "Show Message _Preview"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1469
+#: ../modules/mail/e-mail-shell-view-actions.c:1925
 msgid "Show message preview pane"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1475
+#: ../modules/mail/e-mail-shell-view-actions.c:1931
 msgid "Show _Deleted Messages"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1477
+#: ../modules/mail/e-mail-shell-view-actions.c:1933
 msgid "Show deleted messages with a line through them"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1483
+#: ../modules/mail/e-mail-shell-view-actions.c:1939
 msgid "_Group By Threads"
 msgstr "_Grupigi laŭ fadenoj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1485
+#: ../modules/mail/e-mail-shell-view-actions.c:1941
 msgid "Threaded message list"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1506
+#: ../modules/mail/e-mail-shell-view-actions.c:1947
+msgid "_Unmatched Folder Enabled"
+msgstr ""
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1949
+msgid "Toggles whether Unmatched search folder is enabled"
+msgstr ""
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1969
 msgid "Show message preview below the message list"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1513
+#: ../modules/mail/e-mail-shell-view-actions.c:1976
 msgid "Show message preview alongside the message list"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../modules/mail/e-mail-shell-view-actions.c:1984
 msgid "All Messages"
 msgstr "Ĉiuj mesaĝoj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1528
+#: ../modules/mail/e-mail-shell-view-actions.c:1991
 msgid "Important Messages"
 msgstr "Gravaj mesaĝoj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1535
+#: ../modules/mail/e-mail-shell-view-actions.c:1998
 msgid "Last 5 Days' Messages"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1542
+#: ../modules/mail/e-mail-shell-view-actions.c:2005
 msgid "Messages Not Junk"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1549
+#: ../modules/mail/e-mail-shell-view-actions.c:2012
 msgid "Messages with Attachments"
 msgstr "Mesaĝoj kun aldonaĵoj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1556
+#: ../modules/mail/e-mail-shell-view-actions.c:2019
 msgid "No Label"
 msgstr "Neniu etikedo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1563
+#: ../modules/mail/e-mail-shell-view-actions.c:2026
 msgid "Read Messages"
 msgstr "Legitaj mesaĝoj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1570
-msgid "Recent Messages"
-msgstr ""
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1577
+#: ../modules/mail/e-mail-shell-view-actions.c:2033
 msgid "Unread Messages"
 msgstr "Nelegitaj mesaĝoj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1629
+#: ../modules/mail/e-mail-shell-view-actions.c:2092
 msgid "Subject or Addresses contain"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1639
+#: ../modules/mail/e-mail-shell-view-actions.c:2102
 msgid "All Accounts"
 msgstr "Ĉiuj kontoj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1646
+#: ../modules/mail/e-mail-shell-view-actions.c:2109
 msgid "Current Account"
 msgstr "Aktualo konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1653
+#: ../modules/mail/e-mail-shell-view-actions.c:2116
 msgid "Current Folder"
 msgstr "Aktuala dosierujo"
 
-#: ../modules/mail/e-mail-shell-view.c:560
+#: ../modules/mail/e-mail-shell-view.c:700
 msgid "All Account Search"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view.c:721
+#: ../modules/mail/e-mail-shell-view.c:808
 msgid "Account Search"
 msgstr "Kontoserĉo"
 
-#: ../modules/mail/e-mail-shell-view.c:942
-msgid "Proxy _Logout"
-msgstr ""
-
-#: ../modules/mail/e-mail-shell-view-private.c:998
+#: ../modules/mail/e-mail-shell-view-private.c:986
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d elektite, "
 msgstr[1] "%d elektite, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1009
+#: ../modules/mail/e-mail-shell-view-private.c:995
+#: ../modules/mail/e-mail-shell-view-private.c:1012
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d forigite"
 msgstr[1] "%d forigite"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1015
-#: ../modules/mail/e-mail-shell-view-private.c:1022
+#: ../modules/mail/e-mail-shell-view-private.c:1021
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d trudmesaĵo"
+msgstr[1] "%d trudmesaĵoj"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1028
+#: ../modules/mail/e-mail-shell-view-private.c:1034
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d malneto"
 msgstr[1] "%d malnetoj"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1034
+#: ../modules/mail/e-mail-shell-view-private.c:1040
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d nesendita"
+msgstr[1] "%d nesenditaj"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1040
+#: ../modules/mail/e-mail-shell-view-private.c:1046
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sendite"
 msgstr[1] "%d sendite"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1052
+#: ../modules/mail/e-mail-shell-view-private.c:1058
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d nelegite, "
 msgstr[1] "%d nelegite, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1055
-#, c-format
+#: ../modules/mail/e-mail-shell-view-private.c:1061
+#, fuzzy, c-format
 msgid "%d total"
 msgid_plural "%d total"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d totala"
+msgstr[1] "%d totalaj"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1078
-msgid "Trash"
-msgstr "Rubujo"
-
-#: ../modules/mail/e-mail-shell-view-private.c:1554
+#: ../modules/mail/e-mail-shell-view-private.c:1569
 msgid "Send / Receive"
+msgstr "Sendi / Ricevi"
+
+#: ../modules/mail/em-composer-prefs.c:413
+#, fuzzy
+#| msgid "Select Folder"
+msgid "Select Folder to Add"
+msgstr "Elekti dosierujon"
+
+#: ../modules/mail/em-composer-prefs.c:883
+msgid "Folder"
+msgstr "Dosierujo"
+
+#: ../modules/mail/em-composer-prefs.c:919
+msgid "Recipient"
 msgstr ""
 
-#: ../modules/mail/em-composer-prefs.c:507
+#: ../modules/mail/em-composer-prefs.c:1192
+#, fuzzy
+#| msgid "Outbox"
+msgid "Keep in Outbox"
+msgstr "Elirkesto"
+
+#: ../modules/mail/em-composer-prefs.c:1193
+#| msgid "_Send message"
+msgid "Send immediately"
+msgstr "Sendi tuj"
+
+#: ../modules/mail/em-composer-prefs.c:1194
+#| msgid "05 minutes"
+msgid "Send after 5 minutes"
+msgstr "Sendi post 5 minutoj"
+
+#: ../modules/mail/em-composer-prefs.c:1267
 msgid "Language(s)"
 msgstr "Lingvo(j)"
 
-#: ../modules/mail/em-mailer-prefs.c:89
-msgid "Every time"
+#: ../modules/mail/em-mailer-prefs.c:79
+#, fuzzy
+#| msgid "Every time"
+msgid "On exit, every time"
 msgstr "Ĉiam"
 
-#: ../modules/mail/em-mailer-prefs.c:90
+#: ../modules/mail/em-mailer-prefs.c:80
 msgid "Once per day"
 msgstr "Unufoje dum tago"
 
-#: ../modules/mail/em-mailer-prefs.c:91
+#: ../modules/mail/em-mailer-prefs.c:81
 msgid "Once per week"
 msgstr "Unufoje dum semajno"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:82
 msgid "Once per month"
 msgstr "Unufoje dum monato"
 
-#: ../modules/mail/em-mailer-prefs.c:291
+#: ../modules/mail/em-mailer-prefs.c:83
+msgid "Immediately, on folder leave"
+msgstr ""
+
+#: ../modules/mail/em-mailer-prefs.c:356
 msgid "Header"
 msgstr "Paĝokapo"
 
-#: ../modules/mail/em-mailer-prefs.c:295
+#: ../modules/mail/em-mailer-prefs.c:360
 msgid "Contains Value"
 msgstr ""
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1048
+#: ../modules/mail/em-mailer-prefs.c:1236
 msgid "_Date header:"
 msgstr ""
 
-#: ../modules/mail/em-mailer-prefs.c:1049
+#: ../modules/mail/em-mailer-prefs.c:1237
 msgid "Show _original header value"
 msgstr ""
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+#: ../modules/mailto-handler/evolution-mailto-handler.c:140
 msgid "Do you want to make Evolution your default email client?"
 msgstr "Ĉu vi volas igi Evolucion je via defaŭlta retpoŝtumilo?"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:256
+#: ../modules/mdn/evolution-mdn.c:304
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr ""
 
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:322
+#: ../modules/mdn/evolution-mdn.c:370
 #, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr ""
 
-#: ../modules/mdn/evolution-mdn.c:447
+#: ../modules/mdn/evolution-mdn.c:531
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr ""
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:452
+#: ../modules/mdn/evolution-mdn.c:536
 msgid "_Notify Sender"
 msgstr ""
 
 #: ../modules/mdn/evolution-mdn.error.xml.h:1
-msgid "Sender has been notified that you have read this message."
+msgid "Sender wants to be notified when you have read this message."
 msgstr ""
 
 #: ../modules/mdn/evolution-mdn.error.xml.h:2
-msgid "Sender wants to be notified when you have read this message."
+msgid "Sender has been notified that you have read this message."
 msgstr ""
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
-msgid "Click 'Work Online' to return to online mode."
-msgstr ""
+msgid "Evolution is currently offline."
+msgstr "Evolutionon nun estas senkonekta."
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
-msgid "Evolution is currently offline due to a network outage."
+msgid "Click 'Work Online' to return to online mode."
 msgstr ""
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
-msgid "Evolution is currently offline."
-msgstr "Evolutionon nun estas senkonekta."
+msgid "Evolution is currently offline due to a network outage."
+msgstr ""
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
 msgid ""
@@ -16769,439 +21603,529 @@ msgid ""
 "established."
 msgstr ""
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:388
-msgid ""
-"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-"from which to obtain an authentication token."
-msgstr ""
-
-#: ../modules/online-accounts/camel-sasl-xoauth.c:475
-msgid "OAuth"
-msgstr ""
-
-#: ../modules/online-accounts/camel-sasl-xoauth.c:477
-msgid ""
-"This option will connect to the server by way of the GNOME Online Accounts "
-"service"
-msgstr ""
-
-#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../modules/plugin-manager/evolution-plugin-manager.c:67
 msgid "Author(s)"
 msgstr "Aŭtoro(j)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:255
+#: ../modules/plugin-manager/evolution-plugin-manager.c:253
 msgid "Plugin Manager"
 msgstr "Kromprogram-administrilo"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:270
+#: ../modules/plugin-manager/evolution-plugin-manager.c:268
 msgid "Note: Some changes will not take effect until restart"
 msgstr ""
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:299
+#: ../modules/plugin-manager/evolution-plugin-manager.c:297
 msgid "Overview"
 msgstr "Superrigardo"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:368
-#: ../modules/plugin-manager/evolution-plugin-manager.c:451
+#: ../modules/plugin-manager/evolution-plugin-manager.c:366
+#: ../modules/plugin-manager/evolution-plugin-manager.c:449
 msgid "Plugin"
 msgstr "Kromprogramo"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:489
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
 msgid "_Plugins"
 msgstr "_Kromprogramoj"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:490
+#: ../modules/plugin-manager/evolution-plugin-manager.c:488
 msgid "Enable and disable plugins"
 msgstr "Enŝalti kaj elŝalti kromprogramojn"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:139
+#, fuzzy
+#| msgid "Display the next message"
+msgid "Display plain text version"
+msgstr "Montri la sekvan mesaĝon"
+
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:141
+#, fuzzy
+#| msgid "Display the next important message"
+msgid "Display plain text version of multipart/alternative message"
+msgstr "Montri la sekvan gravan mesaĝon"
+
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:147
+msgid "Display HTML version"
+msgstr "Vidigi HTML-version"
+
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:149
+#, fuzzy
+#| msgid "Display the previous important message"
+msgid "Display HTML version of multipart/alternative message"
+msgstr "Montri HTML-version de mesaĝon"
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../modules/prefer-plain/plugin/config-ui.c:43
+msgid "Show HTML if present"
 msgstr ""
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
+#: ../modules/prefer-plain/plugin/config-ui.c:44
+msgid "Let Evolution choose the best part to show."
 msgstr ""
 
-#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
-msgid "Hello Python"
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../modules/prefer-plain/plugin/config-ui.c:47
+msgid "Show plain text if present"
 msgstr ""
 
-#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
-msgid "Python Plugin Loader tests"
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
+#: ../modules/prefer-plain/plugin/config-ui.c:48
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
+msgstr ""
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../modules/prefer-plain/plugin/config-ui.c:52
+msgid "Only ever show plain text"
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:190
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
+#: ../modules/prefer-plain/plugin/config-ui.c:53
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+msgstr ""
+
+#: ../modules/prefer-plain/plugin/config-ui.c:104
+msgid "Show s_uppressed HTML parts as attachments"
+msgstr ""
+
+#: ../modules/prefer-plain/plugin/config-ui.c:126
+msgid "HTML _Mode"
+msgstr "HTML-_reĝomo"
+
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:1
+msgid "Prefer Plain Text"
+msgstr "Preferi platan tekston"
+
+#. but then we also need to create our own section frame
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:3
+msgid "Plain Text Mode"
+msgstr ""
+
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.c:187
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:213
+#: ../modules/spamassassin/evolution-spamassassin.c:210
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:232
+#: ../modules/spamassassin/evolution-spamassassin.c:229
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:260
+#: ../modules/spamassassin/evolution-spamassassin.c:257
 msgid "Failed to read output from SpamAssassin: "
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:315
+#: ../modules/spamassassin/evolution-spamassassin.c:312
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:834
+#: ../modules/spamassassin/evolution-spamassassin.c:535
 msgid "SpamAssassin Options"
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:849
+#: ../modules/spamassassin/evolution-spamassassin.c:550
 msgid "I_nclude remote tests"
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:863
+#: ../modules/spamassassin/evolution-spamassassin.c:564
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:1072
+#: ../modules/spamassassin/evolution-spamassassin.c:739
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
 msgid "SpamAssassin"
 msgstr ""
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:279
-#: ../widgets/misc/e-import-assistant.c:396
-msgid "Please select the information that you would like to import:"
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
+msgid "Junk filter using SpamAssassin"
 msgstr ""
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:311
-#: ../widgets/misc/e-import-assistant.c:552
-#, c-format
-msgid "From %s:"
-msgstr "De %s:"
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:322
-#: ../modules/startup-wizard/evolution-startup-wizard.c:420
+#. Keep the title identical to EMailConfigImportPage
+#. * so it's only shown once in the assistant sidebar.
+#: ../modules/startup-wizard/e-mail-config-import-page.c:260
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:339
 msgid "Importing Files"
-msgstr ""
+msgstr "Enportante dosierojn"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:398
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:258
 msgid "Import cancelled."
-msgstr ""
+msgstr "Nuligita enporto."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:416
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:275
 msgid "Import complete."
-msgstr ""
+msgstr "Kompleta enporto."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:490
-msgid "Evolution Setup Assistant"
-msgstr ""
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:496
-msgid "Welcome"
-msgstr "Bonvenon"
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:501
+#: ../modules/startup-wizard/e-startup-assistant.c:155
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications."
+"Welcome to Evolution.\n"
+"\n"
+"The next few screens will allow Evolution to connect to your email accounts, "
+"and to import files from other applications."
 msgstr ""
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:605
+#: ../modules/startup-wizard/evolution-startup-wizard.c:228
 msgid "Loading accounts..."
 msgstr "Ŝargante kontojn..."
 
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Add local address books to Evolution."
-msgstr "Aldoni lokan adresaron al Evolucio."
-
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Local Address Books"
-msgstr "Loka adresaro"
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:126
-msgid "_Do not show this message again."
-msgstr "_Ne montru tiun mesaĝon denove."
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:94
+#, fuzzy
+#| msgid "_Format:"
+msgid "_Format as..."
+msgstr "_Formo:"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:464
-#: ../plugins/templates/templates.c:460
-msgid "Keywords"
-msgstr "Ŝlosilvortoj"
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:102
+#, fuzzy
+#| msgid "_Languages"
+msgid "_Other languages"
+msgstr "_Lingvoj"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-msgid ""
-"Evolution has found some keywords that suggest that this message should "
-"contain an attachment, but cannot find one."
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:438
+msgid "Text Highlight"
 msgstr ""
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
-msgid "Message has no attachments"
-msgstr "Mesaĝo ne havas aldonaĵojn"
-
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
-msgid "_Add Attachment..."
-msgstr "_Aldoni aldonaĵon..."
-
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Edit Message"
-msgstr "_Redakti mesaĝon"
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:439
+msgid "Syntax highlighting of mail parts"
+msgstr ""
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
-msgid "Attachment Reminder"
-msgstr "Aldonaĵ-rememorigolo"
+#: ../modules/text-highlight/languages.c:31
+msgid "_Plain text"
+msgstr ""
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid "Reminds you when you forgot to add an attachment to a mail message."
+#: ../modules/text-highlight/languages.c:37
+msgid "_Assembler"
 msgstr ""
 
-#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid "Inline Audio"
+#: ../modules/text-highlight/languages.c:42
+msgid "_Bash"
 msgstr ""
 
-#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Play audio attachments directly in mail messages."
+#: ../modules/text-highlight/languages.c:53
+msgid "_C/C++"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:77
-msgid "Back up Evolution directory"
+#: ../modules/text-highlight/languages.c:62
+msgid "_C#"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:79
-msgid "Restore Evolution directory"
+#: ../modules/text-highlight/languages.c:67
+msgid "_Cascade Style Sheet"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:81
-msgid "Check Evolution Back up"
+#: ../modules/text-highlight/languages.c:80
+msgid "_Java"
+msgstr "_Java"
+
+#: ../modules/text-highlight/languages.c:86
+#| msgid "_Script:"
+msgid "_JavaScript"
+msgstr "_JavaScript"
+
+#: ../modules/text-highlight/languages.c:92
+msgid "_Patch/diff"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:83
-msgid "Restart Evolution"
-msgstr "Restartigi Evolucion"
+#: ../modules/text-highlight/languages.c:98
+#| msgid "_Personal"
+msgid "_Perl"
+msgstr "_Perl"
 
-#: ../plugins/backup-restore/backup.c:85
-msgid "With Graphical User Interface"
-msgstr "Per grafika interfaco"
+#: ../modules/text-highlight/languages.c:109
+msgid "_PHP"
+msgstr "_PHP"
 
-#. FIXME Will the versioned setting always work?
-#: ../plugins/backup-restore/backup.c:300
-#: ../plugins/backup-restore/backup.c:424
-msgid "Shutting down Evolution"
-msgstr "Elŝalti Evolucion"
+#: ../modules/text-highlight/languages.c:122
+msgid "_Python"
+msgstr "_Python"
 
-#: ../plugins/backup-restore/backup.c:309
-msgid "Backing Evolution accounts and settings"
-msgstr ""
+#: ../modules/text-highlight/languages.c:127
+msgid "_Ruby"
+msgstr "_Ruby"
 
-#: ../plugins/backup-restore/backup.c:321
-msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr ""
+#: ../modules/text-highlight/languages.c:134
+msgid "_Tcl/Tk"
+msgstr "_Tcl/Tk"
 
-#: ../plugins/backup-restore/backup.c:337
-msgid "Back up complete"
-msgstr ""
+#: ../modules/text-highlight/languages.c:140
+msgid "_TeX/LaTeX"
+msgstr "_TeX/LaTeX"
 
-#: ../plugins/backup-restore/backup.c:344
-#: ../plugins/backup-restore/backup.c:560
-msgid "Restarting Evolution"
-msgstr "Restartante Evolucion"
+#: ../modules/text-highlight/languages.c:146
+msgid "_Vala"
+msgstr "_Vala"
 
-#: ../plugins/backup-restore/backup.c:430
-msgid "Back up current Evolution data"
-msgstr ""
+#: ../modules/text-highlight/languages.c:151
+msgid "_Visual Basic"
+msgstr "_Visual Basic"
 
-#: ../plugins/backup-restore/backup.c:438
-msgid "Extracting files from back up"
-msgstr ""
+#: ../modules/text-highlight/languages.c:158
+msgid "_XML"
+msgstr "_XML"
 
-#: ../plugins/backup-restore/backup.c:505
-msgid "Loading Evolution settings"
-msgstr "Ŝargante Evolucio-agordojn"
+#: ../modules/text-highlight/languages.c:176
+#| msgid "_Actions"
+msgid "_ActionScript"
+msgstr "_ActionScript"
 
-#: ../plugins/backup-restore/backup.c:541
-msgid "Removing temporary back up files"
+#: ../modules/text-highlight/languages.c:181
+msgid "_ADA95"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:553
-msgid "Ensuring local sources"
+#: ../modules/text-highlight/languages.c:188
+msgid "_ALGOL 68"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:748
-msgid "Evolution Back Up"
+#: ../modules/text-highlight/languages.c:193
+msgid "(_G)AWK"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:749
-#, c-format
-msgid "Backing up to the folder %s"
-msgstr ""
+#: ../modules/text-highlight/languages.c:198
+msgid "_COBOL"
+msgstr "_COBOL"
 
-#: ../plugins/backup-restore/backup.c:754
-msgid "Evolution Restore"
+#: ../modules/text-highlight/languages.c:203
+msgid "_DOS Batch"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:755
-#, c-format
-msgid "Restoring from the folder %s"
+#: ../modules/text-highlight/languages.c:208
+msgid "_D"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:824
-msgid "Backing up Evolution Data"
+#: ../modules/text-highlight/languages.c:213
+msgid "_Erlang"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:825
-msgid "Please wait while Evolution is backing up your data."
+#: ../modules/text-highlight/languages.c:218
+msgid "_FORTRAN 77"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:827
-msgid "Restoring Evolution Data"
+#: ../modules/text-highlight/languages.c:224
+msgid "_FORTRAN 90"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:828
-msgid "Please wait while Evolution is restoring your data."
+#: ../modules/text-highlight/languages.c:229
+msgid "_F#"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:846
-msgid "This may take a while depending on the amount of data in your account."
-msgstr ""
+#: ../modules/text-highlight/languages.c:234
+#| msgid "_No"
+msgid "_Go"
+msgstr "_Ek"
 
-#: ../plugins/backup-restore/backup-restore.c:223
-msgid "Select name of the Evolution backup file"
+#: ../modules/text-highlight/languages.c:239
+msgid "_Haskell"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:256
-msgid "_Restart Evolution after backup"
+#: ../modules/text-highlight/languages.c:244
+msgid "_JSP"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:283
-msgid "Select name of the Evolution backup file to restore"
+#: ../modules/text-highlight/languages.c:249
+#| msgid "_List:"
+msgid "_Lisp"
+msgstr "_Lisp"
+
+#: ../modules/text-highlight/languages.c:257
+msgid "_Lotus"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:296
-msgid "_Restart Evolution after restore"
+#: ../modules/text-highlight/languages.c:262
+msgid "_Lua"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:383
-msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
-"settings, mail filters etc."
+#: ../modules/text-highlight/languages.c:267
+msgid "_Maple"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:393
-msgid "_Restore Evolution from the backup file"
+#: ../modules/text-highlight/languages.c:272
+msgid "_Matlab"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:403
-msgid "Please select an Evolution Archive to restore:"
+#: ../modules/text-highlight/languages.c:277
+msgid "_Maya"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:407
-msgid "Choose a file to restore"
+#: ../modules/text-highlight/languages.c:282
+msgid "_Oberon"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:421
-msgid "Restore from backup"
+#: ../modules/text-highlight/languages.c:287
+msgid "_Objective C"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:468
-msgid "_Back up Evolution Data..."
+#: ../modules/text-highlight/languages.c:293
+msgid "_OCaml"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:470
-msgid "Back up Evolution data and settings to an archive file"
+#: ../modules/text-highlight/languages.c:298
+msgid "_Octave"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:475
-msgid "R_estore Evolution Data..."
+#: ../modules/text-highlight/languages.c:303
+#, fuzzy
+#| msgid "_Script:"
+msgid "_Object Script"
+msgstr "_Skripto:"
+
+#: ../modules/text-highlight/languages.c:308
+msgid "_Pascal"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:477
-msgid "Restore Evolution data and settings from an archive file"
+#: ../modules/text-highlight/languages.c:313
+msgid "_POV-Ray"
 msgstr ""
 
-#. the path to the shared library
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-msgid "Back up and Restore"
+#: ../modules/text-highlight/languages.c:318
+#, fuzzy
+#| msgid "_Program:"
+msgid "_Prolog"
+msgstr "_Programo:"
+
+#: ../modules/text-highlight/languages.c:323
+msgid "_R"
 msgstr ""
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Back up and restore your Evolution data and settings."
+#: ../modules/text-highlight/languages.c:328
+msgid "_RPM Spec"
 msgstr ""
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
-msgid "Are you sure you want to close Evolution?"
-msgstr "Ĉu vi vere volas fermi Evolucion?"
+#: ../modules/text-highlight/languages.c:333
+msgid "_Scala"
+msgstr ""
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
+#: ../modules/text-highlight/languages.c:338
+msgid "_Smalltalk"
 msgstr ""
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid "Close and Back up Evolution"
+#: ../modules/text-highlight/languages.c:344
+msgid "_TCSH"
 msgstr ""
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-msgid "Close and Restore Evolution"
+#: ../modules/text-highlight/languages.c:349
+msgid "_VHDL"
 msgstr ""
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Insufficient Permissions"
-msgstr "Nesufiĉaj permesoj"
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:131
+#: ../modules/vcard-inline/e-mail-part-vcard.c:151
+#, fuzzy
+#| msgid "Show _Tool Bar"
+msgid "Show F_ull vCard"
+msgstr "Montri _ilobreton"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-msgid "Invalid Evolution backup file"
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:134
+#: ../modules/vcard-inline/e-mail-part-vcard.c:169
+#, fuzzy
+#| msgid "Show _Status Bar"
+msgid "Show Com_pact vCard"
+msgstr "Montri _statbreton"
+
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:162
+#| msgid "Save in Address Book"
+msgid "Save _To Addressbook"
+msgstr "Konservi _en adresaro"
+
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
+msgid "There is one other contact."
 msgstr ""
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid "Please select a valid backup file to restore."
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:189
+#, c-format
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "Estas %d alia kontakto."
+msgstr[1] "Estas %d aliaj kontaktoj."
+
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:215
+#, fuzzy
+#| msgid "Address book source"
+msgid "Addressbook Contact"
+msgstr "Adresaro-fonto"
+
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:216
+msgid "Display the part as an addressbook contact"
 msgstr ""
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "The selected folder is not writable."
-msgstr "La elektita dosierujo ne estas skribebla."
+#: ../modules/web-inspector/evolution-web-inspector.c:95
+#, fuzzy
+#| msgid "Evolution Website"
+msgid "Evolution Web Inspector"
+msgstr "Retpaĝaro de Evolucio"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
+#: ../plugins/attachment-reminder/attachment-reminder.c:123
+msgid "_Do not show this message again."
+msgstr "_Ne montru tiun mesaĝon denove."
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:584
+#: ../plugins/templates/templates.c:478
+msgid "Keywords"
+msgstr "Ŝlosilvortoj"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+msgid "Message has no attachments"
+msgstr "Mesaĝo ne havas aldonaĵojn"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
-"To back up your data and settings, you must first close Evolution. Please "
-"make sure that you save any unsaved data before proceeding."
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
 msgstr ""
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
-msgid ""
-"To restore your data and settings, you must first close Evolution. Please "
-"make sure that you save any unsaved data before proceeding. This will delete "
-"all your current Evolution data and settings and restore them from your "
-"backup."
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+msgid "_Add Attachment..."
+msgstr "_Aldoni aldonaĵon..."
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Edit Message"
+msgstr "_Redakti mesaĝon"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+msgid "Attachment Reminder"
+msgstr "Aldonaĵ-rememorigolo"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:666 ../plugins/bbdb/bbdb.c:675
+#: ../plugins/bbdb/bbdb.c:724 ../plugins/bbdb/bbdb.c:835
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr ""
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:690
+#: ../plugins/bbdb/bbdb.c:739
 msgid "Create _address book entries when sending mails"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:696
+#: ../plugins/bbdb/bbdb.c:749
 msgid "Select Address book for Automatic Contacts"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:711
+#: ../plugins/bbdb/bbdb.c:769
 msgid "Instant Messaging Contacts"
 msgstr ""
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:726
+#: ../plugins/bbdb/bbdb.c:784
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:732
+#: ../plugins/bbdb/bbdb.c:794
 msgid "Select Address book for Pidgin buddy list"
 msgstr ""
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:743
+#: ../plugins/bbdb/bbdb.c:810
 msgid "Synchronize with _buddy list now"
 msgstr ""
 
@@ -17218,443 +22142,161 @@ msgid ""
 "lists."
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:214
-msgid "Authentication failed. Server requires correct login."
-msgstr ""
-
-#: ../plugins/caldav/caldav-browse-server.c:216
-msgid "Given URL cannot be found."
-msgstr ""
-
-#: ../plugins/caldav/caldav-browse-server.c:220
-#, c-format
-msgid ""
-"Server returned unexpected data.\n"
-"%d - %s"
-msgstr ""
-
-#: ../plugins/caldav/caldav-browse-server.c:360
-#: ../plugins/caldav/caldav-browse-server.c:694
-msgid "Failed to parse server response."
-msgstr ""
-
-#: ../plugins/caldav/caldav-browse-server.c:454
-msgid "Events"
-msgstr "Eventoj"
-
-#: ../plugins/caldav/caldav-browse-server.c:476
-msgid "User's calendars"
-msgstr ""
-
-#: ../plugins/caldav/caldav-browse-server.c:588
-#: ../plugins/caldav/caldav-browse-server.c:763
-msgid "Failed to get server URL."
-msgstr ""
-
-#: ../plugins/caldav/caldav-browse-server.c:761
-#: ../plugins/caldav/caldav-browse-server.c:802
-#: ../plugins/caldav/caldav-browse-server.c:1493
-msgid "Searching for user's calendars..."
-msgstr ""
-
-#: ../plugins/caldav/caldav-browse-server.c:800
-msgid "Could not find any user calendar."
-msgstr ""
-
-#: ../plugins/caldav/caldav-browse-server.c:938
-#, c-format
-msgid "Previous attempt failed: %s"
-msgstr ""
-
-#: ../plugins/caldav/caldav-browse-server.c:940
-#, c-format
-msgid "Previous attempt failed with code %d"
-msgstr ""
-
-#: ../plugins/caldav/caldav-browse-server.c:945
-#, c-format
-msgid "Enter password for user %s on server %s"
-msgstr "Enigu pasvorton por uzanto %s sur servilo %s"
-
-#: ../plugins/caldav/caldav-browse-server.c:1008
-#, c-format
-msgid "Cannot create soup message for URL '%s'"
-msgstr ""
-
-#. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1266
-msgid "Searching folder content..."
-msgstr ""
-
-#: ../plugins/caldav/caldav-browse-server.c:1325
-#: ../plugins/caldav/caldav-source.c:261
-msgid "Server _handles meeting invitations"
-msgstr ""
-
-#: ../plugins/caldav/caldav-browse-server.c:1332
-msgid "List of available calendars:"
-msgstr "Listo de disponeblaj kalendaroj:"
-
-#: ../plugins/caldav/caldav-browse-server.c:1370
-msgid "Supports"
-msgstr ""
-
-#: ../plugins/caldav/caldav-browse-server.c:1397
-#: ../plugins/caldav/caldav-source.c:259
-msgid "User e_mail:"
-msgstr "Uzanto-retpoŝto:"
-
-#: ../plugins/caldav/caldav-browse-server.c:1469
-#, c-format
-msgid "Failed to create thread: %s"
-msgstr ""
-
-#: ../plugins/caldav/caldav-browse-server.c:1585
-#, c-format
-msgid "Server URL '%s' is not a valid URL"
-msgstr ""
-
-#: ../plugins/caldav/caldav-browse-server.c:1591
-msgid "Browse for a CalDAV calendar"
-msgstr ""
-
-#: ../plugins/caldav/caldav-source.c:240
-#: ../plugins/calendar-http/calendar-http.c:107
-msgid "_URL:"
-msgstr "_URL:"
-
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:145
-#: ../plugins/google-account-setup/google-contacts-source.c:359
-msgid "Use _secure connection"
-msgstr "Uzi _sekuran konekton"
-
-#: ../plugins/caldav/caldav-source.c:249
-#: ../plugins/google-account-setup/google-contacts-source.c:337
-#: ../plugins/google-account-setup/google-source.c:660
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:269
-msgid "User_name:"
-msgstr "Uzanto_nomo:"
-
-#: ../plugins/caldav/caldav-source.c:264
-msgid "Brows_e server for a calendar"
-msgstr ""
-
-#: ../plugins/caldav/caldav-source.c:282
-#: ../plugins/calendar-file/calendar-file.c:204
-#: ../plugins/calendar-http/calendar-http.c:129
-#: ../plugins/calendar-weather/calendar-weather.c:421
-#: ../plugins/google-account-setup/google-contacts-source.c:377
-#: ../plugins/google-account-setup/google-source.c:666
-msgid "Re_fresh:"
-msgstr "_Aktualigi:"
-
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "Add CalDAV support to Evolution."
-msgstr ""
-
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "CalDAV Support"
-msgstr ""
-
-#: ../plugins/calendar-file/calendar-file.c:134
-msgid "_Customize options"
-msgstr ""
-
-#: ../plugins/calendar-file/calendar-file.c:153
-msgid "File _name:"
-msgstr "Dosier_nomo:"
-
-#: ../plugins/calendar-file/calendar-file.c:157
-msgid "Choose calendar file"
-msgstr "Elekti kalendardosieron"
-
-#: ../plugins/calendar-file/calendar-file.c:209
-msgid "On open"
-msgstr ""
-
-#: ../plugins/calendar-file/calendar-file.c:210
-msgid "On file change"
-msgstr ""
-
-#: ../plugins/calendar-file/calendar-file.c:211
-msgid "Periodically"
-msgstr ""
-
-#: ../plugins/calendar-file/calendar-file.c:228
-msgid "Force read _only"
-msgstr ""
-
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Add local calendars to Evolution."
-msgstr "Aldoni lokan kalendaron al Evolucio."
-
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Local Calendars"
-msgstr "Lokaj kalendaroj"
-
-#: ../plugins/calendar-http/calendar-http.c:207
-msgid "Userna_me:"
-msgstr "Uzantono_mo:"
-
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "Add web calendars to Evolution."
-msgstr "Aldoni ret-kalendarojn al Evolucio."
-
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Web Calendars"
-msgstr "Retaj kalendaroj"
-
-#: ../plugins/calendar-weather/calendar-weather.c:65
-msgid "Weather: Fog"
-msgstr "Vetero: nebulo"
-
-#: ../plugins/calendar-weather/calendar-weather.c:66
-msgid "Weather: Cloudy"
-msgstr "Vetero: nube"
-
-#: ../plugins/calendar-weather/calendar-weather.c:67
-msgid "Weather: Cloudy Night"
-msgstr "Vetero: nuba nokto"
-
-#: ../plugins/calendar-weather/calendar-weather.c:68
-msgid "Weather: Overcast"
-msgstr ""
-
-#: ../plugins/calendar-weather/calendar-weather.c:69
-msgid "Weather: Showers"
-msgstr "Vetero: pluvegoj"
-
-#: ../plugins/calendar-weather/calendar-weather.c:70
-msgid "Weather: Snow"
-msgstr "Vetero: neĝo"
-
-#: ../plugins/calendar-weather/calendar-weather.c:71
-msgid "Weather: Sunny"
-msgstr "Vetero: sune"
-
-#: ../plugins/calendar-weather/calendar-weather.c:72
-msgid "Weather: Clear Night"
-msgstr "Vetero: klara nokto"
-
-#: ../plugins/calendar-weather/calendar-weather.c:73
-msgid "Weather: Thunderstorms"
-msgstr "Vetero: fulmotondroj"
-
-#: ../plugins/calendar-weather/calendar-weather.c:239
-msgid "Select a location"
-msgstr "Elekti lokon"
-
-#. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:350
-#: ../plugins/calendar-weather/calendar-weather.c:398
-msgctxt "weather-cal-location"
-msgid "None"
-msgstr "Neniu"
-
-#: ../plugins/calendar-weather/calendar-weather.c:477
-msgid "_Units:"
-msgstr "_uUnuoj:"
-
-#: ../plugins/calendar-weather/calendar-weather.c:486
-msgid "Metric (Celsius, cm, etc)"
-msgstr "Metrike (Celsiuso, cm, ktp.)"
-
-#: ../plugins/calendar-weather/calendar-weather.c:489
-msgid "Imperial (Fahrenheit, inches, etc)"
-msgstr ""
-
-#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Add weather calendars to Evolution."
-msgstr "Aldoni veter-kalendaroj al Evolucio."
-
-#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
-msgid "Weather Calendars"
-msgstr "Veter-kalendaroj"
-
-#: ../plugins/dbx-import/dbx-importer.c:289
+#: ../plugins/dbx-import/dbx-importer.c:278
 msgid "Importing Outlook Express data"
 msgstr ""
 
 #: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
-msgid "Import Outlook Express messages from DBX file"
-msgstr ""
-
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
 msgid "Outlook DBX import"
 msgstr ""
 
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr ""
 
-#: ../plugins/default-source/default-source.c:169
-msgid "Mark as _default address book"
-msgstr ""
-
-#: ../plugins/default-source/default-source.c:183
-msgid "A_utocomplete with this address book"
-msgstr ""
-
-#: ../plugins/default-source/default-source.c:192
-msgid "Mark as _default calendar"
-msgstr "Marki kiel _defaŭlta kalendaro"
-
-#: ../plugins/default-source/default-source.c:193
-msgid "Mark as _default task list"
-msgstr "Marki kiel _defaŭlta tasklisto"
-
-#: ../plugins/default-source/default-source.c:194
-msgid "Mark as _default memo list"
-msgstr ""
-
-#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
-msgid "Default Sources"
-msgstr "Defaŭltaj fontoj"
-
-#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid "Mark your preferred address book and calendar as default."
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+msgid "Import Outlook Express messages from DBX file"
 msgstr ""
 
-#: ../plugins/email-custom-header/email-custom-header.c:322
+#: ../plugins/email-custom-header/email-custom-header.c:293
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Sekureco:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:326
+#: ../plugins/email-custom-header/email-custom-header.c:297
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Persona"
 
-#: ../plugins/email-custom-header/email-custom-header.c:327
+#: ../plugins/email-custom-header/email-custom-header.c:298
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Nekategoriigite"
 
-#: ../plugins/email-custom-header/email-custom-header.c:328
+#: ../plugins/email-custom-header/email-custom-header.c:299
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Protektite"
 
-#: ../plugins/email-custom-header/email-custom-header.c:329
+#: ../plugins/email-custom-header/email-custom-header.c:300
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Konfidence"
 
-#: ../plugins/email-custom-header/email-custom-header.c:330
+#: ../plugins/email-custom-header/email-custom-header.c:301
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Sekrete"
 
-#: ../plugins/email-custom-header/email-custom-header.c:331
+#: ../plugins/email-custom-header/email-custom-header.c:302
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Sekretege"
 
-#: ../plugins/email-custom-header/email-custom-header.c:388
+#: ../plugins/email-custom-header/email-custom-header.c:362
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "Neniu"
 
-#: ../plugins/email-custom-header/email-custom-header.c:584
+#: ../plugins/email-custom-header/email-custom-header.c:539
 msgid "_Custom Header"
 msgstr ""
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the 
format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:847
+#: ../plugins/email-custom-header/email-custom-header.c:809
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
 msgstr ""
 
-#: ../plugins/email-custom-header/email-custom-header.c:901
+#: ../plugins/email-custom-header/email-custom-header.c:862
 msgid "Key"
 msgstr "Ŝlosilo"
 
-#: ../plugins/email-custom-header/email-custom-header.c:917
-#: ../plugins/templates/templates.c:466
+#: ../plugins/email-custom-header/email-custom-header.c:879
+#: ../plugins/templates/templates.c:487
 msgid "Values"
 msgstr "Valoroj"
 
-#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to 
specify what value for the message header would be added
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
-msgid "Add custom headers to outgoing mail messages."
-msgstr ""
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:1
+msgid "Custom Header"
+msgstr "Propra paĝokapo"
 
+#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to 
specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
-msgid "Custom Header"
+msgid "Add custom headers to outgoing mail messages."
 msgstr ""
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
 msgid "Email Custom Header"
 msgstr ""
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
-msgid "Automatically launch editor when key is pressed in the mail composer"
+#: ../plugins/external-editor/external-editor.c:113
+msgid "Command to be executed to launch the editor: "
 msgstr ""
 
 #: ../plugins/external-editor/external-editor.c:114
-msgid "Command to be executed to launch the editor: "
+msgid ""
+"For XEmacs use \"xemacs\"\n"
+"For Vim use \"gvim -f\""
 msgstr ""
 
-#: ../plugins/external-editor/external-editor.c:115
-msgid ""
-"For Emacs use \"xemacs\"\n"
-"For VI use \"gvim -f\""
+#: ../plugins/external-editor/external-editor.c:124
+msgid "_Automatically launch when a new mail is edited"
 msgstr ""
 
-#: ../plugins/external-editor/external-editor.c:394
-#: ../plugins/external-editor/external-editor.c:396
+#: ../plugins/external-editor/external-editor.c:469
+#: ../plugins/external-editor/external-editor.c:471
 msgid "Compose in External Editor"
 msgstr ""
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid "External Editor"
-msgstr ""
+msgstr "Ekstera redaktilo"
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
 msgid "Use an external editor to compose plain-text mail messages."
 msgstr ""
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
-msgid "Cannot create Temporary File"
+msgid "Editor not launchable"
 msgstr ""
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
-msgid "Editor not launchable"
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
 msgstr ""
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
+msgid "Cannot create Temporary File"
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
 msgstr ""
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
 msgid "External editor still running"
 msgstr ""
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
 "The external editor is still running. The mail composer window cannot be "
 "closed as long as the editor is active."
 msgstr ""
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
-msgid ""
-"The external editor set in your plugin preferences cannot be launched. Try "
-"setting a different editor."
-msgstr ""
-
-#: ../plugins/face/face.c:292
+#: ../plugins/face/face.c:288
 msgid "Select a Face Picture"
 msgstr ""
 
-#: ../plugins/face/face.c:302
+#: ../plugins/face/face.c:298
 msgid "Image files"
 msgstr "Bilddosieroj"
 
-#: ../plugins/face/face.c:359
+#: ../plugins/face/face.c:357
 msgid "_Insert Face picture by default"
 msgstr ""
 
@@ -17662,11 +22304,11 @@ msgstr ""
 msgid "Load new _Face picture"
 msgstr ""
 
-#: ../plugins/face/face.c:429
+#: ../plugins/face/face.c:431
 msgid "Include _Face"
 msgstr ""
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Attach a small picture of your face to outgoing messages."
 msgstr ""
 
@@ -17675,882 +22317,74 @@ msgid "Failed Read"
 msgstr ""
 
 #: ../plugins/face/org-gnome-face.error.xml.h:2
-msgid "Invalid Image Size"
-msgstr ""
+msgid "The file cannot be read"
+msgstr "La dosiero ne estas legebla"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:3
-msgid "Not an image"
-msgstr "Ne estas bildo"
+msgid "Invalid Image Size"
+msgstr ""
 
 #: ../plugins/face/org-gnome-face.error.xml.h:4
 msgid "Please select an image of size 48 * 48"
 msgstr ""
 
 #: ../plugins/face/org-gnome-face.error.xml.h:5
-msgid "The file cannot be read"
-msgstr "La dosiero ne estas legebla"
+msgid "Not an image"
+msgstr "Ne estas bildo"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:6
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr ""
 
-#: ../plugins/google-account-setup/google-contacts-source.c:325
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
-msgid "Server"
-msgstr "Servilo"
-
-#: ../plugins/google-account-setup/google-source.c:457
-#, c-format
-msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr ""
-
-#: ../plugins/google-account-setup/google-source.c:569
-#, c-format
-msgid ""
-"Cannot read data from Google server.\n"
-"%s"
-msgstr ""
-
-#: ../plugins/google-account-setup/google-source.c:569
-#: ../plugins/mail-to-task/mail-to-task.c:823
-#: ../plugins/mail-to-task/mail-to-task.c:1086
-msgid "Unknown error."
-msgstr "Nekonata eraro."
-
-#: ../plugins/google-account-setup/google-source.c:670
-msgid "Cal_endar:"
-msgstr "Kal_endaro:"
-
-#: ../plugins/google-account-setup/google-source.c:705
-msgid "Retrieve _List"
-msgstr ""
-
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "Add Google Calendars to Evolution."
-msgstr ""
-
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Google Calendars"
-msgstr ""
-
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
-msgid "Inline Image"
-msgstr ""
-
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
-msgid "View image attachments directly in mail messages."
-msgstr ""
-
-#: ../plugins/imap-features/imap-headers.c:335
-#: ../plugins/imap-features/imap-headers.ui.h:2
-msgid "Custom Headers"
-msgstr ""
-
-#: ../plugins/imap-features/imap-headers.c:347
-#: ../plugins/imap-features/imap-headers.ui.h:5
-msgid "IMAP Headers"
-msgstr ""
-
-#: ../plugins/imap-features/imap-headers.ui.h:1
-msgid "Basic and _Mailing List Headers (Default)"
-msgstr ""
-
-#: ../plugins/imap-features/imap-headers.ui.h:3
-msgid ""
-"Give the extra headers that you need to fetch in addition to the above "
-"standard headers. \n"
-"You can ignore this if you choose \"All Headers\"."
-msgstr ""
-
-#: ../plugins/imap-features/imap-headers.ui.h:6
-msgid ""
-"Select your IMAP Header Preferences. \n"
-"The more headers you have the more time it will take to download."
-msgstr ""
-
-#: ../plugins/imap-features/imap-headers.ui.h:8
-msgid ""
-"_Basic Headers (Fastest) \n"
-"Use this if you do not have filters based on mailing lists"
-msgstr ""
-
-#: ../plugins/imap-features/imap-headers.ui.h:10
-msgid "_Fetch All Headers"
-msgstr ""
-
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "Fine-tune your IMAP accounts."
-msgstr ""
-
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
-msgid "IMAP Features"
-msgstr ""
-
-#. Translators: The first '%s' is replaced with a calendar name,
-#. * the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:496
-#, c-format
-msgid "Failed to load the calendar '%s' (%s)"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:656
-#, c-format
-msgid "An appointment in the calendar '%s' conflicts with this meeting"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:680
-#, c-format
-msgid "Found the appointment in the calendar '%s'"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:791
-msgid "Unable to find any calendars"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:798
-msgid "Unable to find this meeting in any calendar"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:802
-msgid "Unable to find this task in any task list"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:806
-msgid "Unable to find this memo in any memo list"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:1108
-msgid "Opening the calendar. Please wait..."
-msgstr "Malfermante la kalendaron.  Bonvole atendu..."
-
-#: ../plugins/itip-formatter/itip-formatter.c:1111
-msgid "Searching for an existing version of this appointment"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:1473
-#, c-format
-msgid "Unable to send item to calendar '%s'.  %s"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:1487
-#, c-format
-msgid "Sent to calendar '%s' as accepted"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:1491
-#, c-format
-msgid "Sent to calendar '%s' as tentative"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:1496
-#, c-format
-msgid "Sent to calendar '%s' as declined"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:1501
-#, c-format
-msgid "Sent to calendar '%s' as canceled"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:1570
-#: ../plugins/itip-formatter/itip-formatter.c:1963
-#: ../plugins/itip-formatter/itip-formatter.c:2054
-msgid "Saving changes to the calendar. Please wait..."
-msgstr "Konservante ŝanĝojn al kalendaro. Bonvole atendu..."
-
-#: ../plugins/itip-formatter/itip-formatter.c:1609
-msgid "Unable to parse item"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:1789
-#, c-format
-msgid "Organizer has removed the delegate %s "
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:1796
-msgid "Sent a cancelation notice to the delegate"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:1798
-msgid "Could not send the cancelation notice to the delegate"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:1844
-#, c-format
-msgid "Unable to update attendee. %s"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:1850
-msgid "Attendee status updated"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:1870
-msgid "The meeting is invalid and cannot be updated"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:1936
-msgid "Attendee status could not be updated because the status is invalid"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:1993
-#: ../plugins/itip-formatter/itip-formatter.c:2031
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:2075
-msgid "Meeting information sent"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:2078
-msgid "Task information sent"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:2081
-msgid "Memo information sent"
-msgstr "Noto-informoj estas sendite"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2090
-msgid "Unable to send meeting information, the meeting does not exist"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:2093
-msgid "Unable to send task information, the task does not exist"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:2096
-msgid "Unable to send memo information, the memo does not exist"
-msgstr ""
-
-#. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:2162
-msgid "calendar.ics"
-msgstr "kalendaro.ics"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2167
-msgid "Save Calendar"
-msgstr "Konservi kalendaron"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2230
-#: ../plugins/itip-formatter/itip-formatter.c:2241
-msgid "The calendar attached is not valid"
-msgstr "La aldonita kalendaro ne estas valida"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2231
-#: ../plugins/itip-formatter/itip-formatter.c:2242
-msgid ""
-"The message claims to contain a calendar, but the calendar is not a valid "
-"iCalendar."
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:2282
-#: ../plugins/itip-formatter/itip-formatter.c:2310
-#: ../plugins/itip-formatter/itip-formatter.c:2419
-msgid "The item in the calendar is not valid"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:2283
-#: ../plugins/itip-formatter/itip-formatter.c:2311
-#: ../plugins/itip-formatter/itip-formatter.c:2420
-msgid ""
-"The message does contain a calendar, but the calendar contains no events, "
-"tasks or free/busy information"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:2324
-msgid "The calendar attached contains multiple items"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:2325
-msgid ""
-"To process all of these items, the file should be saved and the calendar "
-"imported"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:2847
-msgctxt "cal-itip"
-msgid "None"
-msgstr "Nenio"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2863
-msgid "Tentatively Accepted"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:2981
-msgid "This meeting recurs"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:2984
-msgid "This task recurs"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:2987
-msgid "This memo recurs"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:3216
-msgid "Meeting Invitations"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:3242
-msgid "_Delete message after acting"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:3254
-#: ../plugins/itip-formatter/itip-formatter.c:3287
-msgid "Conflict Search"
-msgstr ""
-
-#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:3269
-msgid "Select the calendars to search for meeting conflicts"
-msgstr ""
-
-#. strftime format of a time,
-#. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:195
-msgid "Today %H:%M"
-msgstr "Hodiaŭ %H:%M"
-
-#. strftime format of a time,
-#. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:199
-msgid "Today %H:%M:%S"
-msgstr "Hodiaŭ %H:%M:%S"
-
-#. strftime format of a time,
-#. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:208
-msgid "Today %l:%M:%S %p"
-msgstr "Hodiaŭ %l:%M:%S %p"
-
-#. strftime format of a time,
-#. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:223
-msgid "Tomorrow %H:%M"
-msgstr "Morgaŭ %H:%M"
-
-#. strftime format of a time,
-#. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:227
-msgid "Tomorrow %H:%M:%S"
-msgstr "Morgaŭ %H:%M:%S"
-
-#. strftime format of a time,
-#. * in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:232
-msgid "Tomorrow %l:%M %p"
-msgstr "Morgaŭ %l:%M %p"
-
-#. strftime format of a time,
-#. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:236
-msgid "Tomorrow %l:%M:%S %p"
-msgstr "Morgaŭ %l:%M:%S %p"
-
-#. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:255
-#, c-format
-msgid "%A"
-msgstr "%A"
-
-#. strftime format of a weekday and a
-#. * time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:260
-msgid "%A %H:%M"
-msgstr "%A %H:%M"
-
-#. strftime format of a weekday and a
-#. * time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:264
-msgid "%A %H:%M:%S"
-msgstr "%A %H:%M:%S"
-
-#. strftime format of a weekday and a
-#. * time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:269
-msgid "%A %l:%M %p"
-msgstr ""
-
-#. strftime format of a weekday and a
-#. * time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:273
-msgid "%A %l:%M:%S %p"
-msgstr ""
-
-#. strftime format of a weekday and a date
-#. * without a year.
-#: ../plugins/itip-formatter/itip-view.c:282
-msgid "%A, %B %e"
-msgstr ""
-
-#. strftime format of a weekday, a date
-#. * without a year and a time,
-#. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:288
-msgid "%A, %B %e %H:%M"
-msgstr ""
-
-#. strftime format of a weekday, a date without a year
-#. * and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:292
-msgid "%A, %B %e %H:%M:%S"
-msgstr ""
-
-#. strftime format of a weekday, a date without a year
-#. * and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:297
-msgid "%A, %B %e %l:%M %p"
-msgstr ""
-
-#. strftime format of a weekday, a date without a year
-#. * and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:301
-msgid "%A, %B %e %l:%M:%S %p"
-msgstr ""
-
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:307
-msgid "%A, %B %e, %Y"
-msgstr ""
-
-#. strftime format of a weekday, a date and a
-#. * time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:312
-msgid "%A, %B %e, %Y %H:%M"
-msgstr ""
-
-#. strftime format of a weekday, a date and a
-#. * time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:316
-msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr ""
-
-#. strftime format of a weekday, a date and a
-#. * time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:321
-msgid "%A, %B %e, %Y %l:%M %p"
-msgstr ""
-
-#. strftime format of a weekday, a date and a
-#. * time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:325
-msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:363
-#: ../plugins/itip-formatter/itip-view.c:364
-#: ../plugins/itip-formatter/itip-view.c:451
-#: ../plugins/itip-formatter/itip-view.c:452
-#: ../plugins/itip-formatter/itip-view.c:539
-msgid "An unknown person"
-msgstr "Nekonata persono"
-
-#: ../plugins/itip-formatter/itip-view.c:368
-#: ../plugins/itip-formatter/itip-view.c:456
-#: ../plugins/itip-formatter/itip-view.c:543
-#, c-format
-msgid "Please respond on behalf of %s"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:370
-#: ../plugins/itip-formatter/itip-view.c:458
-#: ../plugins/itip-formatter/itip-view.c:545
-#, c-format
-msgid "Received on behalf of %s"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:375
-#, c-format
-msgid "%s through %s has published the following meeting information:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:377
-#, c-format
-msgid "%s has published the following meeting information:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:382
-#, c-format
-msgid "%s has delegated the following meeting to you:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:385
-#, c-format
-msgid "%s through %s requests your presence at the following meeting:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:387
-#, c-format
-msgid "%s requests your presence at the following meeting:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:393
-#, c-format
-msgid "%s through %s wishes to add to an existing meeting:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:395
-#, c-format
-msgid "%s wishes to add to an existing meeting:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:399
-#, c-format
-msgid ""
-"%s through %s wishes to receive the latest information for the following "
-"meeting:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:401
-#, c-format
-msgid "%s wishes to receive the latest information for the following meeting:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:405
-#, c-format
-msgid "%s through %s has sent back the following meeting response:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:407
-#, c-format
-msgid "%s has sent back the following meeting response:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:411
-#, c-format
-msgid "%s through %s has canceled the following meeting:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:413
-#, c-format
-msgid "%s has canceled the following meeting:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:417
-#, c-format
-msgid "%s through %s has proposed the following meeting changes."
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:419
-#, c-format
-msgid "%s has proposed the following meeting changes:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:423
-#, c-format
-msgid "%s through %s has declined the following meeting changes:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:425
-#, c-format
-msgid "%s has declined the following meeting changes:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:463
-#, c-format
-msgid "%s through %s has published the following task:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:465
-#, c-format
-msgid "%s has published the following task:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:470
-#, c-format
-msgid "%s requests the assignment of %s to the following task:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:473
-#, c-format
-msgid "%s through %s has assigned you a task:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:475
-#, c-format
-msgid "%s has assigned you a task:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:481
-#, c-format
-msgid "%s through %s wishes to add to an existing task:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:483
-#, c-format
-msgid "%s wishes to add to an existing task:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:487
-#, c-format
-msgid ""
-"%s through %s wishes to receive the latest information for the following "
-"assigned task:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:489
-#, c-format
-msgid ""
-"%s wishes to receive the latest information for the following assigned task:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:493
-#, c-format
-msgid "%s through %s has sent back the following assigned task response:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:495
-#, c-format
-msgid "%s has sent back the following assigned task response:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:499
-#, c-format
-msgid "%s through %s has canceled the following assigned task:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:501
-#, c-format
-msgid "%s has canceled the following assigned task:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:505
-#, c-format
-msgid "%s through %s has proposed the following task assignment changes:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:507
-#, c-format
-msgid "%s has proposed the following task assignment changes:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:511
-#, c-format
-msgid "%s through %s has declined the following assigned task:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:513
-#, c-format
-msgid "%s has declined the following assigned task:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:550
-#, c-format
-msgid "%s through %s has published the following memo:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:552
-#, c-format
-msgid "%s has published the following memo:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:557
-#, c-format
-msgid "%s through %s wishes to add to an existing memo:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:559
-#, c-format
-msgid "%s wishes to add to an existing memo:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:563
-#, c-format
-msgid "%s through %s has canceled the following shared memo:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:565
-#, c-format
-msgid "%s has canceled the following shared memo:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:689
-msgid "All day:"
-msgstr "Tuttage:"
-
-#: ../plugins/itip-formatter/itip-view.c:699
-msgid "Start day:"
-msgstr ""
-
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:699
-#: ../plugins/itip-formatter/itip-view.c:1062
-msgid "Start time:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:711
-msgid "End day:"
-msgstr ""
-
-#. End time
-#: ../plugins/itip-formatter/itip-view.c:711
-#: ../plugins/itip-formatter/itip-view.c:1073
-msgid "End time:"
-msgstr ""
-
-#. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:847
-msgid "_Open Calendar"
-msgstr "_Malfermi kalendaron"
-
-#: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:857
-#: ../plugins/itip-formatter/itip-view.c:863
-#: ../plugins/itip-formatter/itip-view.c:880
-#: ../plugins/itip-formatter/itip-view.c:885
-msgid "_Decline"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:882
-#: ../plugins/itip-formatter/itip-view.c:887
-msgid "A_ccept"
-msgstr "Ak_cepti"
-
-#: ../plugins/itip-formatter/itip-view.c:857
-msgid "_Decline all"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:858
-msgid "_Tentative all"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:858
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:881
-#: ../plugins/itip-formatter/itip-view.c:886
-msgid "_Tentative"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:859
-msgid "A_ccept all"
-msgstr "Ak_cepti ĉiujn"
-
-#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:870
-msgid "_Send Information"
-msgstr ""
-
-#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:874
-msgid "_Update Attendee Status"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:877
-msgid "_Update"
-msgstr "Ĝ_isdatigi"
-
-#. Comment
-#: ../plugins/itip-formatter/itip-view.c:1093
-#: ../plugins/itip-formatter/itip-view.c:1147
-msgid "Comment:"
-msgstr "Komento:"
-
-#: ../plugins/itip-formatter/itip-view.c:1132
-msgid "Send _reply to sender"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:1170
-msgid "Send _updates to attendees"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:1179
-msgid "_Apply to all instances"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:1188
-msgid "Show time as _free"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:1191
-msgid "_Preserve my reminder"
-msgstr ""
-
-#. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1197
-msgid "_Inherit reminder"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:1973
-msgid "_Tasks:"
-msgstr "_Taskoj:"
-
-#: ../plugins/itip-formatter/itip-view.c:1975
-msgid "_Memos:"
-msgstr "_Notoj:"
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Display \"text/calendar\" MIME parts in mail messages."
-msgstr ""
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
-msgid "Itip Formatter"
-msgstr ""
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
-msgstr ""
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
-msgid "This meeting has been delegated"
-msgstr ""
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
-msgstr ""
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:345
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:364
 msgid "Get List _Archive"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:347
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
 msgid "Get an archive of the list this message belongs to"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:352
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:371
 msgid "Get List _Usage Information"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:354
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
 msgid "Get information about the usage of the list this message belongs to"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:359
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:378
 msgid "Contact List _Owner"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:361
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:385
 msgid "_Post Message to List"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:368
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
 msgid "Post a message to the mailing list this message belongs to"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:392
 msgid "_Subscribe to List"
 msgstr "_Aboni liston"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:375
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Aboni la dissendoliston al kiu tiu ĉi mesaĝo apartenas"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:399
 msgid "_Unsubscribe from List"
 msgstr "_Malaboni liston"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:401
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Malaboni la dissendoliston al kiu tiu ĉi mesaĝo apartenas"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:408
 msgid "Mailing _List"
 msgstr "Dissendo_listo"
 
@@ -18568,102 +22402,95 @@ msgstr "Ago ne desponeblas"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
-"message automatically, or see and change it first.\n"
-"\n"
-"You should receive an answer from the mailing list shortly after the message "
-"has been sent."
-msgstr ""
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
-msgid "Malformed header"
-msgstr ""
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
-msgid "No e-mail action"
+"This message does not contain the header information required for this "
+"action."
 msgstr ""
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:3
 msgid "Posting not allowed"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:4
 msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
 msgstr ""
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
 msgid "Send e-mail message to mailing list?"
 msgstr "Ĉu sendi retpoŝtmesaĝon al dissendolisto?"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
 msgid ""
-"The action could not be performed. The header for this action did not "
-"contain any action that could be processed.\n"
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
 "\n"
-"Header: {0}"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+msgid "_Send message"
+msgstr "_Sendi mesaĝon"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+msgid "_Edit message"
+msgstr "_Redakti mesaĝon"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:11
+msgid "Malformed header"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:12
 msgid ""
 "The {0} header of this message is malformed and could not be processed.\n"
 "\n"
 "Header: {1}"
 msgstr ""
 
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:15
+msgid "No e-mail action"
+msgstr ""
+
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
 msgid ""
-"This message does not contain the header information required for this "
-"action."
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
+"\n"
+"Header: {0}"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
-msgid "_Edit message"
-msgstr "_Redakti mesaĝon"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
-msgid "_Send message"
-msgstr "_Sendi mesaĝon"
+#: ../plugins/mail-notification/mail-notification.c:382
+#: ../plugins/mail-notification/mail-notification.c:418
+#, c-format
+msgid "You have received %d new message."
+msgid_plural "You have received %d new messages."
+msgstr[0] "Vi ricevis %d novan mesaĝon."
+msgstr[1] "Vi ricevis %d novajn mesaĝojn."
 
-#: ../plugins/mail-notification/mail-notification.c:384
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:393
 #, c-format
-msgid ""
-"You have received %d new message\n"
-"in %s."
-msgid_plural ""
-"You have received %d new messages\n"
-"in %s."
-msgstr[0] ""
-"Vi ricevis %d novan mesaĝon\n"
-"en %s."
-msgstr[1] ""
-"Vi ricevis %d novajn mesaĝojn\n"
-"en %s."
+msgid "From: %s"
+msgstr "De: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:409
+#: ../plugins/mail-notification/mail-notification.c:407
 #, c-format
 msgid "Subject: %s"
 msgstr "Temo: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:420
-#, c-format
-msgid "You have received %d new message."
-msgid_plural "You have received %d new messages."
-msgstr[0] "Vi ricevis %d novan mesaĝon."
-msgstr[1] "Vi ricevis %d novajn mesaĝojn."
-
-#: ../plugins/mail-notification/mail-notification.c:429
-#: ../plugins/mail-notification/mail-notification.c:437
-#: ../plugins/mail-notification/mail-notification.c:440
-msgid "New email"
-msgstr "Nova retmesaĝo"
+#: ../plugins/mail-notification/mail-notification.c:424
+#, fuzzy
+#| msgid "Restarting Evolution"
+msgid "New email in Evolution"
+msgstr "Restartante Evolucion"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:461
+#: ../plugins/mail-notification/mail-notification.c:459
 #, c-format
 msgid "Show %s"
 msgstr "Montri na %s"
@@ -18672,27 +22499,27 @@ msgstr "Montri na %s"
 msgid "_Play sound when a new message arrives"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:691
+#: ../plugins/mail-notification/mail-notification.c:693
 msgid "_Beep"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:702
+#: ../plugins/mail-notification/mail-notification.c:706
 msgid "Use sound _theme"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:719
+#: ../plugins/mail-notification/mail-notification.c:725
 msgid "Play _file:"
 msgstr "Lodi _dosieron:"
 
-#: ../plugins/mail-notification/mail-notification.c:726
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Select sound file"
 msgstr "Elekti sondosieron"
 
-#: ../plugins/mail-notification/mail-notification.c:782
+#: ../plugins/mail-notification/mail-notification.c:790
 msgid "Notify new messages for _Inbox only"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:790
+#: ../plugins/mail-notification/mail-notification.c:800
 msgid "Show _notification when a new message arrives"
 msgstr ""
 
@@ -18705,131 +22532,156 @@ msgid "Notifies you when new mail messages arrive."
 msgstr ""
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:238
+#: ../plugins/mail-to-task/mail-to-task.c:229
 #, c-format
 msgid "Created from a mail by %s"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:613
+#. Translators: Dialog button to Cancel edit of an existing event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:594
+#| msgid "Cancel"
+msgctxt "mail-to-task"
+msgid "_Cancel"
+msgstr "_Nuligi"
+
+#. Translators: Dialog button to Edit an existing event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:596
+#| msgid "_Edit"
+msgctxt "mail-to-task"
+msgid "_Edit"
+msgstr "R_edakti"
+
+#. Translators: Dialog button to create a New event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:598
+#| msgid "_New"
+msgctxt "mail-to-task"
+msgid "_New"
+msgstr "_Nova"
+
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#: ../plugins/mail-to-task/mail-to-task.c:619
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
 "old task?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:619
+#: ../plugins/mail-to-task/mail-to-task.c:622
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
 "old memo?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:636
+#: ../plugins/mail-to-task/mail-to-task.c:642
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
 "add them all?"
-msgstr ""
+msgid_plural ""
+"You have selected %d mails to be converted to events. Do you really want to "
+"add them all?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:639
+#: ../plugins/mail-to-task/mail-to-task.c:649
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
 "add them all?"
-msgstr ""
+msgid_plural ""
+"You have selected %d mails to be converted to tasks. Do you really want to "
+"add them all?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:642
+#: ../plugins/mail-to-task/mail-to-task.c:656
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
 "add them all?"
-msgstr ""
+msgid_plural ""
+"You have selected %d mails to be converted to memos. Do you really want to "
+"add them all?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:661
+#: ../plugins/mail-to-task/mail-to-task.c:677
 msgid "Do you wish to continue converting remaining mails?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:753
 msgid "[No Summary]"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:748
+#: ../plugins/mail-to-task/mail-to-task.c:766
 msgid "Invalid object returned from a server"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:798
+#: ../plugins/mail-to-task/mail-to-task.c:821
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:823
+#: ../plugins/mail-to-task/mail-to-task.c:857
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Ne eblis malfermi kalendaron. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:830
+#: ../plugins/mail-to-task/mail-to-task.c:861
 msgid ""
-"Selected source is read only, thus cannot create event there. Select other "
-"source, please."
+"Selected calendar is read only, thus cannot create event there. Select other "
+"calendar, please."
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:833
+#: ../plugins/mail-to-task/mail-to-task.c:864
 msgid ""
-"Selected source is read only, thus cannot create task there. Select other "
-"source, please."
+"Selected task list is read only, thus cannot create task there. Select other "
+"task list, please."
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:836
+#: ../plugins/mail-to-task/mail-to-task.c:867
 msgid ""
-"Selected source is read only, thus cannot create memo there. Select other "
-"source, please."
+"Selected memo list is read only, thus cannot create memo there. Select other "
+"memo list, please."
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
-#, c-format
-msgid "Cannot get source list. %s"
-msgstr ""
+#: ../plugins/mail-to-task/mail-to-task.c:1269
+#| msgid "Create a new appointment"
+msgid "Create an _Appointment"
+msgstr "Kreii novan _rendevuon"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1147
-msgid "No writable calendar is available."
-msgstr ""
-
-#: ../plugins/mail-to-task/mail-to-task.c:1239
-msgid "Create an _Event"
-msgstr "Krei _eventon"
-
-#: ../plugins/mail-to-task/mail-to-task.c:1241
+#: ../plugins/mail-to-task/mail-to-task.c:1271
 msgid "Create a new event from the selected message"
 msgstr "Krei novan eventon de la elektita mesaĝo"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1246
+#: ../plugins/mail-to-task/mail-to-task.c:1276
 msgid "Create a Mem_o"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:1248
+#: ../plugins/mail-to-task/mail-to-task.c:1278
 msgid "Create a new memo from the selected message"
 msgstr "Krei novan noton de la elektita mesaĝo"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1253
+#: ../plugins/mail-to-task/mail-to-task.c:1283
 msgid "Create a _Task"
 msgstr "Krei _taskon"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1255
+#: ../plugins/mail-to-task/mail-to-task.c:1285
 msgid "Create a new task from the selected message"
 msgstr "Krei novan taskon de la elektita mesaĝo"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1263
+#: ../plugins/mail-to-task/mail-to-task.c:1293
 msgid "Create a _Meeting"
 msgstr "Krei _kunsidon"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1265
+#: ../plugins/mail-to-task/mail-to-task.c:1295
 msgid "Create a new meeting from the selected message"
 msgstr "Krei novan kunsidon de la elektita mesaĝo"
 
@@ -18837,129 +22689,49 @@ msgstr "Krei novan kunsidon de la elektita mesaĝo"
 msgid "Convert a mail message to a task."
 msgstr ""
 
-#: ../plugins/mark-all-read/mark-all-read.c:42
-msgid "Also mark messages in subfolders?"
-msgstr ""
-
-#: ../plugins/mark-all-read/mark-all-read.c:44
-msgid ""
-"Do you want to mark messages as read in the current folder only, or in the "
-"current folder as well as all subfolders?"
-msgstr ""
-
-#: ../plugins/mark-all-read/mark-all-read.c:215
-msgid "In Current Folder and _Subfolders"
-msgstr ""
-
-#: ../plugins/mark-all-read/mark-all-read.c:229
-msgid "In Current _Folder Only"
-msgstr ""
-
-#: ../plugins/mark-all-read/mark-all-read.c:568
-msgid "Mark Me_ssages as Read"
-msgstr "Marki me_saĝojn kiel legite"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
-msgid "Mark All Read"
-msgstr "Marki ĉiujn legite"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark all messages in a folder as read."
-msgstr "Marki ĉiujn mesaĝojn en dosierujo kiel legite."
-
-#. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
-msgid "Plain Text Mode"
-msgstr ""
-
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
-msgid "Prefer Plain Text"
-msgstr ""
-
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
-msgid "View mail messages as plain text, even if they contain HTML content."
-msgstr ""
-
-#: ../plugins/prefer-plain/prefer-plain.c:250
-msgid "Show HTML if present"
-msgstr ""
-
-#: ../plugins/prefer-plain/prefer-plain.c:251
-msgid "Let Evolution choose the best part to show."
-msgstr ""
-
-#: ../plugins/prefer-plain/prefer-plain.c:254
-msgid "Show plain text if present"
-msgstr ""
-
-#: ../plugins/prefer-plain/prefer-plain.c:255
-msgid ""
-"Show plain text part, if present, otherwise let Evolution choose the best "
-"part to show."
-msgstr ""
-
-#: ../plugins/prefer-plain/prefer-plain.c:259
-msgid "Only ever show plain text"
-msgstr ""
-
-#: ../plugins/prefer-plain/prefer-plain.c:260
-msgid ""
-"Always show plain text part and make attachments from other parts, if "
-"requested."
-msgstr ""
-
-#: ../plugins/prefer-plain/prefer-plain.c:311
-msgid "Show s_uppressed HTML parts as attachments"
-msgstr ""
-
-#: ../plugins/prefer-plain/prefer-plain.c:331
-msgid "HTML _Mode"
-msgstr "HTML-_reĝomo"
-
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
-msgid "Import Outlook messages from PST file"
+msgid "Outlook PST import"
 msgstr ""
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
-msgid "Outlook PST import"
+msgid "Outlook personal folders (.pst)"
 msgstr ""
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
-msgid "Outlook personal folders (.pst)"
+msgid "Import Outlook messages from PST file"
 msgstr ""
 
-#: ../plugins/pst-import/pst-importer.c:542
+#: ../plugins/pst-import/pst-importer.c:526
 msgid "_Mail"
 msgstr "_Retpoŝto"
 
-#: ../plugins/pst-import/pst-importer.c:564
+#: ../plugins/pst-import/pst-importer.c:555
 msgid "Destination folder:"
 msgstr "Celdosierujo:"
 
-#: ../plugins/pst-import/pst-importer.c:572
+#: ../plugins/pst-import/pst-importer.c:565
 msgid "_Address Book"
 msgstr "_Adresaro"
 
-#: ../plugins/pst-import/pst-importer.c:577
+#: ../plugins/pst-import/pst-importer.c:570
 msgid "A_ppointments"
 msgstr "_Rendevuoj"
 
-#: ../plugins/pst-import/pst-importer.c:582 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:575 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "_Taskoj"
 
-#: ../plugins/pst-import/pst-importer.c:587
+#: ../plugins/pst-import/pst-importer.c:580
 msgid "_Journal entries"
 msgstr ""
 
-#: ../plugins/pst-import/pst-importer.c:698
+#: ../plugins/pst-import/pst-importer.c:697
 msgid "Importing Outlook data"
 msgstr ""
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+#: ../plugins/publish-calendar/publish-calendar.c:140
 #: ../plugins/publish-calendar/publish-calendar.c:147
-#: ../plugins/publish-calendar/publish-calendar.c:155
-#: ../plugins/publish-calendar/publish-calendar.c:157
 msgid "Calendar Publishing"
 msgstr ""
 
@@ -18971,234 +22743,231 @@ msgstr "Lokoj"
 msgid "Publish calendars to the web."
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:216
-#: ../plugins/publish-calendar/publish-calendar.c:463
+#: ../plugins/publish-calendar/publish-calendar.c:217
+#: ../plugins/publish-calendar/publish-calendar.c:484
 #, c-format
 msgid "Could not open %s:"
 msgstr "Ne eblis malfemi %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:218
-#, c-format
-msgid "Could not open %s: Unknown error"
-msgstr "Ne eblis malfemi %s: Nekonata eraro"
-
-#: ../plugins/publish-calendar/publish-calendar.c:238
+#: ../plugins/publish-calendar/publish-calendar.c:236
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:240
+#: ../plugins/publish-calendar/publish-calendar.c:242
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:284
+#: ../plugins/publish-calendar/publish-calendar.c:290
 #, c-format
 msgid "Mount of %s failed:"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:611
-#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+#: ../plugins/publish-calendar/publish-calendar.c:655
+#: ../plugins/publish-calendar/publish-calendar.ui.h:35
 msgid "E_nable"
 msgstr "E_nŝalti"
 
-#: ../plugins/publish-calendar/publish-calendar.c:759
+#: ../plugins/publish-calendar/publish-calendar.c:805
 msgid "Are you sure you want to remove this location?"
 msgstr "Ĉu vi certe volas forigi tiun lokon?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1091
+#: ../plugins/publish-calendar/publish-calendar.c:1144
 msgid "Could not create publish thread."
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:1099
+#: ../plugins/publish-calendar/publish-calendar.c:1154
 msgid "_Publish Calendar Information"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:2
-msgid "Custom Location"
-msgstr "Propra loko"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+msgid "iCal"
+msgstr ""
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:3
 msgid "Daily"
 msgstr "Ĉiutage"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:5
-msgid "FTP (with login)"
-msgstr "FTP (per ensaluto)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "Weekly"
+msgstr "Ĉiusemajne"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
 msgid "Manual (via Actions menu)"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:11
-msgid "P_ort:"
-msgstr "P_ordo:"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+msgid "Secure FTP (SFTP)"
+msgstr "Sekura FTP (SFTP)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+#: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Public FTP"
 msgstr "Publika FTP"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:13
-msgid "Publishing Location"
-msgstr ""
+#: ../plugins/publish-calendar/publish-calendar.ui.h:11
+msgid "FTP (with login)"
+msgstr "FTP (per ensaluto)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:14
-msgid "Publishing _Frequency:"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+msgid "Windows share"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:15
-msgid "Secure FTP (SFTP)"
-msgstr "Sekura FTP (SFTP)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:13
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV (HTTP)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+#: ../plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Secure WebDAV (HTTPS)"
 msgstr "Sekura WebDAV (HTTPS)"
 
+#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+msgid "Custom Location"
+msgstr "Propra loko"
+
 #: ../plugins/publish-calendar/publish-calendar.ui.h:17
-msgid "Service _type:"
-msgstr "Servo_tipo:"
+msgid "_Publish as:"
+msgstr ""
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:18
-msgid "Sources"
-msgstr "Fontoj"
+msgid "Publishing _Frequency:"
+msgstr ""
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
 msgstr ""
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:20
-msgid "WebDAV (HTTP)"
-msgstr "WebDAV (HTTP)"
-
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-msgid "Weekly"
-msgstr "Ĉiusemajne"
+msgid "Sources"
+msgstr "Fontoj"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:22
-msgid "Windows share"
-msgstr ""
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+msgid "Service _type:"
+msgstr "Servo_tipo:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_File:"
 msgstr "_Dosiero:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:25
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+msgid "P_ort:"
+msgstr "P_ordo:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:28
+msgid "_Username:"
+msgstr "_Uzantonomo:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
+#: ../smime/gui/certificate-manager.c:772
 msgid "_Password:"
 msgstr "_Pasvorto:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:26
-msgid "_Publish as:"
-msgstr ""
-
-#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
 msgid "_Remember password"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:29
-msgid "_Username:"
-msgstr "_Uzantonomo:"
-
 #: ../plugins/publish-calendar/publish-calendar.ui.h:31
-msgid "iCal"
+msgid "Publishing Location"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-format-fb.c:94
-#: ../plugins/publish-calendar/publish-format-ical.c:91
-#, c-format
-msgid "Could not publish calendar: Calendar backend no longer exists"
-msgstr ""
+#: ../plugins/publish-calendar/publish-format-fb.c:101
+#: ../plugins/publish-calendar/publish-format-ical.c:104
+#, fuzzy, c-format
+#| msgid "Invalid folder URI '%s'"
+msgid "Invalid source UID '%s'"
+msgstr "Nevalida dosierujo-adreso '%s'"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:518
+#: ../plugins/publish-calendar/url-editor-dialog.c:544
 msgid "New Location"
 msgstr "Nova loko"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:520
+#: ../plugins/publish-calendar/url-editor-dialog.c:546
 msgid "Edit Location"
 msgstr "Redakti lokon"
 
 #. Translators: the %F %T is the third argument for a
 #. * strftime function.  It lets you define the formatting
 #. * of the date in the csv-file.
-#: ../plugins/save-calendar/csv-format.c:168
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "UID"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Description List"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Categories List"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Comment List"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Contact List"
 msgstr "Kontaktlisto"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "Start"
 msgstr "Komenco"
 
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "End"
 msgstr "Fino"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "Due"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "percent Done"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/save-calendar/csv-format.c:388
 msgid "Attendees List"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:398
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "Modified"
 msgstr "Modifite"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:563
 msgid "A_dvanced options for the CSV format"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:571
 msgid "Prepend a _header"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:590
+#: ../plugins/save-calendar/csv-format.c:580
 msgid "_Value delimiter:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:601
+#: ../plugins/save-calendar/csv-format.c:591
 msgid "_Record delimiter:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:612
+#: ../plugins/save-calendar/csv-format.c:602
 msgid "_Encapsulate values with:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:638
+#: ../plugins/save-calendar/csv-format.c:628
 msgid "Comma separated values (.csv)"
 msgstr ""
 
-#: ../plugins/save-calendar/ical-format.c:173 ../shell/e-shell-utils.c:199
+#: ../plugins/save-calendar/ical-format.c:183 ../shell/e-shell-utils.c:177
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -19215,7 +22984,7 @@ msgstr ""
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:152
+#: ../plugins/save-calendar/rdf-format.c:147
 msgid "%FT%T"
 msgstr ""
 
@@ -19223,290 +22992,75 @@ msgstr ""
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:127
+#: ../plugins/save-calendar/save-calendar.c:119
 msgid "_Format:"
 msgstr "_Formo:"
 
-#: ../plugins/save-calendar/save-calendar.c:189
+#: ../plugins/save-calendar/save-calendar.c:184
 msgid "Select destination file"
 msgstr "Elekti celdosieron"
 
-#: ../plugins/save-calendar/save-calendar.c:344
+#: ../plugins/save-calendar/save-calendar.c:188
+#| msgid "_Save"
+msgid "_Save As"
+msgstr "Konservi _kiel"
+
+#: ../plugins/save-calendar/save-calendar.c:347
 msgid "Save the selected calendar to disk"
 msgstr "Konservi la elektitan kalendaron al disko"
 
-#: ../plugins/save-calendar/save-calendar.c:375
+#: ../plugins/save-calendar/save-calendar.c:378
 msgid "Save the selected memo list to disk"
 msgstr "Konversi la elektitan notoliston al datumportilo"
 
-#: ../plugins/save-calendar/save-calendar.c:406
+#: ../plugins/save-calendar/save-calendar.c:409
 msgid "Save the selected task list to disk"
 msgstr "Konservi la elektitan taskliston al disko"
 
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
 "$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
 "an email you are replying to."
 msgstr ""
 
-#: ../plugins/templates/templates.c:1099
+#: ../plugins/templates/templates.c:1245
 msgid "No Title"
 msgstr "Sen titolo"
 
-#: ../plugins/templates/templates.c:1211
+#: ../plugins/templates/templates.c:1354
 msgid "Save as _Template"
 msgstr "Konservi kiel ŝ_ablono"
 
-#: ../plugins/templates/templates.c:1213
+#: ../plugins/templates/templates.c:1356
 msgid "Save as Template"
 msgstr "Savu kiel ŝablono"
 
-#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
-msgstr ""
-
-#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-msgid "TNEF Decoder"
-msgstr ""
-
-#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
-msgid "Inline vCards"
-msgstr ""
-
-#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
-msgid "Show vCards directly in mail messages."
-msgstr ""
-
-#: ../plugins/vcard-inline/vcard-inline.c:208
-#: ../plugins/vcard-inline/vcard-inline.c:293
-msgid "Show Full vCard"
-msgstr ""
-
-#: ../plugins/vcard-inline/vcard-inline.c:211
-msgid "Show Compact vCard"
-msgstr ""
-
-#: ../plugins/vcard-inline/vcard-inline.c:272
-msgid "There is one other contact."
-msgstr ""
-
-#: ../plugins/vcard-inline/vcard-inline.c:281
-#, c-format
-msgid "There is %d other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "Estas %d alia kontakto."
-msgstr[1] "Estas %d aliaj kontaktoj."
-
-#: ../plugins/vcard-inline/vcard-inline.c:302
-msgid "Save in Address Book"
-msgstr "Konservi en adresaro"
-
-#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "Add WebDAV contacts to Evolution."
-msgstr ""
-
-#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
-msgid "WebDAV contacts"
-msgstr "WebDAV-kontaktoj"
-
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:283
-msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "Authenticate proxy server connections"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
-msgid "Automatic proxy configuration URL"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:5
-msgid "Default window X coordinate"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:6
-msgid "Default window Y coordinate"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:7
-msgid "Default window height"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:8
-msgid "Default window state"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:9
-msgid "Default window width"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:11
-msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:13
-msgid "HTTP proxy host name"
-msgstr "HTTP-prokura komputilnomo"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:14
-msgid "HTTP proxy password"
-msgstr "HTTP-prokura pasvorto"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:15
-msgid "HTTP proxy port"
-msgstr "HTTP-prokura pordo"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:16
-msgid "HTTP proxy username"
-msgstr "HTTP-prokura uzantonomo"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:18
-msgid ""
-"If true, then connections to the proxy server require authentication. The "
-"username is retrieved from the \"/apps/evolution/shell/network_config/"
-"authentication_user\" GConf key, and the password is retrieved from either "
-"gnome-keyring or the ~/.gnome2_private/Evolution password file."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:22
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:23
-msgid "Non-proxy hosts"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid "Password to pass as authentication when doing HTTP proxying."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:25
-msgid "Proxy configuration mode"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:26
-msgid "SOCKS proxy host name"
-msgstr "SOCKS-prokura komputilnomo"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:27
-msgid "SOCKS proxy port"
-msgstr "SOCKS-prokura pordo"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:28
-msgid "Secure HTTP proxy host name"
-msgstr "Sekura HTTP-prokura komputilnomo"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:29
-msgid "Secure HTTP proxy port"
-msgstr "Sekura HTTP-prokura pordo"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:30
-msgid ""
-"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
-"representing \"use system settings\", \"no proxy\", \"use manual proxy "
-"configuration\" and \"use proxy configuration provided in the autoconfig url"
-"\" respectively."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:36
-msgid "The default X coordinate for the main window."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid "The default Y coordinate for the main window."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:38
-msgid "The default height for the main window, in pixels."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:39
-msgid "The default width for the main window, in pixels."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:42
-msgid "The machine name to proxy HTTP through."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:43
-msgid "The machine name to proxy secure HTTP through."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:44
-msgid "The machine name to proxy socks through."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:45
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"http_host\" that you proxy through."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:46
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"secure_host\" that you proxy through."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:47
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"socks_host\" that you proxy through."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid ""
-"This key contains a list of hosts which are connected to directly, rather "
-"than via the proxy (if it is active). The values can be hostnames, domains "
-"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
-"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:51
-msgid "URL that provides proxy configuration values."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:52
-msgid "Use HTTP proxy"
-msgstr "Uzi HTTP-prokurilon"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:53
-msgid "Username to pass as authentication when doing HTTP proxying."
+#: ../shell/e-shell.c:337
+msgid "Preparing to go offline..."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "Whether or not the window should be maximized."
+#: ../shell/e-shell.c:390
+msgid "Preparing to go online..."
 msgstr ""
 
-#: ../shell/e-shell.c:312
-msgid "Preparing to go offline..."
+#: ../shell/e-shell.c:501
+msgid "Preparing to quit"
 msgstr ""
 
-#: ../shell/e-shell.c:365
-msgid "Preparing to go online..."
+#: ../shell/e-shell.c:507
+msgid "Preparing to quit..."
 msgstr ""
 
-#: ../shell/e-shell.c:435
-msgid "Preparing to quit..."
+#: ../shell/e-shell.c:915
+msgid "Credentials are required to connect to the destination host."
 msgstr ""
 
-#: ../shell/e-shell-content.c:727 ../shell/e-shell-content.c:728
+#: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
 msgid "Searches"
 msgstr "Serĉoj"
 
-#: ../shell/e-shell-content.c:771
+#: ../shell/e-shell-content.c:764
 msgid "Save Search"
 msgstr "Konservi serĉon"
 
@@ -19514,339 +23068,340 @@ msgstr "Konservi serĉon"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:940
+#: ../shell/e-shell-searchbar.c:930
 msgid "Sho_w:"
 msgstr "_Montri:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:973
+#: ../shell/e-shell-searchbar.c:955
 msgid "Sear_ch:"
 msgstr "_Serĉi:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1036
+#: ../shell/e-shell-searchbar.c:1023
 msgid "i_n"
 msgstr "e_n"
 
-#: ../shell/e-shell-utils.c:197
+#: ../shell/e-shell-utils.c:174
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:220
+#: ../shell/e-shell-utils.c:198
 msgid "All Files (*)"
 msgstr "Ĉiuj dosieroj (*)"
 
-#: ../shell/e-shell-view.c:303
+#: ../shell/e-shell-view.c:292
 msgid "Saving user interface state"
 msgstr ""
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:645
+#: ../shell/e-shell-window-actions.c:72
 msgid "translator-credits"
 msgstr ""
-"Launchpad Contributions:\n"
-"  Aisano https://launchpad.net/~info-ais-sanmarino\n";
-"  Eliovir https://launchpad.net/~eliovir\n";
-"  Kim Ribeiro https://launchpad.net/~kimribeiro\n";
-"  Kristjan SCHMIDT https://launchpad.net/~kristjan-eo\n";
-"  Leo Arias https://launchpad.net/~elopio\n";
-"  Michael Moroni https://launchpad.net/~airon90\n";
-"  Patrick (Petriko) Oudejans https://launchpad.net/~patrickoudejans\n";
-"  Serge Leblanc https://launchpad.net/~serge-leblanc\n";
-"  Simon Tite https://launchpad.net/~simontite\n";
-"  Yekrats https://launchpad.net/~yekrats-gmail\n";
-"  chops https://launchpad.net/~chopssmith-googlemail\n";
-"  maku https://launchpad.net/~markus-niemisto\n";
-"  trio https://launchpad.net/~trio-esperanto";
-
-#: ../shell/e-shell-window-actions.c:656
+"Aisano, Eliovir, Kim RIBEIRO, Leo Arias, Michael MORONI, Patrick (Petriko) "
+"Oudejans, Serge LEBLANC, Simon TITE, Yekrats, chops, maku, trio, Kristjan "
+"SCHMIDT, Daniel PUENTES"
+
+#: ../shell/e-shell-window-actions.c:83
 msgid "Evolution Website"
 msgstr "Retpaĝaro de Evolucio"
 
-#: ../shell/e-shell-window-actions.c:914
+#: ../shell/e-shell-window-actions.c:339
 msgid "Categories Editor"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1249
+#: ../shell/e-shell-window-actions.c:715
 msgid "Bug Buddy is not installed."
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1251
+#: ../shell/e-shell-window-actions.c:716
 msgid "Bug Buddy could not be run."
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1432
+#: ../shell/e-shell-window-actions.c:894
+msgid "_About"
+msgstr ""
+
+#: ../shell/e-shell-window-actions.c:896
 msgid "Show information about Evolution"
 msgstr "Montri informojn pri Evolucio"
 
-#: ../shell/e-shell-window-actions.c:1437
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:901 ../shell/e-shell-window-actions.c:915
 msgid "_Close Window"
 msgstr "_Fermi fenestron"
 
-#: ../shell/e-shell-window-actions.c:1458
+#: ../shell/e-shell-window-actions.c:922
 msgid "_Contents"
 msgstr "_Enhavoj"
 
-#: ../shell/e-shell-window-actions.c:1460
+#: ../shell/e-shell-window-actions.c:924
 msgid "Open the Evolution User Guide"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1486
-msgid "_Forget Passwords"
-msgstr "_Forgesigi pasvortojn"
-
-#: ../shell/e-shell-window-actions.c:1488
-msgid "Forget all remembered passwords"
-msgstr "Forgesigi ĉiujn pasvortojn"
-
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:950
 msgid "I_mport..."
 msgstr "I_mporto..."
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:952
 msgid "Import data from other programs"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:957
 msgid "New _Window"
 msgstr "Nova _fenestro"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:959
 msgid "Create a new window displaying this view"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:971
 msgid "Available Cate_gories"
 msgstr "Disponeblaj kate_gorioj"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:973
 msgid "Manage available categories"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:985
 msgid "_Quick Reference"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:987
 msgid "Show Evolution's shortcut keys"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:992
+#| msgid "Quit"
+msgid "_Quit"
+msgstr "Ĉ_esi"
+
+#: ../shell/e-shell-window-actions.c:994
 msgid "Exit the program"
 msgstr "Eliri de la programon"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:999
 msgid "_Advanced Search..."
 msgstr "_Detala serĉo..."
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1001
 msgid "Construct a more advanced search"
 msgstr "Krei pli specialan serĉon"
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1008
 msgid "Clear the current search parameters"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1556
+#: ../shell/e-shell-window-actions.c:1013
 msgid "_Edit Saved Searches..."
 msgstr "_Redakti konservitajn serĉojn..."
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1015
 msgid "Manage your saved searches"
 msgstr "Administri viajn konservitajn serĉojn"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1022
 msgid "Click here to change the search type"
 msgstr "Klaku ĉi tie por ŝanĝi la serĉtipon"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1027
 msgid "_Find Now"
 msgstr "_Serĉi nun"
 
-#. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1029
 msgid "Execute the current search parameters"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1577
+#: ../shell/e-shell-window-actions.c:1034
 msgid "_Save Search..."
 msgstr "_Konservi serĉon..."
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1036
 msgid "Save the current search parameters"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1048
 msgid "Submit _Bug Report..."
-msgstr "Transsendi __cimraporton..."
+msgstr "Transsendi _cimraporton..."
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1050
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Transsendi cimraporton per Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1055
 msgid "_Work Offline"
 msgstr "Labori _senkonekte"
 
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1057
 msgid "Put Evolution into offline mode"
 msgstr "Ŝalti Evolucion al nekonektita reĝimo"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1062
 msgid "_Work Online"
 msgstr "_Labori konektite"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1064
 msgid "Put Evolution into online mode"
 msgstr "Ŝalti Evolucion al konektita reĝimo"
 
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1092
 msgid "Lay_out"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1642
+#. Translators: This is a New menu item caption, under File->New
+#: ../shell/e-shell-window-actions.c:1100
 msgid "_New"
 msgstr "_Nova"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1107
 msgid "_Search"
 msgstr "_Serĉi"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1114
 msgid "_Switcher Appearance"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1670
+#: ../shell/e-shell-window-actions.c:1128
 msgid "_Window"
 msgstr "_Fenestro"
 
-#: ../shell/e-shell-window-actions.c:1699
+#: ../shell/e-shell-window-actions.c:1157
 msgid "Show Side _Bar"
 msgstr "Montri flankan _breton"
 
-#: ../shell/e-shell-window-actions.c:1701
+#: ../shell/e-shell-window-actions.c:1159
 msgid "Show the side bar"
 msgstr "Montri la flankan breton"
 
-#: ../shell/e-shell-window-actions.c:1707
+#: ../shell/e-shell-window-actions.c:1165
 msgid "Show _Buttons"
 msgstr "Montri _butonojn"
 
-#: ../shell/e-shell-window-actions.c:1709
+#: ../shell/e-shell-window-actions.c:1167
 msgid "Show the switcher buttons"
 msgstr "Montri la ŝaltbutonojn"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1173
 msgid "Show _Status Bar"
 msgstr "Montri _statbreton"
 
-#: ../shell/e-shell-window-actions.c:1717
+#: ../shell/e-shell-window-actions.c:1175
 msgid "Show the status bar"
 msgstr "Montri la statbreton"
 
-#: ../shell/e-shell-window-actions.c:1723
+#: ../shell/e-shell-window-actions.c:1181
 msgid "Show _Tool Bar"
 msgstr "Montri _ilobreton"
 
-#: ../shell/e-shell-window-actions.c:1725
+#: ../shell/e-shell-window-actions.c:1183
 msgid "Show the tool bar"
 msgstr "Montri la ilobreton"
 
-#: ../shell/e-shell-window-actions.c:1747
+#: ../shell/e-shell-window-actions.c:1205
 msgid "_Icons Only"
 msgstr "Nur _bildsimboloj"
 
-#: ../shell/e-shell-window-actions.c:1749
+#: ../shell/e-shell-window-actions.c:1207
 msgid "Display window buttons with icons only"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1212
 msgid "_Text Only"
 msgstr "Nur _teksto"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1214
 msgid "Display window buttons with text only"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1219
 msgid "Icons _and Text"
 msgstr "Bildsimboloj _kaj tekto"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1221
 msgid "Display window buttons with icons and text"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1226
 msgid "Tool_bar Style"
 msgstr "Ilo_bret-stilo"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1778
-msgid "Define Views..."
-msgstr ""
-
-#: ../shell/e-shell-window-actions.c:1780
-msgid "Create or edit views"
-msgstr ""
+#: ../shell/e-shell-window-actions.c:1236
+#, fuzzy
+#| msgid "Save Current View"
+msgid "Delete Current View"
+msgstr "Konservi aktualan vidon"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1243
 msgid "Save Custom View..."
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1245
 msgid "Save current custom view"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1252
 msgid "C_urrent View"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1804
+#: ../shell/e-shell-window-actions.c:1262
 msgid "Custom View"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1806
+#: ../shell/e-shell-window-actions.c:1264
 msgid "Current view is a customized view"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1816
+#: ../shell/e-shell-window-actions.c:1272
+msgid "Page Set_up..."
+msgstr ""
+
+#: ../shell/e-shell-window-actions.c:1274
 msgid "Change the page settings for your current printer"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:2206
+#: ../shell/e-shell-window-actions.c:1635
 #, c-format
 msgid "Switch to %s"
 msgstr "Ŝanĝi al %s"
 
-#: ../shell/e-shell-window-actions.c:2326
+#: ../shell/e-shell-window-actions.c:1758
 #, c-format
 msgid "Select view: %s"
 msgstr "Elekti vidon: %s"
 
-#: ../shell/e-shell-window-actions.c:2426
+#: ../shell/e-shell-window-actions.c:1775
+#, fuzzy, c-format
+#| msgid "Select view: %s"
+msgid "Delete view: %s"
+msgstr "Elekti vidon: %s"
+
+#: ../shell/e-shell-window-actions.c:1869
 msgid "Execute these search parameters"
 msgstr ""
 
-#: ../shell/e-shell-window.c:445
+#. Translators: a 'New' toolbar button caption which is context sensitive and
+#. runs one of the actions under File->New menu
+#: ../shell/e-shell-window.c:505
+#| msgid "New"
+msgctxt "toolbar-button"
 msgid "New"
 msgstr "Nova"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:577
+#: ../shell/e-shell-window-private.c:579
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolucio"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:189
+#: ../shell/main.c:183
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19866,7 +23421,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: ../shell/main.c:213
+#: ../shell/main.c:207
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19874,204 +23429,164 @@ msgstr ""
 "Dankon\n"
 "La Evolucio-teamo\n"
 
-#: ../shell/main.c:220
+#: ../shell/main.c:213
 msgid "Do not tell me again"
 msgstr ""
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:311
+#: ../shell/main.c:302
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 msgstr ""
 
-#: ../shell/main.c:315
+#: ../shell/main.c:306
 msgid "Apply the given geometry to the main window"
 msgstr ""
 
-#: ../shell/main.c:319
+#: ../shell/main.c:310
 msgid "Start in online mode"
 msgstr ""
 
-#: ../shell/main.c:321
+#: ../shell/main.c:312
 msgid "Ignore network availability"
 msgstr ""
 
-#: ../shell/main.c:323
-msgid "Start in \"express\" mode"
-msgstr ""
-
-#: ../shell/main.c:326
+#: ../shell/main.c:315
 msgid "Forcibly shut down Evolution"
 msgstr ""
 
-#: ../shell/main.c:329
-msgid "Send the debugging output of all components to a file."
-msgstr ""
-
-#: ../shell/main.c:331
+#: ../shell/main.c:318
 msgid "Disable loading of any plugins."
 msgstr ""
 
-#: ../shell/main.c:333
+#: ../shell/main.c:320
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr ""
 
-#: ../shell/main.c:337
-msgid "Import URIs or file names given as rest of arguments."
+#: ../shell/main.c:324
+msgid "Import URIs or filenames given as rest of arguments."
 msgstr ""
 
-#: ../shell/main.c:339
+#: ../shell/main.c:326
 msgid "Request a running Evolution process to quit"
 msgstr ""
 
-#: ../shell/main.c:510 ../shell/main.c:518
+#: ../shell/main.c:403
+#, c-format
+msgid ""
+"Cannot start Evolution.  Another Evolution instance may be unresponsive. "
+"System error: %s"
+msgstr ""
+
+#: ../shell/main.c:457 ../shell/main.c:462
 msgid "- The Evolution PIM and Email Client"
 msgstr ""
 
-#: ../shell/main.c:583
+#: ../shell/main.c:520
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
 msgstr ""
 
-#: ../shell/main.c:589
+#: ../shell/main.c:526
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:1
-msgid "Are you sure you want to forget all remembered passwords?"
-msgstr ""
-
 #: ../shell/shell.error.xml.h:2
-msgid "Cannot upgrade directly from version {0}"
+msgid "Upgrade from previous version failed:"
 msgstr ""
 
 #: ../shell/shell.error.xml.h:3
-msgid "Continue Anyway"
-msgstr ""
-
-#: ../shell/shell.error.xml.h:4
 msgid ""
-"Evolution no longer supports upgrading directly from version {0}. However as "
-"a workaround you might try first upgrading to Evolution 2, and then "
-"upgrading to Evolution 3."
+"{0}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:5
-msgid ""
-"Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed."
+#: ../shell/shell.error.xml.h:7
+msgid "Continue Anyway"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:8
 msgid "Quit Now"
 msgstr "Ĉesi nun"
 
-#: ../shell/shell.error.xml.h:8
-msgid "Upgrade from previous version failed:"
-msgstr ""
-
 #: ../shell/shell.error.xml.h:9
-msgid "_Forget"
-msgstr "_Forgesi"
+msgid "Cannot upgrade directly from version {0}"
+msgstr ""
 
 #: ../shell/shell.error.xml.h:10
 msgid ""
-"{0}\n"
-"\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
 msgstr ""
 
-#: ../shell/test/e-test-shell-backend.c:52
-msgctxt "New"
-msgid "_Test Item"
+#: ../shell/shell.error.xml.h:11
+msgid "Close Evolution with pending background operations?"
 msgstr ""
 
-#: ../shell/test/e-test-shell-backend.c:54
-msgid "Create a new test item"
+#: ../shell/shell.error.xml.h:12
+msgid ""
+"Evolution is taking a long time to shut down, possibly due to network "
+"connectivity issues. Would you like to cancel all pending operations and "
+"close immediately, or keep waiting?"
 msgstr ""
 
-#: ../shell/test/e-test-shell-backend.c:62
-msgctxt "New"
-msgid "Test _Source"
+#: ../shell/shell.error.xml.h:13
+msgid "_Close Immediately"
 msgstr ""
 
-#: ../shell/test/e-test-shell-backend.c:64
-msgid "Create a new test source"
+#: ../shell/shell.error.xml.h:14
+#| msgid "Waiting..."
+msgid "Keep _Waiting"
 msgstr ""
 
-#: ../smclient/eggdesktopfile.c:166
-#, c-format
-msgid "File is not a valid .desktop file"
-msgstr "Dosiero ne estas valida .desktop-dosiero"
-
-#: ../smclient/eggdesktopfile.c:189
-#, c-format
-msgid "Unrecognized desktop file Version '%s'"
-msgstr "Nerekonata versio '%s' de labortabla dosiero"
-
-#: ../smclient/eggdesktopfile.c:959
-#, c-format
-msgid "Starting %s"
-msgstr "Lanĉante %s"
-
-#: ../smclient/eggdesktopfile.c:1102
-#, c-format
-msgid "Application does not accept documents on command line"
-msgstr "Aplikaĵo ne akceptas dokumentojn per komandlinio"
-
-#: ../smclient/eggdesktopfile.c:1170
-#, c-format
-msgid "Unrecognized launch option: %d"
-msgstr "Nerekonata lanĉparametro: %d"
-
-#: ../smclient/eggdesktopfile.c:1370
-#, c-format
-msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+#: ../shell/shell.error.xml.h:15
+msgid "Failed to get values from '{0}'"
 msgstr ""
-"Ne eblas transdoni URI-ojn de dokumentoj al labortabla elemento 'Type=Link'"
 
-#: ../smclient/eggdesktopfile.c:1391
-#, c-format
-msgid "Not a launchable item"
-msgstr "Nelanĉebla ero"
-
-#: ../smclient/eggsmclient.c:226
-msgid "Disable connection to session manager"
-msgstr "Elŝalti la konekton al la seancoadministrilo"
+#: ../shell/shell.error.xml.h:16
+#, fuzzy
+#| msgid "Failed to authenticate with LDAP server."
+msgid "Failed to invoke authenticate for '{0}'"
+msgstr "Aŭtentigo al servilo malsukcesis '{0}'"
 
-#: ../smclient/eggsmclient.c:229
-msgid "Specify file containing saved configuration"
-msgstr "Specifi dosieron kiu enhavas konservitan agordon"
+#: ../shell/shell.error.xml.h:17
+msgid "Failed to connect to '{0}'"
+msgstr "Malsukcesis konekti al '{0}'"
 
-#: ../smclient/eggsmclient.c:229
-msgid "FILE"
-msgstr "DOSIERO"
+#: ../shell/shell.error.xml.h:18
+#| msgid "_Recover"
+msgid "_Reconnect"
+msgstr "_Rekonekti"
 
-#: ../smclient/eggsmclient.c:232
-msgid "Specify session management ID"
-msgstr "Specifi identigilon de la seancoadministrilo"
+#: ../shell/shell.error.xml.h:19
+msgid "Failed to prompt for credentials for '{0}'"
+msgstr ""
 
-#: ../smclient/eggsmclient.c:232
-msgid "ID"
-msgstr "ID"
+#: ../shell/shell.error.xml.h:20
+#, fuzzy
+#| msgid "Failed to unsubscribe from folder."
+msgid "Failed to finish trust prompt for '{0}'"
+msgstr "Malsukcesis fini de dosierujo '{0}'"
 
-#: ../smclient/eggsmclient.c:253
-msgid "Session management options:"
-msgstr "Agordoj de la seancoadministrilo:"
+#: ../shell/shell.error.xml.h:21
+msgid "SSL certificate for '{0}' is not trusted."
+msgstr ""
 
-#: ../smclient/eggsmclient.c:254
-msgid "Show session management options"
-msgstr "Montri agordojn de la seancoadministrilo"
+#: ../shell/shell.error.xml.h:22
+msgid "Reason: {1}"
+msgstr ""
 
-#: ../smime/gui/ca-trust-dialog.c:107
+#: ../smime/gui/ca-trust-dialog.c:106
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20079,540 +23594,499 @@ msgid ""
 "Edit trust settings:"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
-#: ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:123
 msgid "Certificate Name"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+#: ../smime/gui/certificate-manager.c:85
+#: ../smime/gui/certificate-manager.c:105
 msgid "Issued To Organization"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
+#: ../smime/gui/certificate-manager.c:86
+#: ../smime/gui/certificate-manager.c:106
 msgid "Issued To Organizational Unit"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
-#: ../smime/gui/certificate-manager.c:114 ../smime/gui/smime-ui.ui.h:32
-#: ../smime/lib/e-cert.c:565
+#: ../smime/gui/certificate-manager.c:87
+#: ../smime/gui/certificate-manager.c:107
+#: ../smime/gui/certificate-manager.c:125
 msgid "Serial Number"
 msgstr "Seria numero"
 
-#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
-#: ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:88
+#: ../smime/gui/certificate-manager.c:108
+#: ../smime/gui/certificate-manager.c:126
 msgid "Purposes"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
-#: ../smime/gui/certificate-manager.c:116 ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/certificate-manager.c:89
+#: ../smime/gui/certificate-manager.c:109
+#: ../smime/gui/certificate-manager.c:127
 msgid "Issued By"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
-#: ../smime/gui/certificate-manager.c:117
+#: ../smime/gui/certificate-manager.c:90
+#: ../smime/gui/certificate-manager.c:110
+#: ../smime/gui/certificate-manager.c:128
 msgid "Issued By Organization"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:80
-#: ../smime/gui/certificate-manager.c:100
-#: ../smime/gui/certificate-manager.c:118
+#: ../smime/gui/certificate-manager.c:91
+#: ../smime/gui/certificate-manager.c:111
+#: ../smime/gui/certificate-manager.c:129
 msgid "Issued By Organizational Unit"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
-#: ../smime/gui/certificate-manager.c:119
+#: ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:130
 msgid "Issued"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
-#: ../smime/gui/certificate-manager.c:120
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:131
 msgid "Expires"
 msgstr "Senvalidiĝo"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121 ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/certificate-manager.c:94
+#: ../smime/gui/certificate-manager.c:114
+#: ../smime/gui/certificate-manager.c:132
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122 ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/certificate-manager.c:95
+#: ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:133
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:93
-#: ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:124
 msgid "Email Address"
 msgstr "Retpoŝtadreso"
 
-#: ../smime/gui/certificate-manager.c:575
-msgid "Select a certificate to import..."
+#: ../smime/gui/certificate-manager.c:650
+msgid "Select a file to backup your key and certificate..."
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:588
+#. To Translators:
+#. * %s-backup.p12 is the default file name suggested by the file selection dialog,
+#. * when a user wants to backup one of her/his private keys/certificates.
+#. * For example: gnomedev-backup.p12
+#.
+#: ../smime/gui/certificate-manager.c:662
+#, c-format
+msgid "%s-backup.p12"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:676
+#: ../smime/gui/certificate-manager.c:965
 msgid "All files"
 msgstr "Ĉiuj dosieroj"
 
-#: ../smime/gui/certificate-manager.c:623
-msgid "Failed to import certificate"
-msgstr ""
-
-#: ../smime/gui/certificate-manager.c:992
-msgid "All PKCS12 files"
-msgstr ""
+#: ../smime/gui/certificate-manager.c:728
+#, fuzzy
+#| msgid "Certificate"
+msgid "Backup Certificate"
+msgstr "Atestilo"
 
-#: ../smime/gui/certificate-manager.c:1009
-msgid "All email certificate files"
-msgstr ""
+#. filename selection
+#: ../smime/gui/certificate-manager.c:742
+#| msgid "_Filename:"
+msgid "_File name:"
+msgstr "_Dosiernomo:"
 
-#: ../smime/gui/certificate-manager.c:1026
-msgid "All CA certificate files"
-msgstr ""
+#. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
+#: ../smime/gui/certificate-manager.c:747
+#| msgid "Please select a folder"
+msgid "Please select a file..."
+msgstr "Bonvole elektu dosierujon..."
 
-#: ../smime/gui/certificate-viewer.c:345
-#, c-format
-msgid "Certificate Viewer: %s"
+#: ../smime/gui/certificate-manager.c:761
+msgid "_Include certificate chain in the backup"
 msgstr ""
 
-#: ../smime/gui/cert-trust-dialog.c:146
+#. To Translators: this text was copied from Firefox
+#: ../smime/gui/certificate-manager.c:767
 msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
+"The certificate backup password you set here protects the backup file that "
+"you are about to create.\n"
+"You must set this password to proceed with the backup."
 msgstr ""
 
-#: ../smime/gui/cert-trust-dialog.c:150
-msgid ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
-msgstr ""
+#: ../smime/gui/certificate-manager.c:786
+#| msgid "_Password:"
+msgid "_Repeat Password:"
+msgstr "_Ripeti pasvorton:"
 
-#: ../smime/gui/component.c:50
-#, c-format
-msgid "Enter the password for '%s'"
-msgstr "Enigu la pasvorton por '%s'"
-
-#. we're setting the password initially
-#: ../smime/gui/component.c:76
-msgid "Enter new password for certificate database"
+#: ../smime/gui/certificate-manager.c:805
+msgid "Passwords do not match"
 msgstr ""
 
-#: ../smime/gui/component.c:79
-msgid "Enter new password"
-msgstr "Enigu novan pasvorton"
-
-#. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:118
-#, c-format
-msgid ""
-"Issued to:\n"
-"  Subject: %s\n"
-msgstr ""
-
-#: ../smime/gui/e-cert-selector.c:119
-#, c-format
+#. To Translators: this text was copied from Firefox
+#: ../smime/gui/certificate-manager.c:813
 msgid ""
-"Issued by:\n"
-"  Subject: %s\n"
-msgstr ""
-
-#: ../smime/gui/e-cert-selector.c:172
-msgid "Select certificate"
-msgstr ""
-
-#: ../smime/gui/smime-ui.ui.h:1
-msgid "<Not Part of Certificate>"
+"Important:\n"
+"If you forget your certificate backup password, you will not be able to "
+"restore this backup later.\n"
+"Please record it in a safe location."
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:2
-msgid "Authorities"
+#: ../smime/gui/certificate-manager.c:858
+msgid "No file name provided"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup _All"
+#: ../smime/gui/certificate-manager.c:862
+msgid "Failed to backup key and certificate"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:4
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
+#: ../smime/gui/certificate-manager.c:951
+msgid "Select a certificate to import..."
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1093
-msgid "Certificate"
-msgstr "Atestilo"
-
-#: ../smime/gui/smime-ui.ui.h:6
-msgid "Certificate Authority Trust"
+#: ../smime/gui/certificate-manager.c:1001
+msgid "Failed to import certificate"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:7
-msgid "Certificate Fields"
+#: ../smime/gui/certificate-manager.c:1117
+msgctxt "CamelTrust"
+msgid "Ask when used"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:8
-msgid "Certificate Hierarchy"
-msgstr ""
+#: ../smime/gui/certificate-manager.c:1119
+#| msgid "Never"
+msgctxt "CamelTrust"
+msgid "Never"
+msgstr "Neniam"
 
-#: ../smime/gui/smime-ui.ui.h:9
-msgid "Certificate details"
+#: ../smime/gui/certificate-manager.c:1121
+msgctxt "CamelTrust"
+msgid "Marginal"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:10
-msgid "Certificates Table"
+#: ../smime/gui/certificate-manager.c:1123
+msgctxt "CamelTrust"
+msgid "Fully"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:11
-msgid "Common Name (CN)"
+#: ../smime/gui/certificate-manager.c:1125
+msgctxt "CamelTrust"
+msgid "Ultimate"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:12
-msgid "Contact Certificates"
+#: ../smime/gui/certificate-manager.c:1127
+msgctxt "CamelTrust"
+msgid "Temporary"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:14
-msgid "Do not trust the authenticity of this certificate"
-msgstr ""
+#: ../smime/gui/certificate-manager.c:1333
+#, fuzzy
+#| msgid "Certificates"
+msgid "Change certificate trust"
+msgstr "Atestiloj"
 
-#: ../smime/gui/smime-ui.ui.h:15
-msgid "Email Certificate Trust Settings"
+#: ../smime/gui/certificate-manager.c:1345
+#, c-format
+msgid "Change trust for the host '%s':"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Email Recipient Certificate"
+#: ../smime/gui/certificate-manager.c:1369
+msgctxt "CamelTrust"
+msgid "_Ask when used"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:17
-msgid "Email Signer Certificate"
+#: ../smime/gui/certificate-manager.c:1370
+msgctxt "CamelTrust"
+msgid "_Temporary (this session only)"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:18
-msgid "Expires On"
-msgstr ""
+#: ../smime/gui/certificate-manager.c:1371
+#| msgid "Never"
+msgctxt "CamelTrust"
+msgid "_Never"
+msgstr "_Neniam"
 
-#: ../smime/gui/smime-ui.ui.h:19
-msgid "Field Value"
+#: ../smime/gui/certificate-manager.c:1372
+msgctxt "CamelTrust"
+msgid "_Marginal"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:20
-msgid "Fingerprints"
-msgstr "Fingropremoj"
+#: ../smime/gui/certificate-manager.c:1373
+#| msgid "_Full name"
+msgctxt "CamelTrust"
+msgid "_Fully"
+msgstr "_Tute"
 
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Issued On"
+#: ../smime/gui/certificate-manager.c:1374
+msgctxt "CamelTrust"
+msgid "_Ultimate"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:25
-msgid "Issued To"
+#: ../smime/gui/certificate-manager.c:1378
+msgid ""
+"Before trusting this site, you should examine its certificate and its policy "
+"and procedures (if available)."
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:27
-msgid "Organization (O)"
-msgstr ""
+#: ../smime/gui/certificate-manager.c:1393
+#| msgid "_View Certificate"
+msgid "_Display certificate"
+msgstr "_Montri ateston"
 
-#: ../smime/gui/smime-ui.ui.h:28
-msgid "Organizational Unit (OU)"
+#: ../smime/gui/certificate-manager.c:1598
+msgid "You have certificates on file that identify these mail servers:"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:825
-msgid "SSL Client Certificate"
-msgstr ""
+#: ../smime/gui/certificate-manager.c:1629
+#| msgid "_List name:"
+msgid "Host name"
+msgstr "Aparatnomo"
 
-#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:829
-msgid "SSL Server Certificate"
+#: ../smime/gui/certificate-manager.c:1631
+msgid "Issuer"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:33
-msgid "This certificate has been verified for the following uses:"
-msgstr ""
+#: ../smime/gui/certificate-manager.c:1632
+#| msgid "Fingerprints"
+msgid "Fingerprint"
+msgstr "Fingropremaĵo"
 
-#: ../smime/gui/smime-ui.ui.h:34
-msgid "Trust the authenticity of this certificate"
+#: ../smime/gui/certificate-manager.c:1633
+msgid "Trust"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:35
-msgid "Trust this CA to identify _email users."
-msgstr ""
+#: ../smime/gui/certificate-manager.c:1654
+#, fuzzy
+#| msgid "_Edit Full"
+msgid "_Edit Trust"
+msgstr "R_edakti plene"
 
-#: ../smime/gui/smime-ui.ui.h:36
-msgid "Trust this CA to identify _software developers."
+#: ../smime/gui/certificate-manager.c:1973
+msgid "All PKCS12 files"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:37
-msgid "Trust this CA to identify _websites."
+#: ../smime/gui/certificate-manager.c:1990
+msgid "All email certificate files"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:38
-msgid "Validity"
-msgstr "Valideco"
-
-#: ../smime/gui/smime-ui.ui.h:39
-msgid "You have certificates from these organizations that identify you:"
+#: ../smime/gui/certificate-manager.c:2007
+msgid "All CA certificate files"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/cert-trust-dialog.c:152
 msgid ""
-"You have certificates on file that identify these certificate authorities:"
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:41
-msgid "You have certificates on file that identify these people:"
+#: ../smime/gui/cert-trust-dialog.c:157
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:42
-msgid "Your Certificates"
-msgstr "Viaj atestiloj"
+#: ../smime/gui/component.c:55
+#, fuzzy, c-format
+#| msgid "Enter the password for '%s'"
+msgid "Enter the password for '%s', token '%s'"
+msgstr "Enigu la pasvorton por '%s', '%s'"
 
-#. This is a verb, as in "make a backup".
-#: ../smime/gui/smime-ui.ui.h:44
-msgid "_Backup"
-msgstr "_Sekurkopio"
-
-#: ../smime/gui/smime-ui.ui.h:45
-msgid "_Edit CA Trust"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:226 ../smime/lib/e-cert.c:236
-msgid "%d/%m/%Y"
-msgstr "%Y-%m-%d"
+#: ../smime/gui/component.c:57
+#, c-format
+msgid "Enter the password for '%s'"
+msgstr "Enigu la pasvorton por '%s'"
 
-#. x509 certificate usage types
-#: ../smime/lib/e-cert.c:413
-msgid "Sign"
+#. we're setting the password initially
+#: ../smime/gui/component.c:85
+msgid "Enter new password for certificate database"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:414
-msgid "Encrypt"
-msgstr "Ĉifradi"
-
-#: ../smime/lib/e-cert.c:526
-msgid "Version"
-msgstr "Versio"
-
-#: ../smime/lib/e-cert.c:541
-msgid "Version 1"
-msgstr "Versio 1"
-
-#: ../smime/lib/e-cert.c:544
-msgid "Version 2"
-msgstr "Versio 2"
-
-#: ../smime/lib/e-cert.c:547
-msgid "Version 3"
-msgstr "Versio 3"
+#: ../smime/gui/component.c:88
+msgid "Enter new password"
+msgstr "Enigu novan pasvorton"
 
-#: ../smime/lib/e-cert.c:630
-msgid "PKCS #1 MD2 With RSA Encryption"
+#: ../smime/gui/e-cert-selector.c:180
+msgid "Select certificate"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:633
-msgid "PKCS #1 MD5 With RSA Encryption"
+#: ../smime/gui/smime-ui.ui.h:3
+msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:636
-msgid "PKCS #1 SHA-1 With RSA Encryption"
+#: ../smime/gui/smime-ui.ui.h:4
+msgid "Certificates Table"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:639
-msgid "PKCS #1 SHA-256 With RSA Encryption"
-msgstr ""
+#. This is a verb, as in "make a backup".
+#: ../smime/gui/smime-ui.ui.h:7
+msgid "_Backup"
+msgstr "_Sekurkopio"
 
-#: ../smime/lib/e-cert.c:642
-msgid "PKCS #1 SHA-384 With RSA Encryption"
+#: ../smime/gui/smime-ui.ui.h:8
+msgid "Backup _All"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:645
-msgid "PKCS #1 SHA-512 With RSA Encryption"
-msgstr ""
+#: ../smime/gui/smime-ui.ui.h:11
+msgid "Your Certificates"
+msgstr "Viaj atestiloj"
 
-#: ../smime/lib/e-cert.c:672
-msgid "PKCS #1 RSA Encryption"
+#: ../smime/gui/smime-ui.ui.h:12
+msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:675
-msgid "Certificate Key Usage"
+#: ../smime/gui/smime-ui.ui.h:14
+msgid "Contact Certificates"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:678
-msgid "Netscape Certificate Type"
+#: ../smime/gui/smime-ui.ui.h:15
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:681
-msgid "Certificate Authority Key Identifier"
+#: ../smime/gui/smime-ui.ui.h:16
+msgid "Authorities"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:693
-#, c-format
-msgid "Object Identifier (%s)"
+#: ../smime/gui/smime-ui.ui.h:17
+msgid "Certificate Authority Trust"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:745
-msgid "Algorithm Identifier"
+#: ../smime/gui/smime-ui.ui.h:18
+msgid "Trust this CA to identify _websites."
 msgstr ""
 
-#: ../smime/lib/e-cert.c:753
-msgid "Algorithm Parameters"
+#: ../smime/gui/smime-ui.ui.h:19
+msgid "Trust this CA to identify _email users."
 msgstr ""
 
-#: ../smime/lib/e-cert.c:775
-msgid "Subject Public Key Info"
+#: ../smime/gui/smime-ui.ui.h:20
+msgid "Trust this CA to identify _software developers."
 msgstr ""
 
-#: ../smime/lib/e-cert.c:780
-msgid "Subject Public Key Algorithm"
+#: ../smime/gui/smime-ui.ui.h:21
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
 msgstr ""
 
-#: ../smime/lib/e-cert.c:795
-msgid "Subject's Public Key"
-msgstr ""
+#: ../smime/gui/smime-ui.ui.h:25
+msgid "Certificate"
+msgstr "Atestilo"
 
-#: ../smime/lib/e-cert.c:816 ../smime/lib/e-cert.c:866
-msgid "Error: Unable to process extension"
+#: ../smime/gui/smime-ui.ui.h:26
+msgid "Email Certificate Trust Settings"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:837 ../smime/lib/e-cert.c:849
-msgid "Object Signer"
+#: ../smime/gui/smime-ui.ui.h:27
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:841
-msgid "SSL Certificate Authority"
+#: ../smime/gui/smime-ui.ui.h:28
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:845
-msgid "Email Certificate Authority"
+#: ../smime/gui/smime-ui.ui.h:29
+msgid "_Edit CA Trust"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:874
-msgid "Signing"
-msgstr "Signado"
-
-#: ../smime/lib/e-cert.c:878
-msgid "Non-repudiation"
-msgstr ""
+#: ../smime/lib/e-cert.c:236 ../smime/lib/e-cert.c:248
+msgid "%d/%m/%Y"
+msgstr "%Y-%m-%d"
 
-#: ../smime/lib/e-cert.c:882
-msgid "Key Encipherment"
-msgstr ""
+#. x509 certificate usage types
+#: ../smime/lib/e-cert.c:404
+msgid "Sign"
+msgstr "Subskribi"
 
-#: ../smime/lib/e-cert.c:886
-msgid "Data Encipherment"
-msgstr ""
+#: ../smime/lib/e-cert.c:405
+msgid "Encrypt"
+msgstr "Ĉifradi"
 
-#: ../smime/lib/e-cert.c:890
-msgid "Key Agreement"
-msgstr ""
+#: ../smime/lib/e-cert-db.c:787
+msgid "Certificate already exists"
+msgstr "Atestilo jam ekzistas"
 
-#: ../smime/lib/e-cert.c:894
-msgid "Certificate Signer"
+#: ../smime/lib/e-pkcs12.c:201
+msgid "PKCS12 File Password"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:898
-msgid "CRL Signer"
+#: ../smime/lib/e-pkcs12.c:202
+msgid "Enter password for PKCS12 file:"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:947
-msgid "Critical"
-msgstr "Kritike"
-
-#: ../smime/lib/e-cert.c:949 ../smime/lib/e-cert.c:952
-msgid "Not Critical"
-msgstr "Ne kritike"
-
-#: ../smime/lib/e-cert.c:973
-msgid "Extensions"
-msgstr "Etendaĵoj"
-
-#. Translators: This string is used in Certificate
-#. * details for fields like Issuer or Subject, which
-#. * shows the field name on the left and its respective
-#. * value on the right, both as stored in the
-#. * certificate itself.  You probably do not need to
-#. * change this string, unless changing the order of
-#. * name and value.  As a result example:
-#. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-cert.c:1051
+#: ../smime/lib/e-pkcs12.c:328
 #, c-format
-msgid "%s = %s"
-msgstr "%s = %s"
-
-#: ../smime/lib/e-cert.c:1107 ../smime/lib/e-cert.c:1230
-msgid "Certificate Signature Algorithm"
+msgid "Unable to create export context, err_code: %i"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:1116
-msgid "Issuer"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:1171
-msgid "Issuer Unique ID"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:1190
-msgid "Subject Unique ID"
+#: ../smime/lib/e-pkcs12.c:335
+#, c-format
+msgid "Unable to setup password integrity, err_code: %i"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:1236
-msgid "Certificate Signature Value"
+#: ../smime/lib/e-pkcs12.c:345
+#, c-format
+msgid "Unable to create safe bag, err_code: %i"
 msgstr ""
 
-#: ../smime/lib/e-cert-db.c:910
-msgid "Certificate already exists"
-msgstr "Atestilo jam ekzistas"
-
-#: ../smime/lib/e-pkcs12.c:255
-msgid "PKCS12 File Password"
+#: ../smime/lib/e-pkcs12.c:363
+#, c-format
+msgid "Unable to add key/cert to the store, err_code: %i"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:256
-msgid "Enter password for PKCS12 file:"
+#: ../smime/lib/e-pkcs12.c:381
+#, c-format
+msgid "Unable to write store to disk, err_code: %i"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:362
+#: ../smime/lib/e-pkcs12.c:408
 msgid "Imported Certificate"
 msgstr ""
 
 #: ../views/addressbook/galview.xml.h:1
-msgid "By _Company"
-msgstr ""
-
-#: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
 msgstr ""
 
-#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:2 ../views/calendar/galview.xml.h:5
 msgid "_List View"
 msgstr ""
 
+#: ../views/addressbook/galview.xml.h:3
+msgid "By _Company"
+msgstr ""
+
 #: ../views/calendar/galview.xml.h:1
-msgid "W_eek View"
+msgid "_Day View"
 msgstr ""
 
 #: ../views/calendar/galview.xml.h:2
-msgid "_Day View"
+msgid "_Work Week View"
 msgstr ""
 
-#: ../views/calendar/galview.xml.h:4
-msgid "_Month View"
+#: ../views/calendar/galview.xml.h:3
+msgid "W_eek View"
 msgstr ""
 
-#: ../views/calendar/galview.xml.h:5
-msgid "_Work Week View"
+#: ../views/calendar/galview.xml.h:4
+msgid "_Month View"
 msgstr ""
 
 #: ../views/mail/galview.xml.h:1
-msgid "As Sent Folder for Wi_de View"
-msgstr ""
+msgid "_Messages"
+msgstr "_Mesaĝoj"
 
 #: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr ""
 
 #: ../views/mail/galview.xml.h:3
-msgid "By S_tatus"
+msgid "By Su_bject"
 msgstr ""
 
 #: ../views/mail/galview.xml.h:4
@@ -20620,7 +24094,7 @@ msgid "By Se_nder"
 msgstr ""
 
 #: ../views/mail/galview.xml.h:5
-msgid "By Su_bject"
+msgid "By S_tatus"
 msgstr ""
 
 #: ../views/mail/galview.xml.h:6
@@ -20632,1035 +24106,721 @@ msgid "For _Wide View"
 msgstr ""
 
 #: ../views/mail/galview.xml.h:8
-msgid "_Messages"
-msgstr "_mesaĝoj"
+msgid "As Sent Folder for Wi_de View"
+msgstr ""
 
 #: ../views/memos/galview.xml.h:1
 msgid "_Memos"
 msgstr "_Notoj"
 
-#: ../views/tasks/galview.xml.h:1
+#: ../views/tasks/galview.xml.h:2
 msgid "With _Due Date"
 msgstr ""
 
-#: ../views/tasks/galview.xml.h:2
+#: ../views/tasks/galview.xml.h:3
 msgid "With _Status"
 msgstr ""
 
-#. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:789
-msgid "UTC"
-msgstr "UTC"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
-msgid "Select a Time Zone"
-msgstr "Elekti horzonon"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
-msgid "Time Zones"
-msgstr "Horzonoj"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
-msgid "Timezone drop-down combination box"
-msgstr ""
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-"Use the right mouse button to zoom out."
-msgstr ""
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:6
-msgid "_Selection"
-msgstr "_Elekto"
-
-#: ../widgets/menus/gal-define-views-dialog.c:359
-#: ../widgets/menus/gal-define-views.ui.h:4
-#, no-c-format
-msgid "Define Views for %s"
-msgstr ""
-
-#: ../widgets/menus/gal-define-views-dialog.c:367
-#: ../widgets/menus/gal-define-views-dialog.c:369
-msgid "Define Views"
-msgstr ""
-
-#: ../widgets/menus/gal-define-views.ui.h:2
-#, no-c-format
-msgid "Define Views for \"%s\""
-msgstr ""
-
-#: ../widgets/menus/gal-view-factory-etable.c:111
-msgid "Table"
-msgstr "Tabelo"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
-msgid "Save Current View"
-msgstr "Konservi aktualan vidon"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
-msgid "_Create new view"
-msgstr "_Krei novan vidon"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:3
-msgid "_Replace existing view"
-msgstr "_Anstataŭigi ekzistantan vidon"
-
-#: ../widgets/menus/gal-view-new-dialog.c:108
-msgid "Define New View"
-msgstr "Difini novan vidon"
-
-#: ../widgets/menus/gal-view-new-dialog.ui.h:1
-msgid "Name of new view:"
-msgstr "Nomo de la nova vido:"
-
-#: ../widgets/menus/gal-view-new-dialog.ui.h:2
-msgid "Type of View"
-msgstr "Tipo de la vido"
-
-#: ../widgets/menus/gal-view-new-dialog.ui.h:3
-msgid "Type of view:"
-msgstr "Tipo de la vido:"
-
-#: ../widgets/misc/ea-calendar-item.c:306
-#: ../widgets/misc/ea-calendar-item.c:315
-msgid "%d %B %Y"
-msgstr "%d %B %Y"
-
-#: ../widgets/misc/ea-calendar-item.c:318
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "Kalendaro: de %s al %s"
+#, fuzzy
+#~| msgid "GConf error: %s"
+#~ msgid "HTTP Error: %s"
+#~ msgstr "Eraro de GConf: %s"
 
-#: ../widgets/misc/ea-calendar-item.c:354
-msgid "evolution calendar item"
-msgstr "Kalendar-elemento de Evolucio"
+#, fuzzy
+#~| msgid "Could not open source"
+#~ msgid "Could not parse response"
+#~ msgstr "Ne eblis malfermi fonton"
 
-#: ../widgets/misc/e-alert-bar.c:116
-msgid "Close this message"
-msgstr "Fermi tiun mesaĝon"
+#, fuzzy
+#~| msgid "_Empty Trash"
+#~ msgid "Empty response"
+#~ msgstr "_Malplenigi rubujon"
 
-#. To Translators: This text is set as a description of an attached
-#. * message when, for example, attaching it to a composer. When the
-#. * message to be attached has also filled Subject, then this text is
-#. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:996
-msgid "Attached message"
-msgstr "Aldonita mesaĝo"
+#, fuzzy
+#~| msgid "Could not create message."
+#~ msgid "Could not locate user's calendars"
+#~ msgstr "Ne eblis kreii mesaĝon."
 
-#. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1807 ../widgets/misc/e-attachment.c:2345
-#: ../widgets/misc/e-attachment-store.c:522
-msgid "attachment.dat"
-msgstr "aldonajxo.dat"
+#, fuzzy
+#~| msgid "_Path:"
+#~ msgid "Path"
+#~ msgstr "_Vojo:"
 
-#: ../widgets/misc/e-attachment.c:1850 ../widgets/misc/e-attachment.c:2647
-msgid "A load operation is already in progress"
-msgstr ""
+#, fuzzy
+#~| msgid "Enter the password for '%s'"
+#~ msgid "Enter Google password for user '%s'."
+#~ msgstr "Enigu la pasvorton por '%s'"
 
-#: ../widgets/misc/e-attachment.c:1858 ../widgets/misc/e-attachment.c:2655
-msgid "A save operation is already in progress"
-msgstr ""
+#~ msgid ""
+#~ "Currently you can only access the GroupWise System Address Book from "
+#~ "Evolution. Please use some other GroupWise mail client once to get your "
+#~ "GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
+#~ msgstr ""
+#~ "Nuntempe vi nur povas aliri la sisteman adresaron de GroupWise de "
+#~ "Evolucio. Por aliri viajn GroupWise-dosierujojn pri oftaj kontaktoj kaj "
+#~ "personaj kontaktoj bonvolu unufoje uzi alian GroupWise-poŝto-klienton."
 
-#: ../widgets/misc/e-attachment.c:1950
-#, c-format
-msgid "Could not load '%s'"
-msgstr "Ne eblis ŝargi na '%s'"
+#~ msgid "GroupWise Address book creation:"
+#~ msgstr "Kreado de GroupWise-adresaro:"
 
-#: ../widgets/misc/e-attachment.c:1953
-#, c-format
-msgid "Could not load the attachment"
-msgstr ""
+#~ msgid "Some features may not work properly with your current server"
+#~ msgstr "Iuj trajtoj eble ne funkcios bone kun via nuna servilo."
 
-#: ../widgets/misc/e-attachment.c:2226
-#, c-format
-msgid "Could not open '%s'"
-msgstr "Ne eblis malfermi na '%s'"
+#~ msgid ""
+#~ "You are connecting to an unsupported GroupWise server and may encounter "
+#~ "problems using Evolution. For best results the server should be upgraded "
+#~ "to a supported version"
+#~ msgstr ""
+#~ "Vi konektas al nesubtenata Groupwise-servilo kaj vi povus sperti "
+#~ "problemojn uzante Evolucion. Por la plej bonaj rezultoj necesas promocii "
+#~ "la servilon al subtenata versio."
 
-#: ../widgets/misc/e-attachment.c:2229
-#, c-format
-msgid "Could not open the attachment"
-msgstr "Ne eblis malfermi aldonaĵon"
+#~ msgid "Web addresses"
+#~ msgstr "TTT-adresoj"
 
-#: ../widgets/misc/e-attachment.c:2663
-msgid "Attachment contents not loaded"
-msgstr ""
+#~ msgid "Original Contact:"
+#~ msgstr "Origina kontaktulo:"
 
-#: ../widgets/misc/e-attachment.c:2739
-#, c-format
-msgid "Could not save '%s'"
-msgstr "Ne eblis konservi na '%s'"
+#~ msgid "Card View"
+#~ msgstr "Kartvido"
 
-#: ../widgets/misc/e-attachment.c:2742
-#, c-format
-msgid "Could not save the attachment"
-msgstr "Ne eblis konservi la aldonaĵon"
+#~ msgid "Export in asynchronous mode"
+#~ msgstr "Elporti per nesinkrona reĝimo"
 
-#: ../widgets/misc/e-attachment-dialog.c:308
-msgid "Attachment Properties"
-msgstr "Ecoj de aldonaĵoj"
+#~ msgid ""
+#~ "The number of cards in one output file in asynchronous mode, default size "
+#~ "100."
+#~ msgstr ""
+#~ "Nombro de kartoj en unu eliga dosiero dum malsamtempa modo, apriora "
+#~ "grando: 100."
 
-#: ../widgets/misc/e-attachment-dialog.c:330
-msgid "_Filename:"
-msgstr "_Dosiernomo:"
+#~ msgid "NUMBER"
+#~ msgstr "NOMBRO"
 
-#: ../widgets/misc/e-attachment-dialog.c:365
-msgid "MIME Type:"
-msgstr "MIME-tipo:"
+#~ msgid "In async mode, output must be file."
+#~ msgstr "En nesinkrona reĝimo eligo estu dosiero."
 
-#: ../widgets/misc/e-attachment-dialog.c:373
-#: ../widgets/misc/e-attachment-store.c:439
-msgid "_Suggest automatic display of attachment"
-msgstr ""
+#~ msgid "In normal mode, there is no need for the size option."
+#~ msgstr "En normala reĝimo, ne necesas la grandopcion."
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
-msgid "Could not set as background"
-msgstr ""
+#~ msgid "Couldn't get list of address books: %s"
+#~ msgstr "Ne eblis ricevi liston de adresaroj: %s"
 
-#: ../widgets/misc/e-attachment-handler-image.c:145
-msgid "Set as _Background"
-msgstr "Uzi kiel _fono"
+#~ msgid ""
+#~ "Evolution does not support calendar reminders with\n"
+#~ "email notifications yet, but this reminder was\n"
+#~ "configured to send an email.  Evolution will display\n"
+#~ "a normal reminder dialog box instead."
+#~ msgstr ""
+#~ "Evolucio ankoraŭ ne subtenas kalendarmemorilojn kun\n"
+#~ "retpoŝtaj atentigoj sed ĉi tiu memorilo estis\n"
+#~ "agordita por sendi retpoŝton.  Evolucio anstataŭe montros\n"
+#~ "normalan memorilan dialogkeston."
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:93
-msgid "Could not send attachment"
-msgid_plural "Could not send attachments"
-msgstr[0] "Ne eblis sendi aldonaĵon"
-msgstr[1] "Ne eblis sendi aldonaĵojn"
+#~ msgid ""
+#~ "'{0}' is a read-only calendar and cannot be modified. Please select a "
+#~ "different calendar from the side bar in the Calendar view."
+#~ msgstr ""
+#~ "'{0}' estas nurlega kalendaro kaj ne estas modifebla. Bonvolu elekti "
+#~ "alian kalendaron de la flankbreto en la kalendarvido."
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:135
-msgid "_Send To..."
-msgstr "_Sendi al..."
+#~ msgid "Cannot create a new event"
+#~ msgstr "Ne eblas krei novan eventon"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:137
-msgid "Send the selected attachments somewhere"
-msgstr ""
+#~ msgid "Error on {0}: {1}"
+#~ msgstr "Eraro ĉe {0}: {1}"
 
-#: ../widgets/misc/e-attachment-icon-view.c:162
-#: ../widgets/misc/e-attachment-tree-view.c:547
-msgid "Loading"
-msgstr "Ŝargante"
+#~ msgid "Some features may not work properly with your current server."
+#~ msgstr "Klekaj trajtoj ne korekte funkcius en via aktuala servilo."
 
-#: ../widgets/misc/e-attachment-icon-view.c:174
-#: ../widgets/misc/e-attachment-tree-view.c:559
-msgid "Saving"
-msgstr "Konservante"
+#~ msgid "The Evolution calendars have quit unexpectedly."
+#~ msgstr "La Evolucio-kalendaroj ĉesigitis neatendite."
 
-#: ../widgets/misc/e-attachment-paned.c:100
-msgid "Hide Attachment _Bar"
-msgstr "Kaŝi aldonaĵ_breton"
+#~ msgid "The Evolution memo has quit unexpectedly."
+#~ msgstr "La Evolucio-notoj ĉesigitis neatendite."
 
-#: ../widgets/misc/e-attachment-paned.c:102
-#: ../widgets/misc/e-attachment-paned.c:712
-msgid "Show Attachment _Bar"
-msgstr "Montri aldonaĵ_breton"
+#~ msgid "The Evolution tasks have quit unexpectedly."
+#~ msgstr "La Evolucio-taskoj ĉesigitis neatendite."
 
-#: ../widgets/misc/e-attachment-store.c:427
-msgid "Add Attachment"
-msgstr "Aldoni aldonaĵo"
+#~ msgid ""
+#~ "You are connecting to an unsupported GroupWise server and may encounter "
+#~ "problems using Evolution. For best results, the server should be upgraded "
+#~ "to a supported version."
+#~ msgstr ""
+#~ "Vi estas konektanta al nesubtenata GroupWise-servilon kaj vi eble "
+#~ "renkontus problemojn uzante Evolution. Por plejbonaj rezultoj, la servilo "
+#~ "estus ĝisdatigita al subtenata versio."
 
-#: ../widgets/misc/e-attachment-store.c:430
-msgid "A_ttach"
-msgstr "_Aldoni"
+#~ msgid "Your calendars will not be available until Evolution is restarted."
+#~ msgstr "Viaj kalendaroj ne estas disponeblaj ĝis restarto de Evolucio."
 
-#: ../widgets/misc/e-attachment-store.c:493
-msgid "Save Attachment"
-msgid_plural "Save Attachments"
-msgstr[0] "Konservi aldonaĵon"
-msgstr[1] "Konservi aldonaĵojn"
+#~ msgid "Day View"
+#~ msgstr "Tagvido"
 
-#: ../widgets/misc/e-attachment-view.c:404
-msgid "Open With Other Application..."
-msgstr ""
+#~ msgid "Work Week View"
+#~ msgstr "Laborsemajn-vido"
 
-#: ../widgets/misc/e-attachment-view.c:411
-msgid "S_ave All"
-msgstr "_Konservi ĉiujn"
+#~ msgid "Week View"
+#~ msgstr "Semajnvido"
 
-#: ../widgets/misc/e-attachment-view.c:437
-msgid "A_dd Attachment..."
-msgstr "_Alsodni aldonaĵon..."
+#~ msgid "Month View"
+#~ msgstr "Monatvido"
 
-#: ../widgets/misc/e-attachment-view.c:461
-msgid "_Hide"
-msgstr "_Kaŝi"
+#~ msgid "_Type:"
+#~ msgstr "_Tipo:"
 
-#: ../widgets/misc/e-attachment-view.c:468
-msgid "Hid_e All"
-msgstr "Kaŝ_i ĉiujn"
+#, fuzzy
+#~ msgid "Sh_ow reminder notifications"
+#~ msgstr "M_ontri memorigilon"
 
-#: ../widgets/misc/e-attachment-view.c:475
-msgid "_View Inline"
-msgstr ""
+#~ msgid "Recent _Documents"
+#~ msgstr "Freŝaj _dokumentoj"
 
-#: ../widgets/misc/e-attachment-view.c:482
-msgid "Vie_w All Inline"
-msgstr ""
+#~ msgid "Cannot create object"
+#~ msgstr "Ne eblas krei objekton"
 
-#: ../widgets/misc/e-attachment-view.c:803
-#, c-format
-msgid "Open With \"%s\""
-msgstr "Malfermi per \"%s\""
+#~ msgid "Customize"
+#~ msgstr "Adapti"
 
-#: ../widgets/misc/e-attachment-view.c:806
-#, c-format
-msgid "Open this attachment in %s"
-msgstr ""
+#~ msgid "Custom Reminder:"
+#~ msgstr "Adapti memorigaĵon:"
 
-#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:387
-msgid "Ctrl-click to open a link"
-msgstr ""
+#~ msgid "Unable to open memos in '%s': %s"
+#~ msgstr "Ne eblis malfermi notoj en '%s': %s"
 
-#: ../widgets/misc/e-calendar.c:226
-msgid "Month Calendar"
-msgstr "Monata kalendaro"
+#~ msgid "Web Page"
+#~ msgstr "Retpaĝo"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1250
-msgid "%B %Y"
-msgstr "%B %Y"
+#~ msgid "Stat_us:"
+#~ msgstr "Stat_o:"
 
-#: ../widgets/misc/e-charset-combo-box.c:96
-msgid "Character Encoding"
-msgstr ""
+#~ msgid "Unable to open tasks in '%s': %s"
+#~ msgstr "Ne eblis malfermi la taskojn en '%s': %s"
 
-#: ../widgets/misc/e-charset-combo-box.c:119
-msgid "Enter the character set to use"
-msgstr ""
+#~ msgid "Categor_ies..."
+#~ msgstr "Kategor_ioj..."
 
-#: ../widgets/misc/e-charset-combo-box.c:339
-msgid "Other..."
-msgstr "Alia..."
+#~ msgid "Opening %s"
+#~ msgstr "Malfermante %s"
 
-#: ../widgets/misc/e-contact-map-window.c:355
-msgid "Contacts Map"
-msgstr "Kontakt-mapo"
+#~ msgid "Please enter your full name."
+#~ msgstr "Bonvole enigu vian tutan nomon."
 
-#: ../widgets/misc/e-dateedit.c:501
-msgid "Date and Time"
-msgstr "Dato kaj horo"
+#~ msgid "Please enter your email address."
+#~ msgstr "Bonvole enigu vian retpoŝtadreson."
 
-#: ../widgets/misc/e-dateedit.c:522
-msgid "Text entry to input date"
-msgstr ""
+#~ msgid "The email address you have entered is invalid."
+#~ msgstr "La enmetita retpoŝtadreso estas nevalida."
 
-#: ../widgets/misc/e-dateedit.c:544
-msgid "Click this button to show a calendar"
-msgstr ""
+#~ msgid "Please enter your password."
+#~ msgstr "Bonvole enigu vian pasvorton."
 
-#: ../widgets/misc/e-dateedit.c:591
-msgid "Drop-down combination box to select time"
-msgstr ""
+#~ msgid "CalDAV"
+#~ msgstr "CalDAV"
 
-#: ../widgets/misc/e-dateedit.c:663
-msgid "No_w"
-msgstr "_Nun"
+#~ msgid "Personal details:"
+#~ msgstr "Persondetaloj:"
 
-#: ../widgets/misc/e-dateedit.c:669
-msgid "_Today"
-msgstr "_Hodiaŭ"
+#~ msgid "Email address:"
+#~ msgstr "Retpoŝtadreso:"
 
-#. Note that we don't show this here, since by default a 'None' date
-#. * is not permitted.
-#: ../widgets/misc/e-dateedit.c:677
-msgid "_None"
-msgstr "_Neniu"
+#~ msgid "Details:"
+#~ msgstr "Detaloj:"
 
-#. Translators: "None" for date field of a date edit, shown when
-#. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1688 ../widgets/misc/e-dateedit.c:1921
-msgctxt "date"
-msgid "None"
-msgstr "Neniu"
+#~ msgid "Server address:"
+#~ msgstr "Serviladreso:"
 
-#: ../widgets/misc/e-dateedit.c:1815
-msgid "Invalid Date Value"
-msgstr ""
+#~ msgid "Use encryption:"
+#~ msgstr "Uti ĉifradon:"
 
-#: ../widgets/misc/e-dateedit.c:1859
-msgid "Invalid Time Value"
-msgstr ""
+#~ msgid "never"
+#~ msgstr "neniam"
 
-#: ../widgets/misc/e-import-assistant.c:249
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list."
-msgstr ""
+#~ msgid "Finish"
+#~ msgstr "Fini"
 
-#: ../widgets/misc/e-import-assistant.c:266
-msgid "F_ilename:"
-msgstr "_Dosiernomo:"
+#~ msgid "Close Tab"
+#~ msgstr "Fermi la langeton"
 
-#: ../widgets/misc/e-import-assistant.c:276
-msgid "Select a file"
-msgstr "Elekti dosieron"
+#~ msgid "Modify %s..."
+#~ msgstr "Modifi %s..."
 
-#: ../widgets/misc/e-import-assistant.c:290
-#: ../widgets/misc/e-import-assistant.c:465
-msgid "File _type:"
-msgstr "Dosier-_tipo:"
+#~ msgid "Add a new account"
+#~ msgstr "Aldoni novan konton"
 
-#: ../widgets/misc/e-import-assistant.c:333
-#: ../widgets/misc/e-import-assistant.c:913
-msgid "Choose the destination for this import"
-msgstr ""
+#~ msgid "Account management"
+#~ msgstr "Konto-administrado"
 
-#: ../widgets/misc/e-import-assistant.c:358
-msgid "Choose the type of importer to run:"
-msgstr ""
+#~ msgid "Settings"
+#~ msgstr "Agordoj"
 
-#: ../widgets/misc/e-import-assistant.c:366
-msgid "Import data and settings from _older programs"
-msgstr ""
+#~ msgid "Save draft"
+#~ msgstr "Konservi malneton"
 
-#: ../widgets/misc/e-import-assistant.c:374
-msgid "Import a _single file"
-msgstr ""
+#~ msgid "Configure email accounts"
+#~ msgstr "Agordi la retpoŝtkontojn"
 
-#: ../widgets/misc/e-import-assistant.c:526
-msgid ""
-"Evolution checked for settings to import from the following applications: "
-"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
-"like to try again, please click the \"Back\" button."
-msgstr ""
+#~ msgid "Email Settings"
+#~ msgstr "Retpoŝtagordoj"
 
-#. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:768
-msgid "_Cancel Import"
-msgstr ""
+#, fuzzy
+#~ msgid "List of calendars to load"
+#~ msgstr "Listo de disponeblaj kalendaroj:"
 
-#: ../widgets/misc/e-import-assistant.c:912
-msgid "Preview data to be imported"
-msgstr ""
+#~ msgid "List of selected calendars"
+#~ msgstr "Listo de elektitaj kalendaroj"
 
-#: ../widgets/misc/e-import-assistant.c:918
-#: ../widgets/misc/e-import-assistant.c:931
-#: ../widgets/misc/e-import-assistant.c:1276
-#: ../widgets/misc/e-import-assistant.c:1352
-#: ../widgets/misc/e-import-assistant.c:1361
-msgid "Import Data"
-msgstr ""
+#~ msgid "List of selected memo lists"
+#~ msgstr "Listo de elektitaj notolistoj"
 
-#: ../widgets/misc/e-import-assistant.c:926
-msgid "Select what type of file you want to import from the list."
-msgstr ""
+#~ msgid "List of selected task lists"
+#~ msgstr "Listo de elektitaj tasklistoj"
 
-#: ../widgets/misc/e-import-assistant.c:1266
-#: ../widgets/misc/e-import-assistant.c:1301
-msgid "Evolution Import Assistant"
-msgstr "Enport-asistanto de Evolucio"
+#~ msgid "Week start"
+#~ msgstr "Semajnkomenco"
 
-#: ../widgets/misc/e-import-assistant.c:1283
-#: ../widgets/misc/e-import-assistant.c:1339
-msgid "Import Location"
-msgstr ""
+#~ msgid "Work days"
+#~ msgstr "Labortagoj"
 
-#: ../widgets/misc/e-import-assistant.c:1294
-msgid ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of importing "
-"external files into Evolution."
-msgstr ""
+#~ msgid "Configuration version"
+#~ msgstr "Agordo-versio"
 
-#: ../widgets/misc/e-import-assistant.c:1311
-msgid "Importer Type"
-msgstr ""
+#, fuzzy
+#~ msgid "Disable or enable ellipsizing of folder names in side bar"
+#~ msgstr "Ĉu elŝalti la mallongigon de mesaĝujaj nomoj en la flanka breto?"
 
-#: ../widgets/misc/e-import-assistant.c:1321
-msgid "Select Information to Import"
-msgstr ""
+#~ msgid "Spell checking color"
+#~ msgstr "Koloro de literumkontrolo"
 
-#: ../widgets/misc/e-import-assistant.c:1330
-msgid "Select a File"
-msgstr "Elekti dosieron"
+#~ msgid "This option would help in improving the speed of fetching."
+#~ msgstr "Tiu ĉi opcio povas plirapidigi la elŝutadon."
 
-#: ../widgets/misc/e-import-assistant.c:1347
-msgid "Click \"Apply\" to begin importing the file into Evolution."
-msgstr "Alkaku \"Apliki\" por komenci la enporton de la dosiero en Evolucion."
+#~ msgid "Underline color for misspelled words when using inline spelling."
+#~ msgstr ""
+#~ "Koloro por substreki misliterumitajn vortojn ĉe uzo de la enprograma "
+#~ "ortografia kontrolo."
 
-#: ../widgets/misc/e-map.c:883
-msgid "World Map"
-msgstr "Mondmapo"
+#~ msgid "Whether disable ellipsizing feature of folder names in side bar."
+#~ msgstr "Ĉu elŝalti la mallongigon de mesaĝujaj nomoj en la flanka breto?"
 
-#: ../widgets/misc/e-map.c:886
-msgid ""
-"Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should instead select the timezone from the drop-down combination box below."
-msgstr ""
+#~ msgid "Do you wish to overwrite it?"
+#~ msgstr "Ĉu vi volas anstataŭigi ĝin?"
 
-#: ../widgets/misc/e-online-button.c:27
-msgid "Evolution is currently online.  Click this button to work offline."
-msgstr ""
-"Evolucio nun estas konektite. Alklaku tiun butonon por labori nekonektite."
+#~ msgid "File exists \"{0}\"."
+#~ msgstr "Dosiero ekzistas \"{0}\"."
 
-#: ../widgets/misc/e-online-button.c:30
-msgid "Evolution is currently offline.  Click this button to work online."
-msgstr ""
-"Evolucio nun estas nekonektite. Alklaku tiun butonon por labori konektite."
+#~ msgid "Create R_ule"
+#~ msgstr "Krei reg_ulon"
 
-#: ../widgets/misc/e-online-button.c:33
-msgid "Evolution is currently offline because the network is unavailable."
-msgstr "Evolucio nun estas nekonektite ĉar la reto ne disponeblas."
+#~ msgid "Folder '%s'"
+#~ msgstr "Dosierujo '%s'"
 
-#: ../widgets/misc/e-preferences-window.c:279
-msgid "Evolution Preferences"
-msgstr "Evolucio-agordoj"
+#~ msgid "Enter Password for %s"
+#~ msgstr "Enigu pasvorton por %s"
 
-#: ../widgets/misc/e-search-bar.c:81
-#, c-format
-msgid "Matches: %d"
-msgstr ""
+#~ msgid "Enter Password"
+#~ msgstr "Enigu pasvorton"
 
-#: ../widgets/misc/e-search-bar.c:563
-msgid "Close the find bar"
-msgstr ""
+#~ msgid "Unsubscribing from folder '%s'"
+#~ msgstr "Malaboni de dosierujo '%s'"
 
-#: ../widgets/misc/e-search-bar.c:571
-msgid "Fin_d:"
-msgstr "_Serĉi:"
+#~ msgctxt "mail-signature"
+#~ msgid "None"
+#~ msgstr "Nenio"
 
-#: ../widgets/misc/e-search-bar.c:583
-msgid "Clear the search"
-msgstr ""
+#~ msgctxt "mail-receiving"
+#~ msgid "None"
+#~ msgstr "Nenio"
 
-#: ../widgets/misc/e-search-bar.c:607
-msgid "_Previous"
-msgstr "_Antaŭa"
+#~ msgid "Fil_e:"
+#~ msgstr "Dosi_ero:"
 
-#: ../widgets/misc/e-search-bar.c:613
-msgid "Find the previous occurrence of the phrase"
-msgstr ""
+#~ msgid "Mail Configuration"
+#~ msgstr "Agordoj pri retmesaĝoj"
 
-#: ../widgets/misc/e-search-bar.c:626
-msgid "_Next"
-msgstr "_Sekva"
+#~ msgid "minu_tes"
+#~ msgstr "minu_toj"
 
-#: ../widgets/misc/e-search-bar.c:632
-msgid "Find the next occurrence of the phrase"
-msgstr ""
+#~ msgid "Always (SSL)"
+#~ msgstr "Ĉiam (SSL)"
 
-#: ../widgets/misc/e-search-bar.c:645
-msgid "Mat_ch case"
-msgstr ""
+#, fuzzy
+#~ msgid "Setup Google ca_lendar with Evolution"
+#~ msgstr "Aldoni lokan kalendaron al Evolucio."
 
-#: ../widgets/misc/e-search-bar.c:673
-msgid "Reached bottom of page, continued from top"
-msgstr ""
+#, fuzzy
+#~ msgid "Setup _Yahoo calendar with Evolution"
+#~ msgstr "Aldoni veter-kalendaroj al Evolucio."
 
-#: ../widgets/misc/e-search-bar.c:695
-msgid "Reached top of page, continued from bottom"
-msgstr ""
+#~ msgid "Overdue:"
+#~ msgstr "Posttempe:"
 
-#: ../widgets/misc/e-send-options.c:552
-msgid "When de_leted:"
-msgstr ""
+#~ msgid "by"
+#~ msgstr "de"
 
-#: ../widgets/misc/e-send-options.ui.h:1
-msgid "A_uto-delete sent item"
-msgstr ""
+#~ msgid "List of accounts"
+#~ msgstr "Listo de kontoj"
 
-#: ../widgets/misc/e-send-options.ui.h:3
-msgid "Creat_e a sent item to track information"
-msgstr ""
+#~ msgid "Original message."
+#~ msgstr "Originala mesaĝo."
 
-#: ../widgets/misc/e-send-options.ui.h:4
-msgid "Deli_vered and opened"
-msgstr ""
+#~ msgid "Cle_ar"
+#~ msgstr "V_akigi"
 
-#: ../widgets/misc/e-send-options.ui.h:5
-msgid "Delivery Options"
-msgstr ""
+#~ msgid "Pass_word:"
+#~ msgstr "Pas_vorto:"
 
-#: ../widgets/misc/e-send-options.ui.h:6
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "Ĝ_is"
+#~ msgid "Proxy Settings"
+#~ msgstr "Prokurilagordo"
 
-#: ../widgets/misc/e-send-options.ui.h:7
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "_Post"
+#~ msgid "S_elect..."
+#~ msgstr "_Elekti..."
 
-#: ../widgets/misc/e-send-options.ui.h:8
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "tagoj"
+#~ msgid "Signat_ure:"
+#~ msgstr "S_ubskribo:"
 
-#: ../widgets/misc/e-send-options.ui.h:9
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr "_Dum"
+#~ msgid "Us_ername:"
+#~ msgstr "U_zantonomo:"
 
-#: ../widgets/misc/e-send-options.ui.h:10
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "tagoj"
+#~ msgid "User _Name:"
+#~ msgstr "Uzanto_nomo:"
 
-#: ../widgets/misc/e-send-options.ui.h:11
-msgid "For Your Eyes Only"
-msgstr "Nur por viaj okuloj"
+#~ msgid "_Add Signature"
+#~ msgstr "_Aldoni subskribon"
 
-#: ../widgets/misc/e-send-options.ui.h:12
-msgid "Gene_ral Options"
-msgstr "Ĝene_ralaj agordoj"
+#~ msgid "_Use system defaults"
+#~ msgstr "_Uzi sistemdefaŭltojn"
 
-#: ../widgets/misc/e-send-options.ui.h:15
-msgid "Mail Receipt"
-msgstr ""
+#~ msgid "description"
+#~ msgstr "priskribo"
 
-#: ../widgets/misc/e-send-options.ui.h:17
-msgid "Proprietary"
-msgstr "Mallibere"
+#~ msgid "label"
+#~ msgstr "etikedo"
 
-#: ../widgets/misc/e-send-options.ui.h:18
-msgid "R_eply requested"
-msgstr ""
+#~ msgid "none"
+#~ msgstr "neniu"
 
-#: ../widgets/misc/e-send-options.ui.h:20
-msgid "Return Notification"
-msgstr ""
+#~ msgid "Cannot open source \"{1}\"."
+#~ msgstr "Ne eblis malfermi fonton \"{1}\"."
 
-#: ../widgets/misc/e-send-options.ui.h:21
-msgid "Secret"
-msgstr "Sekrete"
+#~ msgid "Close message window."
+#~ msgstr "Fermi mesaĝfenestron."
 
-#: ../widgets/misc/e-send-options.ui.h:23
-msgid "Sta_tus Tracking"
-msgstr ""
+#~ msgid "Signature Already Exists"
+#~ msgstr "Subskribo jam ekzistas"
 
-#: ../widgets/misc/e-send-options.ui.h:24
-msgid "Standard"
-msgstr "Standarde"
+#~ msgid "Sent Messages"
+#~ msgstr "Senditaj mesaĝoj"
 
-#: ../widgets/misc/e-send-options.ui.h:25
-msgid "Status Tracking"
-msgstr ""
+#~ msgid "Details"
+#~ msgstr "Detaloj"
 
-#: ../widgets/misc/e-send-options.ui.h:26
-msgid "Top Secret"
-msgstr "Sekretege"
+#~ msgid "On LDAP Servers"
+#~ msgstr "En LDAP-serviloj"
 
-#: ../widgets/misc/e-send-options.ui.h:28
-msgid "When acce_pted:"
-msgstr ""
+#~ msgid "5"
+#~ msgstr "5"
 
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "When co_mpleted:"
-msgstr ""
+#~ msgid "Lo_gin:"
+#~ msgstr "E_nsaluti:"
 
-#: ../widgets/misc/e-send-options.ui.h:30
-msgid "When decli_ned:"
-msgstr ""
+#~ msgid "One"
+#~ msgstr "Unu"
 
-#: ../widgets/misc/e-send-options.ui.h:31
-msgid "_All information"
-msgstr "Ĉi_uj informoj"
+#~ msgid "S_earch filter:"
+#~ msgstr "S_erĉfiltrilo:"
 
-#: ../widgets/misc/e-send-options.ui.h:32
-msgid "_Classification:"
-msgstr ""
+#~ msgid "Ser_ver:"
+#~ msgstr "Ser_vilo:"
 
-#: ../widgets/misc/e-send-options.ui.h:33
-msgid "_Delay message delivery"
-msgstr ""
+#~ msgid "Use secure _connection:"
+#~ msgstr "Uzi sekura _konekton:"
 
-#: ../widgets/misc/e-send-options.ui.h:34
-msgid "_Delivered"
-msgstr ""
+#~ msgid "_Timeout:"
+#~ msgstr "_Tempolimo:"
 
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Set expiration date"
-msgstr ""
+#~ msgid "cards"
+#~ msgstr "kartoj"
 
-#: ../widgets/misc/e-send-options.ui.h:37
-msgid "_When convenient"
-msgstr ""
+#~ msgid ""
+#~ "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+#~ msgstr ""
+#~ "Koloro por kolori la nunhoromontrilan linion en la tempa tabulbarilo "
+#~ "(malplenigu la kampon elektos la aprioran koloron)."
 
-#: ../widgets/misc/e-send-options.ui.h:38
-msgid "_When opened:"
-msgstr ""
+#~ msgid ""
+#~ "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+#~ "debug messages."
+#~ msgstr ""
+#~ "Tio povas havi tri eblajn valorojn: 0 por eraroj. 1 por avertoj. 2 por "
+#~ "sencimigaj mesaĝoj."
 
-#. Translators: Used in send options dialog
-#: ../widgets/misc/e-send-options.ui.h:40
-msgctxt "send-options"
-msgid "None"
-msgstr "Neniu"
+#~ msgid ""
+#~ "Use the system timezone instead of the timezone selected in Evolution."
+#~ msgstr ""
+#~ "Uzi la sisteman horzonon anstataŭ la horzono kiu estas elektita en "
+#~ "Evolucio."
 
-#: ../widgets/misc/e-signature-editor.c:138
-#: ../widgets/misc/e-signature-editor.c:564
-#: ../widgets/misc/e-signature-manager.c:372
-#: ../widgets/misc/e-signature-script-dialog.c:219
-msgid "Unnamed"
-msgstr "Sennome"
+#~ msgid "Weather"
+#~ msgstr "Vetero"
 
-#: ../widgets/misc/e-signature-editor.c:214
-msgid "_Save and Close"
-msgstr "_Konservi kaj fermi"
+#~ msgid "Loading calendars"
+#~ msgstr "Ŝarĝante kalendarojn"
 
-#: ../widgets/misc/e-signature-editor.c:431
-msgid "Edit Signature"
-msgstr "Redakti subskribon"
+#~ msgid "_New Calendar..."
+#~ msgstr "_Nova kalendaro..."
 
-#: ../widgets/misc/e-signature-editor.c:446
-msgid "_Signature Name:"
-msgstr "_Subsribonomo:"
+#~ msgid "Copy..."
+#~ msgstr "Kopii..."
 
-#: ../widgets/misc/e-signature-manager.c:317
-msgid "Add Signature Script"
-msgstr ""
+#~ msgid "Local Address Books"
+#~ msgstr "Loka adresaro"
 
-#: ../widgets/misc/e-signature-manager.c:382
-msgid "Edit Signature Script"
-msgstr ""
+#~ msgid "Events"
+#~ msgstr "Eventoj"
 
-#: ../widgets/misc/e-signature-manager.c:602
-msgid "Add _Script"
-msgstr ""
+#~ msgid "Enter password for user %s on server %s"
+#~ msgstr "Enigu pasvorton por uzanto %s sur servilo %s"
 
-#: ../widgets/misc/e-signature-script-dialog.c:268
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only."
-msgstr ""
+#~ msgid "List of available calendars:"
+#~ msgstr "Listo de disponeblaj kalendaroj:"
 
-#: ../widgets/misc/e-signature-script-dialog.c:313
-msgid "S_cript:"
-msgstr ""
+#~ msgid "User e_mail:"
+#~ msgstr "Uzanto-retpoŝto:"
 
-#: ../widgets/misc/e-signature-script-dialog.c:344
-msgid "Script file must be executable."
-msgstr ""
+#~ msgid "Re_fresh:"
+#~ msgstr "_Aktualigi:"
 
-#: ../widgets/misc/e-url-entry.c:78
-msgid "Click here to go to URL"
-msgstr ""
+#~ msgid "File _name:"
+#~ msgstr "Dosier_nomo:"
 
-#: ../widgets/misc/e-web-view.c:410
-msgid "_Copy Link Location"
-msgstr ""
+#~ msgid "Local Calendars"
+#~ msgstr "Lokaj kalendaroj"
 
-#: ../widgets/misc/e-web-view.c:412
-msgid "Copy the link to the clipboard"
-msgstr ""
+#~ msgid "Userna_me:"
+#~ msgstr "Uzantono_mo:"
 
-#: ../widgets/misc/e-web-view.c:420
-msgid "_Open Link in Browser"
-msgstr "_Malfermi ligilon per foliumilo"
+#~ msgid "Add web calendars to Evolution."
+#~ msgstr "Aldoni ret-kalendarojn al Evolucio."
 
-#: ../widgets/misc/e-web-view.c:422
-msgid "Open the link in a web browser"
-msgstr "Malfermi la ligilon per foliumilo"
+#~ msgid "Weather: Fog"
+#~ msgstr "Vetero: nebulo"
 
-#: ../widgets/misc/e-web-view.c:430
-msgid "_Copy Email Address"
-msgstr "_Kopii la retpoŝtadreson"
+#~ msgid "Weather: Cloudy"
+#~ msgstr "Vetero: nube"
 
-#: ../widgets/misc/e-web-view.c:447
-msgid "_Copy Image"
-msgstr "_Kopii bildon"
+#~ msgid "Weather: Cloudy Night"
+#~ msgstr "Vetero: nuba nokto"
 
-#: ../widgets/misc/e-web-view.c:449
-msgid "Copy the image to the clipboard"
-msgstr "Kopii la bildon en la tondujon"
+#~ msgid "Weather: Showers"
+#~ msgstr "Vetero: pluvegoj"
 
-#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
-msgid "Select all text and images"
-msgstr "Elekti ĉiujn tekston kaj bildojn"
+#~ msgid "Weather: Snow"
+#~ msgstr "Vetero: neĝo"
 
-#: ../widgets/misc/e-web-view.c:982 ../widgets/misc/e-web-view.c:984
-#: ../widgets/misc/e-web-view.c:986
-#, c-format
-msgid "Click to call %s"
-msgstr ""
+#~ msgid "Weather: Sunny"
+#~ msgstr "Vetero: sune"
 
-#: ../widgets/misc/e-web-view.c:988
-msgid "Click to hide/unhide addresses"
-msgstr ""
+#~ msgid "Weather: Clear Night"
+#~ msgstr "Vetero: klara nokto"
 
-#: ../widgets/misc/e-web-view.c:990
-#, c-format
-msgid "Click to open %s"
-msgstr "Klaki por malfermi %s"
+#~ msgid "Weather: Thunderstorms"
+#~ msgstr "Vetero: fulmotondroj"
 
-#: ../widgets/table/e-cell-combo.c:187
-msgid "popup list"
-msgstr ""
+#~ msgid "Select a location"
+#~ msgstr "Elekti lokon"
 
-#: ../widgets/table/e-cell-date-edit.c:299
-msgid "Now"
-msgstr "Nun"
+#~ msgctxt "weather-cal-location"
+#~ msgid "None"
+#~ msgstr "Neniu"
 
-#. Translators: "None" as a label of a button to unset date in a date table cell
-#: ../widgets/table/e-cell-date-edit.c:316
-msgctxt "table-date"
-msgid "None"
-msgstr "Neniu"
+#~ msgid "Metric (Celsius, cm, etc)"
+#~ msgstr "Metrike (Celsiuso, cm, ktp.)"
 
-#: ../widgets/table/e-cell-date-edit.c:324
-msgid "OK"
-msgstr ""
+#~ msgid "Add weather calendars to Evolution."
+#~ msgstr "Aldoni veter-kalendaroj al Evolucio."
 
-#: ../widgets/table/e-cell-date-edit.c:868
-#, c-format
-msgid "The time must be in the format: %s"
-msgstr ""
+#~ msgid "Weather Calendars"
+#~ msgstr "Veter-kalendaroj"
 
-#: ../widgets/table/e-cell-percent.c:80
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr ""
+#~ msgid "Default Sources"
+#~ msgstr "Defaŭltaj fontoj"
 
-#: ../widgets/table/e-table-click-to-add.c:607
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:62
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:143
-msgid "click to add"
-msgstr "klaku por aldoni"
+#~ msgid "Server"
+#~ msgstr "Servilo"
 
-#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
-msgid "(Ascending)"
-msgstr ""
+#~ msgid "Unknown error."
+#~ msgstr "Nekonata eraro."
 
-#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
-msgid "(Descending)"
-msgstr ""
+#~ msgid "Cal_endar:"
+#~ msgstr "Kal_endaro:"
 
-#: ../widgets/table/e-table-config.c:400
-msgid "Not sorted"
-msgstr "Ne ordigite"
+#~ msgid "A_ccept"
+#~ msgstr "Ak_cepti"
 
-#: ../widgets/table/e-table-config.c:441
-msgid "No grouping"
-msgstr "Ne grupite"
+#~ msgid ""
+#~ "You have received %d new message\n"
+#~ "in %s."
+#~ msgid_plural ""
+#~ "You have received %d new messages\n"
+#~ "in %s."
+#~ msgstr[0] ""
+#~ "Vi ricevis %d novan mesaĝon\n"
+#~ "en %s."
+#~ msgstr[1] ""
+#~ "Vi ricevis %d novajn mesaĝojn\n"
+#~ "en %s."
 
-#: ../widgets/table/e-table-config.c:666
-#: ../widgets/table/e-table-config.ui.h:11
-msgid "Show Fields"
-msgstr "Montri kampojn"
+#~ msgid "New email"
+#~ msgstr "Nova retmesaĝo"
 
-#: ../widgets/table/e-table-config.c:686
-msgid "Available Fields"
-msgstr "Disponeblaj kampoj"
+#~ msgid "Mark All Read"
+#~ msgstr "Marki ĉiujn legite"
 
-#: ../widgets/table/e-table-config.ui.h:1
-msgid "A_vailable Fields:"
-msgstr "_Disponeblaj kampoj:"
+#~ msgid "Mark all messages in a folder as read."
+#~ msgstr "Marki ĉiujn mesaĝojn en dosierujo kiel legite."
 
-#: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1721
-msgid "Ascending"
-msgstr "Kreskante"
+#~ msgid "Could not open %s: Unknown error"
+#~ msgstr "Ne eblis malfemi %s: Nekonata eraro"
 
-#: ../widgets/table/e-table-config.ui.h:3
-msgid "Clear All"
-msgstr "Vakigi ĉion"
+#~ msgid "WebDAV contacts"
+#~ msgstr "WebDAV-kontaktoj"
 
-#: ../widgets/table/e-table-config.ui.h:4
-msgid "Clear _All"
-msgstr "Vakigi ĉi_on"
+#~ msgid "WebDAV"
+#~ msgstr "WebDAV"
 
-#: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1721
-msgid "Descending"
-msgstr "Malkreskante"
+#~ msgid "HTTP proxy host name"
+#~ msgstr "HTTP-prokura komputilnomo"
 
-#: ../widgets/table/e-table-config.ui.h:8
-msgid "Group Items By"
-msgstr ""
+#~ msgid "HTTP proxy password"
+#~ msgstr "HTTP-prokura pasvorto"
 
-#: ../widgets/table/e-table-config.ui.h:9
-msgid "Move _Down"
-msgstr "Movi _malsupren"
+#~ msgid "HTTP proxy port"
+#~ msgstr "HTTP-prokura pordo"
 
-#: ../widgets/table/e-table-config.ui.h:10
-msgid "Move _Up"
-msgstr "Movi s_upren"
+#~ msgid "HTTP proxy username"
+#~ msgstr "HTTP-prokura uzantonomo"
 
-#: ../widgets/table/e-table-config.ui.h:12
-msgid "Show _field in View"
-msgstr ""
+#~ msgid "SOCKS proxy host name"
+#~ msgstr "SOCKS-prokura komputilnomo"
 
-#: ../widgets/table/e-table-config.ui.h:13
-msgid "Show field i_n View"
-msgstr ""
+#~ msgid "SOCKS proxy port"
+#~ msgstr "SOCKS-prokura pordo"
 
-#: ../widgets/table/e-table-config.ui.h:14
-msgid "Show field in _View"
-msgstr ""
+#~ msgid "Secure HTTP proxy host name"
+#~ msgstr "Sekura HTTP-prokura komputilnomo"
 
-#: ../widgets/table/e-table-config.ui.h:15
-msgid "Sort"
-msgstr "Ordigi"
+#~ msgid "Secure HTTP proxy port"
+#~ msgstr "Sekura HTTP-prokura pordo"
 
-#: ../widgets/table/e-table-config.ui.h:16
-msgid "Sort Items By"
-msgstr ""
+#~ msgid "_Forget Passwords"
+#~ msgstr "_Forgesigi pasvortojn"
 
-#: ../widgets/table/e-table-config.ui.h:17
-msgid "Then By"
-msgstr "Tiam laŭ"
+#~ msgid "Forget all remembered passwords"
+#~ msgstr "Forgesigi ĉiujn pasvortojn"
 
-#: ../widgets/table/e-table-config.ui.h:19
-msgid "_Fields Shown..."
-msgstr ""
+#~ msgid "_Forget"
+#~ msgstr "_Forgesi"
 
-#: ../widgets/table/e-table-config.ui.h:20
-msgid "_Group By..."
-msgstr ""
+#~ msgid "File is not a valid .desktop file"
+#~ msgstr "Dosiero ne estas valida .desktop-dosiero"
 
-#: ../widgets/table/e-table-config.ui.h:21
-msgid "_Remove"
-msgstr "Fo_rigi"
+#~ msgid "Unrecognized desktop file Version '%s'"
+#~ msgstr "Nerekonata versio '%s' de labortabla dosiero"
 
-#: ../widgets/table/e-table-config.ui.h:22
-msgid "_Show field in View"
-msgstr ""
+#~ msgid "Starting %s"
+#~ msgstr "Lanĉante %s"
 
-#: ../widgets/table/e-table-config.ui.h:23
-msgid "_Show these fields in order:"
-msgstr ""
+#~ msgid "Application does not accept documents on command line"
+#~ msgstr "Aplikaĵo ne akceptas dokumentojn per komandlinio"
 
-#: ../widgets/table/e-table-config.ui.h:24
-msgid "_Sort..."
-msgstr "_Ordigi..."
+#~ msgid "Unrecognized launch option: %d"
+#~ msgstr "Nerekonata lanĉparametro: %d"
 
-#: ../widgets/table/e-table-field-chooser.c:153
-msgid ""
-"To add a column to your table, drag it into\n"
-"the location in which you want it to appear."
-msgstr ""
+#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+#~ msgstr ""
+#~ "Ne eblas transdoni URI-ojn de dokumentoj al labortabla elemento "
+#~ "'Type=Link'"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:119
-msgid "Add a Column"
-msgstr ""
+#~ msgid "Not a launchable item"
+#~ msgstr "Nelanĉebla ero"
 
-#. Translators: This text is used as a special row when an ETable
-#. * has turned on grouping on a column, which has set a title.
-#. * The first %s is replaced with a column title.
-#. * The second %s is replaced with an actual  group value.
-#. * Finally the %d is replaced with count of items in this group.
-#. * Example: "Family name: Smith (13 items)"
-#.
-#: ../widgets/table/e-table-group-container.c:361
-#, c-format
-msgid "%s: %s (%d item)"
-msgid_plural "%s: %s (%d items)"
-msgstr[0] ""
-msgstr[1] ""
+#~ msgid "Disable connection to session manager"
+#~ msgstr "Elŝalti la konekton al la seancoadministrilo"
 
-#. Translators: This text is used as a special row when an ETable
-#. * has turned on grouping on a column, which doesn't have set a title.
-#. * The %s is replaced with an actual group value.
-#. * The %d is replaced with count of items in this group.
-#. * Example: "Smith (13 items)"
-#.
-#: ../widgets/table/e-table-group-container.c:373
-#, c-format
-msgid "%s (%d item)"
-msgid_plural "%s (%d items)"
-msgstr[0] ""
-msgstr[1] ""
+#~ msgid "Specify file containing saved configuration"
+#~ msgstr "Specifi dosieron kiu enhavas konservitan agordon"
 
-#: ../widgets/table/e-table-header-item.c:1561
-msgid "Customize Current View"
-msgstr ""
+#~ msgid "FILE"
+#~ msgstr "DOSIERO"
 
-#: ../widgets/table/e-table-header-item.c:1583
-msgid "Sort _Ascending"
-msgstr ""
+#~ msgid "Specify session management ID"
+#~ msgstr "Specifi identigilon de la seancoadministrilo"
 
-#: ../widgets/table/e-table-header-item.c:1586
-msgid "Sort _Descending"
-msgstr ""
+#~ msgid "ID"
+#~ msgstr "ID"
 
-#: ../widgets/table/e-table-header-item.c:1589
-msgid "_Unsort"
-msgstr "_Neordigite"
+#~ msgid "Session management options:"
+#~ msgstr "Agordoj de la seancoadministrilo:"
 
-#: ../widgets/table/e-table-header-item.c:1592
-msgid "Group By This _Field"
-msgstr ""
+#~ msgid "Show session management options"
+#~ msgstr "Montri agordojn de la seancoadministrilo"
 
-#: ../widgets/table/e-table-header-item.c:1595
-msgid "Group By _Box"
-msgstr ""
+#~ msgid "Validity"
+#~ msgstr "Valideco"
 
-#: ../widgets/table/e-table-header-item.c:1599
-msgid "Remove This _Column"
-msgstr ""
+#~ msgid "Version"
+#~ msgstr "Versio"
 
-#: ../widgets/table/e-table-header-item.c:1602
-msgid "Add a C_olumn..."
-msgstr ""
+#~ msgid "Version 1"
+#~ msgstr "Versio 1"
 
-#: ../widgets/table/e-table-header-item.c:1606
-msgid "A_lignment"
-msgstr ""
+#~ msgid "Version 2"
+#~ msgstr "Versio 2"
 
-#: ../widgets/table/e-table-header-item.c:1609
-msgid "B_est Fit"
-msgstr ""
+#~ msgid "Version 3"
+#~ msgstr "Versio 3"
 
-#: ../widgets/table/e-table-header-item.c:1612
-msgid "Format Column_s..."
-msgstr ""
+#~ msgid "Signing"
+#~ msgstr "Signado"
 
-#: ../widgets/table/e-table-header-item.c:1616
-msgid "Custo_mize Current View..."
-msgstr ""
+#~ msgid "Not Critical"
+#~ msgstr "Ne kritike"
 
-#: ../widgets/table/e-table-header-item.c:1678
-msgid "_Sort By"
-msgstr "_Ordigi laŭ"
+#~ msgid "Extensions"
+#~ msgstr "Etendaĵoj"
 
-#. Custom
-#: ../widgets/table/e-table-header-item.c:1696
-msgid "_Custom"
-msgstr "_Propre"
+#~ msgid "%s = %s"
+#~ msgstr "%s = %s"
 
-#: ../widgets/table/gal-a11y-e-cell.c:123
-msgid "Table Cell"
-msgstr "Tabela ĉelo"
+#~ msgid "Define New View"
+#~ msgstr "Difini novan vidon"
 
-#. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:125
-msgid "popup a child"
-msgstr "ŝpruci idon"
+#~ msgid "Name of new view:"
+#~ msgstr "Nomo de la nova vido:"
 
-#. Translators: description of a "toggle" action
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:178
-msgid "toggle the cell"
-msgstr "baskuligi la ĉelon"
+#~ msgid "Type of View"
+#~ msgstr "Tipo de la vido"
 
-#. Translators: description of an "expand" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:214
-msgid "expands the row in the ETree containing this cell"
-msgstr ""
+#~ msgid "Type of view:"
+#~ msgstr "Tipo de la vido:"
 
-#. Translators: description of a "collapse" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:221
-msgid "collapses the row in the ETree containing this cell"
-msgstr "maletendas la vicon en la ETree enhavanta ĉi tiun ĉelon"
+#~ msgid "Could not send attachment"
+#~ msgid_plural "Could not send attachments"
+#~ msgstr[0] "Ne eblis sendi aldonaĵon"
+#~ msgstr[1] "Ne eblis sendi aldonaĵojn"
 
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:72
-msgid "click"
-msgstr "klaki"
+#~ msgid "_Send To..."
+#~ msgstr "_Sendi al..."
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:158
-msgid "sort"
-msgstr "ordigi"
+#~ msgid "Available Fields"
+#~ msgstr "Disponeblaj kampoj"
 
-#: ../widgets/text/e-text.c:2328
-msgid "Select All"
-msgstr "Elekti ĉiujn"
+#~ msgid "A_vailable Fields:"
+#~ msgstr "_Disponeblaj kampoj:"
 
-#: ../widgets/text/e-text.c:2340
-msgid "Input Methods"
-msgstr "Enigaj metodoj"
+#~ msgid "Move _Up"
+#~ msgstr "Movi s_upren"
 
 #~ msgid "Edit Alarm"
 #~ msgstr "Redakti alarmon"
@@ -21687,9 +24847,6 @@ msgstr "Enigaj metodoj"
 #~ msgid "None"
 #~ msgstr "Neniu"
 
-#~ msgid "Custom Alarm:"
-#~ msgstr "Propra alarm:"
-
 #~ msgid "_Alarm"
 #~ msgstr "_Alarmo"
 
@@ -21703,9 +24860,6 @@ msgstr "Enigaj metodoj"
 #~ msgid "has alarms"
 #~ msgstr "havas alarmojn"
 
-#~ msgid "GConf error: %s"
-#~ msgstr "Eraro de GConf: %s"
-
 #~ msgid "All further errors shown only on terminal."
 #~ msgstr "Ĉiuj pliaj eraroj estos montritaj nur en terminalo."
 
@@ -21755,21 +24909,9 @@ msgstr "Enigaj metodoj"
 #~ msgid "Compose New Message"
 #~ msgstr "Krei novan mesaĝon"
 
-#~ msgid "Creating folder '%s'"
-#~ msgstr "Kreante dosierujon '%s'"
-
 #~ msgid "_Add attachment..."
 #~ msgstr "_Aldoni aldonaĵon..."
 
-#~ msgid "Accept"
-#~ msgstr "Akcepti"
-
-#~ msgid "Create folder"
-#~ msgstr "Krei dosierujon"
-
-#~ msgid "Email:"
-#~ msgstr "Retpoŝtadreso:"
-
 #~ msgid "_Enable"
 #~ msgstr "_Enŝalti"
 
@@ -21804,9 +24946,6 @@ msgstr "Enigaj metodoj"
 #~ msgid "Add User"
 #~ msgstr "Aldoni uzanton"
 
-#~ msgid "Users"
-#~ msgstr "Uzantoj"
-
 #~ msgid "Sharing"
 #~ msgstr "Komunigo"
 
@@ -21825,11 +24964,6 @@ msgstr "Enigaj metodoj"
 #~ msgid "Accepted: "
 #~ msgstr "Akceptite: "
 
-#~ msgid "Every day"
-#~ msgid_plural "Every %d days"
-#~ msgstr[0] "Ĉiun tagon"
-#~ msgstr[1] "Ĉiujn %d tagojn"
-
 #~ msgid "Every week"
 #~ msgid_plural "Every %d weeks"
 #~ msgstr[0] "Ĉiun semajnon"
@@ -21875,15 +25009,9 @@ msgstr "Enigaj metodoj"
 #~ msgid "--to--"
 #~ msgstr "--al--"
 
-#~ msgid "Calendar Message"
-#~ msgstr "Kalendar-mesaĝo"
-
 #~ msgid "Date:"
 #~ msgstr "Dato:"
 
-#~ msgid "Loading Calendar"
-#~ msgstr "Ŝagante kalendaron"
-
 #~ msgid "Loading calendar..."
 #~ msgstr "Ŝagante kalendaron..."
 
@@ -21925,9 +25053,6 @@ msgstr "Enigaj metodoj"
 #~ msgid "Account Management"
 #~ msgstr "Konto-administrado"
 
-#~ msgid "Folder"
-#~ msgstr "Dosierujo"
-
 #~ msgid "No server has been selected"
 #~ msgstr "Neniu servilo estas elektita"
 



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