Add Esperanto translation

author: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com> 2012-01-06 22:29:13 +0800
committer: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com> 2012-01-06 22:29:13 +0800
commit: 885a1f44666b6f6e51c9b6bc4b170410befbd41d (patch)
tree: b7220a4971abc133b1b59946416913fb470bc6d1 /po
parent: 0a016671ee2b5004df4fd2bca80f0e34e68476c3 (diff)
download: gsoc2013-evolution-885a1f44666b6f6e51c9b6bc4b170410befbd41d.tar
gsoc2013-evolution-885a1f44666b6f6e51c9b6bc4b170410befbd41d.tar.gz
gsoc2013-evolution-885a1f44666b6f6e51c9b6bc4b170410befbd41d.tar.bz2
gsoc2013-evolution-885a1f44666b6f6e51c9b6bc4b170410befbd41d.tar.lz
gsoc2013-evolution-885a1f44666b6f6e51c9b6bc4b170410befbd41d.tar.xz
gsoc2013-evolution-885a1f44666b6f6e51c9b6bc4b170410befbd41d.tar.zst
gsoc2013-evolution-885a1f44666b6f6e51c9b6bc4b170410befbd41d.zip
1 files changed, 7785 insertions, 6667 deletions
diff --git a/po/eo.po b/po/eo.po
index ec6a3b064b..c240cac5bc 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,25 +1,25 @@
 # Esperanto translation for evolution.
 # 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.
+# 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.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=evolution&keywords=I18N+L10N\n"
-"POT-Creation-Date: 2011-06-20 15:12+0000\n"
-"PO-Revision-Date: 2011-06-20 19:09+0200\n"
+"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"
 "Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n"
-"Language-Team: Esperanto <ubuntu-l10n-eo@lists.launchpad.net>\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: 8bit\n"
+"Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Launchpad-Export-Date: 2011-06-20 16:28+0000\n"
-"X-Generator: Launchpad (build 13242)\n"
+"X-Launchpad-Export-Date: 2012-01-05 22:21+0000\n"
+"X-Generator: Launchpad (build 14625)\n"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
@@ -39,22 +39,34 @@ msgstr ""
 "sama adreso?"
 
 #: ../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?"
+msgstr ""
+"Kontaktlisto nomata '{0}' jam estas en tiu kontaktlisto. Ĉu vi tamen volas "
+"aldoni ĝin?"
+
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Add with duplicates"
+msgstr "Aldoni kun duplikatoj"
+
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Address '{0}' already exists."
 msgstr "Adreso '{0}' jam ekzistas."
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Cannot add new contact"
 msgstr "Ne eblas aldoni novan kontakton"
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:8
 msgid "Cannot move contact."
 msgstr "Ne eblas movi kontakton."
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Category editor not available."
 msgstr "Ne disponeblas redaktilo por la kategorio."
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../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; "
@@ -64,15 +76,15 @@ msgstr ""
 "ensalut-metodon. Memoru, ke pasvortoj distingas usklecon; eble vi aktivigis "
 "la majuskligan klavon."
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Could not get schema information for LDAP server."
 msgstr "Ne eblas ricevi skemo-informojn pri LDAP-servilo."
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Could not remove address book."
 msgstr "Ne eblis forigi adresaron."
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../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 "
@@ -82,52 +94,64 @@ msgstr ""
 "Por aliri viajn GroupWise-dosierujojn pri oftaj kontaktoj kaj personaj "
 "kontaktoj bonvolu unufoje uzi alian GroupWise-poŝto-klienton."
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Delete address book '{0}'?"
 msgstr "Forigi adresaron '{0}'?"
 
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+#: ../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"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Eraro je konservo de {0} al {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Failed to authenticate with LDAP server."
 msgstr "Aŭtentigo al LDAP-servilo fiaskis."
 
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1272
+#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Failed to delete contact"
 msgstr "Forigo de kontakto malsukcesis."
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "GroupWise Address book creation:"
 msgstr "Kreado de GroupWise-adresaro:"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "LDAP server did not respond with valid schema information."
 msgstr "Bild-akirilo ne respondis per valida skeminformo."
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../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."
+
+#: ../addressbook/addressbook.error.xml.h:22
+msgid "Skip duplicates"
+msgstr ""
+
+#: ../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."
+
+#: ../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."
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "La adresaro de Evolucio ĉesigitis neatendite."
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:26
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "La bildo kiun vi elektis estas tro grande. Ĉu vi volas aligrandigi kaj "
 "konservi ĝin?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../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 "
@@ -137,15 +161,15 @@ msgstr ""
 "ĉi funkcion, aŭ eble ĝi estas mise agordita. Demandu vian administranton, "
 "kiuj serĉbazoj estas subtenataj."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This address book could not be opened."
 msgstr "Ĉi tiu adresaro povus ne malfermiĝi."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../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."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../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."
@@ -153,31 +177,31 @@ msgstr ""
 "Ĉi tiu adresarservilo povas esti neatingebla aŭ la servilnomo estis "
 "mistajpita aŭ via retkonekto faliĝis."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "This address book will be removed permanently."
 msgstr "Ĉi tiu adresaro estos por ĉiam viŝita."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Ĉi tiu servilo ne subtenas informskemon por LDAPv3."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "Unable to open address book"
 msgstr "Ne eblas malfermi adresaron"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "Unable to perform search."
 msgstr "Ne ebliĝas efektivigi serĉon."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Unable to save {0}."
 msgstr "Ne eblas konservi {0}."
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../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:32
+#: ../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?"
@@ -185,7 +209,7 @@ 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:33
+#: ../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 "
@@ -195,47 +219,55 @@ msgstr ""
 "uzante Evolucion. Por la plej bonaj rezultoj necesas promocii la servilon al "
 "subtenata versio."
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:39
+msgid ""
+"You are trying to add addresses that are part of this list already. Would "
+"you like to add them anyway?"
+msgstr ""
+"Vi provis aldoni adresojn kiuj jam apartenas al tiu listo. Ĉu vi volas "
+"aldoni ĝin malgraŭ tio?"
+
+#: ../addressbook/addressbook.error.xml.h:40
 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:35
+#: ../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:37
+#: ../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:38 ../mail/em-vfolder-rule.c:604
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:595
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_Aldoni"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:45
 msgid "_Discard"
 msgstr "_Rifuzi"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "_Do not save"
 msgstr "_Ne konservi"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:47
 msgid "_Resize"
 msgstr "_Aligrandigi"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:48
 msgid "_Use as it is"
 msgstr "_Uzi laŭ ĝi estas"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:617
-#: ../calendar/gui/e-calendar-view.c:2078
+#: ../addressbook/gui/widgets/eab-contact-display.c:720
+#: ../calendar/gui/e-calendar-view.c:2068
 msgid "Anniversary"
 msgstr "Datreveno"
 
@@ -245,9 +277,9 @@ msgstr "Datreveno"
 #. * 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:616
-#: ../calendar/gui/e-calendar-view.c:2077 ../capplet/anjal-settings-main.c:79
-#: ../shell/main.c:140
+#: ../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"
 
@@ -257,7 +289,7 @@ msgid "Blog:"
 msgstr "Blogo:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ka_tegorioj..."
@@ -267,24 +299,24 @@ msgid "Calendar:"
 msgstr "Kalendaro:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:979
+#: ../addressbook/importers/evolution-vcard-importer.c:990
 msgid "Contact"
 msgstr "Kontakto"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:643
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:663
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2862
+#: ../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:358
+#: ../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
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
-#: ../addressbook/gui/widgets/eab-contact-display.c:911
-#: ../smime/lib/e-cert.c:832
+#: ../smime/lib/e-cert.c:833
 msgid "Email"
 msgstr "Retpoŝto"
 
@@ -298,9 +330,9 @@ msgstr "Tuta _nomo..."
 
 #: ../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:75
-#: ../addressbook/gui/widgets/eab-contact-display.c:1195
-#: ../widgets/misc/e-contact-map.c:295
+#: ../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"
 
@@ -334,15 +366,14 @@ msgid "Nic_kname:"
 msgstr "_Kromnomo:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-#: ../modules/calendar/e-memo-shell-migrate.c:265
 msgid "Notes"
 msgstr "Notoj"
 
 #: ../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:76
-#: ../addressbook/gui/widgets/eab-contact-display.c:400
-#: ../calendar/gui/e-calendar-view.c:1783
+#: ../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"
 
@@ -368,10 +399,10 @@ msgstr "TTT-adresoj"
 
 #: ../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:74
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../addressbook/gui/widgets/eab-contact-display.c:1192
-#: ../widgets/misc/e-contact-map.c:303
+#: ../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"
 
@@ -396,9 +427,9 @@ msgid "_Blog:"
 msgstr "_Blogo:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:708
-#: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../plugins/itip-formatter/itip-view.c:1922
+#: ../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:"
 
@@ -477,73 +508,73 @@ msgid "_Zip/Postal Code:"
 msgstr "Poŝt_kodo:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../addressbook/gui/widgets/eab-contact-display.c:663
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:564
+#: ../addressbook/gui/widgets/eab-contact-display.c:665
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:565
+#: ../addressbook/gui/widgets/eab-contact-display.c:666
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:563
+#: ../addressbook/gui/widgets/eab-contact-display.c:664
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/widgets/eab-contact-display.c:662
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:661
 msgid "GroupWise"
 msgstr "GroupWise"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/eab-contact-display.c:667
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:219
-#: ../addressbook/gui/widgets/eab-gui-util.c:446
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:220
+#: ../addressbook/gui/widgets/eab-gui-util.c:481
 msgid "Error adding contact"
 msgstr "Eraro aldonante kontakton"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:235
 msgid "Error modifying contact"
 msgstr "Eraro dum modifado de kontaktulo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Error removing contact"
 msgstr "Eraro dum forigo de kontaktulo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:658
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2856
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:670
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2931
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktula redaktilo – %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3411
 msgid "Please select an image for this contact"
 msgstr "Bonvolu elekti bildon por tiu ĉi kontaktulo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3299
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3412
 msgid "_No image"
 msgstr "_Neniu bildo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3612
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3739
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -551,43 +582,48 @@ msgstr ""
 "La kontaktulaj informoj ne estas validaj:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3616
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3745
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' havas nevalidan strukturon."
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3623
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3752
+#, c-format
+msgid "'%s' cannot be a future date"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3760
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' havas nevalidan strukturon."
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3635
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3646
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3773
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3787
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' estas malplena"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3661
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3802
 msgid "Invalid contact."
 msgstr "Nevalida kontakto."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:438
 msgid "Contact Quick-Add"
 msgstr "Rapida aldono de kontaktulo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:414
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
 msgid "_Edit Full"
 msgstr "R_edakti plene"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:462
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:490
 msgid "_Full name"
 msgstr "_Tuta nomo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:473
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:501
 msgid "E_mail"
 msgstr "Ret_poŝto"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:484
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:512
 msgid "_Select Address Book"
 msgstr "E_ekti adresaron"
 
@@ -657,7 +693,7 @@ 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:726
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
 msgid "Contact List Editor"
 msgstr "Kontaktlist-redaktilo"
 
@@ -674,7 +710,7 @@ msgid "_List name:"
 msgstr "_Listnomo:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:175
 msgid "_Select..."
 msgstr "_Elekti..."
 
@@ -682,24 +718,23 @@ msgstr "_Elekti..."
 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/e-contact-list-editor.c:851
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:885
 msgid "Contact List Members"
 msgstr "Kontaktlist-membroj"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1169
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1588
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1402
 msgid "_Members"
 msgstr "_Membroj"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1422
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1516
 msgid "Error adding list"
 msgstr "Eraro dum aldono de listo"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1436
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1531
 msgid "Error modifying list"
 msgstr "Eraro dum ŝangô de listo"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1450
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1546
 msgid "Error removing list"
 msgstr "Eraro dum forigo de listo"
 
@@ -742,54 +777,332 @@ msgstr ""
 "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:304
+#: ../addressbook/gui/merging/eab-contact-merging.c:338
 msgid "_Merge"
 msgstr "_Kunigi"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:287
+#: ../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:1059
-#: ../modules/calendar/e-cal-shell-view-actions.c:1694
-#: ../modules/calendar/e-memo-shell-view-actions.c:775
-#: ../modules/calendar/e-task-shell-view-actions.c:974
+#: ../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"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1066
+#: ../modules/addressbook/e-book-shell-view-actions.c:1070
 msgid "Email begins with"
 msgstr "Retpoŝto komencas kun"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:1073
+#: ../modules/addressbook/e-book-shell-view-actions.c:1077
 msgid "Name contains"
 msgstr "La nomo entenas"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:155
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:97
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:106
+#: ../addressbook/gui/widgets/ea-minicard-view.c:189
+msgid "evolution address book"
+msgstr "adresaro de Evolucio"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:182
+msgid "Copy _Email Address"
+msgstr "Kopiu _Retpoŝtadreson"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:184
+#: ../widgets/misc/e-web-view.c:432
+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
+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
+msgid "Send a mail message to this address"
+msgstr "Sendi retmesaĝon al tiu ĉi adreso"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:218
+msgid "Open map"
+msgstr "Malfermi mapon"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:533
+#: ../addressbook/gui/widgets/eab-contact-display.c:561
+msgid "List Members:"
+msgstr "Listanoj:"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr "Kromnomo"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:685
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Company"
+msgstr "Firmao"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
+msgid "Department"
+msgstr "Distrikto"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:687
+msgid "Profession"
+msgstr "Profesio"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:688
+msgid "Position"
+msgstr "Pozicio"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:689
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr "Estro"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:690
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr "Asistanto"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:691
+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
+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
+msgid "Free/Busy"
+msgstr "Libere/okupite"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:694
+#: ../addressbook/gui/widgets/eab-contact-display.c:716
+msgid "Phone"
+msgstr "Telefono"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:695
+msgid "Fax"
+msgstr "Faksilo"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:696
+#: ../addressbook/gui/widgets/eab-contact-display.c:718
+msgid "Address"
+msgstr "Adreso"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:713
+msgid "Home Page"
+msgstr "Hejmpaĝo"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:714
+msgid "Web Log"
+msgstr "Blogo"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:717
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Poŝtelefono"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:721
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+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
+msgid "Personal"
+msgstr "Persona"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:744
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr "Noto"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1013
+msgid "List Members"
+msgstr "Listanoj"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1031
+msgid "Job Title"
+msgstr "Postena titolo"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1068
+msgid "Home page"
+msgstr "Hejmpaĝo"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1077
+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-gui-util.c:120
+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 "
+"load the address book once in online mode to download its contents."
+msgstr ""
+"Ne eblas malfermi tiun ĉi adresaron. Aŭ ĝi ne estas markita por senkonekta "
+"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
+#, 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 "
+"kaj ĉu la permesagordoj permesas atingi ĝin al vi."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
+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 "
+"LDAP necesas instali alian version de Evolucio, kiu subtenas LDAP."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
+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-"
+"on, aŭ la servilo ne atingeblas."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
+msgid "Detailed error message:"
+msgstr "Detala erar-mesaĝo:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:209
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this address book."
+msgstr ""
+"Tiu ĉi serĉo kongruas kun pli da kartoj ol permesas\n"
+"la servilo aŭ la agordo de Evolucio. Bonvolu igi vian\n"
+"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
+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"
+"more specific or raise the time limit in the directory server\n"
+"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."
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#, c-format
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr ""
+"La interna interfaco por tiu adresaro ne povis sintakse analizi 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:229
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr ""
+"La interna interfaco por tiu adresaro rifuzis efektivigi tiun informpeton. %s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
+#: ../addressbook/gui/widgets/eab-gui-util.c:241
+#, c-format
+msgid "This query did not complete successfully. %s"
+msgstr "Tiu informpeto ne sukcese finiĝis. %s"
+
+#. This is a filename. Translators take note.
+#: ../addressbook/gui/widgets/eab-gui-util.c:263
+msgid "card.vcf"
+msgstr "karto.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:309
+msgid "Select Address Book"
+msgstr "Elekti adresaron"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:383
+msgid "list"
+msgstr "listo"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:568
+msgid "Move contact to"
+msgstr "Movi kontakton al"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:570
+msgid "Copy contact to"
+msgstr "Kopii kontakton al"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:573
+msgid "Move contacts to"
+msgstr "Movi kontaktojn al"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:575
+msgid "Copy contacts to"
+msgstr "Kopii kontaktojn al"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:157
 msgid "No contacts"
 msgstr "Neniuj kontaktoj"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:159
+#: ../addressbook/gui/widgets/e-addressbook-model.c:161
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d kontakto"
 msgstr[1] "%d kontaktoj"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:340
+#: ../addressbook/gui/widgets/e-addressbook-model.c:357
 msgid "Error getting book view"
 msgstr "Eraro dum akiro de libro-aspekton"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:751
+#: ../addressbook/gui/widgets/e-addressbook-model.c:774
 msgid "Search Interrupted"
 msgstr "Serĉado interrompita"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:156
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:158
 msgid "Error modifying card"
 msgstr "Eraro dum modifado de karto"
 
@@ -806,7 +1119,7 @@ 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:877
+#: ../modules/addressbook/e-book-shell-view-actions.c:881
 msgid "Delete selected contacts"
 msgstr "Forigi la elektitajn kontaktulojn"
 
@@ -814,34 +1127,34 @@ msgstr "Forigi la elektitajn kontaktulojn"
 msgid "Select all visible contacts"
 msgstr "Elektu ĉiujn videblajn kontaktulojn"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1326
 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:1320
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
 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:1324
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1334
 #, 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:1330
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1340
 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:1334
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1344
 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:1338
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1348
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Ĉu certe vi volas forigi tiun ĉi kontaktulon (%s)?"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1487
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1504
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -856,19 +1169,14 @@ 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:1495
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1512
 msgid "_Don't Display"
 msgstr "_Ne montru"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1496
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
 msgid "Display _All Contacts"
 msgstr "_Montru ĉiujn kontaktulojn"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
-msgid "Assistant"
-msgstr "Asistanto"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
 msgstr "Telefono de asistanto"
@@ -894,18 +1202,13 @@ msgid "Car Phone"
 msgstr "Aŭta telefono"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:5
-#: ../calendar/gui/e-cal-list-view.etspec.h:1
+#: ../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:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
-msgid "Company"
-msgstr "Firmao"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 msgid "Company Phone"
 msgstr "Kompania telefono"
@@ -950,26 +1253,6 @@ msgstr "ISDN-a telefono"
 msgid "Journal"
 msgstr "Ĵurnalo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:587
-msgid "Manager"
-msgstr "Estro"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:614
-msgid "Mobile Phone"
-msgstr "Poŝtelefono"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:552
-msgid "Nickname"
-msgstr "Kromnomo"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
-msgid "Note"
-msgstr "Noto"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Oficejo"
@@ -995,16 +1278,11 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:571
+#: ../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:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:618
-msgid "Spouse"
-msgstr "Edz(in)o"
-
 #. Translators: This is a vcard standard and stands for the type of
 #. phone used by the hearing impaired. TTY stands for "teletype"
 #. (familiar from Unix device names), and TDD is "Telecommunications
@@ -1031,6 +1309,50 @@ msgstr "Unuo"
 msgid "Web Site"
 msgstr "Retpaĝo"
 
+#: ../addressbook/gui/widgets/ea-minicard.c:34
+msgid "Open"
+msgstr "Malfermi"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:156
+msgid "Contact List: "
+msgstr "Kontaklisto: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:157
+msgid "Contact: "
+msgstr "Kontakto: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:183
+msgid "evolution minicard"
+msgstr "karteto de Evolucio"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+msgid "New Contact"
+msgstr "Nova kontakto"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:37
+msgid "New Contact List"
+msgstr "Nova kontaktaro"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:172
+#, 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-minicard.c:101
+msgid "Home Email"
+msgstr "Hejma Retpoŝto"
+
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:819
+msgid "Other Email"
+msgstr "Alia Retpoŝto"
+
 #: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
@@ -1089,377 +1411,66 @@ msgstr ""
 "\n"
 "Ne estas eroj montreblaj en tiu ĉi vido."
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
-msgid "Work Email"
-msgstr "Labora Retpoŝto"
-
-#: ../addressbook/gui/widgets/e-minicard.c:101
-msgid "Home Email"
-msgstr "Hejma Retpoŝto"
-
-#: ../addressbook/gui/widgets/e-minicard.c:102
-#: ../addressbook/gui/widgets/e-minicard.c:807
-msgid "Other Email"
-msgstr "Alia Retpoŝto"
-
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:97
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:106
-#: ../addressbook/gui/widgets/ea-minicard-view.c:187
-msgid "evolution address book"
-msgstr "adresaro de Evolucio"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
-msgid "New Contact"
-msgstr "Nova kontakto"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:37
-msgid "New Contact List"
-msgstr "Nova kontaktaro"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:170
-#, 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/ea-minicard.c:34
-msgid "Open"
-msgstr "Malfermi"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:156
-msgid "Contact List: "
-msgstr "Kontaklisto: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:157
-msgid "Contact: "
-msgstr "Kontakto: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:183
-msgid "evolution minicard"
-msgstr "karteto de Evolucio"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:179
-msgid "Copy _Email Address"
-msgstr "Kopiu _Retpoŝtadreson"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:430
-msgid "Copy the email address to the clipboard"
-msgstr "Kopii la retpoŝtadreson en la tondujon"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:186
-#: ../widgets/misc/e-web-view.c:435
-msgid "_Send New Message To..."
-msgstr "_Sendi novan mesaĝon al..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:188
-#: ../widgets/misc/e-web-view.c:437
-msgid "Send a mail message to this address"
-msgstr "Sendi retmesaĝon al tiu ĉi adreso"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:210
-msgid "Open map"
-msgstr "Malfermi mapon"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:465
-#: ../addressbook/gui/widgets/eab-contact-display.c:878
-msgid "List Members"
-msgstr "Listanoj"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:584
-msgid "Department"
-msgstr "Distrikto"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:585
-msgid "Profession"
-msgstr "Profesio"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:586
-msgid "Position"
-msgstr "Pozicio"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:589
-msgid "Video Chat"
-msgstr "Video-babilado"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:590
-#: ../calendar/gui/dialogs/calendar-setup.c:376
-#: ../modules/calendar/e-cal-shell-view-actions.c:222
-#: ../modules/calendar/e-cal-shell-view-actions.c:251
-#: ../modules/calendar/e-cal-shell-view.c:507
-#: ../plugins/publish-calendar/publish-calendar.ui.h:1
-#: ../widgets/misc/e-send-options.c:519
-msgid "Calendar"
-msgstr "Kalendaro"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
-#: ../calendar/gui/dialogs/event-editor.c:123
-#: ../calendar/gui/dialogs/event-editor.c:350
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
-#: ../plugins/publish-calendar/publish-calendar.ui.h:6
-msgid "Free/Busy"
-msgstr "Libere/okupite"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-#: ../addressbook/gui/widgets/eab-contact-display.c:613
-msgid "Phone"
-msgstr "Telefono"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
-msgid "Fax"
-msgstr "Faksilo"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
-#: ../addressbook/gui/widgets/eab-contact-display.c:615
-msgid "Address"
-msgstr "Adreso"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
-msgid "Home Page"
-msgstr "Hejmpaĝo"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
-msgid "Web Log"
-msgstr "Blogo"
-
-#. 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:620
-#: ../capplet/settings/mail-capplet-shell.c:350
-#: ../modules/addressbook/e-book-shell-backend.c:116
-#: ../modules/addressbook/e-book-shell-migrate.c:144
-#: ../modules/calendar/e-cal-shell-backend.c:134
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-memo-shell-backend.c:118
-#: ../modules/calendar/e-memo-shell-migrate.c:120
-#: ../modules/calendar/e-task-shell-backend.c:118
-#: ../modules/calendar/e-task-shell-migrate.c:132
-msgid "Personal"
-msgstr "Persona"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:896
-msgid "Job Title"
-msgstr "Postena titolo"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:933
-msgid "Home page"
-msgstr "Hejmpaĝo"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:942
-msgid "Blog"
-msgstr "Blogo"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:1135
-#: ../widgets/misc/e-web-view.c:954
-#, c-format
-msgid "Click to mail %s"
-msgstr "Klaku por sendi retpoŝton al %s"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:113
-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 "
-"load the address book once in online mode to download its contents."
-msgstr ""
-"Ne eblas malfermi tiun ĉi adresaron. Aŭ ĝi ne estas markita por senkonekta "
-"uzo, aŭ ĝi ankoraŭ neniam estis elŝutita por senkonekta uzo. Bonvolu unufoje "
-"ŝargi la adresaron en konektita reĝimo por elŝuti ĝian enhavon."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
-#, 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 "
-"kaj ĉu la permesagordoj permesas atingi ĝin al vi."
-
-#: ../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 "
-"LDAP necesas instali alian version de Evolucio, kiu subtenas LDAP."
-
-#: ../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. Tiu signifas ke vi enigis malĝustan URI-"
-"on, aŭ la servilo ne atingeblas."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
-msgid "Detailed error message:"
-msgstr "Detala erar-mesaĝo:"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:200
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this address book."
-msgstr ""
-"Tiu ĉi serĉo kongruas kun pli da kartoj ol permesas\n"
-"la servilo aŭ la agordo de Evolucio. Bonvolu igi vian\n"
-"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:207
-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"
-"more specific or raise the time limit in the directory server\n"
-"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."
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
-#, c-format
-msgid "The backend for this address book was unable to parse this query. %s"
-msgstr ""
-"La interna interfaco por tiu adresaro ne povis sintakse analizi 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:220
-#, 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:226
-#: ../addressbook/gui/widgets/eab-gui-util.c:232
-#, 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:254
-msgid "card.vcf"
-msgstr "karto.vcf"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:294
-msgid "Select Address Book"
-msgstr "Elekti adresaron"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:357
-msgid "list"
-msgstr "listo"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:524
-msgid "Move contact to"
-msgstr "Movi kontakton al"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:526
-msgid "Copy contact to"
-msgstr "Kopii kontakton al"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:529
-msgid "Move contacts to"
-msgstr "Movi kontaktojn al"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:531
-msgid "Copy contacts to"
-msgstr "Kopii kontaktojn al"
-
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
 msgid "Card View"
 msgstr "Kartvido"
 
-#: ../addressbook/importers/evolution-csv-importer.c:740
-#: ../addressbook/importers/evolution-ldif-importer.c:539
-#: ../addressbook/importers/evolution-vcard-importer.c:282
-#: ../calendar/importers/icalendar-importer.c:380
-#: ../calendar/importers/icalendar-importer.c:847
-#: ../calendar/importers/icalendar-importer.c:877 ../shell/shell.error.xml.h:6
+#: ../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
 msgid "Importing..."
 msgstr "Enportante..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1041
+#: ../addressbook/importers/evolution-csv-importer.c:1075
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook-CSV aŭ -Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1042
+#: ../addressbook/importers/evolution-csv-importer.c:1076
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook-CSV kaj -Tab-Enportilo"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1050
+#: ../addressbook/importers/evolution-csv-importer.c:1084
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla-CSV aŭ -Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1051
+#: ../addressbook/importers/evolution-csv-importer.c:1085
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla-CSV kaj -Tab-Enportilo"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1059
+#: ../addressbook/importers/evolution-csv-importer.c:1093
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolucio-CSV aŭ -Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1060
+#: ../addressbook/importers/evolution-csv-importer.c:1094
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolucio-CSV kaj -Tab-Enportilo"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:779
+#: ../addressbook/importers/evolution-ldif-importer.c:796
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Datum-Interŝanĝ-Formato (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:780
+#: ../addressbook/importers/evolution-ldif-importer.c:797
 msgid "Evolution LDIF importer"
 msgstr "Evolucio-LDIF-enportilo"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:648
+#: ../addressbook/importers/evolution-vcard-importer.c:657
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:649
+#: ../addressbook/importers/evolution-vcard-importer.c:658
 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:714
+#: ../addressbook/printing/e-contact-print.c:721
 #, c-format
 msgid "Page %d"
 msgstr "Paĝo %d"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:645
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:680
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
-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/event-page.c:2893
-#: ../calendar/gui/dialogs/memo-page.c:920
-#: ../calendar/gui/dialogs/task-page.c:1810 ../em-format/em-format.c:2280
-#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:650
-#: ../plugins/caldav/caldav-browse-server.c:209
-#: ../plugins/caldav/caldav-browse-server.c:1406 ../plugins/face/face.c:169
-#: ../smime/gui/certificate-manager.c:313
-msgid "Unknown error"
-msgstr "Nekonata eraro"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
-#, c-format
-msgid "Failed to open client '%s': %s"
-msgstr "Ne eblis malfermi la klienton '%s': %s"
-
 #: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Specify the output file instead of standard output"
 msgstr "Uzi la eligitan dosieron anstataŭ la defaŭltan eligon"
@@ -1496,30 +1507,243 @@ msgstr ""
 msgid "NUMBER"
 msgstr "NOMBRO"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:138
+#: ../addressbook/tools/evolution-addressbook-export.c:139
 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:152
+#: ../addressbook/tools/evolution-addressbook-export.c:153
 msgid "Only support csv or vcard format."
-msgstr ""
+msgstr "Nur subteni CSV- aŭ vcard- aranĝonjn."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:161
+#: ../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:169
+#: ../addressbook/tools/evolution-addressbook-export.c:170
 msgid "In normal mode, there is no need for the size option."
-msgstr ""
+msgstr "En normala reĝimo, ne necesas la grandopcion."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:200
+#: ../addressbook/tools/evolution-addressbook-export.c:201
 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
+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
+#, 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
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minuto"
+msgstr[1] "minutoj"
+
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:122
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "horo"
+msgstr[1] "horoj"
+
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+#. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:135
+#: ../calendar/gui/dialogs/recurrence-page.c:1188
+msgid "day"
+msgid_plural "days"
+msgstr[0] "tago"
+msgstr[1] "tagoj"
+
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:331
+msgid "Start time"
+msgstr "Strarttempo"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:1
+msgid "Appointments"
+msgstr "Rendevuoj"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:2
+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:"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4
+msgid "Snooze _time:"
+msgstr "Dormet_tempo:"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert-dialog.c:160
+msgid "_Dismiss"
+msgstr "_Malakcepti"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+msgid "_Snooze"
+msgstr "_Dormeti"
+
+#. 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
+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
+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
+msgid "minutes"
+msgstr "minutoj"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1605
+#: ../calendar/alarm-notify/alarm-queue.c:1737
+msgid "No summary available."
+msgstr "Neniu resumo disponeblas."
+
+#: ../calendar/alarm-notify/alarm-queue.c:1614
+#: ../calendar/alarm-notify/alarm-queue.c:1616
+msgid "No description available."
+msgstr "Neniu priskribo disponebla."
+
+#: ../calendar/alarm-notify/alarm-queue.c:1624
+msgid "No location information available."
+msgstr "Neniu lokinformo disponeblas."
+
+#: ../calendar/alarm-notify/alarm-queue.c:1670
+#, 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
+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:1911
+#, c-format
+msgid ""
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
+msgstr ""
+"Evolucio-kalendara memorilo estas ekagigota. Ĉi tiu memorilo estas agordita "
+"por lanĉi la sekvan programaron:\n"
+"\n"
+"        %s\n"
+"\n"
+"Ĉu vi certe volas lanĉi ĉi tiun programaron?"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1926
+msgid "Do not ask me about this program again."
+msgstr "Ne demandu min denove pri tiu programo."
+
+#: ../calendar/alarm-notify/util.c:45
+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
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d horo"
+msgstr[1] "%d horoj"
+
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:411
+#: ../calendar/gui/misc.c:122
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuto"
+msgstr[1] "%d minutoj"
+
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. 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
+#, 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:2
 msgid ""
+"'{0}' does not support assigned tasks, please select a different task list."
+msgstr ""
+
+#. 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 ""
@@ -1527,7 +1751,7 @@ msgstr ""
 "kalendaron de la flankbreto en la kalendarvido."
 
 #. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:4
+#: ../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."
@@ -1535,185 +1759,197 @@ msgstr ""
 "'{0}' estas nurlega kalendaro kaj ne estas modifebla. Bonvolu elekti alian "
 "kalendaron kiu povas akcepti rendevuojn."
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:7
 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:6
+#: ../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."
 msgstr ""
+"Aldoni signifan resumon al via tasko donos al vi ideon pri kio via tasko "
+"temas pri."
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../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/calendar.error.xml.h:8
+#: ../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."
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../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."
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../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."
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../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/calendar.error.xml.h:12
+#: ../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:13
+#: ../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:14
+#: ../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."
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../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}'?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../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}'?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../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}'?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../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:19
+#: ../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?"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../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?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../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}?"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:24
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Ĉe vi certe volas forigi tiun rendevuon?"
 
-#: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:187
+#: ../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?"
 
-#: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:193
+#: ../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?"
 
-#: ../calendar/calendar.error.xml.h:25
-#: ../calendar/gui/dialogs/delete-comp.c:190
+#: ../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?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../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?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../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?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../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?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:31
 msgid "Cannot create a new event"
 msgstr "Ne eblas krei novan eventon"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:32
 msgid "Cannot save event"
 msgstr "Ne eblas konservi eventon"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:33
+msgid "Cannot save task"
+msgstr "Ne eblas konservi taskon"
+
+#: ../calendar/calendar.error.xml.h:34
 msgid "Delete calendar '{0}'?"
 msgstr "Ĉu forigi kalendaron '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Delete memo list '{0}'?"
 msgstr "Ĉu forigi notoliston '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Delete task list '{0}'?"
 msgstr "Ĉu forigi taskliston '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:38
 msgid "Do _not Send"
 msgstr "_Ne sendi"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../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?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../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?"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 msgid "Editor could not be loaded."
 msgstr "Ne eblis ŝargi redaktilon."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "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 "
+"akcepti ĉi tiun taskon."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:43
 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:41
+#: ../calendar/calendar.error.xml.h:44
 msgid "Error loading calendar"
 msgstr "Eraro ŝargante kalendaron"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
 msgid "Error loading memo list"
 msgstr "Eraro dum ŝargo de notolisto"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../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:46
+#: ../calendar/calendar.error.xml.h:49
 msgid "Error on {0}: {1}"
 msgstr "Eraro ĉe {0}: {1}"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../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."
@@ -1721,7 +1957,7 @@ msgstr ""
 "Se vi ne sendas nulig-mesaĝon, la aliaj partoprenantoj eble ne scias, ke la "
 "kunsido estas nuligite."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../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."
@@ -1729,7 +1965,7 @@ msgstr ""
 "Se vi ne sendas nulig-mesaĝon, la aliaj partoprenantoj eble ne scias, ke la "
 "noto estas forigite."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -1737,353 +1973,196 @@ msgstr ""
 "Se vi ne sendas nulig-mesaĝon, la aliaj partoprenantoj eble ne scias, ke la "
 "tasko estas forigite."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../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:51
+#: ../calendar/calendar.error.xml.h:54
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr ""
+"Sendi ĝidatigatajn informojn permesas aliajn partoprenantojn manteni iliajn "
+"taskojn ĝisdatigitajn"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../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."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../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."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "Some features may not work properly with your current server."
-msgstr ""
+msgstr "Klekaj trajtoj ne korekte funkcius en via aktuala servilo."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "La Evolucio-kalendaro ĉesigitis neatendite."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "La Evolucio-kalendaroj ĉesigitis neatendite."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "La Evolucio-notoj ĉesigitis neatendite."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "La Evolucio-taskoj ĉesigitis neatendite."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "The calendar is not marked for offline usage."
 msgstr "La kalendaro ne estas markite por senkonekta uzado."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../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."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../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."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "This calendar will be removed permanently."
 msgstr "La kalendaro estos daŭre forigta."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "This memo list will be removed permanently."
 msgstr "Tiu notolisto forigitos por ĉiam."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "This task list will be removed permanently."
 msgstr "La tasklisto estos daŭre forigta."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../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?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../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?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../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:68
+#: ../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?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../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?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send all the participants a cancelation notice?"
-msgstr ""
+msgstr "Ĉu vi volas sendi al ĉiuj partoprenantoj nuligpeton?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../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:72
+#: ../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?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../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:74
+#: ../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:75
+#: ../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."
 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."
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../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
+#: ../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."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../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."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../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:80
+#: ../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."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../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."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../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."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:86
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "_Ignori ŝanĝojn"
 
-#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:317
+#: ../calendar/calendar.error.xml.h:87 ../composer/e-composer-actions.c:316
 msgid "_Save"
 msgstr "Kon_servi"
 
-#: ../calendar/calendar.error.xml.h:85
+#: ../calendar/calendar.error.xml.h:88
 msgid "_Save Changes"
 msgstr "Kon_servi ŝanĝojn"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../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"
 
-#: ../calendar/calendar.error.xml.h:87
+#: ../calendar/calendar.error.xml.h:90
 msgid "_Send Notice"
 msgstr "_Sendi rimarkon"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minuto"
-msgstr[1] "minutoj"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "horo"
-msgstr[1] "horoj"
-
-#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
-#. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
-#. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:129
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
-msgid "day"
-msgid_plural "days"
-msgstr[0] "tago"
-msgstr[1] "tagoj"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:303
-msgid "Start time"
-msgstr "Strarttempo"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
-msgid "Appointments"
-msgstr "Rendevuoj"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:2
-msgid "Dismiss _All"
-msgstr "Malakcepi ĉi_on"
-
-#. Location
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1682
-#: ../plugins/itip-formatter/itip-view.c:1044
-msgid "Location:"
-msgstr "Loko:"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:4
-msgid "Snooze _time:"
-msgstr "Dormet_tempo:"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:916
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
-msgid "_Dismiss"
-msgstr "_Malakcepti"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-msgid "_Snooze"
-msgstr "_Dormeti"
-
-#. Translators: This is the last part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:428
-#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:340
-#: ../plugins/google-account-setup/google-contacts-source.c:379
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
-msgid "days"
-msgstr "tagoj"
-
-#: ../calendar/gui/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:427
-#: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:378
-msgid "hours"
-msgstr "horoj"
-
-#: ../calendar/gui/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/gui/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:426
-#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:377
-msgid "minutes"
-msgstr "minutoj"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
-msgid "No summary available."
-msgstr "Neniu resumo disponeblas."
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1535
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1537
-msgid "No description available."
-msgstr "Neniu priskribo disponebla."
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1545
-msgid "No location information available."
-msgstr "Neniu lokinformo disponeblas."
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1589
-#, c-format
-msgid "You have %d alarm"
-msgid_plural "You have %d alarms"
-msgstr[0] "Vi havas %d alarmon"
-msgstr[1] "Vi havas %d alarmojn"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1780
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1813
-msgid "Warning"
-msgstr "Averto"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1784
-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 ""
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1819
-#, c-format
-msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
-"\n"
-"        %s\n"
-"\n"
-"Are you sure you want to run this program?"
-msgstr ""
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1834
-msgid "Do not ask me about this program again."
-msgstr "Ne demandu min denove pri tiu programo."
-
-#: ../calendar/gui/alarm-notify/util.c:44
-msgid "invalid time"
-msgstr "nevalida tempo"
-
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:396
-#: ../calendar/gui/misc.c:116
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d horo"
-msgstr[1] "%d horoj"
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:402
-#: ../calendar/gui/misc.c:122
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minuto"
-msgstr[1] "%d minutoj"
-
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:408
-#: ../calendar/gui/misc.c:126
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d sekundo"
-msgstr[1] "%d sekundoj"
-
-#: ../calendar/gui/calendar-view-factory.c:116
+#: ../calendar/gui/calendar-view-factory.c:110
 msgid "Day View"
 msgstr "Tagvido"
 
-#: ../calendar/gui/calendar-view-factory.c:119
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Work Week View"
 msgstr "Laborsemajn-vido"
 
-#: ../calendar/gui/calendar-view-factory.c:122
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Week View"
 msgstr "Semajnvido"
 
-#: ../calendar/gui/calendar-view-factory.c:125
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Month View"
 msgstr "Monatvido"
 
@@ -2101,7 +2180,7 @@ msgstr "Aldonaĵoj"
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 #: ../calendar/gui/tasktypes.xml.h:6
 msgid "Attendee"
-msgstr ""
+msgstr "Partoprenantoj"
 
 #: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
 #: ../calendar/gui/tasktypes.xml.h:8
@@ -2112,15 +2191,15 @@ msgstr "Kategorio"
 msgid "Classification"
 msgstr "Kategoriado"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:759 ../calendar/gui/e-task-table.c:492
+#: ../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: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:71
+#: ../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"
@@ -2136,126 +2215,142 @@ msgstr "Description entenas"
 msgid "Do Not Exist"
 msgstr "Ne ekzistas"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:11
+msgid "Exactly"
+msgstr ""
+
+#: ../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/caltypes.xml.h:13
+msgid "Less Than"
+msgstr "malpli ol"
+
+#: ../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:835
+#: ../plugins/publish-calendar/publish-calendar.c:855
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:397
 msgid "Location"
 msgstr "Loko"
 
-#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
+#: ../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:17 ../calendar/gui/memotypes.xml.h:11
 #: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "Organizilo"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:239
-#: ../calendar/gui/e-cal-model.c:757 ../calendar/gui/e-task-table.c:491
+#: ../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:15 ../calendar/gui/e-cal-list-view.c:238
-#: ../calendar/gui/e-cal-model.c:748 ../calendar/gui/e-cal-model.c:755
-#: ../calendar/gui/e-task-table.c:490 ../calendar/gui/memotypes.xml.h:13
+#: ../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:16
+#: ../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
 msgid "Recurrence"
 msgstr "Rikuro"
 
-#: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:8
+#: ../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:370
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Summary"
 msgstr "Resumo"
 
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
+#: ../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:19 ../calendar/gui/memotypes.xml.h:16
+#: ../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:20 ../calendar/gui/memotypes.xml.h:17
+#: ../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/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../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:22 ../calendar/gui/memotypes.xml.h:19
+#: ../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/dialogs/alarm-dialog.c:626
-msgid "Edit Alarm"
-msgstr "Redakti alarmon"
+#: ../calendar/gui/dialogs/alarm-dialog.c:632
+msgid "Edit Reminder"
+msgstr "Redakti memorigaĵon"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:817
-#: ../calendar/gui/e-alarm-list.c:438
+#: ../calendar/gui/dialogs/alarm-dialog.c:823
+#: ../calendar/gui/e-alarm-list.c:447
 msgid "Pop up an alert"
-msgstr ""
+msgstr "Ŝpruci averton"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:818
-#: ../calendar/gui/e-alarm-list.c:434
+#: ../calendar/gui/dialogs/alarm-dialog.c:824
+#: ../calendar/gui/e-alarm-list.c:443
 msgid "Play a sound"
 msgstr "Ludi sonon"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:819
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/dialogs/alarm-dialog.c:825
+#: ../calendar/gui/e-alarm-list.c:455
 msgid "Run a program"
 msgstr "Lanĉi programon"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:820
-#: ../calendar/gui/e-alarm-list.c:442
+#: ../calendar/gui/dialogs/alarm-dialog.c:826
+#: ../calendar/gui/e-alarm-list.c:451
 msgid "Send an email"
 msgstr "Sundu retpoŝton"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "Add Alarm"
-msgstr "Aldoni alarmon"
+msgid "Add Reminder"
+msgstr "Aldoni memorigaĵon"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
-msgid "Alarm"
-msgstr "Alarmo"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "Propra _mesaĝo"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "Custom alarm sound"
-msgstr "Propra alarmsono"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
+msgid "Custom reminder sound"
+msgstr "Propra memorigsono"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Mes_sage:"
 msgstr "Me_saĝo:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:75
+#: ../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:6
+#: ../calendar/gui/dialogs/event-editor.c:360
+msgid "Reminder"
+msgstr "Memorigilo"
+
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
 msgid "Repeat"
 msgstr "Ripeti"
@@ -2277,8 +2372,8 @@ msgid "_Program:"
 msgstr "_Programo:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the alarm"
-msgstr "_Ripeti la alarmon"
+msgid "_Repeat the reminder"
+msgstr "_Ripeti la memorigilaĵon"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
@@ -2300,7 +2395,7 @@ msgstr "tago(j)"
 msgid "end of appointment"
 msgstr "fino de rendevuo"
 
-#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#. 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"
@@ -2317,464 +2412,474 @@ msgstr "minuto(j)"
 msgid "start of appointment"
 msgstr "komenco de rendevuo"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:240
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
-msgstr ""
+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:1
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
-msgid "Alarms"
-msgstr "Alarmoj"
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+msgid "Reminders"
+msgstr "Memorigaĵoj"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:159
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:175
-#: ../modules/addressbook/addressbook-config.c:511
+#: ../calendar/gui/dialogs/calendar-setup.c:185
+#: ../modules/addressbook/addressbook-config.c:527
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:156
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../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:276
+#: ../calendar/gui/dialogs/calendar-setup.c:314
 msgid "Cop_y calendar contents locally for offline operation"
-msgstr ""
+msgstr "Loke kop_ii kalendaran enhavon por nekonektitaj agoj"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:278
+#: ../calendar/gui/dialogs/calendar-setup.c:316
 msgid "Cop_y task list contents locally for offline operation"
-msgstr ""
+msgstr "Loke kop_ii tasklistan enhavon por nekonektitaj agoj"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:280
+#: ../calendar/gui/dialogs/calendar-setup.c:318
 msgid "Cop_y memo list contents locally for offline operation"
-msgstr ""
+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:352
+#: ../calendar/gui/dialogs/calendar-setup.c:439
 msgid "Colo_r:"
 msgstr "Kolo_ro:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:375
-#: ../calendar/gui/dialogs/calendar-setup.c:386
-#: ../calendar/gui/dialogs/calendar-setup.c:397
-#: ../mail/em-folder-properties.c:232 ../mail/mail-config.ui.h:52
-#: ../modules/addressbook/addressbook-config.c:1012
-#: ../modules/calendar/e-calendar-preferences.ui.h:19
-#: ../plugins/itip-formatter/itip-formatter.c:2946
+#: ../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:387
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
+#: ../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:398
+#: ../calendar/gui/dialogs/calendar-setup.c:486
 msgid "Memo List"
 msgstr "Notolisto"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:578
 msgid "Calendar Properties"
 msgstr "Kalendar-ecoj"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:578
 msgid "New Calendar"
 msgstr "Nova kalendaro"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:638
 msgid "Task List Properties"
 msgstr "Tasklist-ecoj"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:638
 msgid "New Task List"
 msgstr "Nova tasklisto"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:698
 msgid "Memo List Properties"
-msgstr ""
+msgstr "Ecoj de notlisto"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:698
 msgid "New Memo List"
 msgstr "Nova notolisto"
 
-#: ../calendar/gui/dialogs/changed-comp.c:59
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Tiu evento estas forigita."
 
-#: ../calendar/gui/dialogs/changed-comp.c:63
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Tiu tasko estas forigita."
 
-#: ../calendar/gui/dialogs/changed-comp.c:67
+#: ../calendar/gui/dialogs/changed-comp.c:68
 msgid "This memo has been deleted."
 msgstr "Tiu noto estas forigite."
 
-#: ../calendar/gui/dialogs/changed-comp.c:76
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
+"%s  Vi faris ŝanĝojn. Ĉu forgesi tiajn ŝanĝojn kaj fermi la redaktilon?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:78
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
-msgstr ""
+msgstr "%s  Vi ne faris ŝanĝojn. Ĉu fermi la redaktilon?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:83
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Tiu evento estas ŝanĝita."
 
-#: ../calendar/gui/dialogs/changed-comp.c:87
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Tiu tasko estas ŝanĝita."
 
-#: ../calendar/gui/dialogs/changed-comp.c:91
+#: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This memo has been changed."
 msgstr "Tiu noto estas ŝanĝite."
 
-#: ../calendar/gui/dialogs/changed-comp.c:100
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, 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:102
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, 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-page.c:458
-#, c-format
-msgid "Validation error: %s"
-msgstr "Validig-eraro: %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:264
+#: ../calendar/gui/dialogs/comp-editor.c:276
 msgid "Could not save attachments"
 msgstr "Ne eblis konservi aldonaĵojn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:585
+#: ../calendar/gui/dialogs/comp-editor.c:622
 msgid "Could not update object"
 msgstr "Ne eblis aktualigi onjekton"
 
-#: ../calendar/gui/dialogs/comp-editor.c:710
+#: ../calendar/gui/dialogs/comp-editor.c:750
 msgid "Edit Appointment"
 msgstr "Redakti rendevuon"
 
-#: ../calendar/gui/dialogs/comp-editor.c:717
+#: ../calendar/gui/dialogs/comp-editor.c:757
 #, c-format
 msgid "Meeting - %s"
 msgstr "Kunsido - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:719
+#: ../calendar/gui/dialogs/comp-editor.c:759
 #, c-format
 msgid "Appointment - %s"
 msgstr "Rendevuo - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:725
+#: ../calendar/gui/dialogs/comp-editor.c:765
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Asignitaj taskoj - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:727
+#: ../calendar/gui/dialogs/comp-editor.c:767
 #, c-format
 msgid "Task - %s"
 msgstr "Tasko - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:732
+#: ../calendar/gui/dialogs/comp-editor.c:772
 #, c-format
 msgid "Memo - %s"
 msgstr "Noto - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:748
+#: ../calendar/gui/dialogs/comp-editor.c:788
 msgid "No Summary"
-msgstr ""
+msgstr "Neniu resumo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:869
+#: ../calendar/gui/dialogs/comp-editor.c:909
 msgid "Keep original item?"
-msgstr ""
+msgstr "Ĉu manteni originan eron?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1066
-msgid "Click here to close the current window"
-msgstr ""
+#: ../calendar/gui/dialogs/comp-editor.c:1122
+msgid "Close the current window"
+msgstr "Fermi la aktualan fenestron"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073 ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1474
+#: ../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:457 ../widgets/misc/e-web-view.c:1280
+#: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
 msgid "Copy the selection"
 msgstr "Kopii la elektaĵon"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1080 ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1481
+#: ../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:1274
+#: ../widgets/misc/e-web-view.c:1300
 msgid "Cut the selection"
 msgstr "Eltondi la elektaĵon"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1087
-#: ../shell/e-shell-window-actions.c:1488
+#: ../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
 msgid "Delete the selection"
 msgstr "Forigi la elektitaĵon"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1094
-msgid "Click here to view help available"
-msgstr ""
+#: ../calendar/gui/dialogs/comp-editor.c:1150
+msgid "View help"
+msgstr "Montri helpon"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1101 ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1523
+#: ../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:1286
+#: ../widgets/misc/e-web-view.c:1312
 msgid "Paste the clipboard"
 msgstr "Enmeti la tondujon"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122
-msgid "Click here to save the current window"
-msgstr "Klaku ĉi tie por konservi la aktualan fenestron"
+#: ../calendar/gui/dialogs/comp-editor.c:1178
+msgid "Save current changes"
+msgstr "Konservi aktualajn ŝanĝojn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1600
+#: ../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
 msgid "Select all text"
 msgstr "Elekti tutan tekston"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/dialogs/comp-editor.c:1192
 msgid "_Classification"
 msgstr "_Kategoriado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../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:176
+#: ../mail/e-mail-browser.c:172
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1628
+#: ../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:1150 ../mail/e-mail-browser.c:169
-#: ../shell/e-shell-window-actions.c:1635
+#: ../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
 msgid "_File"
 msgstr "_Dosiero"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1157
-#: ../shell/e-shell-window-actions.c:1642
+#: ../calendar/gui/dialogs/comp-editor.c:1213
+#: ../shell/e-shell-window-actions.c:1628
 msgid "_Help"
 msgstr "_Helpo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164
+#: ../calendar/gui/dialogs/comp-editor.c:1220
 msgid "_Insert"
 msgstr "_Enmeti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1171
-#: ../composer/e-composer-actions.c:340
+#: ../calendar/gui/dialogs/comp-editor.c:1227
+#: ../composer/e-composer-actions.c:339
 msgid "_Options"
 msgstr "_Agordoj"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1178 ../mail/e-mail-browser.c:183
-#: ../shell/e-shell-window-actions.c:1677 ../smime/gui/smime-ui.ui.h:46
+#: ../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
 msgid "_View"
 msgstr "_Vido"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1188
-#: ../composer/e-composer-actions.c:289
+#: ../calendar/gui/dialogs/comp-editor.c:1244
+#: ../composer/e-composer-actions.c:288
 msgid "_Attachment..."
 msgstr "_Aldonaĵo..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1190
-msgid "Click here to attach a file"
-msgstr "Klaku ĉi tie por aldoni dosieron"
+#: ../calendar/gui/dialogs/comp-editor.c:1246
+#: ../composer/e-composer-actions.c:290
+#: ../widgets/misc/e-attachment-view.c:439
+msgid "Attach a file"
+msgstr "Aldoni dosieron"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1198
+#: ../calendar/gui/dialogs/comp-editor.c:1254
 msgid "_Categories"
 msgstr "_Kategorioj"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1200
+#: ../calendar/gui/dialogs/comp-editor.c:1256
 msgid "Toggles whether to display categories"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1206
+#: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "Time _Zone"
 msgstr "Hor_zono"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1208
+#: ../calendar/gui/dialogs/comp-editor.c:1264
 msgid "Toggles whether the time zone is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1217
+#: ../calendar/gui/dialogs/comp-editor.c:1273
 msgid "Pu_blic"
 msgstr "Pu_blike"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1219
+#: ../calendar/gui/dialogs/comp-editor.c:1275
 msgid "Classify as public"
 msgstr "Kategoriigi kiel publike"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1224
+#: ../calendar/gui/dialogs/comp-editor.c:1280
 msgid "_Private"
 msgstr "_Private"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1226
+#: ../calendar/gui/dialogs/comp-editor.c:1282
 msgid "Classify as private"
 msgstr "Kategoriigi kiel private"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1231
+#: ../calendar/gui/dialogs/comp-editor.c:1287
 msgid "_Confidential"
 msgstr "_Konfidence"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1233
+#: ../calendar/gui/dialogs/comp-editor.c:1289
 msgid "Classify as confidential"
 msgstr "Kategoriigi kiel konfidence"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1241
+#: ../calendar/gui/dialogs/comp-editor.c:1297
 msgid "R_ole Field"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1243
+#: ../calendar/gui/dialogs/comp-editor.c:1299
 msgid "Toggles whether the Role field is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1249
+#: ../calendar/gui/dialogs/comp-editor.c:1305
 msgid "_RSVP"
-msgstr ""
+msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1251
+#: ../calendar/gui/dialogs/comp-editor.c:1307
 msgid "Toggles whether the RSVP field is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1257
+#: ../calendar/gui/dialogs/comp-editor.c:1313
 msgid "_Status Field"
 msgstr "_Statokampo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1259
+#: ../calendar/gui/dialogs/comp-editor.c:1315
 msgid "Toggles whether the Status field is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1265
+#: ../calendar/gui/dialogs/comp-editor.c:1321
 msgid "_Type Field"
 msgstr "_Tipokampo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1267
+#: ../calendar/gui/dialogs/comp-editor.c:1323
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1291
+#: ../calendar/gui/dialogs/comp-editor.c:1347
 #: ../composer/e-composer-private.c:77
 msgid "Recent _Documents"
-msgstr ""
+msgstr "Freŝaj _dokumentoj"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2003
-#: ../composer/e-composer-actions.c:508
+#: ../calendar/gui/dialogs/comp-editor.c:2079
+#: ../composer/e-composer-actions.c:507
 msgid "Attach"
 msgstr "Aldoni"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2337
-#: ../calendar/gui/dialogs/comp-editor.c:2500
-#: ../calendar/gui/dialogs/comp-editor.c:3478
+#: ../calendar/gui/dialogs/comp-editor.c:2427
+#: ../calendar/gui/dialogs/comp-editor.c:2590
+#: ../calendar/gui/dialogs/comp-editor.c:3582
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:3442
-#: ../plugins/prefer-plain/prefer-plain.c:64
+#: ../calendar/gui/dialogs/comp-editor.c:3546
+#: ../plugins/prefer-plain/prefer-plain.c:66
 msgid "attachment"
 msgstr "aldonaĵo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3510
+#: ../calendar/gui/dialogs/comp-editor.c:3614
 msgid "Unable to use current version!"
 msgstr "Ne eblas uzi aktualan version!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:108
+#: ../calendar/gui/dialogs/comp-editor-page.c:461
+#, 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:123
+#: ../calendar/gui/dialogs/copy-source-dialog.c:130
 msgid "Destination is read only"
 msgstr "Celo estas nur legebla"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:157
+#: ../calendar/gui/dialogs/copy-source-dialog.c:164
 msgid "Cannot create object"
 msgstr "Ne eblas krei objekton"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:183
+#: ../calendar/gui/dialogs/copy-source-dialog.c:193
 msgid "Could not open source"
 msgstr "Ne eblis malfermi fonton"
 
-#: ../calendar/gui/dialogs/delete-comp.c:210
+#: ../calendar/gui/dialogs/delete-comp.c:212
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-comp.c:213
+#: ../calendar/gui/dialogs/delete-comp.c:215
 msgid "_Retract comment"
 msgstr ""
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:56
+#: ../calendar/gui/dialogs/delete-error.c:55
 #, 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:60
+#: ../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:64
+#: ../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:68
+#: ../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:75
+#: ../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:78
+#: ../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:81
+#: ../calendar/gui/dialogs/delete-error.c:80
 msgid "The memo could not be deleted because permission was denied"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:84
+#: ../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:92
+#: ../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:96
+#: ../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:100
+#: ../calendar/gui/dialogs/delete-error.c:99
 #, c-format
 msgid "The memo 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:104
+#: ../calendar/gui/dialogs/delete-error.c:103
 #, c-format
 msgid "The item could not be deleted due to an error: %s"
 msgstr ""
@@ -2792,11 +2897,11 @@ msgid "Enter Delegate"
 msgstr ""
 
 #: ../calendar/gui/dialogs/event-editor.c:212
-msgid "_Alarms"
-msgstr "_Alarmoj"
+msgid "_Reminders"
+msgstr "Momo_rigaĵoj"
 
 #: ../calendar/gui/dialogs/event-editor.c:214
-msgid "Click here to set or unset alarms for this event"
+msgid "Set or unset reminders for this event"
 msgstr ""
 
 #: ../calendar/gui/dialogs/event-editor.c:222
@@ -2841,13 +2946,13 @@ msgstr "_Libere/okupite"
 msgid "Query free / busy information for the attendees"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3185
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3327
 msgid "Appointment"
 msgstr "Rendevuo"
 
 #: ../calendar/gui/dialogs/event-editor.c:384
-#: ../calendar/gui/dialogs/event-page.ui.h:3
-#: ../calendar/gui/e-meeting-list-view.c:148
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/e-meeting-list-view.c:161
 msgid "Attendees"
 msgstr ""
 
@@ -2855,158 +2960,158 @@ msgstr ""
 msgid "Print this event"
 msgstr "Presi tiun eventon"
 
-#: ../calendar/gui/dialogs/event-page.c:556
+#: ../calendar/gui/dialogs/event-page.c:558
 msgid "Event's start time is in the past"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:633
+#: ../calendar/gui/dialogs/event-page.c:635
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:637
+#: ../calendar/gui/dialogs/event-page.c:639
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:649
-#: ../calendar/gui/dialogs/event-page.c:3021
-msgid "This event has alarms"
-msgstr "Tiu evento havas alarmojn"
+#: ../calendar/gui/dialogs/event-page.c:651
+#: ../calendar/gui/dialogs/event-page.c:3093
+msgid "This event has reminders"
+msgstr "Tiu evento havas memorigaĵojn"
 
-#: ../calendar/gui/dialogs/event-page.c:716
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.c:718
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizilo:"
 
-#: ../calendar/gui/dialogs/event-page.c:1254
+#: ../calendar/gui/dialogs/event-page.c:1277
 msgid "Event with no start date"
 msgstr "Evento sen komencdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1257
+#: ../calendar/gui/dialogs/event-page.c:1280
 msgid "Event with no end date"
 msgstr "Evento sen findato"
 
-#: ../calendar/gui/dialogs/event-page.c:1430
-#: ../calendar/gui/dialogs/memo-page.c:689
-#: ../calendar/gui/dialogs/task-page.c:843
+#: ../calendar/gui/dialogs/event-page.c:1453
+#: ../calendar/gui/dialogs/memo-page.c:718
+#: ../calendar/gui/dialogs/task-page.c:836
 msgid "Start date is wrong"
 msgstr "Komencdato estas neĝusta"
 
-#: ../calendar/gui/dialogs/event-page.c:1440
+#: ../calendar/gui/dialogs/event-page.c:1463
 msgid "End date is wrong"
 msgstr "Findato estas neĝusta"
 
-#: ../calendar/gui/dialogs/event-page.c:1463
+#: ../calendar/gui/dialogs/event-page.c:1486
 msgid "Start time is wrong"
 msgstr "Komenctempo estas neĝusta"
 
-#: ../calendar/gui/dialogs/event-page.c:1470
+#: ../calendar/gui/dialogs/event-page.c:1493
 msgid "End time is wrong"
 msgstr "Fintempo estas neĝusta"
 
-#: ../calendar/gui/dialogs/event-page.c:1635
-#: ../calendar/gui/dialogs/memo-page.c:730
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/event-page.c:1656
+#: ../calendar/gui/dialogs/memo-page.c:757
+#: ../calendar/gui/dialogs/task-page.c:889
 msgid "An organizer is required."
 msgstr "Organizilo estas bezonata."
 
-#: ../calendar/gui/dialogs/event-page.c:1669
-#: ../calendar/gui/dialogs/task-page.c:939
+#: ../calendar/gui/dialogs/event-page.c:1690
+#: ../calendar/gui/dialogs/task-page.c:923
 msgid "At least one attendee is required."
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1869
+#: ../calendar/gui/dialogs/event-page.c:1897
 msgid "_Delegatees"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1871
+#: ../calendar/gui/dialogs/event-page.c:1899
 msgid "Atte_ndees"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:2891
+#: ../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
+#. * (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
+#. * 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:2939
-#: ../calendar/gui/dialogs/memo-page.c:961
-#: ../calendar/gui/dialogs/task-page.c:1855
+#. * 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:3250
+#: ../calendar/gui/dialogs/event-page.c:3338
 #, 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:3256
+#: ../calendar/gui/dialogs/event-page.c:3344
 #, 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:3262
+#: ../calendar/gui/dialogs/event-page.c:3350
 #, 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:3281
+#: ../calendar/gui/dialogs/event-page.c:3369
 msgid "Customize"
 msgstr "Adapti"
 
-#. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3287
-msgctxt "cal-alarms"
+#. Translators: "None" for "No reminder set"
+#: ../calendar/gui/dialogs/event-page.c:3375
+msgctxt "cal-reminders"
 msgid "None"
 msgstr "Neniu"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 #: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:565
 msgid "Atte_ndees..."
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "Custom Alarm:"
-msgstr "Propra alarm:"
+#: ../calendar/gui/dialogs/event-page.ui.h:5
+msgid "Custom Reminder:"
+msgstr "Adapti memorigaĵon:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "Event Description"
 msgstr "Event-priskribo"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:9
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Time _zone:"
 msgstr "Hor_zono:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-msgid "_Alarm"
-msgstr "_Alarmo"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../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:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
-#: ../plugins/calendar-weather/calendar-weather.c:366
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../plugins/calendar-weather/calendar-weather.c:381
 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:14
 msgid "_Summary:"
 msgstr "_Resumo:"
@@ -3015,19 +3120,19 @@ msgstr "_Resumo:"
 msgid "_Time:"
 msgstr "_Tempo:"
 
-#. TRANSLATORS: Predefined alarm's description
+#. 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"
 
-#. TRANSLATORS: Predefined alarm's description
+#. 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"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
 msgctxt "eventpage"
 msgid "15 minutes before appointment"
@@ -3037,13 +3142,13 @@ msgstr "15 minutoj antaŭ la rendevuo"
 #: ../calendar/gui/dialogs/event-page.ui.h:23
 msgctxt "eventpage"
 msgid "for"
-msgstr ""
+msgstr "por"
 
 #. 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 ""
+msgstr "ĝis"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:1
 msgid "April"
@@ -3094,7 +3199,7 @@ msgid "Select Date"
 msgstr "Elekti daton"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1363
 msgid "Select _Today"
 msgstr "Elekti _hodiaŭ"
 
@@ -3102,7 +3207,7 @@ msgstr "Elekti _hodiaŭ"
 msgid "September"
 msgstr "Septembro"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3189
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3331
 msgid "Memo"
 msgstr "Noto"
 
@@ -3110,26 +3215,26 @@ msgstr "Noto"
 msgid "Print this memo"
 msgstr "Presi tiun noton"
 
-#: ../calendar/gui/dialogs/memo-page.c:387
+#: ../calendar/gui/dialogs/memo-page.c:418
 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:424
+#: ../calendar/gui/dialogs/memo-page.c:455
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr ""
 
-#: ../calendar/gui/dialogs/memo-page.c:428
+#: ../calendar/gui/dialogs/memo-page.c:459
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr ""
 
-#: ../calendar/gui/dialogs/memo-page.c:918
+#: ../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:1093 ../em-format/em-format-quote.c:284
-#: ../em-format/em-format.c:1056 ../mail/em-format-html.c:2478
-#: ../mail/em-format-html.c:2543 ../mail/em-format-html.c:2567
+#: ../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
 msgid "To"
 msgstr "Al"
@@ -3149,62 +3254,62 @@ msgid "T_o:"
 msgstr "_Al:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:331
+#: ../calendar/gui/dialogs/task-page.c:338
 #: ../calendar/gui/dialogs/task-page.ui.h:9
-msgid "_Group:"
-msgstr "_Grupo:"
+msgid "_List:"
+msgstr "_Listo:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:59
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:64
+#: ../calendar/gui/dialogs/recur-comp.c:63
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:90
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This Instance Only"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:94
+#: ../calendar/gui/dialogs/recur-comp.c:93
 msgid "This and Prior Instances"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:99
 msgid "This and Future Instances"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:105
+#: ../calendar/gui/dialogs/recur-comp.c:104
 msgid "All Instances"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:563
+#: ../calendar/gui/dialogs/recurrence-page.c:573
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:894
+#: ../calendar/gui/dialogs/recurrence-page.c:962
 msgid "Recurrence date is invalid"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:934
+#: ../calendar/gui/dialogs/recurrence-page.c:1002
 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:964
+#: ../calendar/gui/dialogs/recurrence-page.c:1032
 msgid "on"
 msgstr "je"
 
@@ -3212,7 +3317,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:1022
+#: ../calendar/gui/dialogs/recurrence-page.c:1095
 msgid "first"
 msgstr "unua"
 
@@ -3221,7 +3326,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:1028
+#: ../calendar/gui/dialogs/recurrence-page.c:1101
 msgid "second"
 msgstr "dua"
 
@@ -3229,7 +3334,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:1033
+#: ../calendar/gui/dialogs/recurrence-page.c:1106
 msgid "third"
 msgstr "tria"
 
@@ -3237,7 +3342,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:1038
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "fourth"
 msgstr "kvara"
 
@@ -3245,7 +3350,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:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 msgid "fifth"
 msgstr "kvina"
 
@@ -3253,13 +3358,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:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
 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:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1145
 msgid "Other Date"
 msgstr "Alia dato"
 
@@ -3267,7 +3372,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:1078
+#: ../calendar/gui/dialogs/recurrence-page.c:1151
 msgid "1st to 10th"
 msgstr "1a ĝis 10a"
 
@@ -3275,7 +3380,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:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1157
 msgid "11th to 20th"
 msgstr "11a ĝis 20a"
 
@@ -3283,73 +3388,73 @@ 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:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1163
 msgid "21st to 31st"
 msgstr "21a ĝis 31a"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/recurrence-page.c:1189
 #: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "Monday"
 msgstr "Lundo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
+#: ../calendar/gui/dialogs/recurrence-page.c:1190
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "Tuesday"
 msgstr "Mardo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1191
+#: ../modules/calendar/e-calendar-preferences.ui.h:50
 msgid "Wednesday"
 msgstr "Merkredo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1192
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
 msgid "Thursday"
 msgstr "Ĵaŭdo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1193
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
 msgid "Friday"
 msgstr "Vendredo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
-#: ../modules/calendar/e-calendar-preferences.ui.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1194
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Saturday"
 msgstr "Sabato"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-#: ../modules/calendar/e-calendar-preferences.ui.h:36
+#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../modules/calendar/e-calendar-preferences.ui.h:38
 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:1244
+#: ../calendar/gui/dialogs/recurrence-page.c:1319
 msgid "on the"
 msgstr "je"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1418
+#: ../calendar/gui/dialogs/recurrence-page.c:1494
 msgid "occurrences"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Add exception"
 msgstr "Aldoni escepton"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2169
+#: ../calendar/gui/dialogs/recurrence-page.c:2251
 msgid "Could not get a selection to modify."
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2175
+#: ../calendar/gui/dialogs/recurrence-page.c:2257
 msgid "Modify exception"
 msgstr "Modifi escepton"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2219
+#: ../calendar/gui/dialogs/recurrence-page.c:2301
 msgid "Could not get a selection to delete."
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2353
+#: ../calendar/gui/dialogs/recurrence-page.c:2435
 msgid "Date/Time"
 msgstr "Dato/tempo"
 
@@ -3361,7 +3466,7 @@ msgstr "Ĉiun"
 msgid "Exceptions"
 msgstr "Esceptoj"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:82
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:88
 msgid "Preview"
 msgstr "Antaŭrigardo"
 
@@ -3411,11 +3516,11 @@ msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "jaro(j)"
 
-#: ../calendar/gui/dialogs/send-comp.c:192
-msgid "Send my alarms with this event"
+#: ../calendar/gui/dialogs/send-comp.c:196
+msgid "Send my reminders with this event"
 msgstr ""
 
-#: ../calendar/gui/dialogs/send-comp.c:194
+#: ../calendar/gui/dialogs/send-comp.c:198
 msgid "Notify new attendees _only"
 msgstr ""
 
@@ -3424,17 +3529,17 @@ msgstr ""
 msgid "Completed date is wrong"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-details-page.c:488
+#: ../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:298
-#: ../calendar/gui/e-cal-model-tasks.c:439
-#: ../calendar/gui/e-cal-model-tasks.c:713 ../calendar/gui/e-task-table.c:210
-#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:594
-#: ../calendar/gui/print.c:3275 ../mail/em-sync-stream.c:152
+#: ../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"
@@ -3442,59 +3547,59 @@ msgstr "Nuligite"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:437
-#: ../calendar/gui/e-cal-model-tasks.c:711
+#: ../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:208 ../calendar/gui/e-task-table.c:223
-#: ../calendar/gui/e-task-table.c:593 ../calendar/gui/print.c:3272
-#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:374
+#: ../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:317
-#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1224 ../widgets/misc/e-send-options.ui.h:13
+#: ../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:292
-#: ../calendar/gui/e-cal-model-tasks.c:435
-#: ../calendar/gui/e-cal-model-tasks.c:709
-#: ../calendar/gui/e-cal-model-tasks.c:786 ../calendar/gui/e-task-table.c:206
-#: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:592
-#: ../calendar/gui/print.c:3269
+#: ../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:321
-#: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1222 ../widgets/misc/e-send-options.ui.h:14
+#: ../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:319
-#: ../calendar/gui/e-cal-model.c:1518 ../calendar/gui/e-task-table.c:515
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1223
+#: ../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:302
-#: ../calendar/gui/e-cal-model-tasks.c:433
-#: ../calendar/gui/e-cal-model-tasks.c:707 ../calendar/gui/e-task-table.c:204
-#: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:591
-#: ../calendar/gui/print.c:3266 ../calendar/gui/tasktypes.xml.h:18
+#: ../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 ""
 
@@ -3507,11 +3612,11 @@ 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   ...
+#. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1831
-#: ../calendar/gui/e-meeting-list-view.c:596
+#: ../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
@@ -3520,7 +3625,7 @@ msgstr "Stato"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:517 ../calendar/gui/tasktypes.xml.h:24
+#: ../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"
@@ -3550,45 +3655,51 @@ msgstr ""
 msgid "_Send Options"
 msgstr "_Send-agordoj"
 
-#: ../calendar/gui/dialogs/task-editor.c:319 ../calendar/gui/print.c:3187
-#: ../widgets/misc/e-send-options.c:526
+#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3329
+#: ../widgets/misc/e-send-options.c:535
 msgid "Task"
 msgstr "Tasko"
 
-#: ../calendar/gui/dialogs/task-editor.c:322
+#: ../calendar/gui/dialogs/task-editor.c:324
 msgid "Task Details"
 msgstr "Taskdetaloj"
 
-#: ../calendar/gui/dialogs/task-editor.c:364
+#: ../calendar/gui/dialogs/task-editor.c:366
 msgid "Print this task"
 msgstr "Presi la taskon"
 
-#: ../calendar/gui/dialogs/task-page.c:249
+#: ../calendar/gui/dialogs/task-page.c:250
 msgid "Task's start date is in the past"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-page.c:250
+#: ../calendar/gui/dialogs/task-page.c:251
 msgid "Task's due date is in the past"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-page.c:284
+#: ../calendar/gui/dialogs/task-page.c:285
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-page.c:288
+#: ../calendar/gui/dialogs/task-page.c:289
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-page.c:339
+#: ../calendar/gui/dialogs/task-page.c:293
+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:816
+#: ../calendar/gui/dialogs/task-page.c:818
 msgid "Due date is wrong"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-page.c:1808
+#: ../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"
@@ -3605,8 +3716,163 @@ msgstr ""
 msgid "Time zone:"
 msgstr "Horzono:"
 
+#: ../calendar/gui/ea-cal-view.c:315
+msgid "New Appointment"
+msgstr "Nova rendevuo"
+
+#: ../calendar/gui/ea-cal-view.c:316
+msgid "New All Day Event"
+msgstr "Nova tuttaga evento"
+
+#: ../calendar/gui/ea-cal-view.c:317
+msgid "New Meeting"
+msgstr "Nova Kunsido"
+
+#: ../calendar/gui/ea-cal-view.c:318
+msgid "Go to Today"
+msgstr "Iri al hodiaŭ"
+
+#: ../calendar/gui/ea-cal-view.c:319
+msgid "Go to Date"
+msgstr "Iri al dato"
+
+#: ../calendar/gui/ea-cal-view-event.c:290
+msgid "It has reminders."
+msgstr "Ĝi havas memorigaĵojn."
+
+#: ../calendar/gui/ea-cal-view-event.c:293
+msgid "It has recurrences."
+msgstr "Ĝi havas rikurojn."
+
+#: ../calendar/gui/ea-cal-view-event.c:296
+msgid "It is a meeting."
+msgstr "Ĝi estas kunsido."
+
+#: ../calendar/gui/ea-cal-view-event.c:303
+#, c-format
+msgid "Calendar Event: Summary is %s."
+msgstr "Kalendara evento: resumo estas %s."
+
+#: ../calendar/gui/ea-cal-view-event.c:306
+msgid "Calendar Event: It has no summary."
+msgstr "Kalendara evento: ne havas resumon."
+
+#: ../calendar/gui/ea-cal-view-event.c:328
+msgid "calendar view event"
+msgstr "kalendare vidi eventon"
+
+#: ../calendar/gui/ea-cal-view-event.c:557
+msgid "Grab Focus"
+msgstr "Kapti fokuson"
+
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
+#, c-format
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "Ĝi havas %d eventon."
+msgstr[1] "Ĝi havas %d eventojn."
+
+#. 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
+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
+#, 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
+#, c-format
+msgid "Day View: %s. %s"
+msgstr "Taga vido: %s. %s"
+
+#: ../calendar/gui/ea-day-view.c:203
+msgid "calendar view for a work week"
+msgstr "kalendara vido por labora semanjo"
+
+#: ../calendar/gui/ea-day-view.c:205
+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
+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"
+
+#: ../calendar/gui/ea-jump-button.c:159
+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:384
+#: ../calendar/gui/e-alarm-list.c:393
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -3614,194 +3880,130 @@ 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:390
+#: ../calendar/gui/e-alarm-list.c:399
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semajno"
 msgstr[1] "%d semajnoj"
 
-#: ../calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/e-alarm-list.c:461
 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:466
+#: ../calendar/gui/e-alarm-list.c:475
 #, 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:471
+#: ../calendar/gui/e-alarm-list.c:480
 #, 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:478
+#: ../calendar/gui/e-alarm-list.c:487
 #, 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:489
+#: ../calendar/gui/e-alarm-list.c:498
 #, 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:494
+#: ../calendar/gui/e-alarm-list.c:503
 #, 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:501
+#: ../calendar/gui/e-alarm-list.c:510
 #, 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:525
+#: ../calendar/gui/e-alarm-list.c:534
 #, 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:533
+#: ../calendar/gui/e-alarm-list.c:542
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:669
+#: ../calendar/gui/ea-week-view.c:159
+#, c-format
+msgid "Month View: %s. %s"
+msgstr "Monata Vido: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:163
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "Semanja Vido: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:197
+msgid "calendar view for a month"
+msgstr "kalendara vido por monato"
+
+#: ../calendar/gui/ea-week-view.c:199
+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
 msgid "Untitled"
 msgstr "Sentitole"
 
-#: ../calendar/gui/e-cal-component-preview.c:198
+#: ../calendar/gui/e-cal-component-preview.c:200
 msgid "Categories:"
 msgstr "Kategorioj:"
 
-#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Summary:"
 msgstr "Resumo:"
 
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-component-preview.c:261
+#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:263
 msgid "Start Date:"
 msgstr ""
 
-#: ../calendar/gui/e-cal-component-preview.c:275
+#: ../calendar/gui/e-cal-component-preview.c:277
 msgid "Due Date:"
-msgstr ""
+msgstr "Limdato:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:288
-#: ../plugins/itip-formatter/itip-view.c:1075
+#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../plugins/itip-formatter/itip-view.c:1083
 msgid "Status:"
 msgstr "Stato:"
 
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-preview.c:317
 msgid "Priority:"
 msgstr "Prioritato:"
 
-#: ../calendar/gui/e-cal-component-preview.c:340 ../mail/mail-config.ui.h:37
+#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "Priskribo:"
 
-#: ../calendar/gui/e-cal-component-preview.c:371
+#: ../calendar/gui/e-cal-component-preview.c:373
 msgid "Web Page:"
 msgstr "Retpaĝo:"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:2
-#: ../calendar/gui/e-calendar-table.etspec.h:7
-#: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:375
-msgid "Created"
-msgstr "Kreite"
-
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
-msgid "End Date"
-msgstr "Findato"
-
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:9
-#: ../calendar/gui/e-memo-table.etspec.h:4
-msgid "Last modified"
-msgstr ""
-
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
-#: ../calendar/gui/e-memo-table.etspec.h:5
-msgid "Start Date"
-msgstr ""
-
-#: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:568
-msgid "Free"
-msgstr "Libere"
-
-#: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:546 ../calendar/gui/e-task-table.c:569
-msgid "Busy"
-msgstr "Okupite"
-
-#: ../calendar/gui/e-cal-model-tasks.c:655
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-
-#. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:705
-msgctxt "cal-task-status"
-msgid "None"
-msgstr "Nenio"
-
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1524
-#: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
-#: ../calendar/gui/e-meeting-store.c:1028
-msgid "Yes"
-msgstr "Jes"
-
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1524
-#: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:190
-msgid "No"
-msgstr "Ne"
-
-#: ../calendar/gui/e-cal-model.c:761 ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../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:1098
-#: ../calendar/gui/print.c:1115 ../e-util/e-charset.c:52
-#: ../modules/plugin-manager/evolution-plugin-manager.c:101
-#: ../plugins/itip-formatter/itip-formatter.c:462
-#: ../plugins/itip-formatter/itip-formatter.c:2608
-msgid "Unknown"
-msgstr "Nekonate"
-
-#: ../calendar/gui/e-cal-model.c:1520
-msgid "Recurring"
-msgstr ""
-
-#: ../calendar/gui/e-cal-model.c:1522
-msgid "Assigned"
-msgstr ""
-
-#: ../calendar/gui/e-cal-model.c:2629
-#, c-format
-msgid "Opening %s"
-msgstr "Malfermante %s"
-
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
@@ -3819,13 +4021,26 @@ msgstr "Plenumite"
 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:8
 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"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:394
 msgid "Priority"
 msgstr "Prioritato"
 
@@ -3834,76 +4049,45 @@ msgid "Start date"
 msgstr "Komencdato"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:559
+#: ../calendar/gui/e-meeting-list-view.c:598
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../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"
 
-#: ../calendar/gui/e-calendar-view.c:420
+#: ../calendar/gui/e-calendar-view.c:423
 msgid "Cut selected events to the clipboard"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:426
+#: ../calendar/gui/e-calendar-view.c:429
 msgid "Copy selected events to the clipboard"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:432
+#: ../calendar/gui/e-calendar-view.c:435
 msgid "Paste events from the clipboard"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:438
+#: ../calendar/gui/e-calendar-view.c:441
 msgid "Delete selected events"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:457 ../calendar/gui/e-memo-table.c:182
-#: ../calendar/gui/e-task-table.c:260
+#: ../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"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:852
-#: ../calendar/gui/e-task-table.c:1082
+#: ../calendar/gui/e-calendar-view.c:656 ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-task-table.c:1145
 msgid "Updating objects"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1778
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../plugins/itip-formatter/itip-formatter.c:2596
-msgid "Accepted"
-msgstr "Akceptite"
-
-#: ../calendar/gui/e-calendar-view.c:1779
-#: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../plugins/itip-formatter/itip-formatter.c:2602
-msgid "Declined"
-msgstr "Malakceptite"
-
-#: ../calendar/gui/e-calendar-view.c:1780
-#: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../calendar/gui/e-meeting-time-sel.c:545
-msgid "Tentative"
-msgstr "Provizore"
-
-#: ../calendar/gui/e-calendar-view.c:1781
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../plugins/itip-formatter/itip-formatter.c:2605
-msgid "Delegated"
-msgstr "Delegite"
-
-#: ../calendar/gui/e-calendar-view.c:1782
-msgid "Needs action"
-msgstr "Bezonas agon"
-
 #. 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:1926 ../calendar/gui/e-memo-table.c:537
-#: ../calendar/gui/e-task-table.c:758
+#: ../calendar/gui/e-calendar-view.c:1912 ../calendar/gui/e-memo-table.c:539
+#: ../calendar/gui/e-task-table.c:811
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizilo: %s <%s>"
@@ -3911,24 +4095,125 @@ 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:1930 ../calendar/gui/e-memo-table.c:542
-#: ../calendar/gui/e-task-table.c:762
+#: ../calendar/gui/e-calendar-view.c:1916 ../calendar/gui/e-memo-table.c:544
+#: ../calendar/gui/e-task-table.c:815
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizilo: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3221
+#: ../calendar/gui/e-calendar-view.c:1932 ../calendar/gui/print.c:3363
 #, c-format
 msgid "Location: %s"
 msgstr "Loko: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1977
+#: ../calendar/gui/e-calendar-view.c:1963
 #, 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-cal-list-view.etspec.h:7
+#: ../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
+msgid "Unknown"
+msgstr "Nekonate"
+
+#: ../calendar/gui/e-cal-model.c:1609
+msgid "Recurring"
+msgstr ""
+
+#: ../calendar/gui/e-cal-model.c:1611
+msgid "Assigned"
+msgstr ""
+
+#: ../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
+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
+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
+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
+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
+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
+msgid "Delegated"
+msgstr "Delegite"
+
+#: ../calendar/gui/e-cal-model.c:3444
+msgid "Needs action"
+msgstr "Bezonas agon"
+
+#: ../calendar/gui/e-cal-model-calendar.c:188
+#: ../calendar/gui/e-task-table.c:620
+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
+msgid "Busy"
+msgstr "Okupite"
+
+#: ../calendar/gui/e-cal-model-tasks.c:718
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+
+#. Translators: "None" for task's status
+#: ../calendar/gui/e-cal-model-tasks.c:770
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "Nenio"
+
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: ../calendar/gui/e-cell-date-edit-text.c:156
 msgid "%a %m/%d/%Y %H:%M:%S"
@@ -3946,90 +4231,65 @@ msgid ""
 "%s"
 msgstr ""
 
+#. 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
+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
+msgid "pm"
+msgstr "ptm"
+
+#. strftime format %A = full weekday name, %d = day of month,
+#. * %B = full month name. Don't use any other specifiers.
+#. strftime format %A = full weekday name, %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-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
+msgid "%A %d %B"
+msgstr ""
+
+#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
+#: ../calendar/gui/e-day-view.c:2638
+#, 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:806
+#: ../calendar/gui/e-day-view-time-item.c:804
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
-#: ../calendar/gui/e-day-view-time-item.c:827
+#: ../calendar/gui/e-day-view-time-item.c:825
 msgid "Show the second time zone"
 msgstr "Montri la duan horzonon"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:844
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
-#: ../modules/calendar/e-calendar-preferences.c:178
-#: ../modules/calendar/e-calendar-preferences.c:227
+#: ../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
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Nenio"
 
-#: ../calendar/gui/e-day-view-time-item.c:876
+#: ../calendar/gui/e-day-view-time-item.c:874
 #: ../calendar/gui/e-timezone-entry.c:319
-#: ../modules/calendar/e-calendar-preferences.c:254
+#: ../modules/calendar/e-calendar-preferences.c:258
 msgid "Select..."
 msgstr "Elekti..."
 
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %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-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1793
-#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1875
-msgid "%A %d %B"
-msgstr ""
-
-#. 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-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1810
-#: ../calendar/gui/e-week-view-main-item.c:224
-#: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../modules/calendar/e-cal-shell-view-private.c:1016
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#. 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-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1826
-#: ../calendar/gui/e-week-view-main-item.c:238
-#: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../modules/calendar/e-cal-shell-view-private.c:1052
-msgid "%d %b"
-msgstr "%d %b"
-
-#. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1002 ../calendar/gui/e-week-view.c:756
-#: ../calendar/gui/print.c:926 ../calendar/gui/print.c:945
-#: ../calendar/gui/print.c:2372 ../calendar/gui/print.c:2392
-msgid "am"
-msgstr "atm"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:759
-#: ../calendar/gui/print.c:931 ../calendar/gui/print.c:947
-#: ../calendar/gui/print.c:2377 ../calendar/gui/print.c:2394
-msgid "pm"
-msgstr "ptm"
-
-#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2606
-#, c-format
-msgid "Week %d"
-msgstr "Semajno %d"
-
 #: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr ""
@@ -4046,67 +4306,67 @@ msgstr ""
 msgid "Resources"
 msgstr "Risurcoj"
 
-#: ../calendar/gui/e-meeting-list-view.c:159
+#: ../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:1022 ../calendar/gui/print.c:1094
+#: ../calendar/gui/e-meeting-store.c:1047 ../calendar/gui/print.c:1158
 msgid "Individual"
 msgstr "Individue"
 
-#: ../calendar/gui/e-meeting-list-view.c:160
+#: ../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:1095 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/print.c:1159 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Grupo"
 
-#: ../calendar/gui/e-meeting-list-view.c:161
+#: ../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:1096
+#: ../calendar/gui/print.c:1160
 msgid "Resource"
 msgstr "Risurco"
 
-#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../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:1097
+#: ../calendar/gui/print.c:1161
 msgid "Room"
 msgstr "Ĉambro"
 
-#: ../calendar/gui/e-meeting-list-view.c:173
+#: ../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:1111
+#: ../calendar/gui/print.c:1175
 msgid "Chair"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../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:1025 ../calendar/gui/print.c:1112
+#: ../calendar/gui/e-meeting-store.c:1050 ../calendar/gui/print.c:1176
 msgid "Required Participant"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../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:1113
+#: ../calendar/gui/print.c:1177
 msgid "Optional Participant"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../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:1114
+#: ../calendar/gui/print.c:1178
 msgid "Non-Participant"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../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:1035
+#: ../calendar/gui/e-meeting-store.c:1060
 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:539
+#: ../calendar/gui/e-meeting-list-view.c:578
 msgid "Attendee                          "
 msgstr ""
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:584
+#: ../calendar/gui/e-meeting-list-view.c:623
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4115,104 +4375,82 @@ msgstr ""
 msgid "In Process"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-store.c:1834
+#: ../calendar/gui/e-meeting-store.c:1876
 #, 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:1844
+#: ../calendar/gui/e-meeting-store.c:1886
 #, c-format
 msgid "Failure reason: %s"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-store.c:1849
-#: ../plugins/caldav/caldav-browse-server.c:920
-#: ../plugins/google-account-setup/google-source.c:444
-#: ../plugins/publish-calendar/publish-calendar.c:332
-#: ../smime/gui/component.c:49
+#: ../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
 msgid "Enter password"
 msgstr "Enigi pasvorton"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:431
-#: ../calendar/gui/e-meeting-time-sel.c:2380
-msgid "%A, %B %d, %Y"
-msgstr ""
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:435
-#: ../calendar/gui/e-meeting-time-sel.c:2411
-msgid "%a %m/%d/%Y"
-msgstr ""
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:439
-msgid "%m/%d/%Y"
-msgstr ""
-
-#: ../calendar/gui/e-meeting-time-sel.c:547
+#: ../calendar/gui/e-meeting-time-sel.c:549
 msgid "Out of Office"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:548
+#: ../calendar/gui/e-meeting-time-sel.c:550
 msgid "No Information"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:584
+#: ../calendar/gui/e-meeting-time-sel.c:586
 msgid "O_ptions"
 msgstr "_Agordoj"
 
-#: ../calendar/gui/e-meeting-time-sel.c:602
+#: ../calendar/gui/e-meeting-time-sel.c:604
 msgid "Show _only working hours"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:613
+#: ../calendar/gui/e-meeting-time-sel.c:615
 msgid "Show _zoomed out"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:629
+#: ../calendar/gui/e-meeting-time-sel.c:631
 msgid "_Update free/busy"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:644
+#: ../calendar/gui/e-meeting-time-sel.c:646
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:662
+#: ../calendar/gui/e-meeting-time-sel.c:664
 msgid "_Autopick"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:677
+#: ../calendar/gui/e-meeting-time-sel.c:679
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:695
+#: ../calendar/gui/e-meeting-time-sel.c:697
 msgid "_All people and resources"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:705
+#: ../calendar/gui/e-meeting-time-sel.c:707
 msgid "All _people and one resource"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:715
+#: ../calendar/gui/e-meeting-time-sel.c:717
 msgid "_Required people"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:724
+#: ../calendar/gui/e-meeting-time-sel.c:726
 msgid "Required people and _one resource"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:773
+#: ../calendar/gui/e-meeting-time-sel.c:775
 msgid "_Start time:"
 msgstr "_Komenctempo:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:813
+#: ../calendar/gui/e-meeting-time-sel.c:815
 msgid "_End time:"
 msgstr "_Fintempo:"
 
@@ -4240,47 +4478,47 @@ msgstr "Lingvo"
 msgid "Member"
 msgstr "Membro"
 
-#: ../calendar/gui/e-memo-table.c:418
-#: ../modules/calendar/e-cal-shell-content.c:473
-#: ../modules/calendar/e-memo-shell-view-actions.c:222
-#: ../modules/calendar/e-memo-shell-view-actions.c:237
+#: ../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:437
+#: ../plugins/caldav/caldav-browse-server.c:458
 msgid "Memos"
 msgstr "Notoj"
 
-#: ../calendar/gui/e-memo-table.c:499 ../calendar/gui/e-task-table.c:721
+#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:774
 msgid "* No Summary *"
 msgstr ""
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:584 ../calendar/gui/e-task-table.c:803
+#: ../calendar/gui/e-memo-table.c:588 ../calendar/gui/e-task-table.c:858
 msgid "Start: "
 msgstr "Komenco: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:603 ../calendar/gui/e-task-table.c:821
+#: ../calendar/gui/e-memo-table.c:607 ../calendar/gui/e-task-table.c:876
 msgid "Due: "
 msgstr "Limdato: "
 
-#: ../calendar/gui/e-memo-table.c:717
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Cut selected memos to the clipboard"
 msgstr "Eltondi la elektitajn notojn al la tondujo"
 
-#: ../calendar/gui/e-memo-table.c:723
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Copy selected memos to the clipboard"
 msgstr "Kopii la elektitajn notojn en la tondujon"
 
-#: ../calendar/gui/e-memo-table.c:729
+#: ../calendar/gui/e-memo-table.c:738
 msgid "Paste memos from the clipboard"
 msgstr "Enmeti notojn de la tondujo"
 
-#: ../calendar/gui/e-memo-table.c:735
-#: ../modules/calendar/e-memo-shell-view-actions.c:573
+#: ../calendar/gui/e-memo-table.c:744
+#: ../modules/calendar/e-memo-shell-view-actions.c:586
 msgid "Delete selected memos"
 msgstr "Forigi la elektitajn notojn"
 
-#: ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-memo-table.c:750
 msgid "Select all visible memos"
 msgstr "Elekti ĉiujn videblajn notojn"
 
@@ -4289,43 +4527,44 @@ msgid "Click to add a memo"
 msgstr "Klaku por aldoni noton"
 
 #. Translators: "%d%%" is the percentage of a task done.
-#. %d is the actual value, %% is replaced with a percent sign.
-#. Result values will be 0%, 10%, 20%, ... 100%
+#. * %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:543
+#: ../calendar/gui/e-task-table.c:595
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:640 ../calendar/gui/print.c:2168
+#: ../calendar/gui/e-task-table.c:692 ../calendar/gui/print.c:2287
 #: ../calendar/importers/icalendar-importer.c:85
-#: ../calendar/importers/icalendar-importer.c:971
-#: ../modules/calendar/e-cal-shell-content.c:434
-#: ../modules/calendar/e-task-shell-view-actions.c:245
-#: ../modules/calendar/e-task-shell-view-actions.c:260
+#: ../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:435
+#: ../plugins/caldav/caldav-browse-server.c:456
 msgid "Tasks"
 msgstr "Taskoj"
 
-#: ../calendar/gui/e-task-table.c:947
+#: ../calendar/gui/e-task-table.c:1009
 msgid "Cut selected tasks to the clipboard"
 msgstr "Eltondi elektitajn taskojn al la tondujo"
 
-#: ../calendar/gui/e-task-table.c:953
+#: ../calendar/gui/e-task-table.c:1015
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopii elektitajn taskojn al la tondujo"
 
-#: ../calendar/gui/e-task-table.c:959
+#: ../calendar/gui/e-task-table.c:1021
 msgid "Paste tasks from the clipboard"
 msgstr "Enmeti taskojn de la tondujo"
 
-#: ../calendar/gui/e-task-table.c:965
-#: ../modules/calendar/e-task-shell-view-actions.c:697
+#: ../calendar/gui/e-task-table.c:1027
+#: ../modules/calendar/e-task-shell-view-actions.c:710
 msgid "Delete selected tasks"
 msgstr "Forigi elektitajn taskojn"
 
-#: ../calendar/gui/e-task-table.c:971
+#: ../calendar/gui/e-task-table.c:1033
 msgid "Select all visible tasks"
 msgstr "Elekti ĉiujn videblajn taskojn"
 
@@ -4334,190 +4573,42 @@ 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:1856
+#. * 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
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:290
-msgid "It has alarms."
-msgstr "Ĝi havas alarmojn."
-
-#: ../calendar/gui/ea-cal-view-event.c:293
-msgid "It has recurrences."
-msgstr "Ĝi havas rikurojn."
-
-#: ../calendar/gui/ea-cal-view-event.c:296
-msgid "It is a meeting."
-msgstr "Ĝi estas kunsido."
-
-#: ../calendar/gui/ea-cal-view-event.c:303
-#, c-format
-msgid "Calendar Event: Summary is %s."
-msgstr "Kalendara evento: resumo estas %s."
-
-#: ../calendar/gui/ea-cal-view-event.c:306
-msgid "Calendar Event: It has no summary."
-msgstr "Kalendara evento: ne havas resumon."
-
-#: ../calendar/gui/ea-cal-view-event.c:328
-msgid "calendar view event"
-msgstr "kalendare vidi eventon"
-
-#: ../calendar/gui/ea-cal-view-event.c:557
-msgid "Grab Focus"
-msgstr "Kapti fokuson"
-
-#: ../calendar/gui/ea-cal-view.c:303
-msgid "New Appointment"
-msgstr "Nova rendevuo"
-
-#: ../calendar/gui/ea-cal-view.c:304
-msgid "New All Day Event"
-msgstr "Nova tuttaga evento"
-
-#: ../calendar/gui/ea-cal-view.c:305
-msgid "New Meeting"
-msgstr "Nova Kunsido"
-
-#: ../calendar/gui/ea-cal-view.c:306
-msgid "Go to Today"
-msgstr "Iri al hodiaŭ"
-
-#: ../calendar/gui/ea-cal-view.c:307
-msgid "Go to Date"
-msgstr "Iri al dato"
-
-#: ../calendar/gui/ea-day-view-main-item.c:312
-#: ../calendar/gui/ea-week-view-main-item.c:344
-msgid "a table to view and select the current time range"
-msgstr "tabelo por vidi kaj elekti la tempintervalon"
-
-#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
-#, c-format
-msgid "It has %d event."
-msgid_plural "It has %d events."
-msgstr[0] "Ĝi havas %d eventon."
-msgstr[1] "Ĝi havas %d eventojn."
-
-#. 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
-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
-#, 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
-#, c-format
-msgid "Day View: %s. %s"
-msgstr "Taga vido: %s. %s"
-
-#: ../calendar/gui/ea-day-view.c:203
-msgid "calendar view for a work week"
-msgstr "kalendara vido por labora semanjo"
-
-#: ../calendar/gui/ea-day-view.c:205
-msgid "calendar view for one or more days"
-msgstr "kalendara vido por unu aŭ plu tagoj"
-
-#: ../calendar/gui/ea-gnome-calendar.c:50
-#: ../calendar/gui/ea-gnome-calendar.c:58
-#: ../calendar/importers/icalendar-importer.c:1003
-msgid "Gnome Calendar"
-msgstr "Gnomo Kalendaro"
-
-#: ../calendar/gui/ea-gnome-calendar.c:201
-#: ../modules/calendar/e-cal-shell-view-private.c:1012
-msgid "%A %d %b %Y"
-msgstr "%A %d %b %Y"
-
-#: ../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:1019
-#: ../modules/calendar/e-cal-shell-view-private.c:1025
-#: ../modules/calendar/e-cal-shell-view-private.c:1028
-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:1045
-#: ../modules/calendar/e-cal-shell-view-private.c:1056
-#: ../modules/calendar/e-cal-shell-view-private.c:1063
-#: ../modules/calendar/e-cal-shell-view-private.c:1066
-msgid "%d %b %Y"
-msgstr "%d %b %Y"
-
-#: ../calendar/gui/ea-jump-button.c:150
-msgid "Jump button"
-msgstr "Salt-butono"
-
-#: ../calendar/gui/ea-jump-button.c:159
-msgid "Click here, you can find more events."
-msgstr "Klaku ĉi tien, vi povas trovi pluajn eventojn."
-
-#: ../calendar/gui/ea-week-view.c:159
-#, c-format
-msgid "Month View: %s. %s"
-msgstr "Monata Vido: %s. %s"
-
-#: ../calendar/gui/ea-week-view.c:163
-#, c-format
-msgid "Week View: %s. %s"
-msgstr "Semanja Vido: %s. %s"
-
-#: ../calendar/gui/ea-week-view.c:197
-msgid "calendar view for a month"
-msgstr "kalendara vido por monato"
-
-#: ../calendar/gui/ea-week-view.c:199
-msgid "calendar view for one or more weeks"
-msgstr "kalendara vido por unu aŭ plu semanjoj"
-
-#: ../calendar/gui/gnome-cal.c:2215
+#: ../calendar/gui/gnome-cal.c:2255
 msgid "Purging"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:503 ../calendar/gui/itip-utils.c:558
-#: ../calendar/gui/itip-utils.c:661
+#: ../calendar/gui/itip-utils.c:513 ../calendar/gui/itip-utils.c:568
+#: ../calendar/gui/itip-utils.c:681
 msgid "An organizer must be set."
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:560
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:747 ../calendar/gui/itip-utils.c:908
+#: ../calendar/gui/itip-utils.c:767 ../calendar/gui/itip-utils.c:928
 msgid "Event information"
 msgstr "Event-informo"
 
-#: ../calendar/gui/itip-utils.c:750 ../calendar/gui/itip-utils.c:911
+#: ../calendar/gui/itip-utils.c:770 ../calendar/gui/itip-utils.c:931
 msgid "Task information"
 msgstr "Task-informo"
 
-#: ../calendar/gui/itip-utils.c:753 ../calendar/gui/itip-utils.c:914
+#: ../calendar/gui/itip-utils.c:773 ../calendar/gui/itip-utils.c:934
 msgid "Memo information"
 msgstr "Noto-informo"
 
-#: ../calendar/gui/itip-utils.c:756 ../calendar/gui/itip-utils.c:932
+#: ../calendar/gui/itip-utils.c:776 ../calendar/gui/itip-utils.c:952
 msgid "Free/Busy information"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:779
 msgid "Calendar information"
 msgstr "Kalendar-informo"
 
@@ -4525,7 +4616,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:796
+#: ../calendar/gui/itip-utils.c:816
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Akceptite"
@@ -4534,7 +4625,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:803
+#: ../calendar/gui/itip-utils.c:823
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr ""
@@ -4546,7 +4637,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:810 ../calendar/gui/itip-utils.c:858
+#: ../calendar/gui/itip-utils.c:830 ../calendar/gui/itip-utils.c:878
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Malakceptite"
@@ -4555,7 +4646,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:817
+#: ../calendar/gui/itip-utils.c:837
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegite"
@@ -4563,7 +4654,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:830
+#: ../calendar/gui/itip-utils.c:850
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Ĝisdatigite"
@@ -4571,7 +4662,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:837
+#: ../calendar/gui/itip-utils.c:857
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Nuligi"
@@ -4579,7 +4670,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:844
+#: ../calendar/gui/itip-utils.c:864
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Aktualigi"
@@ -4587,252 +4678,252 @@ 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:851
+#: ../calendar/gui/itip-utils.c:871
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:929
+#: ../calendar/gui/itip-utils.c:949
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:937
+#: ../calendar/gui/itip-utils.c:957
 msgid "iCalendar information"
 msgstr "iCalendar-informo"
 
-#: ../calendar/gui/itip-utils.c:962
+#: ../calendar/gui/itip-utils.c:984
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:966
+#: ../calendar/gui/itip-utils.c:988
 msgid "Unable to book a resource, error: "
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:1127
+#: ../calendar/gui/itip-utils.c:1153
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: ../calendar/gui/print.c:548
+#: ../calendar/gui/print.c:592
 msgid "1st"
 msgstr "1a"
 
-#: ../calendar/gui/print.c:548
+#: ../calendar/gui/print.c:592
 msgid "2nd"
 msgstr "2a"
 
-#: ../calendar/gui/print.c:548
+#: ../calendar/gui/print.c:592
 msgid "3rd"
 msgstr "3a"
 
-#: ../calendar/gui/print.c:548
+#: ../calendar/gui/print.c:592
 msgid "4th"
 msgstr "4a"
 
-#: ../calendar/gui/print.c:548
+#: ../calendar/gui/print.c:592
 msgid "5th"
 msgstr "5a"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:593
 msgid "6th"
 msgstr "6a"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:593
 msgid "7th"
 msgstr "7a"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:593
 msgid "8th"
 msgstr "8a"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:593
 msgid "9th"
 msgstr "9a"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:593
 msgid "10th"
 msgstr "10a"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:594
 msgid "11th"
 msgstr "11a"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:594
 msgid "12th"
 msgstr "12a"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:594
 msgid "13th"
 msgstr "13a"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:594
 msgid "14th"
 msgstr "14a"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:594
 msgid "15th"
 msgstr "15a"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:595
 msgid "16th"
 msgstr "16a"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:595
 msgid "17th"
 msgstr "17a"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:595
 msgid "18th"
 msgstr "18a"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:595
 msgid "19th"
 msgstr "19a"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:595
 msgid "20th"
 msgstr "20a"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:596
 msgid "21st"
 msgstr "21a"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:596
 msgid "22nd"
 msgstr "22a"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:596
 msgid "23rd"
 msgstr "23a"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:596
 msgid "24th"
 msgstr "24a"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:596
 msgid "25th"
 msgstr "25a"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:597
 msgid "26th"
 msgstr "26a"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:597
 msgid "27th"
 msgstr "27a"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:597
 msgid "28th"
 msgstr "28a"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:597
 msgid "29th"
 msgstr "29a"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:597
 msgid "30th"
 msgstr "30a"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:598
 msgid "31st"
 msgstr "31a"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:611
+#: ../calendar/gui/print.c:655
 msgid "Su"
 msgstr "Di"
 
-#: ../calendar/gui/print.c:611
+#: ../calendar/gui/print.c:655
 msgid "Mo"
 msgstr "Lu"
 
-#: ../calendar/gui/print.c:611
+#: ../calendar/gui/print.c:655
 msgid "Tu"
 msgstr "Ma"
 
-#: ../calendar/gui/print.c:611
+#: ../calendar/gui/print.c:655
 msgid "We"
 msgstr "Me"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:656
 msgid "Th"
 msgstr "Ĵa"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:656
 msgid "Fr"
 msgstr "Ve"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:656
 msgid "Sa"
 msgstr "Sa"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3014
+#: ../calendar/gui/print.c:3156
 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:3024
+#: ../calendar/gui/print.c:3166
 msgid " (Completed "
 msgstr " (Plenumite "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3030
+#: ../calendar/gui/print.c:3172
 msgid "Completed "
 msgstr "Plenumite "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3040
+#: ../calendar/gui/print.c:3182
 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:3047
+#: ../calendar/gui/print.c:3189
 msgid "Due "
 msgstr "Limdato "
 
-#: ../calendar/gui/print.c:3212
+#: ../calendar/gui/print.c:3354
 #, c-format
 msgid "Summary: %s"
 msgstr ""
 
-#: ../calendar/gui/print.c:3239
+#: ../calendar/gui/print.c:3381
 msgid "Attendees: "
 msgstr ""
 
-#: ../calendar/gui/print.c:3282
+#: ../calendar/gui/print.c:3424
 #, c-format
 msgid "Status: %s"
 msgstr "Stato: %s"
 
-#: ../calendar/gui/print.c:3297
+#: ../calendar/gui/print.c:3439
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritato: %s"
 
-#: ../calendar/gui/print.c:3315
+#: ../calendar/gui/print.c:3457
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: ../calendar/gui/print.c:3326
+#: ../calendar/gui/print.c:3468
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3339
+#: ../calendar/gui/print.c:3481
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorioj: %s"
 
-#: ../calendar/gui/print.c:3350
+#: ../calendar/gui/print.c:3492
 msgid "Contacts: "
 msgstr "Kontaktoj: "
 
@@ -4861,181 +4952,181 @@ msgstr "pli malgranda ol"
 msgid "Appointments and Meetings"
 msgstr "Rendevuoj kaj kunsidoj"
 
-#: ../calendar/importers/icalendar-importer.c:407
-#: ../calendar/importers/icalendar-importer.c:817
-#: ../plugins/itip-formatter/itip-formatter.c:2085
+#: ../calendar/importers/icalendar-importer.c:435
+#: ../calendar/importers/icalendar-importer.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:2486
 msgid "Opening calendar"
 msgstr "Malfermante kalendaron"
 
-#: ../calendar/importers/icalendar-importer.c:547
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar-dosieroj (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:548
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution iCalendar importer"
 msgstr "Evolucio-iCalendar-enportilo"
 
-#: ../calendar/importers/icalendar-importer.c:636
+#: ../calendar/importers/icalendar-importer.c:674
 msgid "Reminder!"
 msgstr "Memorigilo!"
 
-#: ../calendar/importers/icalendar-importer.c:716
+#: ../calendar/importers/icalendar-importer.c:758
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar-dosieroj (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:717
+#: ../calendar/importers/icalendar-importer.c:759
 msgid "Evolution vCalendar importer"
 msgstr "Evolucio-vCalendar-enportilo"
 
-#: ../calendar/importers/icalendar-importer.c:966
+#: ../calendar/importers/icalendar-importer.c:1039
 msgid "Calendar Events"
 msgstr "Kalendara-eventoj"
 
-#: ../calendar/importers/icalendar-importer.c:1004
+#: ../calendar/importers/icalendar-importer.c:1079
 msgid "Evolution Calendar intelligent importer"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:1069
-#: ../calendar/importers/icalendar-importer.c:1386
+#: ../calendar/importers/icalendar-importer.c:1147
+#: ../calendar/importers/icalendar-importer.c:1465
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Kunsido"
 
-#: ../calendar/importers/icalendar-importer.c:1069
-#: ../calendar/importers/icalendar-importer.c:1386
+#: ../calendar/importers/icalendar-importer.c:1147
+#: ../calendar/importers/icalendar-importer.c:1465
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Evento"
 
-#: ../calendar/importers/icalendar-importer.c:1072
-#: ../calendar/importers/icalendar-importer.c:1387
+#: ../calendar/importers/icalendar-importer.c:1150
+#: ../calendar/importers/icalendar-importer.c:1466
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Tasko"
 
-#: ../calendar/importers/icalendar-importer.c:1075
-#: ../calendar/importers/icalendar-importer.c:1388
+#: ../calendar/importers/icalendar-importer.c:1153
+#: ../calendar/importers/icalendar-importer.c:1467
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Noto"
 
-#: ../calendar/importers/icalendar-importer.c:1084
+#: ../calendar/importers/icalendar-importer.c:1162
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:1089
+#: ../calendar/importers/icalendar-importer.c:1167
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:1094
+#: ../calendar/importers/icalendar-importer.c:1172
 msgctxt "iCalImp"
-msgid "has alarms"
-msgstr "havas alarmojn"
+msgid "has reminders"
+msgstr "havas memorigaĵojn"
 
-#: ../calendar/importers/icalendar-importer.c:1099
+#: ../calendar/importers/icalendar-importer.c:1177
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "havas aldonaĵojn"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1112
+#: ../calendar/importers/icalendar-importer.c:1190
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Publike"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1115
+#: ../calendar/importers/icalendar-importer.c:1193
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Private"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1118
+#: ../calendar/importers/icalendar-importer.c:1196
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Konfidence"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1122
+#: ../calendar/importers/icalendar-importer.c:1200
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Kategoriado"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:1127
-#: ../calendar/importers/icalendar-importer.c:1427
+#: ../calendar/importers/icalendar-importer.c:1205
+#: ../calendar/importers/icalendar-importer.c:1506
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Resumo"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1133
+#: ../calendar/importers/icalendar-importer.c:1211
 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:1141
-#: ../calendar/importers/icalendar-importer.c:1423
+#: ../calendar/importers/icalendar-importer.c:1219
+#: ../calendar/importers/icalendar-importer.c:1502
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Komenco"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1152
+#: ../calendar/importers/icalendar-importer.c:1230
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Limdato"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1164
+#: ../calendar/importers/icalendar-importer.c:1242
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Fino"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1174
+#: ../calendar/importers/icalendar-importer.c:1252
 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:1198
+#: ../calendar/importers/icalendar-importer.c:1276
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Plenumite"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1206
+#: ../calendar/importers/icalendar-importer.c:1284
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1217
-#: ../calendar/importers/icalendar-importer.c:1220
+#: ../calendar/importers/icalendar-importer.c:1295
+#: ../calendar/importers/icalendar-importer.c:1298
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organizilo"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1240
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1318
+#: ../calendar/importers/icalendar-importer.c:1321
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:1257
+#: ../calendar/importers/icalendar-importer.c:1335
 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:1419
+#: ../calendar/importers/icalendar-importer.c:1498
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Tipo"
@@ -5589,7 +5680,6 @@ msgid "America/Nassau"
 msgstr "Ameriko/Nassau"
 
 #: ../calendar/zones.h:157
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
 msgid "America/New_York"
 msgstr "Ameriko/Novjorko"
 
@@ -6589,256 +6679,529 @@ msgstr "Pacifiko/Wallis"
 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
 msgid "Save as..."
 msgstr "Konservi kiel..."
 
-#: ../composer/e-composer-actions.c:291
-#: ../widgets/misc/e-attachment-view.c:380
-msgid "Attach a file"
-msgstr "Aldoni dosieron"
-
-#: ../composer/e-composer-actions.c:296
+#: ../composer/e-composer-actions.c:295
 #: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
 msgstr "_Fermi"
 
-#: ../composer/e-composer-actions.c:298
+#: ../composer/e-composer-actions.c:297
 msgid "Close the current file"
 msgstr "Fermi la aktualan dosieron"
 
-#: ../composer/e-composer-actions.c:303
+#: ../composer/e-composer-actions.c:302
 msgid "New _Message"
 msgstr "Nova _mesaĝo"
 
-#: ../composer/e-composer-actions.c:305
+#: ../composer/e-composer-actions.c:304
 msgid "Open New Message window"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1537
+#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1523
 msgid "Configure Evolution"
 msgstr "Agordi Evolucion"
 
-#: ../composer/e-composer-actions.c:319
+#: ../composer/e-composer-actions.c:318
 msgid "Save the current file"
 msgstr "Konservi la aktualan dosieron"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:323
 msgid "Save _As..."
 msgstr "_Konservi kiel..."
 
-#: ../composer/e-composer-actions.c:326
+#: ../composer/e-composer-actions.c:325
 msgid "Save the current file with a different name"
 msgstr "Konservi la aktualan dosieron kun alia nomo"
 
-#: ../composer/e-composer-actions.c:333
+#: ../composer/e-composer-actions.c:332
 msgid "Character _Encoding"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:349
 msgid "_Print..."
 msgstr "_Presi..."
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:356
 msgid "Print Pre_view"
 msgstr "Presi antaŭ_vidon"
 
-#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-actions.c:363
 msgid "Save as _Draft"
 msgstr "Konservi kiel _malneto"
 
-#: ../composer/e-composer-actions.c:366
+#: ../composer/e-composer-actions.c:365
 msgid "Save as draft"
 msgstr "Konservi kiel malneto"
 
-#: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:352
+#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:349
 msgid "S_end"
 msgstr "S_endi"
 
-#: ../composer/e-composer-actions.c:373
+#: ../composer/e-composer-actions.c:372
 msgid "Send this message"
-msgstr "Seni tiun mesaĝon"
+msgstr "Sendi tiun mesaĝon"
 
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:380
 msgid "PGP _Encrypt"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:383
+#: ../composer/e-composer-actions.c:382
 msgid "Encrypt this message with PGP"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:388
 msgid "PGP _Sign"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:391
+#: ../composer/e-composer-actions.c:390
 msgid "Sign this message with your PGP key"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:397
+#: ../composer/e-composer-actions.c:396
 msgid "_Picture Gallery"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:399
+#: ../composer/e-composer-actions.c:398
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:405
+#: ../composer/e-composer-actions.c:404
 msgid "_Prioritize Message"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:407
+#: ../composer/e-composer-actions.c:406
 msgid "Set the message priority to high"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:413
+#: ../composer/e-composer-actions.c:412
 msgid "Re_quest Read Receipt"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:415
+#: ../composer/e-composer-actions.c:414
 msgid "Get delivery notification when your message is read"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:420
 msgid "S/MIME En_crypt"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:423
+#: ../composer/e-composer-actions.c:422
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:429
+#: ../composer/e-composer-actions.c:428
 msgid "S/MIME Sig_n"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:431
+#: ../composer/e-composer-actions.c:430
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:437
+#: ../composer/e-composer-actions.c:436
 msgid "_Bcc Field"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:439
+#: ../composer/e-composer-actions.c:438
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:445
+#: ../composer/e-composer-actions.c:444
 msgid "_Cc Field"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:447
+#: ../composer/e-composer-actions.c:446
 msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:453
+#: ../composer/e-composer-actions.c:452
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:455
+#: ../composer/e-composer-actions.c:454
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:514
+#: ../composer/e-composer-actions.c:513
 msgid "Save Draft"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:40
+#: ../composer/e-composer-header-table.c:38
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:40
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:45
+#: ../composer/e-composer-header-table.c:43
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:1008
+#: ../composer/e-composer-header-table.c:775
 msgid "Fr_om:"
 msgstr "_De:"
 
-#: ../composer/e-composer-header-table.c:1017
+#: ../composer/e-composer-header-table.c:784
 msgid "_Reply-To:"
 msgstr "_Respondi-al:"
 
-#: ../composer/e-composer-header-table.c:1021
+#: ../composer/e-composer-header-table.c:788
 msgid "_To:"
 msgstr "_Al:"
 
-#: ../composer/e-composer-header-table.c:1026
+#: ../composer/e-composer-header-table.c:793
 msgid "_Cc:"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:1031
+#: ../composer/e-composer-header-table.c:798
 msgid "_Bcc:"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:1036
+#: ../composer/e-composer-header-table.c:803
 msgid "_Post To:"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:1040
+#: ../composer/e-composer-header-table.c:807
 msgid "S_ubject:"
 msgstr "_Temo:"
 
-#: ../composer/e-composer-header-table.c:1049
+#: ../composer/e-composer-header-table.c:816
 msgid "Si_gnature:"
 msgstr "_Subskribo:"
 
-#: ../composer/e-composer-name-header.c:141
+#: ../composer/e-composer-name-header.c:145
 msgid "Click here for the address book"
 msgstr "Klaku ĉi tien por la adresaro"
 
-#: ../composer/e-composer-post-header.c:131
+#: ../composer/e-composer-post-header.c:135
 msgid "Click here to select folders to post to"
 msgstr ""
 
-#: ../composer/e-composer-private.c:249
+#: ../composer/e-composer-private.c:247
 msgid "Undo the last action"
 msgstr "Malfari la lastan agon"
 
-#: ../composer/e-composer-private.c:253
+#: ../composer/e-composer-private.c:251
 msgid "Redo the last undone action"
 msgstr "Refari la lastan malfaritan agon"
 
-#: ../composer/e-composer-private.c:257
+#: ../composer/e-composer-private.c:255
 msgid "Search for text"
 msgstr "Serĉi tekston"
 
-#: ../composer/e-composer-private.c:261
+#: ../composer/e-composer-private.c:259
 msgid "Search for and replace text"
 msgstr "Serĉi kaj anstataŭigi tekston"
 
-#: ../composer/e-composer-private.c:372
+#: ../composer/e-composer-private.c:369
 msgid "Save draft"
 msgstr "Konservi malneton"
 
-#: ../composer/e-msg-composer.c:791
+#: ../composer/e-msg-composer.c:813
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:800
+#: ../composer/e-msg-composer.c:822
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1695 ../composer/e-msg-composer.c:2079
+#: ../composer/e-msg-composer.c:1609 ../composer/e-msg-composer.c:1996
 msgid "Compose Message"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:4159
+#: ../composer/e-msg-composer.c:4166
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 
-#: ../composer/e-msg-composer.c:4864
+#: ../composer/e-msg-composer.c:4870
 msgid "Untitled Message"
 msgstr ""
 
@@ -6857,9 +7220,8 @@ msgid "An error occurred while saving to your Drafts folder."
 msgstr "Eraro okazis dum konservado al via malnetdosierujo."
 
 #: ../composer/mail-composer.error.xml.h:4
-#, fuzzy
 msgid "An error occurred while saving to your Outbox folder."
-msgstr "Eraro okazis dum konservado al via senditujo."
+msgstr "Eraro okazis dum konservado al via senditaĵujo."
 
 #: ../composer/mail-composer.error.xml.h:5
 msgid "An error occurred while sending. How do you want to proceed?"
@@ -6986,315 +7348,2530 @@ msgstr ""
 msgid "_Try Again"
 msgstr "_Provi denove"
 
-#. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:153
-msgid "ID of the socket to embed in"
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+msgid "Calendar event notifications"
 msgstr ""
 
-#: ../capplet/anjal-settings-main.c:154
-msgid "socket"
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+msgid "Evolution Alarm Notify"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:77
-msgid "Please enter your full name."
-msgstr "Bonvole enigu vian tutan nomon."
+#: ../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
+msgid "Evolution"
+msgstr "Evolucio"
 
-#: ../capplet/settings/mail-account-view.c:78
-msgid "Please enter your email address."
-msgstr "Bonvole enigu vian retpoŝtadreson."
+#: ../data/evolution.desktop.in.in.h:2
+msgid "Evolution Mail and Calendar"
+msgstr "Evolucio - Retpoŝto kaj Kalendaro"
 
-#: ../capplet/settings/mail-account-view.c:79
-msgid "The email address you have entered is invalid."
-msgstr "La enmetita retpoŝtadreso estas nevalida."
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
+msgid "Groupware Suite"
+msgstr "Grupprogramaro"
 
-#: ../capplet/settings/mail-account-view.c:80
-msgid "Please enter your password."
-msgstr "Bonvole enigu vian vian pasvorton."
+#: ../data/evolution.desktop.in.in.h:4
+msgid "Manage your email, contacts and schedule"
+msgstr "Administri viajn retpoŝton, kontaktojn kaj planojn"
 
-#: ../capplet/settings/mail-account-view.c:259
-#: ../plugins/caldav/caldav-source.c:68
-msgid "CalDAV"
-msgstr "CalDAV"
+#: ../data/evolution-settings.desktop.in.in.h:1
+msgid "Configure email accounts"
+msgstr "Agordi la retpoŝtkontojn"
 
-#: ../capplet/settings/mail-account-view.c:361
-#: ../capplet/settings/mail-account-view.c:413
-#: ../plugins/google-account-setup/google-contacts-source.c:55
-#: ../plugins/google-account-setup/google-source.c:83
-msgid "Google"
-msgstr "Google"
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "Retpoŝtagordoj"
 
-#: ../capplet/settings/mail-account-view.c:463
-msgid "Personal details:"
-msgstr "Persondetaloj:"
+#: ../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"
 
-#: ../capplet/settings/mail-account-view.c:470
-msgid "Name:"
-msgstr "Nomo:"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:2
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
+msgid "Contact layout style"
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:479
-msgid "Email address:"
-msgstr "Retpoŝtadreso:"
+#: ../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 ""
 
-#: ../capplet/settings/mail-account-view.c:489
-msgid "Details:"
-msgstr "Detaloj:"
+#: ../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)"
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:497
-msgid "Receiving"
-msgstr "Ricevante"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:5
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "Enable address formatting"
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:504
-msgid "Server type:"
-msgstr "Serviltipo:"
+#: ../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."
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:513
-msgid "Server address:"
-msgstr "Serviladreso:"
+#: ../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."
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:522
-msgid "Username:"
-msgstr "Uzantonomo:"
+#: ../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"
 
-#: ../capplet/settings/mail-account-view.c:531
-msgid "Use encryption:"
-msgstr "Uti ĉifradon:"
+#: ../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"
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:536
-#: ../capplet/settings/mail-account-view.c:571
-msgid "never"
-msgstr "neniam"
+#: ../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"
 
-#: ../capplet/settings/mail-account-view.c:548
-msgid "Sending"
-msgstr "Sendante"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+msgid "Show preview pane"
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:590
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
 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."
+"The UID of the selected (or \"primary\") address book in the sidebar of the "
+"\"Contacts\" view"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:592
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 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."
+"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 ""
 
-#: ../capplet/settings/mail-account-view.c:594
-msgid "You can specify more options to configure the account."
+#: ../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."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:596
+#: ../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 ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
 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."
+"Whether addresses should be formatted according to standard in their "
+"destination country"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:597
-msgid "You can specify your default settings for your account."
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
+msgid "Whether to show maps in preview pane"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:598
+#: ../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.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 ""
-"Time to check things over before we try and connect to the server and fetch "
-"your mail."
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2180 ../mail/em-account-editor.c:2301
-msgid "Identity"
-msgstr "Identeco"
+#: ../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"
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:613
-msgid "Next - Receiving mail"
+#: ../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"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:614
-msgid "Receiving mail"
+#: ../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."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:614
-#: ../capplet/settings/mail-account-view.c:615
-msgid "Next - Sending mail"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:4
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+msgid "Birthday and anniversary reminder"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:614
-msgid "Back - Identity"
+#: ../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 ""
 
-#: ../capplet/settings/mail-account-view.c:614
-msgid "Next - Receiving options"
+#: ../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"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:615
-msgid "Receiving options"
+#: ../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)"
 msgstr ""
+"Koloro por kolori la nunhoromontrilan linion en la tempa tabulbarilo "
+"(malplenigu la kampon elektos la aprioran koloron)."
 
-#: ../capplet/settings/mail-account-view.c:615
-#: ../capplet/settings/mail-account-view.c:617
-msgid "Back - Receiving mail"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:8
+#, fuzzy
+msgid "Color to draw the Marcus Bains line in the Day View"
 msgstr ""
+"Koloro por kolori la nunhoromontrilan linion en la tempa tabulbarilo "
+"(malplenigu la kampon elektos la aprioran koloron)."
 
-#: ../capplet/settings/mail-account-view.c:617
-msgid "Sending mail"
+#: ../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"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:617
-#: ../capplet/settings/mail-account-view.c:618
-msgid "Next - Review account"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:10
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+msgid "Confirm expunge"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:617
-msgid "Next - Defaults"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
+msgid "Days on which the start and end of work hours should be indicated"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:617
-msgid "Back - Receiving options"
+#: ../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"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:13
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+msgid "Default reminder units"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:618
-#: ../mail/em-account-editor.c:3140
-msgid "Defaults"
-msgstr "Defaŭltoj"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+msgid "Default reminder value"
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:618
-msgid "Back - Sending mail"
+#: ../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"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:620
-msgid "Review account"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:16
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+msgid "Free/busy template URL"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:620
-msgid "Finish"
-msgstr "Fini"
+#: ../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"
 
-#: ../capplet/settings/mail-account-view.c:620
-msgid "Back - Sending"
+#: ../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"
+
+#: ../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"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:20
+#, fuzzy
+msgid "Highlight overdue tasks"
+msgstr "Malfruaj taskoj"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:21
+msgid "Highlight tasks due today"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:740
-msgid "Setup Google contacts with Evolution"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:22
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+msgid "Horizontal pane position"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:741
-msgid "Setup Google calendar with Evolution"
+#: ../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 ""
 
-#: ../capplet/settings/mail-account-view.c:746
-msgid "You may need to enable IMAP access."
+#: ../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."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:754
-msgid "Google account settings:"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
+msgid "If \"true\", show the memo preview pane in the main window"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:780
-msgid "Setup Yahoo calendar with Evolution"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
+msgid "If \"true\", show the task preview pane in the main window"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
+msgid "Intervals shown in Day and Work Week views, in minutes"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+msgid "Last reminder time"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
+#, fuzzy
+msgid "List of calendars to load"
+msgstr "Listo de disponeblaj kalendaroj:"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
+msgid "List of memo lists to load"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
+msgid "List of recently used second time zones in a Day View"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
+msgid "List of selected calendars"
+msgstr "Listo de elektitaj kalendaroj"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
+msgid "List of selected memo lists"
+msgstr "Listo de elektitaj notolistoj"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
+msgid "List of selected task lists"
+msgstr "Listo de elektitaj tasklistoj"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
+msgid "List of task lists to load"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+msgid "Marcus Bains Line"
+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"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:784
+#: ../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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
+msgid "Maximum number of recently used timezones to remember"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
 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."
+"Maximum number of recently used timezones to remember in a 'day-second-"
+"zones' list"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:793
-msgid "Yahoo account settings:"
+#: ../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"
+
+#: ../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)"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:807
-msgid "Yahoo Calendar name:"
+#: ../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)"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:1079
-msgid "Password:"
-msgstr "Pasvorto:"
+#: ../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."
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:1130
-#: ../capplet/settings/mail-settings-view.c:248
-msgid "Close Tab"
-msgstr "Fermi la langeton"
+#: ../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 ""
 
-#: ../capplet/settings/mail-account-view.c:1140
-msgid "Account Wizard"
+#: ../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"
 msgstr ""
 
-#: ../capplet/settings/mail-capplet-shell.c:209
-msgid "Evolution account assistant"
+#: ../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 ""
 
-#. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:744
-#: ../mail/e-mail-store.c:234 ../mail/em-folder-tree-model.c:146
-#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
-#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:161
-#: ../mail/em-folder-tree-model.c:163 ../mail/mail-vfolder.c:235
-#: ../mail/message-list.c:1714
-#: ../modules/addressbook/e-book-shell-backend.c:96
-#: ../modules/addressbook/e-book-shell-migrate.c:136
-#: ../modules/calendar/e-cal-shell-backend.c:109
-#: ../modules/calendar/e-cal-shell-migrate.c:154
-#: ../modules/calendar/e-memo-shell-backend.c:98
-#: ../modules/calendar/e-memo-shell-migrate.c:109
-#: ../modules/calendar/e-task-shell-backend.c:98
-#: ../modules/calendar/e-task-shell-migrate.c:121
-msgid "On This Computer"
-msgstr "En ĉi tiu komputilo"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
+msgid "Number of units for determining a birthday or anniversary reminder"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
+msgid "Number of units for determining a default reminder"
+msgstr ""
+
+#: ../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"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
+msgid ""
+"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:54
+msgid "Position of the memo preview pane when oriented vertically"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
+msgid "Position of the task preview pane when oriented horizontally"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
+msgid "Position of the task preview pane when oriented vertically"
+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"
+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"
+
+#: ../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"
+
+#: ../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"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
+msgid "Programs that are allowed to be run by reminders"
+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"
+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 ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+msgid "Reminder programs"
+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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
+msgid "Scroll Month View by a week, not by a month"
+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"
+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"
+msgstr ""
 
-#: ../capplet/settings/mail-settings-view.c:145
+#: ../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"
+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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+msgid "Show days with recurrent events in italic font in bottom left calendar"
+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"
+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"
+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"
+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"
+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"
+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 ""
+
+#: ../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"
+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 ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
+msgid "Task layout style"
+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 ""
+
+#: ../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)"
+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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+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:86
+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: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"
+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\""
+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"
+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"
+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"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
+msgid "Time divisions"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+msgid "Time the last reminder ran, in time_t"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
+msgid "Timezone"
+msgstr "Horzono"
+
+#: ../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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\""
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
+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"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#, fuzzy
+msgid "Use the system timezone instead of the timezone selected in Evolution"
+msgstr ""
+"Uzi la sisteman horzonon anstataŭ la horzono kiu estas elektita en Evolucio."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+msgid "Vertical position for the tag pane"
+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"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+msgid ""
+"Whether highlight overdue tasks with a special color (task-overdue-color)"
+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)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
+msgid "Whether or not to use the notification tray for display reminders"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+msgid "Whether to ask for confirmation when deleting an appointment or task"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+msgid "Whether to ask for confirmation when expunging appointments and tasks"
+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 ""
+
+#: ../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"
+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"
+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"
+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 ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+msgid "Whether to set a default reminder for appointments"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+msgid "Whether to set a reminder for birthdays and anniversaries"
+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"
+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"
+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"
+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 ""
+
+#: ../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"
+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 ""
+
+#: ../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"
+msgstr ""
+
+#: ../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)."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
+msgid "Work days"
+msgstr "Labortagoj"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
+msgid "Workday end hour"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
+msgid "Workday end minute"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
+msgid "Workday start hour"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
+msgid "Workday start minute"
+msgstr ""
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:1
+#: ../shell/apps_evolution_shell.schemas.in.h:3
+msgid "Configuration version"
+msgstr "Agordo-versio"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:2
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "Last upgraded configuration version"
+msgstr ""
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:3
+msgid "List of disabled plugins"
+msgstr "Listo de elŝaltitaj kromprogramoj"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:4
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:7
+msgid "The window's X coordinate"
+msgstr ""
+
+#: ../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 ""
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:11
+msgid "Whether the window is maximized"
+msgstr ""
+
+#: ../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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:3
+msgid "Whether calendar from Gnome Calendar has been imported or not"
+msgstr ""
+
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:4
+msgid "Whether tasks from Gnome Calendar have been imported or not"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:1
+#: ../mail/evolution-mail.schemas.in.h:13
+msgid "Always request read receipt"
+msgstr "Ĉiam peti kvitancon pri legado"
+
+#: ../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."
+msgstr ""
+
+#: ../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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
+#, fuzzy
+msgid "Attribute message"
+msgstr "Aldonita mesaĝo"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid "Automatic emoticon recognition"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid "Automatic link recognition"
+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 ""
+
+#: ../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"
+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 ""
+
+#: ../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"
+
+#: ../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 ""
+
+#: ../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
+msgid ""
+"Comma-separated list of localized 'Re' abbreviations to skip in a subject "
+"text when replying to a message, as an addition to the standard \"Re\" "
+"prefix. An example is 'SV,AV'."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
+msgid "Composer load/attach directory"
+msgstr ""
+
+#: ../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"
+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 ""
+
+#: ../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."
+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 ""
+
+#: ../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\"."
+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"
+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."
+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"
+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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:36
+msgid "Default forward style"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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."
+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"
+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."
+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"
+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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+msgid "Digitally sign replies when the original message is signed"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+msgid "Directory for loading/attaching files to composer."
+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."
+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?"
+
+#: ../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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:56
+msgid "Do not add signature delimiter"
+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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:59
+msgid "Empty Junk folders on exit"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:60
+msgid "Empty Trash folders on exit"
+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."
+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."
+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."
+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 ""
+
+#: ../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"
+
+#: ../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"
+
+#: ../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."
+msgstr ""
+
+#: ../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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:69
+msgid "Enable search folders"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "Enable search folders on startup."
+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."
+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."
+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."
+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 ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "Enable/disable caret mode"
+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"
+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."
+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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:80
+msgid "Flush Outbox after filtering"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+msgid "Forward message"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:83
+msgid "Group Reply replies to list"
+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"
+
+#: ../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."
+
+#: ../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"
+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."
+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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:89
+msgid "Ignore list Reply-To:"
+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."
+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."
+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."
+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."
+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"
+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"
+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"
+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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:110
+msgid "Layout style"
+msgstr ""
+
+#: ../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."
+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 ""
+
+#: ../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"
+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."
+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."
+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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+msgid "List of localized 'Re'"
+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"
+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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:123
+msgid "Log filter actions"
+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."
+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 ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Mark as Seen after specified timeout"
+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."
+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\""
+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\"."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "Message text limit for display"
+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\")"
+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 ""
+
+#: ../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"
+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."
+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."
+msgstr ""
+
+#: ../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 ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+msgid "Original message"
+msgstr "Originala mesaĝo"
+
+#: ../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"
+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 ""
+
+#: ../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 ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:145
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+msgid "Prompt the user when he or she tries to empty the trash."
+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 ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+msgid "Prompt when emptying the trash"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:151
+msgid "Prompt when replying to many recipients"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:152
+msgid "Prompt when user expunges"
+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"
+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"
+msgstr ""
+
+#: ../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."
+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."
+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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:158
+msgid "Prompt while marking multiple messages"
+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"
+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"
+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."
+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."
+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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:164
+msgid "Save directory"
+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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:166
+msgid "Send HTML mail by default"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:167
+msgid "Send HTML mail by default."
+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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:169
+msgid "Server synchronization interval"
+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."
+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"
+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"
+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"
+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"
+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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Show Animations"
+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"
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:179
+msgid "Show animated images as animations."
+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."
+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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:182
+msgid "Show image animations"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:183
+msgid "Show original \"Date\" header value."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:184
+msgid "Show photo of the sender"
+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."
+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."
+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."
+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."
+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."
+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."
+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."
+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."
+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."
+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"
+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"
+
+#: ../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"
+
+#: ../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"
+
+#: ../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"
+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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:200
+msgid "Terminal font"
+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"
+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)."
+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)."
+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."
+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."
+
+#: ../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"
+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"
+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"
+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"
+
+#: ../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."
+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."
+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."
+msgstr ""
+
+#: ../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."
+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."
+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."
+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."
+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:184
+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: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."
+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"
+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"
+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\"."
+
+#: ../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\"."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:224
+msgid "UID string of the default account."
+msgstr ""
+
+#: ../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."
+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"
+
+#: ../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."
+
+#: ../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."
+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."
+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"
+
+#: ../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?"
+
+#: ../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."
+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."
+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?"
+
+#: ../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."
+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 ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+msgid "Whether to show local folders (On This Computer) in a folder tree"
+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"
+
+#: ../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"
+
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:1
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
+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
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:1
+msgid "Address book source"
+msgstr "Adresaro-fonto"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:2
+msgid "Address book to use for storing automatically synced contacts"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
+msgid "Address book to use for storing automatically synced contacts from GAIM"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
+msgid "Auto sync GAIM contacts"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
+msgid "Check interval for GAIM syncing of contacts"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
+msgid "Enable autocontacts"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
+msgid "GAIM address book source"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
+msgid "GAIM check interval"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
+msgid "GAIM last sync MD5"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
+msgid "GAIM last sync time"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
+msgid "Whether GAIM contacts should be automaticall synced"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
+msgid ""
+"Whether contacts should be automatically added to the user's addressbook"
+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 "
+"custom header followed by \"=\" and the values separated by \";\""
+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 ""
+
+#: ../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"
+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"
+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."
+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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:1
+msgid "Delete processed"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:2
+msgid "Whether to delete processed iTip objects"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+msgid "Beep or play sound file."
+msgstr "Pepi aŭ ludi sondosieron."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:2
+msgid "Enable D-Bus messages."
+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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:4
+msgid "FIXME"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:5
+msgid "Generates a D-Bus message when new mail messages arrive."
+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."
+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."
+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."
+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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
+msgid "Popup message together with the icon."
+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."
+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."
+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."
+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"
+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 ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
+msgid "Whether show message over the icon when new messages arrive."
+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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
+msgid "Mode to use when displaying mails"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:2
+msgid ""
+"The mode to use for displaying mails. \"normal\" makes Evolution choose the "
+"best part to show, \"prefer_plain\" makes it use the text part, if present, "
+"and \"only_plain\" forces Evolution to only show plain text"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:3
+msgid "Whether to show suppressed HTML output"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.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"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "Enable express mode"
+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."
+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."
+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
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
+msgid "Offline folder paths"
+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"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:32
+msgid "Skip development warning dialog"
+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"
+
+#: ../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"
+
+#: ../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."
+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 "
+"by the GNOME toolbar setting."
+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?"
+
+#: ../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 ""
+
+#: ../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."
+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 ""
+
+#: ../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."
+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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:61
+msgid "Window button style"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:62
+msgid "Window buttons are visible"
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
+msgid "Socket path for SpamAssassin"
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:2
+msgid "SpamAssassin client binary"
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
+msgid "SpamAssassin daemon binary"
+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"
+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)."
+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."
+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)."
+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
+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/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"
+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"
+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
+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"
+
+#: ../em-format/em-format.c:1067 ../modules/mail/em-mailer-prefs.c:77
+msgid "Newsgroups"
+msgstr "Novaĵogrupoj"
+
+#: ../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/em-format.c:1469
 #, c-format
-msgid "Modify %s..."
-msgstr "Modifi %s..."
+msgid "%s attachment"
+msgstr "%s aldonaĵo"
 
-#: ../capplet/settings/mail-settings-view.c:147
-msgid "Add a new account"
-msgstr "Aldoni novan konton"
+#: ../em-format/em-format.c:1580
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr ""
 
-#: ../capplet/settings/mail-settings-view.c:183
-msgid "Account management"
-msgstr "Konto-administrado"
+#: ../em-format/em-format.c:1774 ../em-format/em-format.c:2002
+msgid "Could not parse MIME message. Displaying as source."
+msgstr ""
 
-#: ../capplet/settings/mail-settings-view.c:258
-msgid "Settings"
-msgstr "Agordoj"
+#: ../em-format/em-format.c:1785
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
 
-#: ../data/evolution-alarm-notify.desktop.in.in.h:1
-msgid "Calendar event notifications"
+#: ../em-format/em-format.c:1805
+msgid "Could not parse PGP/MIME message"
 msgstr ""
 
-#: ../data/evolution-alarm-notify.desktop.in.in.h:2
-msgid "Evolution Alarm Notify"
+#: ../em-format/em-format.c:1806
+msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr ""
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:996
-#: ../modules/mailto-handler/evolution-mailto-handler.c:215
-#: ../shell/e-shell-window-private.c:257
-msgid "Evolution"
-msgstr "Evolucio"
+#: ../em-format/em-format.c:2027
+msgid "Unsupported signature format"
+msgstr ""
 
-#: ../data/evolution.desktop.in.in.h:2
-msgid "Evolution Mail and Calendar"
-msgstr "Evolucio - Retpoŝto kaj Kalendaro"
+#: ../em-format/em-format.c:2040 ../em-format/em-format.c:2222
+msgid "Error verifying signature"
+msgstr ""
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:657
-msgid "Groupware Suite"
-msgstr "Grupprogramaro"
+#: ../em-format/em-format.c:2041 ../em-format/em-format.c:2207
+#: ../em-format/em-format.c:2223
+msgid "Unknown error verifying signature"
+msgstr ""
 
-#: ../data/evolution.desktop.in.in.h:4
-msgid "Manage your email, contacts and schedule"
-msgstr "Administri viajn retpoŝton, kontaktojn kaj planojn"
+#: ../em-format/em-format.c:2315
+msgid "Could not parse PGP message: "
+msgstr ""
 
-#: ../data/evolution-settings.desktop.in.in.h:1
-msgid "Configure email accounts"
-msgstr "Agordi la retpoŝtkontojn"
+#. pseudo-header
+#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2857
+#: ../modules/mail/em-mailer-prefs.c:1025
+msgid "Mailer"
+msgstr ""
 
-#: ../data/evolution-settings.desktop.in.in.h:2
-msgid "Email Settings"
-msgstr "Retpoŝtagordoj"
+#: ../em-format/em-format-quote.c:564 ../mail/em-composer-utils.c:1219
+msgid "-------- Forwarded Message --------"
+msgstr "-------- plusendita mesaĝo --------"
 
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:227
@@ -7409,106 +9986,106 @@ msgid "Visual"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:199
-#: ../modules/calendar/e-cal-shell-view-actions.c:1823
-#: ../plugins/itip-formatter/itip-view.c:191
+#: ../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ŭ"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:210 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:218
 msgid "Tomorrow"
 msgstr "Morgaŭ"
 
-#: ../e-util/e-datetime-format.c:212
+#: ../e-util/e-datetime-format.c:219
 msgid "Yesterday"
 msgstr "Hieraŭ"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:220
+#. *         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
 msgctxt "DateFmt"
 msgid "Next Mon"
 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:226
+#. *         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
 msgctxt "DateFmt"
 msgid "Next Tue"
 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:232
+#. *         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
 msgctxt "DateFmt"
 msgid "Next Wed"
 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:238
+#. *         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
 msgctxt "DateFmt"
 msgid "Next Thu"
 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:244
+#. *         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
 msgctxt "DateFmt"
 msgid "Next Fri"
 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:250
+#. *         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
 msgctxt "DateFmt"
 msgid "Next Sat"
 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:256
+#. *         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
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Sekva dim"
 
-#: ../e-util/e-datetime-format.c:338 ../e-util/e-datetime-format.c:348
-#: ../e-util/e-datetime-format.c:357
+#: ../e-util/e-datetime-format.c:350 ../e-util/e-datetime-format.c:360
+#: ../e-util/e-datetime-format.c:369
 msgid "Use locale default"
 msgstr "Uzi lokan defaŭlton"
 
-#: ../e-util/e-datetime-format.c:554
+#: ../e-util/e-datetime-format.c:574
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../e-util/e-file-utils.c:151
+#: ../e-util/e-file-utils.c:150
 msgid "(Unknown Filename)"
 msgstr "(Nekonata dosiernomo)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:155
+#: ../e-util/e-file-utils.c:154
 #, 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:160
+#: ../e-util/e-file-utils.c:159
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "Skribante \"%s\" al %s"
 
-#: ../e-util/e-plugin-util.c:429 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:380
+#: ../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"
@@ -7554,120 +10131,14 @@ msgstr "Dosiero ekzistas \"{0}\"."
 msgid "_Overwrite"
 msgstr "_Anstataŭigi"
 
-#: ../e-util/e-util.c:117
+#: ../e-util/e-util.c:245
 msgid "Could not open the link."
 msgstr "Ne eblis malfermi la ligilon."
 
-#: ../e-util/e-util.c:164
+#: ../e-util/e-util.c:292
 msgid "Could not display help for Evolution."
 msgstr "Ne eblis montri helpon pri Evolucio."
 
-#: ../e-util/gconf-bridge.c:1318
-#, c-format
-msgid "GConf error: %s"
-msgstr "Eraro de GConf: %s"
-
-#: ../e-util/gconf-bridge.c:1329
-msgid "All further errors shown only on terminal."
-msgstr "Ĉiuj pliaj eraroj estos montritaj nur en terminalo."
-
-#: ../em-format/em-format-quote.c:284 ../em-format/em-format.c:1054
-#: ../mail/e-mail-tag-editor.c:325 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:70
-msgid "From"
-msgstr "De"
-
-#: ../em-format/em-format-quote.c:284 ../em-format/em-format.c:1055
-#: ../modules/mail/em-mailer-prefs.c:71
-msgid "Reply-To"
-msgstr "Respondo-al"
-
-#: ../em-format/em-format-quote.c:284 ../em-format/em-format.c:1057
-#: ../mail/em-format-html.c:2479 ../mail/em-format-html.c:2547
-#: ../mail/em-format-html.c:2570 ../modules/mail/em-mailer-prefs.c:73
-msgid "Cc"
-msgstr ""
-
-#: ../em-format/em-format-quote.c:284 ../em-format/em-format.c:1058
-#: ../mail/em-format-html.c:2480 ../mail/em-format-html.c:2551
-#: ../mail/em-format-html.c:2573 ../modules/mail/em-mailer-prefs.c:74
-msgid "Bcc"
-msgstr ""
-
-#: ../em-format/em-format-quote.c:428 ../em-format/em-format.c:1059
-#: ../mail/e-mail-tag-editor.c:330 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:75
-#: ../smime/lib/e-cert.c:1142
-msgid "Subject"
-msgstr "Temo"
-
-#. pseudo-header
-#: ../em-format/em-format-quote.c:439 ../mail/em-format-html.c:2667
-#: ../modules/mail/em-mailer-prefs.c:1124
-msgid "Mailer"
-msgstr ""
-
-#: ../em-format/em-format-quote.c:520 ../mail/em-composer-utils.c:1190
-msgid "-------- Forwarded Message --------"
-msgstr "-------- plusendita mesaĝo --------"
-
-#: ../em-format/em-format.c:1060 ../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"
-
-#: ../em-format/em-format.c:1061 ../modules/mail/em-mailer-prefs.c:77
-msgid "Newsgroups"
-msgstr "Novaĵogrupoj"
-
-#: ../em-format/em-format.c:1062 ../modules/mail/em-mailer-prefs.c:78
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "Vizaĝo"
-
-#: ../em-format/em-format.c:1465
-#, c-format
-msgid "%s attachment"
-msgstr "%s aldonaĵo"
-
-#: ../em-format/em-format.c:1576
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr ""
-
-#: ../em-format/em-format.c:1764 ../em-format/em-format.c:1961
-msgid "Could not parse MIME message. Displaying as source."
-msgstr ""
-
-#: ../em-format/em-format.c:1775
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: ../em-format/em-format.c:1795
-msgid "Could not parse PGP/MIME message"
-msgstr ""
-
-#: ../em-format/em-format.c:1796
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr ""
-
-#: ../em-format/em-format.c:1986
-msgid "Unsupported signature format"
-msgstr ""
-
-#: ../em-format/em-format.c:1999 ../em-format/em-format.c:2181
-msgid "Error verifying signature"
-msgstr ""
-
-#: ../em-format/em-format.c:2000 ../em-format/em-format.c:2166
-#: ../em-format/em-format.c:2182
-msgid "Unknown error verifying signature"
-msgstr ""
-
-#: ../em-format/em-format.c:2274
-msgid "Could not parse PGP message: "
-msgstr ""
-
 #. 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
@@ -7782,78 +10253,78 @@ msgstr "nun"
 msgid "%d-%b-%Y"
 msgstr ""
 
-#: ../filter/e-filter-datespec.c:282
+#: ../filter/e-filter-datespec.c:286
 msgid "Select a time to compare against"
 msgstr ""
 
-#: ../filter/e-filter-file.c:190
+#: ../filter/e-filter-file.c:188
 msgid "Choose a File"
 msgstr "Elekti dosieron"
 
-#: ../filter/e-filter-rule.c:664
+#: ../filter/e-filter-rule.c:675
 msgid "R_ule name:"
 msgstr ""
 
-#: ../filter/e-filter-rule.c:694
+#: ../filter/e-filter-rule.c:705
 msgid "Find items that meet the following conditions"
 msgstr ""
 
-#: ../filter/e-filter-rule.c:719
+#: ../filter/e-filter-rule.c:730
 msgid "If all conditions are met"
 msgstr ""
 
-#: ../filter/e-filter-rule.c:720
+#: ../filter/e-filter-rule.c:731
 msgid "If any conditions are met"
 msgstr ""
 
-#: ../filter/e-filter-rule.c:723
+#: ../filter/e-filter-rule.c:734
 msgid "_Find items:"
 msgstr ""
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:752
+#: ../filter/e-filter-rule.c:763
 msgid "None"
 msgstr "Nenio"
 
-#: ../filter/e-filter-rule.c:753
+#: ../filter/e-filter-rule.c:764
 msgid "All related"
 msgstr ""
 
-#: ../filter/e-filter-rule.c:754 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:765 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Respondoj"
 
-#: ../filter/e-filter-rule.c:755
+#: ../filter/e-filter-rule.c:766
 msgid "Replies and parents"
 msgstr ""
 
-#: ../filter/e-filter-rule.c:756
+#: ../filter/e-filter-rule.c:767
 msgid "No reply or parent"
 msgstr ""
 
-#: ../filter/e-filter-rule.c:759
-msgid "I_nclude threads"
+#: ../filter/e-filter-rule.c:770
+msgid "I_nclude threads:"
 msgstr ""
 
-#: ../filter/e-filter-rule.c:784
+#: ../filter/e-filter-rule.c:795
 msgid "A_dd Condition"
 msgstr ""
 
-#: ../filter/e-filter-rule.c:1133 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:319
+#: ../filter/e-filter-rule.c:1146 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr ""
 
-#: ../filter/e-filter-rule.c:1133 ../mail/em-utils.c:320
+#: ../filter/e-filter-rule.c:1146 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr ""
 
-#: ../filter/e-rule-editor.c:263
+#: ../filter/e-rule-editor.c:270
 msgid "Add Rule"
 msgstr "Aldoni regulon"
 
-#: ../filter/e-rule-editor.c:349
+#: ../filter/e-rule-editor.c:359
 msgid "Edit Rule"
 msgstr "Redakti regulon"
 
@@ -7875,7 +10346,7 @@ msgstr "Mankanta dato."
 
 #: ../filter/filter.error.xml.h:5
 msgid "Missing file name."
-msgstr "Makanta dosiernomo."
+msgstr "Mankanta dosiernomo."
 
 #: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:89
 msgid "Missing name."
@@ -7927,7 +10398,7 @@ msgid ""
 "the current time when filtering occurs."
 msgstr ""
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:193
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:163
 msgid "_Filter Rules"
 msgstr "_Filtril-reguloj"
 
@@ -7964,73 +10435,106 @@ msgstr ""
 msgid "years"
 msgstr "jaroj"
 
-#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1156 ../mail/mail-config.ui.h:14
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
-#: ../widgets/misc/e-attachment-paned.c:133
+#: ../mail/e-mail-account-manager.c:405
+msgid "_Restore Default"
+msgstr "_Restaŭri defaŭlton"
+
+#: ../mail/e-mail-account-manager.c:418
+msgid "You can drag and drop account names to reorder them."
+msgstr ""
+
+#: ../mail/e-mail-account-manager.c:463
+msgid "De_fault"
+msgstr "De_faŭlto"
+
+#: ../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"
+
+#: ../mail/e-mail-account-tree-view.c:105
+msgid "Account Name"
+msgstr "Kontonomo"
+
+#. 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"
+
+#: ../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"
 
-#: ../mail/e-mail-attachment-bar.c:608
-#: ../widgets/misc/e-attachment-paned.c:623
+#: ../mail/e-mail-attachment-bar.c:616
+#: ../widgets/misc/e-attachment-paned.c:696
 msgid "Icon View"
 msgstr "Piktograma vido"
 
-#: ../mail/e-mail-attachment-bar.c:610
-#: ../widgets/misc/e-attachment-paned.c:625
+#: ../mail/e-mail-attachment-bar.c:618
+#: ../widgets/misc/e-attachment-paned.c:698
 msgid "List View"
 msgstr "Lista vido"
 
-#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1446
+#: ../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
-#: ../shell/e-shell-window-actions.c:1460
 msgid "Close this window"
 msgstr "Fermi ĉi tiun fenestron"
 
-#: ../mail/e-mail-browser.c:291
+#: ../mail/e-mail-browser.c:289
 msgid "(No Subject)"
 msgstr ""
 
-#: ../mail/e-mail-display.c:66
+#: ../mail/e-mail-display.c:68
 msgid "_Add to Address Book..."
 msgstr "_Aldoni al adresaro..."
 
-#: ../mail/e-mail-display.c:73
+#: ../mail/e-mail-display.c:75
 msgid "_To This Address"
 msgstr "_Al tiu adreso"
 
-#: ../mail/e-mail-display.c:80
+#: ../mail/e-mail-display.c:82
 msgid "_From This Address"
 msgstr "_De tiu adreso"
 
-#: ../mail/e-mail-display.c:87
+#: ../mail/e-mail-display.c:89
 msgid "Send _Reply To..."
 msgstr "Sendi _respondon al..."
 
-#: ../mail/e-mail-display.c:89
+#: ../mail/e-mail-display.c:91
 msgid "Send a reply message to this address"
 msgstr "Sendi respond-mesaĝon al tiu ĉi adreso"
 
-#: ../mail/e-mail-display.c:96
+#: ../mail/e-mail-display.c:98
 msgid "Create Search _Folder"
 msgstr "Kreii serĉ_dosierujon"
 
-#: ../mail/e-mail-folder-utils.c:111
+#: ../mail/e-mail-folder-utils.c:109
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr ""
 
-#: ../mail/e-mail-folder-utils.c:274
+#: ../mail/e-mail-folder-utils.c:270
 msgid "Forwarded messages"
 msgstr ""
 
-#: ../mail/e-mail-folder-utils.c:391
+#: ../mail/e-mail-folder-utils.c:385
 msgid "Scanning messages for duplicates"
 msgstr "Kontroli mesaĝojn pri duobligitoj"
 
-#: ../mail/e-mail-folder-utils.c:584
+#: ../mail/e-mail-folder-utils.c:576
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -8042,989 +10546,962 @@ msgstr[1] ""
 msgid "Removing folder '%s'"
 msgstr ""
 
-#: ../mail/e-mail-folder-utils.c:948
+#: ../mail/e-mail-folder-utils.c:956
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Dosiero \"%s\" estas forigita."
 
-#: ../mail/e-mail-folder-utils.c:952
+#: ../mail/e-mail-folder-utils.c:960
 msgid "File has been removed."
 msgstr "Dosiero estas forigita."
 
-#: ../mail/e-mail-folder-utils.c:1011
+#: ../mail/e-mail-folder-utils.c:1019
 msgid "Removing attachments"
 msgstr "Forigante aldonaĵon"
 
-#: ../mail/e-mail-folder-utils.c:1177
+#: ../mail/e-mail-folder-utils.c:1181
 #, 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:1515 ../mail/em-folder-utils.c:577
+#: ../mail/e-mail-folder-utils.c:1525 ../mail/em-folder-utils.c:622
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Nevalida dosierujo-adreso '%s'"
 
-#: ../mail/e-mail-label-dialog.c:223
+#. 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
+msgid "Junk filtering software:"
+msgstr ""
+
+#: ../mail/e-mail-label-dialog.c:225
 msgid "_Label name:"
 msgstr "_Marknomo:"
 
-#: ../mail/e-mail-label-list-store.c:41
+#: ../mail/e-mail-label-list-store.c:45
 msgid "I_mportant"
 msgstr "_Grave"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:42
+#: ../mail/e-mail-label-list-store.c:46
 msgid "_Work"
 msgstr "_Labore"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:43
+#: ../mail/e-mail-label-list-store.c:47
 msgid "_Personal"
 msgstr "_Persone"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:44
+#: ../mail/e-mail-label-list-store.c:48
 msgid "_To Do"
 msgstr "_Ende"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:45
+#: ../mail/e-mail-label-list-store.c:49
 msgid "_Later"
 msgstr "_Poste"
 
-#: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:676
+#: ../mail/e-mail-label-manager.c:170
+#: ../modules/mail/e-mail-shell-view-actions.c:705
 msgid "Add Label"
 msgstr "Aldoni etikedon"
 
-#: ../mail/e-mail-label-manager.c:216
+#: ../mail/e-mail-label-manager.c:221
 msgid "Edit Label"
 msgstr "Redakti etikedon"
 
-#: ../mail/e-mail-label-manager.c:350
+#: ../mail/e-mail-label-manager.c:353
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
 msgstr ""
 
-#: ../mail/e-mail-label-tree-view.c:88
+#: ../mail/e-mail-label-tree-view.c:89
 msgid "Color"
 msgstr "Koloro"
 
-#: ../mail/e-mail-label-tree-view.c:98
-#: ../modules/plugin-manager/evolution-plugin-manager.c:69
-#: ../plugins/caldav/caldav-browse-server.c:1295
-#: ../widgets/menus/gal-define-views-dialog.c:336
+#: ../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-local.c:41 ../mail/em-folder-properties.c:309
-#: ../mail/em-folder-tree-model.c:722
-#: ../modules/mail/e-mail-shell-view-private.c:1065
-#: ../modules/mail/e-mail-shell-view-private.c:1076
-msgid "Inbox"
-msgstr "Enirkesto"
-
-#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:715
-#: ../modules/mail/e-mail-shell-view-private.c:1063
-msgid "Drafts"
-msgstr "Malnetaĵoj"
-
-#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:726
-#: ../modules/mail/e-mail-shell-view-private.c:1067
-msgid "Outbox"
-msgstr "Elirkesto"
-
-#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:730
-#: ../modules/mail/e-mail-shell-view-private.c:1069
-msgid "Sent"
-msgstr "Sendite"
-
-#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:718
-#: ../modules/mail/e-mail-shell-view-private.c:1071
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:1006 ../plugins/templates/templates.c:1283
-#: ../plugins/templates/templates.c:1293
-msgid "Templates"
-msgstr "Ŝablonoj"
-
-#: ../mail/e-mail-migrate.c:133
-msgid "Migrating..."
-msgstr "Migrigado..."
-
-#: ../mail/e-mail-migrate.c:168
-msgid "Migration"
-msgstr "Migrigado"
-
-#: ../mail/e-mail-migrate.c:209
-#, c-format
-msgid "Migrating '%s':"
-msgstr "Migrigado '%s'"
-
-#: ../mail/e-mail-migrate.c:722
-msgid "Migrating Folders"
-msgstr "Migrigad-dosierujoj"
-
-#: ../mail/e-mail-migrate.c:723
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-
-#: ../mail/e-mail-migrate.c:1279
+#: ../mail/e-mail-migrate.c:1182
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr ""
 
-#: ../mail/e-mail-notebook-view.c:578
+#: ../mail/e-mail-notebook-view.c:627
 msgid "Please select a folder"
 msgstr "Bonvole elektu dosierujon"
 
-#: ../mail/e-mail-reader-utils.c:139
-msgid "Do not warn me again"
-msgstr "Ne averti min denove"
-
-#. Translators: %s is replaced with a folder
-#. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:663
-#, c-format
-msgid ""
-"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
-"it?"
-msgid_plural ""
-"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
-"them?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../mail/e-mail-reader-utils.c:960
-msgid "Save Message"
-msgid_plural "Save Messages"
-msgstr[0] "Konservi mesaĝon"
-msgstr[1] "Konservi mesaĝojn"
-
-#. Translators: This is part of a suggested file name
-#. * used when saving a message or multiple messages to
-#. * 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:981
-msgid "Message"
-msgid_plural "Messages"
-msgstr[0] "Mesaĝo"
-msgstr[1] "Mesaĝoj"
-
-#: ../mail/e-mail-reader.c:304 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:310 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Kopii la dosierujon"
 
-#: ../mail/e-mail-reader.c:304 ../mail/em-folder-utils.c:480
+#: ../mail/e-mail-reader.c:310 ../mail/em-folder-utils.c:486
 msgid "C_opy"
 msgstr "K_opii"
 
-#: ../mail/e-mail-reader.c:806 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:825 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Movi al dosierujo"
 
-#: ../mail/e-mail-reader.c:806 ../mail/em-folder-utils.c:480
+#: ../mail/e-mail-reader.c:825 ../mail/em-folder-utils.c:486
 msgid "_Move"
 msgstr "_Movi"
 
-#: ../mail/e-mail-reader.c:1167 ../mail/e-mail-reader.c:1355
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1186 ../mail/e-mail-reader.c:1366
+#: ../mail/e-mail-reader.c:1405
 msgid "_Do not ask me again."
 msgstr "_Ne demandu min denove."
 
-#: ../mail/e-mail-reader.c:1401
+#: ../mail/e-mail-reader.c:1411
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1767
+#: ../mail/e-mail-reader.c:1772
 msgid "A_dd Sender to Address Book"
 msgstr "Al_doni sendinton al adresaro"
 
-#: ../mail/e-mail-reader.c:1769
+#: ../mail/e-mail-reader.c:1774
 msgid "Add sender to address book"
 msgstr "Aldoni sendinton al adresaro"
 
-#: ../mail/e-mail-reader.c:1774
+#: ../mail/e-mail-reader.c:1779
 msgid "Check for _Junk"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1776
+#: ../mail/e-mail-reader.c:1781
 msgid "Filter the selected messages for junk status"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1781
+#: ../mail/e-mail-reader.c:1786
 msgid "_Copy to Folder..."
 msgstr "_Kopii al dosierujo..."
 
-#: ../mail/e-mail-reader.c:1783
+#: ../mail/e-mail-reader.c:1788
 msgid "Copy selected messages to another folder"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1788
+#: ../mail/e-mail-reader.c:1793
 msgid "_Delete Message"
 msgstr "_Forigi mesaĝojn"
 
-#: ../mail/e-mail-reader.c:1790
+#: ../mail/e-mail-reader.c:1795
 msgid "Mark the selected messages for deletion"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:1800
 msgid "Filter on Mailing _List..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1797
+#: ../mail/e-mail-reader.c:1802
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1802
+#: ../mail/e-mail-reader.c:1807
 msgid "Filter on _Recipients..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1804
+#: ../mail/e-mail-reader.c:1809
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1809
+#: ../mail/e-mail-reader.c:1814
 msgid "Filter on Se_nder..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1811
+#: ../mail/e-mail-reader.c:1816
 msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1816
+#: ../mail/e-mail-reader.c:1821
 msgid "Filter on _Subject..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1818
+#: ../mail/e-mail-reader.c:1823
 msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1823
+#: ../mail/e-mail-reader.c:1828
 msgid "A_pply Filters"
 msgstr "A_pliki filtrilojn"
 
-#: ../mail/e-mail-reader.c:1825
+#: ../mail/e-mail-reader.c:1830
 msgid "Apply filter rules to the selected messages"
 msgstr "Apliki filtril-regulojn al la elektitaj mesaĝoj"
 
-#: ../mail/e-mail-reader.c:1830
+#: ../mail/e-mail-reader.c:1835
 msgid "_Find in Message..."
 msgstr "_Trovi en mesaĝo..."
 
-#: ../mail/e-mail-reader.c:1832
+#: ../mail/e-mail-reader.c:1837
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1837
+#: ../mail/e-mail-reader.c:1842
 msgid "_Clear Flag"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1839
+#: ../mail/e-mail-reader.c:1844
 msgid "Remove the follow-up flag from the selected messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1844
+#: ../mail/e-mail-reader.c:1849
 msgid "_Flag Completed"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1846
+#: ../mail/e-mail-reader.c:1851
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1851
+#: ../mail/e-mail-reader.c:1856
 msgid "Follow _Up..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1853
+#: ../mail/e-mail-reader.c:1858
 msgid "Flag the selected messages for follow-up"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:1863
 msgid "_Attached"
 msgstr "_Aldonite"
 
-#: ../mail/e-mail-reader.c:1860 ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1865 ../mail/e-mail-reader.c:1872
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1865
+#: ../mail/e-mail-reader.c:1870
 msgid "Forward As _Attached"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:1877
 msgid "_Inline"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1874 ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1879 ../mail/e-mail-reader.c:1886
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:1884
 msgid "Forward As _Inline"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:1891
 msgid "_Quoted"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1888 ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:1893 ../mail/e-mail-reader.c:1900
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:1898
 msgid "Forward As _Quoted"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:1905
 msgid "_Load Images"
 msgstr "_Ŝargi bildojn"
 
-#: ../mail/e-mail-reader.c:1902
+#: ../mail/e-mail-reader.c:1907
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:1912
 msgid "_Important"
 msgstr "_Grave"
 
-#: ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:1914
 msgid "Mark the selected messages as important"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:1919
 msgid "_Junk"
 msgstr "_Rubaĵo"
 
-#: ../mail/e-mail-reader.c:1916
+#: ../mail/e-mail-reader.c:1921
 msgid "Mark the selected messages as junk"
 msgstr "Marki la elektitajn mesaĝojn kiel rubaĵo"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:1926
 msgid "_Not Junk"
 msgstr "_Ne rubaĵo"
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:1928
 msgid "Mark the selected messages as not being junk"
 msgstr "Marki la elektitajn mesaĝojn kiel ne-rubaĵo"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:1933
 msgid "_Read"
 msgstr "_Legi"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:1935
 msgid "Mark the selected messages as having been read"
 msgstr "Marki la elektitajn mesaĝojn kiel legite"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:1940
 msgid "Uni_mportant"
 msgstr "_Malgrave"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:1942
 msgid "Mark the selected messages as unimportant"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:1947
 msgid "_Unread"
 msgstr "_Nelegite"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:1949
 msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:1954
 msgid "_Edit as New Message..."
 msgstr "_Redakti kiel nova mesaĝo..."
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:1956
 msgid "Open the selected messages in the composer for editing"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:1961
 msgid "Compose _New Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:1963
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:1968
 msgid "_Open in New Window"
 msgstr "_Malfermi en nova fenestro"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:1970
 msgid "Open the selected messages in a new window"
 msgstr "Malfermi la elektitajn mesaĝojn en nova fenestro"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1975
 msgid "_Move to Folder..."
 msgstr "_Movi al dosierujo..."
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:1977
 msgid "Move selected messages to another folder"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:1982
 msgid "_Switch to Folder"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:1984
 msgid "Display the parent folder"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:1989
 msgid "Switch to _next tab"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:1991
 msgid "Switch to the next tab"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:1996
 msgid "Switch to _previous tab"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:1998
 msgid "Switch to the previous tab"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2003
 msgid "Cl_ose current tab"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2005
 msgid "Close current tab"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2010
 msgid "_Next Message"
 msgstr "_Sekva mesaĝo"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2012
 msgid "Display the next message"
 msgstr "Montri la sekvan mesaĝon"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2017
 msgid "Next _Important Message"
 msgstr "Sekva _grava mesaĝo"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2019
 msgid "Display the next important message"
 msgstr "Montri la sekvan gravan mesaĝon"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2024
 msgid "Next _Thread"
 msgstr "Sekva _fadeno"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2026
 msgid "Display the next thread"
 msgstr "Montri la sekvan fadenon"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2031
 msgid "Next _Unread Message"
 msgstr "Sekva _nelegita mesaĝo"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2033
 msgid "Display the next unread message"
 msgstr "Montri la sekvan nelegitan mesaĝon"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2038
 msgid "_Previous Message"
 msgstr "_Antaŭa mesaĝo"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2040
 msgid "Display the previous message"
 msgstr "Montri la antaŭan mesaĝon"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2045
 msgid "Pr_evious Important Message"
 msgstr "_Antaŭa grava mesaĝo"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2047
 msgid "Display the previous important message"
 msgstr "Montri la antaŭan gravan mesaĝon"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2052
 msgid "Previous T_hread"
 msgstr "_Antaŭa fadeno"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2054
 msgid "Display the previous thread"
 msgstr "Montri la antaŭan fadenon"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2059
 msgid "P_revious Unread Message"
 msgstr "A_ntaŭa nelegita mesaĝo"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2061
 msgid "Display the previous unread message"
 msgstr "Montri la antaŭan nelegitan mesaĝon"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2068
 msgid "Print this message"
 msgstr "Presi tiun mesaĝon"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2075
 msgid "Preview the message to be printed"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2080
 msgid "Re_direct"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2082
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2087
 msgid "Remo_ve Attachments"
 msgstr "_Forigi aldonaĵon"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2089
 msgid "Remove attachments"
 msgstr "Forigi aldonaĵojn"
 
-#: ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:2094
 msgid "Remove Du_plicate Messages"
 msgstr "Forigi duo_bligitajn mesaĝojn"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2096
 msgid "Checks selected messages for duplicates"
 msgstr "Kontroli elektitajn mesaĝojn pri duobligitoj"
 
-#: ../mail/e-mail-reader.c:2096 ../mail/mail.error.xml.h:108
-#: ../modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../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
 msgid "Reply to _All"
 msgstr "Respondi al ĉi_uj"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2103
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2103 ../mail/mail.error.xml.h:109
+#: ../mail/e-mail-reader.c:2108 ../mail/mail.error.xml.h:108
 msgid "Reply to _List"
 msgstr "Respondi al la _listo"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2110
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2115
 #: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "_Respondi al sendinto"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2117
 msgid "Compose a reply to the sender of the selected message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2122
 msgid "_Save as mbox..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2124
 msgid "Save selected messages as an mbox file"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2129
 msgid "_Message Source"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2131
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2143
 msgid "_Undelete Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2145
 msgid "Undelete the selected messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2150
 msgid "_Normal Size"
 msgstr "_Normala grando"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2152
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2157
 msgid "_Zoom In"
 msgstr "E_nzomi"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2159
 msgid "Increase the text size"
 msgstr "Pligrandigi la tekston"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2164
 msgid "Zoom _Out"
 msgstr "E_lzomi"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2166
 msgid "Decrease the text size"
 msgstr "Plimalgrandigi la tekston"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2173
 msgid "Create R_ule"
 msgstr "Krei reg_ulon"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2180
 msgid "Ch_aracter Encoding"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2187
 msgid "F_orward As"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2194
 msgid "_Group Reply"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2201
 msgid "_Go To"
 msgstr "_Iri al"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2208
 msgid "Mar_k As"
 msgstr "Mar_ki kiel"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2215
 msgid "_Message"
 msgstr "_Mesaĝo"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2222
 msgid "_Zoom"
 msgstr "_Zomo"
 
-#: ../mail/e-mail-reader.c:2227
+#: ../mail/e-mail-reader.c:2232
 msgid "Search Folder from Mailing _List..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2234
 msgid "Create a search folder for this mailing list"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2239
 msgid "Search Folder from Recipien_ts..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2241
 msgid "Create a search folder for these recipients"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2241
+#: ../mail/e-mail-reader.c:2246
 msgid "Search Folder from Sen_der..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2248
 msgid "Create a search folder for this sender"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2248
+#: ../mail/e-mail-reader.c:2253
 msgid "Search Folder from S_ubject..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2255
 msgid "Create a search folder for this subject"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2278
 msgid "Mark for Follo_w Up..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2281
+#: ../mail/e-mail-reader.c:2286
 msgid "Mark as _Important"
 msgstr "Marki kiel _grava"
 
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2290
 msgid "Mark as _Junk"
 msgstr "Marki kiel _rubaĵo"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2294
 msgid "Mark as _Not Junk"
 msgstr "Marki kiel _nerubaĵo"
 
-#: ../mail/e-mail-reader.c:2293
+#: ../mail/e-mail-reader.c:2298
 msgid "Mar_k as Read"
 msgstr "Marki kiel _legite"
 
-#: ../mail/e-mail-reader.c:2297
+#: ../mail/e-mail-reader.c:2302
 msgid "Mark as Uni_mportant"
 msgstr "Marki kiel n_egrava"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2306
 msgid "Mark as _Unread"
 msgstr "Marki kiel neleg_ite"
 
-#: ../mail/e-mail-reader.c:2345
+#: ../mail/e-mail-reader.c:2350
 msgid "_Caret Mode"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2347
+#: ../mail/e-mail-reader.c:2352
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2353
+#: ../mail/e-mail-reader.c:2358
 msgid "All Message _Headers"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2360
 msgid "Show messages with all email headers"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2651
+#: ../mail/e-mail-reader.c:2653
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr ""
 
-#. we changed user, thus reset the chosen calendar combo too, because
-#. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3229 ../mail/mail-config.ui.h:32
-#: ../plugins/google-account-setup/google-source.c:306
-#: ../plugins/google-account-setup/google-source.c:549
-#: ../plugins/google-account-setup/google-source.c:688
-#: ../widgets/misc/e-account-tree-view.c:253
-msgid "Default"
-msgstr "Defaŭlto"
-
-#: ../mail/e-mail-reader.c:3396
+#: ../mail/e-mail-reader.c:3555
 #: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "_Plusendi"
 
-#: ../mail/e-mail-reader.c:3397
+#: ../mail/e-mail-reader.c:3556
 msgid "Forward the selected message to someone"
 msgstr "Plusendi la elektitan mesaĝon al iu"
 
-#: ../mail/e-mail-reader.c:3416
+#: ../mail/e-mail-reader.c:3575
 msgid "Group Reply"
 msgstr "Gruprespondo"
 
-#: ../mail/e-mail-reader.c:3417
+#: ../mail/e-mail-reader.c:3576
 msgid "Reply to the mailing list, or to all recipients"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:3470 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3629 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "Forigi"
 
-#: ../mail/e-mail-reader.c:3503
-#: ../modules/calendar/e-cal-shell-view-actions.c:1323
+#: ../mail/e-mail-reader.c:3662
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
 #: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "Sekva"
 
-#: ../mail/e-mail-reader.c:3507
-#: ../modules/calendar/e-cal-shell-view-actions.c:1316
+#: ../mail/e-mail-reader.c:3666
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
 #: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "Antaŭa"
 
-#: ../mail/e-mail-reader.c:3516 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3675 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "Respondi"
 
-#: ../mail/e-mail-reader.c:4186
+#: ../mail/e-mail-reader.c:4362
 #, c-format
 msgid "Folder '%s'"
 msgstr "Dosierujo '%s'"
 
-#: ../mail/e-mail-session.c:661
+#: ../mail/e-mail-reader-utils.c:144
+msgid "Do not warn me again"
+msgstr "Ne averti min denove"
+
+#. Translators: %s is replaced with a folder
+#. * name %u with count of duplicate messages.
+#: ../mail/e-mail-reader-utils.c:639
+#, c-format
+msgid ""
+"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
+"it?"
+msgid_plural ""
+"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
+"them?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/e-mail-reader-utils.c:1016
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "Konservi mesaĝon"
+msgstr[1] "Konservi mesaĝojn"
+
+#. Translators: This is part of a suggested file name
+#. * used when saving a message or multiple messages to
+#. * 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
+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:665
+#: ../mail/e-mail-session.c:1344
 msgid "Enter Passphrase"
 msgstr "Enigi pasfrazon"
 
-#: ../mail/e-mail-session.c:669
+#: ../mail/e-mail-session.c:1348
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Enigu pasvorton por %s"
 
-#: ../mail/e-mail-session.c:673
+#: ../mail/e-mail-session.c:1352
 msgid "Enter Password"
 msgstr "Enigu pasvorton"
 
-#: ../mail/e-mail-session.c:724
+#: ../mail/e-mail-session.c:1403
 #, c-format
 msgid "User canceled operation."
 msgstr ""
 
-#: ../mail/e-mail-session.c:839
+#: ../mail/e-mail-session.c:1522
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr ""
 
-#: ../mail/e-mail-session.c:848
+#: ../mail/e-mail-session.c:1531
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 
-#: ../mail/e-mail-session-utils.c:416
+#: ../mail/e-mail-session.c:1685
+#, 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:496 ../mail/mail-ops.c:626
+#: ../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:520 ../mail/e-mail-session-utils.c:554
-#: ../mail/mail-ops.c:645 ../mail/mail-ops.c:679
+#: ../mail/e-mail-session-utils.c:525 ../mail/e-mail-session-utils.c:559
+#: ../mail/mail-ops.c:631 ../mail/mail-ops.c:667
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local 'Sent' folder instead."
 msgstr ""
 
-#: ../mail/e-mail-session-utils.c:574 ../mail/mail-ops.c:699
+#: ../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:785 ../mail/mail-ops.c:802
-#: ../mail/mail-ops.c:898
+#: ../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:861
+#: ../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:165
+#: ../mail/e-mail-store-utils.c:166
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr ""
 
-#: ../mail/e-mail-store-utils.c:256
+#: ../mail/e-mail-store-utils.c:255
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr ""
 
-#: ../mail/e-mail-store-utils.c:331
+#: ../mail/e-mail-store-utils.c:328
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr ""
 
-#: ../mail/e-mail-tag-editor.c:291
+#: ../mail/e-mail-tag-editor.c:293
 msgid "Flag to Follow Up"
 msgstr ""
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:568 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:9
-msgid "No encryption"
-msgstr ""
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../mail/em-account-editor.c:572 ../mail/mail-config.ui.h:130
-#: ../modules/addressbook/ldap-config.ui.h:20
-msgid "TLS encryption"
-msgstr ""
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-#: ../mail/em-account-editor.c:576 ../mail/mail-config.ui.h:94
-#: ../modules/addressbook/ldap-config.ui.h:12
-msgid "SSL encryption"
-msgstr ""
-
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:839 ../widgets/misc/e-signature-combo-box.c:75
+#: ../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:920
+#: ../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:921
+#: ../mail/em-account-editor.c:1683
 msgid "Always"
 msgstr "Ĉiam"
 
-#: ../mail/em-account-editor.c:922
+#: ../mail/em-account-editor.c:1684
 msgid "Ask for each message"
 msgstr ""
 
-#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1742 ../widgets/misc/e-account-tree-view.c:131
+#: ../mail/em-account-editor.c:2426
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Nenio"
 
-#: ../mail/em-account-editor.c:2177
+#: ../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:2178
+#: ../mail/em-account-editor.c:2876
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Forward\" to begin."
+"Click \"Continue\" to begin."
 msgstr ""
 
-#: ../mail/em-account-editor.c:2181
+#: ../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:2183 ../mail/em-account-editor.c:2346
+#: ../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:2184
+#: ../mail/em-account-editor.c:2882
 msgid "Please configure the following account settings."
 msgstr ""
 
-#: ../mail/em-account-editor.c:2186 ../mail/em-account-editor.c:2846
+#: ../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:2187
+#: ../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:2189 ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "Kontoinformoj"
+#: ../mail/em-account-editor.c:2887
+msgid "Account Summary"
+msgstr ""
 
-#: ../mail/em-account-editor.c:2190
+#: ../mail/em-account-editor.c:2888
 msgid ""
-"Please enter a descriptive name for this account below.\n"
-"This name will be used for display purposes only."
+"This is a summary of the settings which will be used to access your mail."
 msgstr ""
 
-#: ../mail/em-account-editor.c:2194
+#: ../mail/em-account-editor.c:2892
 msgid "Done"
 msgstr "Farite"
 
-#: ../mail/em-account-editor.c:2195
+#: ../mail/em-account-editor.c:2893
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9033,71 +11510,81 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: ../mail/em-account-editor.c:2660
+#: ../mail/em-account-editor.c:3438
 msgid "Check for _new messages every"
 msgstr ""
 
-#: ../mail/em-account-editor.c:2668
+#: ../mail/em-account-editor.c:3446
 msgid "minu_tes"
 msgstr "minu_toj"
 
-#: ../mail/em-account-editor.c:2960
-msgid "Please select a folder from the current account."
-msgstr ""
-
-#: ../mail/em-account-editor.c:3269 ../mail/mail-config.ui.h:101
+#: ../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:3315 ../mail/em-account-editor.c:3383
+#: ../mail/em-account-editor.c:4198 ../mail/em-account-editor.c:4300
 msgid "Receiving Options"
 msgstr ""
 
-#: ../mail/em-account-editor.c:3316 ../mail/em-account-editor.c:3384
+#: ../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:"
+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:1184
+#: ../mail/em-composer-utils.c:1213
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:1195
+#: ../mail/em-composer-utils.c:1224
 msgid "-----Original Message-----"
 msgstr "-----originala mesaĝo-----"
 
-#. Translators: First %s is an email address, second %s
-#. * is the subject of the email, third %s is the date.
-#: ../mail/em-composer-utils.c:1976
-#, c-format
-msgid "Your message to %s about \"%s\" on %s has been read."
-msgstr ""
-
-#: ../mail/em-composer-utils.c:2030
-#, c-format
-msgid "Delivery Notification for: \"%s\""
-msgstr ""
-
-#: ../mail/em-composer-utils.c:2532
+#: ../mail/em-composer-utils.c:2416
 msgid "an unknown sender"
 msgstr "nekonata sendinto"
 
-#: ../mail/em-composer-utils.c:2933
+#: ../mail/em-composer-utils.c:2811
 msgid "Posting destination"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:2934
+#: ../mail/em-composer-utils.c:2812
 msgid "Choose folders to post the message to."
 msgstr ""
 
-#: ../mail/em-filter-folder-element.c:241
+#: ../mail/em-filter-folder-element.c:243
 msgid "Select Folder"
 msgstr "Elekti dosierujon"
 
@@ -9214,7 +11701,7 @@ msgstr ""
 msgid "is set"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:67
 msgid "Junk"
 msgstr "Rubaĵo"
 
@@ -9263,7 +11750,7 @@ msgid "Play Sound"
 msgstr "Ludi sonon"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:15
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "Legite"
 
@@ -9344,11 +11831,11 @@ msgid "Unset Status"
 msgstr ""
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:538
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "Tiam"
 
-#: ../mail/em-filter-rule.c:569
+#: ../mail/em-filter-rule.c:552
 msgid "Add Ac_tion"
 msgstr "Aldoni _agon"
 
@@ -9374,356 +11861,377 @@ msgstr ""
 msgid "Quota usage"
 msgstr ""
 
-#: ../mail/em-folder-properties.c:314
+#: ../mail/em-folder-properties.c:313
 msgid "Folder Properties"
 msgstr ""
 
-#: ../mail/em-folder-selection-button.c:77
+#: ../mail/em-folder-selection-button.c:79
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: ../mail/em-folder-selector.c:385
+#: ../mail/em-folder-selector.c:388
 msgid "C_reate"
 msgstr "K_rei"
 
-#: ../mail/em-folder-selector.c:391
+#: ../mail/em-folder-selector.c:394
 msgid "Folder _name:"
 msgstr "Dosieruj_nomo:"
 
-#. load store to mail component
-#: ../mail/em-folder-tree-model.c:147 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:158
-#: ../mail/em-folder-tree-model.c:165 ../mail/em-folder-tree-model.c:167
-#: ../mail/mail-vfolder.c:1165 ../mail/mail-vfolder.c:1240
-msgid "Search Folders"
-msgstr "Serĉdosierujoj"
-
-#. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
-msgid "UNMATCHED"
-msgstr ""
-
-#: ../mail/em-folder-tree-model.c:792 ../mail/em-folder-tree-model.c:1061
-msgid "Loading..."
-msgstr "Ŝargante..."
-
-#: ../mail/em-folder-tree.c:647
+#: ../mail/em-folder-tree.c:642
 msgid "Folder names cannot contain '/'"
 msgstr "Nomoj de dosierujoj ne povas enhavi '/'"
 
-#: ../mail/em-folder-tree.c:1331
+#: ../mail/em-folder-tree.c:778
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1568
+#: ../mail/em-folder-tree.c:1601
 msgid "Mail Folder Tree"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2068 ../mail/em-folder-utils.c:114
+#: ../mail/em-folder-tree.c:2091 ../mail/em-folder-utils.c:113
 #, c-format
 msgid "Moving folder %s"
 msgstr "Movi dosierujon %s"
 
-#: ../mail/em-folder-tree.c:2071 ../mail/em-folder-utils.c:116
+#: ../mail/em-folder-tree.c:2094 ../mail/em-folder-utils.c:115
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopii dosierujon %s"
 
-#: ../mail/em-folder-tree.c:2078 ../mail/message-list.c:2218
+#: ../mail/em-folder-tree.c:2101 ../mail/message-list.c:2296
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2082 ../mail/message-list.c:2220
+#: ../mail/em-folder-tree.c:2105 ../mail/message-list.c:2298
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2101
+#: ../mail/em-folder-tree.c:2124
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: ../mail/em-folder-utils.c:481
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:157 ../mail/em-folder-tree-model.c:159
+msgid "UNMATCHED"
+msgstr ""
+
+#: ../mail/em-folder-tree-model.c:784 ../mail/em-folder-tree-model.c:1072
+msgid "Loading..."
+msgstr "Ŝargante..."
+
+#: ../mail/em-folder-utils.c:487
 msgid "Move Folder To"
 msgstr "Movi dosierujon al"
 
-#: ../mail/em-folder-utils.c:481
+#: ../mail/em-folder-utils.c:487
 msgid "Copy Folder To"
 msgstr "Kopii dosierujon al"
 
-#: ../mail/em-folder-utils.c:556
+#: ../mail/em-folder-utils.c:599
 msgid "Create Folder"
 msgstr "Krei dosierujon"
 
-#: ../mail/em-folder-utils.c:557
+#: ../mail/em-folder-utils.c:600
 msgid "Specify where to create the folder:"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:85 ../mail/em-format-html.c:1683
+#: ../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-display.c:85
+#: ../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:86 ../mail/em-format-html.c:1684
-msgid "Valid signature"
-msgstr ""
-
-#: ../mail/em-format-html-display.c:86
+#: ../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:87 ../mail/em-format-html.c:1685
-msgid "Invalid signature"
-msgstr "Nevalida subskribo"
-
-#: ../mail/em-format-html-display.c:87
+#: ../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:88 ../mail/em-format-html.c:1686
-msgid "Valid signature, but cannot verify sender"
-msgstr ""
-
-#: ../mail/em-format-html-display.c:88
+#: ../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:89 ../mail/em-format-html.c:1687
-msgid "Signature exists, but need public key"
-msgstr ""
-
-#: ../mail/em-format-html-display.c:89
+#: ../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:96 ../mail/em-format-html.c:1693
-msgid "Unencrypted"
-msgstr "Neĉifrite"
-
-#: ../mail/em-format-html-display.c:96
+#: ../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:97 ../mail/em-format-html.c:1694
-msgid "Encrypted, weak"
-msgstr ""
-
-#: ../mail/em-format-html-display.c:97
+#: ../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:98 ../mail/em-format-html.c:1695
-msgid "Encrypted"
-msgstr "Ĉifrite"
-
-#: ../mail/em-format-html-display.c:98
+#: ../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:99 ../mail/em-format-html.c:1696
-msgid "Encrypted, strong"
-msgstr "Ĉifrite, forte"
-
-#: ../mail/em-format-html-display.c:99
+#: ../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:237 ../smime/gui/smime-ui.ui.h:47
+#: ../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:250
+#: ../mail/em-format-html-display.c:261
 msgid "This certificate is not viewable"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:539
+#: ../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:806
+#: ../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:814
+#: ../mail/em-format-html-display.c:1028
 msgid "Overdue:"
 msgstr "Posttempe:"
 
-#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:818
+#: ../mail/em-format-html-display.c:1036
 msgid "by"
 msgstr "de"
 
-#: ../mail/em-format-html-display.c:1081 ../mail/em-format-html-display.c:1128
+#: ../mail/em-format-html-display.c:1317 ../mail/em-format-html-display.c:1368
 msgid "View _Unformatted"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1083
+#: ../mail/em-format-html-display.c:1319
 msgid "Hide _Unformatted"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1148
+#: ../mail/em-format-html-display.c:1390
 msgid "O_pen With"
 msgstr "_Malfermi per"
 
-#: ../mail/em-format-html-print.c:176
+#: ../mail/em-format-html-print.c:155
 #, c-format
 msgid "Page %d of %d"
 msgstr "Paĝo %d de %d"
 
-#: ../mail/em-format-html.c:165
-msgid "Formatting message"
-msgstr ""
-
-#: ../mail/em-format-html.c:364
-msgid "Formatting Message..."
-msgstr ""
-
-#: ../mail/em-format-html.c:1527 ../mail/em-format-html.c:1537
-#, c-format
-msgid "Retrieving '%s'"
-msgstr ""
-
-#: ../mail/em-format-html.c:2058
-msgid "Unknown external-body part."
-msgstr ""
-
-#: ../mail/em-format-html.c:2066
-msgid "Malformed external-body part."
-msgstr ""
-
-#: ../mail/em-format-html.c:2096
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr ""
-
-#: ../mail/em-format-html.c:2107
+#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
+#: ../mail/em-html-stream.c:122
 #, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
+msgid "No HTML stream available"
 msgstr ""
 
-#: ../mail/em-format-html.c:2109
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr ""
+#: ../mail/em-subscription-editor.c:853
+msgid "_Subscribe"
+msgstr "_Aboni"
 
-#: ../mail/em-format-html.c:2130
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr ""
+#: ../mail/em-subscription-editor.c:862
+msgid "Su_bscribe To Shown"
+msgstr "_Aboni montratajn"
 
-#: ../mail/em-format-html.c:2141
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
-
-#: ../mail/em-format-html.c:2799
-msgid "(no subject)"
-msgstr "<sen nomo>"
+#: ../mail/em-subscription-editor.c:870
+msgid "Subscribe To _All"
+msgstr "_Aboni ĉiujn"
 
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user@example.com"
-#: ../mail/em-format-html.c:2815
-#: ../plugins/mail-notification/mail-notification.c:407
-#, c-format
-msgid "From: %s"
-msgstr "De: %s"
+#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1823
+#: ../modules/mail/e-mail-shell-view-actions.c:1252
+msgid "_Unsubscribe"
+msgstr "_Malaboni"
 
-#. To translators: This message suggests to the receipients that the sender of the mail is
-#. different from the one listed in From field.
-#: ../mail/em-format-html.c:2892
-#, c-format
-msgid "This message was sent by %s on behalf of %s"
-msgstr ""
+#: ../mail/em-subscription-editor.c:979
+msgid "Unsu_bscribe From Hidden"
+msgstr "_Malaboni kaŝitajn"
 
-#: ../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:987
+msgid "Unsubscribe From _All"
+msgstr "_Malaboni ĉiujn"
 
-#: ../mail/em-subscription-editor.c:1138
+#: ../mail/em-subscription-editor.c:1658
 msgid "Folder Subscriptions"
 msgstr ""
 
-#: ../mail/em-subscription-editor.c:1177
+#: ../mail/em-subscription-editor.c:1698
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../mail/em-subscription-editor.c:1192
+#: ../mail/em-subscription-editor.c:1713
 msgid "Clear Search"
 msgstr "Vakigi serĉon"
 
-#: ../mail/em-subscription-editor.c:1210
+#: ../mail/em-subscription-editor.c:1731
 msgid "Sho_w items that contain:"
 msgstr "_Montri erojn kiuj entenas:"
 
-#: ../mail/em-subscription-editor.c:1249
+#: ../mail/em-subscription-editor.c:1776
 msgid "Subscribe to the selected folder"
 msgstr "Aboni la elektitan dosierujon"
 
-#: ../mail/em-subscription-editor.c:1250
+#: ../mail/em-subscription-editor.c:1777
 msgid "Su_bscribe"
 msgstr "_Aboni"
 
-#: ../mail/em-subscription-editor.c:1261
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../mail/em-subscription-editor.c:1822
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
 msgid "Unsubscribe from the selected folder"
 msgstr "Malaboni de la elektita dosierujo"
 
-#: ../mail/em-subscription-editor.c:1262
-#: ../modules/mail/e-mail-shell-view-actions.c:1222
-msgid "_Unsubscribe"
-msgstr "_Malaboni"
-
-#: ../mail/em-subscription-editor.c:1273
+#: ../mail/em-subscription-editor.c:1862
 msgid "Collapse all folders"
 msgstr "Maletendi ĉiujn dosierujon"
 
-#: ../mail/em-subscription-editor.c:1274
+#: ../mail/em-subscription-editor.c:1863
 msgid "C_ollapse All"
 msgstr "_Maletendi ĉiujn"
 
-#: ../mail/em-subscription-editor.c:1284
+#: ../mail/em-subscription-editor.c:1873
 msgid "Expand all folders"
 msgstr "Maletendi ĉiujn dosierujon"
 
-#: ../mail/em-subscription-editor.c:1285
+#: ../mail/em-subscription-editor.c:1874
 msgid "E_xpand All"
 msgstr "_Etendi ĉiujn"
 
-#: ../mail/em-subscription-editor.c:1295
+#: ../mail/em-subscription-editor.c:1884
 msgid "Refresh the folder list"
 msgstr "Aktualigi la dosierujoliston"
 
-#: ../mail/em-subscription-editor.c:1307
+#: ../mail/em-subscription-editor.c:1896
 msgid "Stop the current operation"
 msgstr "Haltigi la aktualan agon"
 
@@ -9731,32 +12239,32 @@ msgstr "Haltigi la aktualan agon"
 #. * 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:102
+#: ../mail/em-utils.c:108
 #, 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:158
+#: ../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:331
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "Mesaĝfiltriloj"
 
-#: ../mail/em-utils.c:916
+#: ../mail/em-utils.c:976
 #, c-format
 msgid "Messages from %s"
 msgstr "Mesaĝoj de %s"
 
-#: ../mail/em-vfolder-editor.c:108
+#: ../mail/em-vfolder-editor.c:105
 msgid "Search _Folders"
 msgstr "Serĉ_dosierujoj"
 
-#: ../mail/em-vfolder-rule.c:604
+#: ../mail/em-vfolder-rule.c:595
 msgid "Add Folder"
 msgstr "Aldoni dosierujon"
 
@@ -9808,109 +12316,16 @@ msgstr ""
 msgid "\"Send and Receive Mail\" window width"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:13
-msgid "Always request read receipt"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr ""
-
-#: ../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"
-msgstr ""
-
 #: ../mail/evolution-mail.schemas.in.h:16
 msgid "Attribute message."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:17
-msgid "Automatic emoticon recognition"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:18
-msgid "Automatic link recognition"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:19
-msgid "Check for new messages in all active accounts"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:20
-msgid "Check for new messages on start"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:21
-msgid "Check incoming mail being junk"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:22
-msgid "Citation highlight color"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:23
-msgid "Citation highlight color."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:24
-msgid "Composer Window default height"
-msgstr ""
-
 #: ../mail/evolution-mail.schemas.in.h:25
-msgid "Composer Window default width"
+msgid "Composer Window default height"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:26
-msgid "Composer load/attach directory"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:27
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:28
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-
-#: ../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."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:30
-msgid "Custom headers to use while checking for junk."
-msgstr ""
-
-#: ../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\"."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:32
-msgid "Default charset in which to compose messages"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:33
-msgid "Default charset in which to compose messages."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:34
-msgid "Default charset in which to display messages"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:35
-msgid "Default charset in which to display messages."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:36
-msgid "Default forward style"
+msgid "Composer Window default width"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:37
@@ -9929,10 +12344,6 @@ msgstr ""
 msgid "Default reply style"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:41
-msgid "Default value for thread expand state"
-msgstr ""
-
 #: ../mail/evolution-mail.schemas.in.h:42
 msgid "Default width of the Composer Window."
 msgstr ""
@@ -9943,223 +12354,63 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
-"Describes wheter message headers in paned view should be collapsed or "
-"expanded by default. \"0\" = expanded \"1\" = collapsed"
+"Define the email export format when doing drag'n'drop. Possible values are : "
+"mbox or pdf"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:45
 msgid ""
-"Determines whether to look up addresses for junk filtering in local address "
-"book only"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:46
-msgid "Determines whether to lookup in address book for sender email"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:47
-msgid ""
-"Determines whether to lookup the sender email in address book. If found, it "
-"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
-"can be slow, if remote address books (like LDAP) are marked for "
-"autocompletion."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:48
-msgid "Determines whether to use custom headers to check for junk"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:49
-msgid ""
-"Determines whether to use custom headers to check for junk. If this option "
-"is enabled and the headers are mentioned, it will be improve the junk "
-"checking speed."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:50
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:51
-msgid "Directory for loading/attaching files to composer."
+"Describes whether message headers in paned view should be collapsed or "
+"expanded by default. \"0\" = expanded \"1\" = collapsed"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:52
-msgid "Directory for saving mail component files."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:53
-msgid "Disable or enable ellipsizing of folder names in side bar"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:54
-msgid "Display only message texts not exceeding certain size"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:55
-msgid "Do not add signature delimiter"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:56
-msgid "Draw spelling error indicators on words as you type."
+msgid "Digitally sign messages when original message signed (PGP or S/MIME)"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:57
-msgid "Empty Junk folders on exit"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:58
-msgid "Empty Trash folders on exit"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:59
-msgid "Empty all Junk folders when exiting Evolution."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:60
-msgid "Empty all Trash folders when exiting Evolution."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:61
-msgid ""
-"Enable animated images in HTML mail. Many users find animated images "
-"annoying and prefer to see a static image instead."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:62
-msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:63
-msgid "Enable or disable magic space bar"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable or disable the prompt whilst marking multiple messages."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:65
-msgid "Enable or disable type ahead search feature"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:66
-msgid "Enable search folders"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "Enable search folders on startup."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:68
-msgid ""
-"Enable the side bar search feature to allow interactive searching of folder "
-"names."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:69
-msgid ""
-"Enable this to use Space bar key to scroll in message preview, message list "
-"and folders."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:70
-msgid ""
-"Enable to display only message texts not exceeding size defined in "
-"'message_text_part_limit' key."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:71
-msgid "Enable to use a similar message list view settings for all folders"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:72
-msgid "Enable to use a similar message list view settings for all folders."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:73
-msgid "Enable/disable caret mode"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:74 ../mail/mail-config.ui.h:45
-msgid "Encode file names in an Outlook/GMail way"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:75
-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."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:76
-msgid "Flush Outbox after filtering"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:77
-msgid "Forward message."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "Group Reply replies to list"
+msgid "Drag'n'drop export format"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:79
-msgid "Height of the message-list pane"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:80
-msgid "Height of the message-list pane."
+msgid ""
+"Exported file name will be : YYYmmDDHHMMSS_email_title Possible values : 1 "
+"(: email sent date), 2 (: drag'n'drop date)"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:81
-msgid "Hides the per-folder preview and removes the selection"
+msgid "Format of the drag'n'drop export filename"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:82
-msgid ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:83
-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."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:84
-msgid "Ignore list Reply-To:"
+msgid "Forward message."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../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/evolution-mail.schemas.in.h:86
+#: ../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."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../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."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../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."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../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 "
@@ -10167,7 +12418,7 @@ msgid ""
 "maximized. This key exists only as an implementation detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../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 "
@@ -10175,7 +12426,7 @@ msgid ""
 "window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../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 "
@@ -10183,7 +12434,7 @@ msgid ""
 "window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../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 "
@@ -10192,801 +12443,198 @@ msgid ""
 "detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../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."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../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."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../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."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../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."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:97
-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 ""
-
-#: ../mail/evolution-mail.schemas.in.h:98
-msgid ""
-"It disables/enables the repeated prompts to warn that deleting messages from "
-"a search folder permanently deletes the message, not simply removing it from "
-"the search results."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:99
-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 ""
-
-#: ../mail/evolution-mail.schemas.in.h:100
-msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"reply to many people."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:101
-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 ""
-
-#: ../mail/evolution-mail.schemas.in.h:102
-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 ""
-
-#: ../mail/evolution-mail.schemas.in.h:103
-msgid "Last time Empty Junk was run"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:104
-msgid "Last time Empty Trash was run"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:105
-msgid "Layout style"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:106
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
-msgid "Level beyond which the message should be logged."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:107
-msgid "List of Labels and their associated colors"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:108
-msgid "List of MIME types to check for Bonobo component viewers"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "List of accepted licenses"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "List of accounts"
 msgstr "Listo de kontoj"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../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/evolution-mail.schemas.in.h:112
-msgid "List of custom headers and whether they are enabled."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:113
-msgid "List of dictionary language codes used for spell checking."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:114
-msgid ""
-"List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:color where color uses the HTML hex encoding."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid "List of protocol names whose license has been accepted."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid "Load images for HTML messages over HTTP"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:117
-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."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:118
-msgid "Log filter actions"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:119
-msgid "Log filter actions to the specified log file."
-msgstr ""
-
 #: ../mail/evolution-mail.schemas.in.h:120
-msgid "Logfile to log filter actions"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:121
-msgid "Logfile to log filter actions."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:122
-msgid "Mail browser height"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:123
-msgid "Mail browser maximized"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:124
-msgid "Mail browser width"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:125
-msgid "Mark as Seen after specified timeout"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:126
-msgid "Mark as Seen after specified timeout."
+msgid "List of protocol names whose license has been accepted."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:127
-msgid "Mark citations in the message \"Preview\""
+msgid "Mail browser height"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:128
-msgid "Mark citations in the message \"Preview\"."
+msgid "Mail browser maximized"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:129
-msgid "Message text limit for display"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:130
-msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:131
-msgid "Minimum days between emptying the junk on exit"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:132
-msgid "Minimum days between emptying the trash on exit"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:133
-msgid "Minimum time between emptying the junk on exit, in days."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:134
-msgid "Minimum time between emptying the trash on exit, in days."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:135
-msgid "Number of addresses to display in TO/CC/BCC"
+msgid "Mail browser width"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Original message."
 msgstr "Originala mesaĝo."
 
-#: ../mail/evolution-mail.schemas.in.h:137
-msgid "Path where picture gallery should search for its content"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../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"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:139
-msgid "Prompt before sending to recipients not entered as mail addresses"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:140
-msgid "Prompt on empty subject"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Prompt the user when he or she tries to expunge a folder."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:142
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:143
-msgid "Prompt when deleting messages in search folder"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:144
-msgid "Prompt when mailing list hijacks private replies"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:145
-msgid "Prompt when replying privately to list messages"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:146
-msgid "Prompt when replying to many recipients"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:147
-msgid "Prompt when user expunges"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:148
-msgid "Prompt when user only fills Bcc"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:149
-msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:150
-msgid ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:151
-msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:152
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:153
-msgid "Prompt while marking multiple messages"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:154
-msgid "Put personalized signatures at the top of replies"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:155
-msgid "Put the cursor at the bottom of replies"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:156
-msgid "Recognize emoticons in text and replace them with images."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:157
-msgid "Recognize links in text and replace them."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:158
-msgid "Run junk test on incoming mail."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:159
-msgid "Save directory"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:160
-msgid "Search for the sender photo in local address books"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:161
-msgid "Send HTML mail by default"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:162
-msgid "Send HTML mail by default."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:163
-msgid "Sender email-address column in the message list"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:164
-msgid "Server synchronization interval"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:165
-msgid ""
-"Set to TRUE in case you do not want to add signature delimiter before your "
-"signature when composing a mail."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:166
-msgid "Show \"Bcc\" field when sending a mail message"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "Show \"Cc\" field when sending a mail message"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Show \"From\" field when posting to a newsgroup"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "Show \"Reply To\" field when posting to a newsgroup"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "Show \"Reply To\" field when sending a mail message"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "Show Animations"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "Show all message headers"
-msgstr "Montri ĉiujn kapliniojn"
-
-#: ../mail/evolution-mail.schemas.in.h:173
-msgid "Show all the headers when viewing a messages."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:174
-msgid "Show animated images as animations."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "Show deleted messages in the message-list"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:177
-msgid "Show image animations"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:178
-msgid "Show original \"Date\" header value."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:179
-msgid "Show photo of the sender"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:180
-msgid ""
-"Show the \"Bcc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:181
-msgid ""
-"Show the \"Cc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:182
-msgid ""
-"Show the \"From\" field when posting to a newsgroup. This is controlled from "
-"the View menu when a news account is chosen."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:183
-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 ""
-
-#: ../mail/evolution-mail.schemas.in.h:184
-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 ""
-
-#: ../mail/evolution-mail.schemas.in.h:185
-msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:186
-msgid ""
-"Show the original \"Date\" header (with a local time only if the time zone "
-"differs). Otherwise always show \"Date\" header value in a user preferred "
-"format and local time zone."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:187
-msgid "Show the photo of the sender in the message reading pane."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:188
-msgid ""
-"Some mailing lists set a Reply-To: header to trick users into sending "
-"replies to the list, even when they ask Evolution to make a private reply. "
-"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
-"so that Evolution will do as you ask it. If you use the private reply "
-"action, it will reply privately, while if you use the 'Reply to List' action "
-"it will do that. It works by comparing the Reply-To: header with a List-"
-"Post: header, if there is one."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:189
-msgid "Spell check inline"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:190
-msgid "Spell checking color"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:191
-msgid "Spell checking languages"
-msgstr "Literum-kontrolataj lingvoj"
-
-#: ../mail/evolution-mail.schemas.in.h:192
-msgid "State of message headers in paned view"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:193
-msgid "Terminal font"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:194
-msgid "The default plugin for Junk hook"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:195
-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\")."
-
-#: ../mail/evolution-mail.schemas.in.h:196
-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\")."
-
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:199
 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."
+"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/evolution-mail.schemas.in.h:198
-msgid "The terminal font for mail display."
-msgstr "La terminala litertiparo por montri poŝtaĵojn."
-
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../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."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../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."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:202
-msgid "The variable width font for mail display."
-msgstr "La varilarĝa tiparo por montrado de retpoŝtaĵoj"
-
-#: ../mail/evolution-mail.schemas.in.h:203
-msgid ""
-"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
-"\"2\" for debug messages."
-msgstr ""
-"Tio ĉi povas havi unu el tri valoroj: 0 = eraro, 1 = averto, 2 = erarospura "
-"informo."
-
-#: ../mail/evolution-mail.schemas.in.h:204
-msgid ""
-"This decides the max size of the message text that will be displayed under "
-"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
-"is used only when 'force_message_limit' key is activated."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:205
-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 ""
-
-#: ../mail/evolution-mail.schemas.in.h:206
-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."
-
-#: ../mail/evolution-mail.schemas.in.h:207
-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."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:208
-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 ""
-
-#: ../mail/evolution-mail.schemas.in.h:209
-msgid "This option would help in improving the speed of fetching."
-msgstr "Tiu ĉi opcio povas plirapidigi la elŝutadon."
-
-#: ../mail/evolution-mail.schemas.in.h:210
-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 \"...\"."
-
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../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."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:212
-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 ""
-
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../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."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:214
-msgid "Thread the message-list based on Subject"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:215
-msgid "Timeout for marking message as seen"
-msgstr "Tempolimo, post kiu mesaĝo estas markita kiel \"legita\"."
-
-#: ../mail/evolution-mail.schemas.in.h:216
-msgid "Timeout for marking message as seen."
-msgstr "Tempolimo, post kiu mesaĝo estas markita kiel \"legita\"."
-
-#: ../mail/evolution-mail.schemas.in.h:217
-msgid "UID string of the default account."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:218
-msgid "Underline color for misspelled words when using inline spelling."
-msgstr ""
-"Koloro por substreki misliterumitajn vortojn ĉe uzo de la enprograma "
-"ortografia kontrolo."
-
-#: ../mail/evolution-mail.schemas.in.h:219
-msgid "Use SpamAssassin daemon and client"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:220
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:221
-msgid "Use custom fonts"
-msgstr "Uzu personecigitajn riparojn"
-
-#: ../mail/evolution-mail.schemas.in.h:222
-msgid "Use custom fonts for displaying mail."
-msgstr "Uzu personecigitajn riparojn por montri poŝtaĵojn."
-
-#: ../mail/evolution-mail.schemas.in.h:223
-msgid "Use only local spam tests."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:224
-msgid "Use only the local spam tests (no DNS)."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:225
-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."
-
-#: ../mail/evolution-mail.schemas.in.h:226
-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."
-
-#: ../mail/evolution-mail.schemas.in.h:227
-msgid "Variable width font"
-msgstr "Diverslarĝa tiparo"
-
-#: ../mail/evolution-mail.schemas.in.h:228
-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?"
-
-#: ../mail/evolution-mail.schemas.in.h:229
-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."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:230
-msgid ""
-"Whether check for new messages when Evolution is started. This includes also "
-"sending messages from Outbox."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:231
-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?"
-
-#: ../mail/evolution-mail.schemas.in.h:232
-msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:233
-msgid "Whether sort threads based on latest message in that thread"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:234
-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."
+#: ../mail/evolution-mail.schemas.in.h:238
+msgid "Whether to show local folders (On This Computer) in a folder tree."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:235
-msgid "Width of the message-list pane"
-msgstr "Larĝo de la mesaĝo-lista areo"
-
-#: ../mail/evolution-mail.schemas.in.h:236
-msgid "Width of the message-list pane."
-msgstr "Larĝo de la mesaĝo-lista areo"
-
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:181
 msgid "Importing Elm data"
 msgstr ""
 
-#: ../mail/importers/elm-importer.c:341 ../mail/importers/pine-importer.c:446
-#: ../modules/mail/e-mail-shell-view.c:1036
-#: ../widgets/misc/e-send-options.c:511
+#: ../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:382
+#: ../mail/importers/elm-importer.c:396
 msgid "Evolution Elm importer"
 msgstr "Evolucio-Elm-enportilo"
 
-#: ../mail/importers/elm-importer.c:383
+#: ../mail/importers/elm-importer.c:397
 msgid "Import mail from Elm."
 msgstr "Enportu poŝtaĵojn de Elm"
 
-#: ../mail/importers/evolution-mbox-importer.c:135
-#: ../plugins/dbx-import/dbx-importer.c:249
+#: ../mail/importers/evolution-mbox-importer.c:142
+#: ../plugins/dbx-import/dbx-importer.c:259
 msgid "_Destination folder:"
 msgstr "_Celdosierujo:"
 
-#: ../mail/importers/evolution-mbox-importer.c:142
-#: ../plugins/dbx-import/dbx-importer.c:259
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../mail/importers/evolution-mbox-importer.c:148
+#: ../plugins/dbx-import/dbx-importer.c:265
+#: ../plugins/pst-import/pst-importer.c:554
 msgid "Select folder"
 msgstr "Elekti dosierujon"
 
-#: ../mail/importers/evolution-mbox-importer.c:143
-#: ../plugins/dbx-import/dbx-importer.c:260
-#: ../plugins/pst-import/pst-importer.c:319
+#: ../mail/importers/evolution-mbox-importer.c:149
+#: ../plugins/dbx-import/dbx-importer.c:266
+#: ../plugins/pst-import/pst-importer.c:555
 msgid "Select folder to import into"
 msgstr "Elektu mesaĝujon, en kiun enporti"
 
-#: ../mail/importers/evolution-mbox-importer.c:417
+#: ../mail/importers/evolution-mbox-importer.c:436
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Temo"
 
-#: ../mail/importers/evolution-mbox-importer.c:422
+#: ../mail/importers/evolution-mbox-importer.c:441
 msgctxt "mboxImp"
 msgid "From"
 msgstr "De"
 
-#: ../mail/importers/evolution-mbox-importer.c:466
-#: ../shell/e-shell-utils.c:221
+#: ../mail/importers/evolution-mbox-importer.c:485
+#: ../shell/e-shell-utils.c:195
 msgid "Berkeley Mailbox (mbox)"
 msgstr ""
 
-#: ../mail/importers/evolution-mbox-importer.c:467
+#: ../mail/importers/evolution-mbox-importer.c:486
 msgid "Importer Berkeley Mailbox format folders"
 msgstr ""
 
-#: ../mail/importers/mail-importer.c:64
+#: ../mail/importers/mail-importer.c:63
 msgid "Importing mailbox"
 msgstr ""
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
-#: ../plugins/dbx-import/dbx-importer.c:603
-#: ../plugins/pst-import/pst-importer.c:500
-#: ../plugins/pst-import/pst-importer.c:609
+#: ../plugins/dbx-import/dbx-importer.c:615
+#: ../plugins/pst-import/pst-importer.c:761
 #, c-format
 msgid "Importing '%s'"
 msgstr "Enportado de \"%s\""
 
-#: ../mail/importers/mail-importer.c:315
+#: ../mail/importers/mail-importer.c:316
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../mail/importers/pine-importer.c:250
+#: ../mail/importers/pine-importer.c:253
 msgid "Importing Pine data"
 msgstr ""
 
-#: ../mail/importers/pine-importer.c:451
-#: ../modules/addressbook/addressbook-config.c:1013
+#: ../mail/importers/pine-importer.c:456
+#: ../modules/addressbook/addressbook-config.c:1083
 msgid "Address Book"
 msgstr "Adresaro"
 
-#: ../mail/importers/pine-importer.c:493
+#: ../mail/importers/pine-importer.c:502
 msgid "Evolution Pine importer"
 msgstr "Evolucio-Pine-enportilo"
 
-#: ../mail/importers/pine-importer.c:494
+#: ../mail/importers/pine-importer.c:503
 msgid "Import mail from Pine."
 msgstr ""
 
@@ -10995,22 +12643,22 @@ msgstr ""
 msgid "Mail to %s"
 msgstr ""
 
-#: ../mail/mail-autofilter.c:238 ../mail/mail-autofilter.c:281
+#: ../mail/mail-autofilter.c:228 ../mail/mail-autofilter.c:271
 #, c-format
 msgid "Mail from %s"
 msgstr "Poŝtaĵo de %s"
 
-#: ../mail/mail-autofilter.c:264
+#: ../mail/mail-autofilter.c:254
 #, c-format
 msgid "Subject is %s"
 msgstr "Temo estas %s"
 
-#: ../mail/mail-autofilter.c:305
+#: ../mail/mail-autofilter.c:295
 #, c-format
 msgid "%s mailing list"
 msgstr "Adresolisto %s"
 
-#: ../mail/mail-autofilter.c:414
+#: ../mail/mail-autofilter.c:404
 msgid "Add Filter Rule"
 msgstr "Aldoni filtran regulon"
 
@@ -11019,7 +12667,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:517
+#: ../mail/mail-autofilter.c:511
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -11031,6 +12679,10 @@ msgid_plural ""
 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..."
@@ -11079,7 +12731,7 @@ msgid "Apply the same _view settings to all folders"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:15
-#: ../modules/addressbook/addressbook-config.c:1020
+#: ../modules/addressbook/addressbook-config.c:1090
 msgid "Authentication"
 msgstr "Aŭtentokontrolo"
 
@@ -11145,8 +12797,8 @@ msgid "Confirmations"
 msgstr "Konfirmoj"
 
 #: ../mail/mail-config.ui.h:31
-#: ../modules/addressbook/autocompletion-config.c:159
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
+#: ../modules/addressbook/autocompletion-config.c:188
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Date/Time Format"
 msgstr "Dato/tempo-aranĝo"
 
@@ -11166,503 +12818,527 @@ msgstr "Forigi mesaĝon"
 msgid "Delete junk messages on e_xit"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:39
+msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:40
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:41
 msgid "Displayed Message Headers"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:40
+#: ../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:41
+#: ../mail/mail-config.ui.h:43
 msgid "Do not quote"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:44
 msgid "Drafts _Folder:"
 msgstr "Malnet_dosierujo:"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:45
 msgid "Email _Address:"
 msgstr "Retpoŝt_adreso:"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:47
 msgid "Empty trash folders on e_xit"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:49
 msgid "Encry_ption certificate:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:50
 msgid "Encrypt out_going messages (by default)"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:51
+msgid "Encryption:"
+msgstr "Ĉifrado:"
+
+#: ../mail/mail-config.ui.h:52
 msgid "F_all back to threading messages by subject"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:53
 msgid "Fix_ed Width Font:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:54
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:55
 msgid "Full Nam_e:"
 msgstr "Tuta _nomo:"
 
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:57
 msgid "Group Reply goes only to mailing list, if possible"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:58
 msgid "HTML Messages"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:59
 msgid "H_TTP Proxy:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:60
 msgid "Header content"
 msgstr "Paĝokapa enhavo"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:61
 msgid "Header name"
 msgstr "Paĝokapa nomo"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:62
 msgid "Headers"
 msgstr "Kaplinioj"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:63
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:64
 msgid "Ignore Reply-To: for mailing lists"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:65
 msgid "Inline"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:66
 msgid "Inline (Outlook style)"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etikedoj"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:69
 msgid "Languages Table"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:70
 msgid "Loading Images"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:71
 msgid "Mail Headers Table"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:72
 msgid "Mailbox location"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:73
 msgid "Message Display"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:74
 msgid "Message Receipts"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:76
 msgid "No _Proxy for:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:77 ../modules/addressbook/ldap-config.ui.h:9
+msgid "No encryption"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:78
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:79
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "Nedeviga informo"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:81
 msgid "Or_ganization:"
 msgstr "Or_ganizo:"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:82
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:83
 msgid "Pass_word:"
 msgstr "Pas_vorto:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:84
+msgid "Personal Details:"
+msgstr "Persondetaloj:"
+
+#: ../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:80
+#: ../mail/mail-config.ui.h:86
 msgid "Port:"
 msgstr "Pordo:"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:87
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:89
 msgid "Proxy Settings"
 msgstr "Prokurilagordo"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:90
 msgid "Quoted"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:91
 msgid "Re_member password"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:92
 msgid "Re_ply-To:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:94
 msgid "Remember _password"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:95
 msgid "Replies and Forwards"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:96
 msgid "Required Information"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:97
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:98
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:99
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:100
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:101
+msgid "SOC_KS Proxy:"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:102 ../modules/addressbook/ldap-config.ui.h:12
+msgid "SSL encryption"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:103
 msgid "SSL is not supported in this build of Evolution"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:104
 msgid "S_earch for sender photograph only in local address books"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:105
 msgid "S_elect..."
 msgstr "_Elekti..."
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:106
 msgid "S_end message receipts:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:107
 msgid "S_tandard Font:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:108
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:110
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:111
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:104
+#: ../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:106
+#: ../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:108
+#: ../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:110
+#: ../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:112
+#: ../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:114
+#: ../mail/mail-config.ui.h:123
 msgid "Sending a reply to a large _number of recipients"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:124
 msgid "Sent _Messages Folder:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:125
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:126
 msgid "Server Configuration"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:127
 msgid "Server _Type:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:130
 msgid "Set custom junk header"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:131
 msgid "Si_gning algorithm:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:132
 msgid "Sig_natures"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:133
 msgid "Sig_ning certificate:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:134
 msgid "Signat_ure:"
 msgstr "S_ubskribo:"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:135
 msgid "Signatures"
 msgstr "Subskriboj"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:136
 msgid "Signing _algorithm:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:137
 msgid "Special Folders"
 msgstr "Specialaj dosierujoj"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:138
 msgid "Spell Checking"
 msgstr "Literumkontrolo"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:139
 msgid "Start _typing at the bottom on replying"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:140
 msgid "Start up"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:131
+#: ../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:132
+#: ../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:133
+#: ../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:136
+#: ../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:137
+#: ../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:139
+#: ../mail/mail-config.ui.h:150
 msgid "Us_ername:"
 msgstr "U_zantonomo:"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:151
 msgid "Use Authe_ntication"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:152
 msgid "User _Name:"
 msgstr "Uzanto_nomo:"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:154
 msgid "_Add Signature"
 msgstr "_Aldoni subskribon"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:155
 msgid "_Always load images from the Internet"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:156
 msgid "_Authentication Type"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:145
-msgid "_Default junk plugin:"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:157
 msgid "_Direct connection to the Internet"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:158
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:159
 msgid "_Forward style:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:160
 msgid "_Junk Folder:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:161
 msgid "_Keep signature above the original message on replying"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:162
 msgid "_Languages"
 msgstr "_Lingvoj"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:163
 msgid "_Load images only in messages from contacts"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:164
 msgid "_Lookup in local address book only"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:165
 msgid "_Make this my default account"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:166
 msgid "_Manual proxy configuration:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:168
 msgid "_Never load images from the Internet"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:158
-msgid "_Path:"
-msgstr "_Vojo:"
-
-#: ../mail/mail-config.ui.h:159 ../modules/addressbook/ldap-config.ui.h:27
+#: ../mail/mail-config.ui.h:170 ../modules/addressbook/ldap-config.ui.h:29
 msgid "_Port:"
 msgstr "_Pordo:"
 
-#: ../mail/mail-config.ui.h:160
+#: ../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:161
+#: ../mail/mail-config.ui.h:172
 msgid "_Reply style:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:173
 msgid "_Script:"
 msgstr "_Skripto:"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:174
 msgid "_Secure HTTP Proxy:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:165 ../modules/addressbook/ldap-config.ui.h:29
+#: ../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:167
+#: ../mail/mail-config.ui.h:178
 msgid "_Show animated images"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:179
 msgid "_Show the photograph of sender in the message preview"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:169
+#: ../mail/mail-config.ui.h:180
 msgid "_Trash Folder:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:170
-msgid "_Use Secure Connection:"
+#: ../mail/mail-config.ui.h:181
+msgid "_Use secure connection:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:182
 msgid "_Use system defaults"
 msgstr "_Uzi sistemdefaŭltojn"
 
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:183
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:174 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:185 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:175
+#: ../mail/mail-config.ui.h:186
 msgid "color"
 msgstr "koloro"
 
-#: ../mail/mail-config.ui.h:176
+#: ../mail/mail-config.ui.h:187
 msgid "description"
 msgstr "priskribo"
 
-#: ../mail/mail-config.ui.h:177
-msgid "gtk-ok"
-msgstr ""
+#: ../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"
@@ -11680,244 +13356,85 @@ msgstr "Ĉiuj lokaj dosierujoj"
 msgid "Call"
 msgstr "Voko"
 
-#: ../mail/mail-dialogs.ui.h:5
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Do Not Forward"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Encryption"
 msgstr "Ĉifrado"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "Antaŭen"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "Permesilo"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "Respondy al ĉiuj"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Search Folder Sources"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Security Information"
 msgstr "Sekurecinformo"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Specific folders"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../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:24
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Accept License"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Due By:"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Flag:"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Tick this to accept the license agreement"
 msgstr ""
 
-#: ../mail/mail-folder-cache.c:767
-#, c-format
-msgid "Pinging %s"
-msgstr ""
-
-#: ../mail/mail-ops.c:85
-msgid "Filtering Selected Messages"
-msgstr ""
-
-#: ../mail/mail-ops.c:205
-msgid "Fetching Mail"
-msgstr ""
-
-#: ../mail/mail-ops.c:813
-#, c-format
-msgid "Sending message %d of %d"
-msgstr ""
-
-#: ../mail/mail-ops.c:861
-#, c-format
-msgid "Failed to send %d of %d messages"
-msgstr ""
-
-#: ../mail/mail-ops.c:865 ../mail/mail-send-recv.c:824
-msgid "Canceled."
-msgstr "Nuligite."
-
-#: ../mail/mail-ops.c:867 ../mail/mail-send-recv.c:826
-msgid "Complete."
-msgstr "Plenumite."
-
-#: ../mail/mail-ops.c:977
-#, c-format
-msgid "Moving messages to '%s'"
-msgstr ""
-
-#: ../mail/mail-ops.c:978
-#, c-format
-msgid "Copying messages to '%s'"
-msgstr ""
-
-#: ../mail/mail-ops.c:1095
-#, c-format
-msgid "Storing folder '%s'"
-msgstr ""
-
-#: ../mail/mail-ops.c:1169
-#, c-format
-msgid "Expunging and storing account '%s'"
-msgstr ""
-
-#: ../mail/mail-ops.c:1170
-#, c-format
-msgid "Storing account '%s'"
-msgstr ""
-
-#: ../mail/mail-ops.c:1232
-#, c-format
-msgid "Refreshing folder '%s'"
-msgstr ""
-
-#: ../mail/mail-ops.c:1410
-#, c-format
-msgid "Expunging folder '%s'"
-msgstr ""
-
-#: ../mail/mail-ops.c:1483
-#, c-format
-msgid "Emptying trash in '%s'"
-msgstr ""
-
-#: ../mail/mail-ops.c:1484
-msgid "Local Folders"
-msgstr "Lokaj dosierujoj"
-
-#: ../mail/mail-ops.c:1582
-#, c-format
-msgid "Disconnecting %s"
-msgstr ""
-
-#: ../mail/mail-send-recv.c:197
-msgid "Canceling..."
-msgstr ""
-
-#: ../mail/mail-send-recv.c:443
-msgid "Send & Receive Mail"
-msgstr ""
-
-#: ../mail/mail-send-recv.c:459
-msgid "Cancel _All"
-msgstr ""
-
-#: ../mail/mail-send-recv.c:585 ../mail/mail-send-recv.c:963
-msgid "Updating..."
-msgstr "Ĝisdatigante..."
-
-#: ../mail/mail-send-recv.c:585 ../mail/mail-send-recv.c:680
-msgid "Waiting..."
-msgstr "Atendante..."
-
-#: ../mail/mail-send-recv.c:943
-#, c-format
-msgid "Checking for new mail"
-msgstr ""
-
-#: ../mail/mail-tools.c:72
-#, c-format
-msgid "Could not create spool directory '%s': %s"
-msgstr ""
-
-#: ../mail/mail-tools.c:106
-#, c-format
-msgid "Trying to movemail a non-mbox source '%s'"
-msgstr ""
-
-#: ../mail/mail-tools.c:215
-#, c-format
-msgid "Forwarded message - %s"
-msgstr ""
-
-#: ../mail/mail-tools.c:217
-msgid "Forwarded message"
-msgstr ""
-
-#: ../mail/mail-vfolder.c:92
-#, c-format
-msgid "Setting up Search Folder: %s"
-msgstr ""
-
-#: ../mail/mail-vfolder.c:238
-#, 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:681
-#, 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.c:1294
-msgid "Edit Search Folder"
-msgstr ""
-
-#: ../mail/mail-vfolder.c:1408
-msgid "New Search Folder"
-msgstr ""
-
 #: ../mail/mail.error.xml.h:1
 msgid "\"Check Junk\" Failed"
 msgstr ""
@@ -11948,210 +13465,200 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:9
 msgid ""
-"A read receipt notification has been requested for \"{1}\". Send the receipt "
-"notification to {0}?"
-msgstr ""
-
-#: ../mail/mail.error.xml.h:10
-msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:11
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:13
+#: ../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:14
+#: ../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:15
+#: ../mail/mail.error.xml.h:14
 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:16
+#: ../mail/mail.error.xml.h:15
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:17
+#: ../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:18
+#: ../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:19
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:21
+#: ../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:22
+#: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Ne eblis kopii dosierujon \"{0}\" al \"{1}\"."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create folder \"{0}\"."
 msgstr "Ne eblis kreii dosierujon \"{0}\"."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Ne eblis forigi dosierujon \"{0}\"."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Ne eblis forigi sistemdosierujon \"{0}\"."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Ne eblis movi dosieron \"{0}\" al \"{1}\"."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source \"{1}\"."
 msgstr "Ne eblis malfermi fonton \"{1}\"."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open source \"{2}\"."
 msgstr "Ne eblis malfermi fonton \"{2}\"."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open target \"{2}\"."
 msgstr "Ne eblis malfermi celon \"{2}\"."
 
-#: ../mail/mail.error.xml.h:35
+#: ../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."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Ne eblis alinomi \"{0}\" al \"{1}\"."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to directory \"{0}\"."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to file \"{0}\"."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot set signature script \"{0}\"."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:42
+#: ../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 ""
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:42
 msgid "Close message window."
 msgstr "Fermi mesaĝfenestron."
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:45
 msgid "Do _Not Disable"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:47
-msgid "Do _Not Send"
-msgstr ""
-
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:46
 msgid "Do _Not Synchronize"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:47
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want to mark all messages as read?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Do you wish to save your changes?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "Enigi pasvorton."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Error while performing operation."
 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:58
+#: ../mail/mail.error.xml.h:56
 msgid "Error while {0}."
 msgstr "Eraro dum {0}."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:57
 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 "
@@ -12162,51 +13669,60 @@ msgid ""
 "sure there is enough disk space if you choose to migrate now."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:60
 msgid "Evolution's local mail format has changed."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:61
 msgid "Failed to download messages for offline viewing."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:62
 msgid "Failed to find duplicate messages."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:63
 msgid "Failed to open folder."
 msgstr "Fiaskis malfermi dosierujon."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:64
+msgid ""
+"Failed to query server for a list of supported authentication mechanisms."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:65
 msgid "Failed to remove attachments from messages."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:66
 msgid "Failed to retrieve messages."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:67
 msgid "Failed to save messages to disk."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:68
 msgid "Failed to unsubscribe from folder."
 msgstr "Fiaskis malabono de dosierujo."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid "File exists but cannot overwrite it."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:70
 msgid "File exists but is not a regular file."
 msgstr ""
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr ""
 
+#: ../mail/mail.error.xml.h:73
+msgid "Hidden file is attached."
+msgstr ""
+
 #: ../mail/mail.error.xml.h:74
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
@@ -12331,51 +13847,53 @@ msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:103
-msgid "Read receipt requested."
-msgstr ""
-
-#: ../mail/mail.error.xml.h:104
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:104
 msgid "Really delete folder \"{0}\"?"
 msgstr "Ĉu certe forigi dosierujon \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:105
 msgid "Remove duplicate messages?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:106
 msgid "Reply _Privately"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:109
 msgid "Search Folders automatically updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:110
 msgid "Send private reply?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:111
 msgid "Send reply to all recipients?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:112
 msgid "Signature Already Exists"
 msgstr "Subskribo jam ekzistas"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:113
 msgid "Synchronize folders locally for offline usage?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:114
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
 msgstr ""
 
+#: ../mail/mail.error.xml.h:115
+msgid ""
+"The attachment named {0} is a hidden file and may contain sensitive data. "
+"Please review it before sending."
+msgstr ""
+
 #: ../mail/mail.error.xml.h:116
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
@@ -12537,7 +14055,7 @@ msgid "_Append"
 msgstr "_Postglui"
 
 #: ../mail/mail.error.xml.h:155
-#: ../plugins/publish-calendar/publish-calendar.c:600
+#: ../plugins/publish-calendar/publish-calendar.c:611
 msgid "_Disable"
 msgstr "_Elŝalti"
 
@@ -12546,7 +14064,7 @@ msgid "_Discard changes"
 msgstr "_Ignori ŝanĝojn"
 
 #: ../mail/mail.error.xml.h:157
-#: ../modules/mail/e-mail-shell-view-actions.c:1124
+#: ../modules/mail/e-mail-shell-view-actions.c:1154
 msgid "_Empty Trash"
 msgstr "_Malplenigi rubujon"
 
@@ -12571,107 +14089,264 @@ msgid "_Open Messages"
 msgstr "_Malfermi mesaĝoj"
 
 #: ../mail/mail.error.xml.h:165
-msgid "_Send Receipt"
-msgstr ""
-
-#: ../mail/mail.error.xml.h:166
 msgid "_Synchronize"
 msgstr "_Sinkronigi"
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:166
 msgid "_Yes"
 msgstr "_Jes"
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:167
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/message-list.c:1211
+#: ../mail/mail-folder-cache.c:885
+#, c-format
+msgid "Pinging %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:85
+msgid "Filtering Selected Messages"
+msgstr ""
+
+#: ../mail/mail-ops.c:205
+msgid "Fetching Mail"
+msgstr ""
+
+#: ../mail/mail-ops.c:821
+#, c-format
+msgid "Sending message %d of %d"
+msgstr ""
+
+#: ../mail/mail-ops.c:869
+#, c-format
+msgid "Failed to send %d of %d messages"
+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-ops.c:988
+#, c-format
+msgid "Copying messages to '%s'"
+msgstr ""
+
+#: ../mail/mail-ops.c:1105
+#, c-format
+msgid "Storing folder '%s'"
+msgstr ""
+
+#: ../mail/mail-ops.c:1178
+#, c-format
+msgid "Expunging and storing account '%s'"
+msgstr ""
+
+#: ../mail/mail-ops.c:1179
+#, c-format
+msgid "Storing account '%s'"
+msgstr ""
+
+#: ../mail/mail-ops.c:1241
+#, c-format
+msgid "Refreshing folder '%s'"
+msgstr ""
+
+#: ../mail/mail-ops.c:1457
+#, c-format
+msgid "Expunging folder '%s'"
+msgstr ""
+
+#: ../mail/mail-ops.c:1550
+#, c-format
+msgid "Emptying trash in '%s'"
+msgstr ""
+
+#: ../mail/mail-ops.c:1646
+#, c-format
+msgid "Disconnecting %s"
+msgstr ""
+
+#: ../mail/mail-send-recv.c:200
+msgid "Canceling..."
+msgstr ""
+
+#: ../mail/mail-send-recv.c:523
+msgid "Send & Receive Mail"
+msgstr ""
+
+#: ../mail/mail-send-recv.c:539
+msgid "Cancel _All"
+msgstr ""
+
+#: ../mail/mail-send-recv.c:639 ../mail/mail-send-recv.c:1016
+msgid "Updating..."
+msgstr "Ĝisdatigante..."
+
+#: ../mail/mail-send-recv.c:639 ../mail/mail-send-recv.c:725
+msgid "Waiting..."
+msgstr "Atendante..."
+
+#: ../mail/mail-send-recv.c:996
+#, c-format
+msgid "Checking for new mail"
+msgstr ""
+
+#: ../mail/mail-tools.c:72
+#, c-format
+msgid "Could not create spool directory '%s': %s"
+msgstr ""
+
+#: ../mail/mail-tools.c:113
+#, c-format
+msgid "Trying to movemail a non-mbox source '%s'"
+msgstr ""
+
+#: ../mail/mail-tools.c:225
+#, c-format
+msgid "Forwarded message - %s"
+msgstr ""
+
+#: ../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.c:1183
+msgid "Edit Search Folder"
+msgstr ""
+
+#: ../mail/mail-vfolder.c:1288
+msgid "New Search Folder"
+msgstr ""
+
+#: ../mail/message-list.c:1269
 msgid "Unseen"
 msgstr "Nevidite"
 
-#: ../mail/message-list.c:1212
+#: ../mail/message-list.c:1270
 msgid "Seen"
 msgstr "Vidite"
 
-#: ../mail/message-list.c:1213
+#: ../mail/message-list.c:1271
 msgid "Answered"
 msgstr "Respondite"
 
-#: ../mail/message-list.c:1214
+#: ../mail/message-list.c:1272
 msgid "Forwarded"
 msgstr "Plusendite"
 
-#: ../mail/message-list.c:1215
+#: ../mail/message-list.c:1273
 msgid "Multiple Unseen Messages"
 msgstr "Multaj neviditaj mesaĝoj"
 
-#: ../mail/message-list.c:1216
+#: ../mail/message-list.c:1274
 msgid "Multiple Messages"
 msgstr ""
 
-#: ../mail/message-list.c:1220
+#: ../mail/message-list.c:1278
 msgid "Lowest"
 msgstr "Plej malalte"
 
-#: ../mail/message-list.c:1221
+#: ../mail/message-list.c:1279
 msgid "Lower"
 msgstr "Pli malalte"
 
-#: ../mail/message-list.c:1225
+#: ../mail/message-list.c:1283
 msgid "Higher"
 msgstr "Pli alte"
 
-#: ../mail/message-list.c:1226
+#: ../mail/message-list.c:1284
 msgid "Highest"
 msgstr "Plej alte"
 
-#: ../mail/message-list.c:1838 ../widgets/table/e-cell-date.c:48
+#: ../mail/message-list.c:1901 ../widgets/table/e-cell-date.c:51
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
-#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1845 ../plugins/itip-formatter/itip-view.c:205
+#. * in 12-hour format, without seconds.
+#: ../mail/message-list.c:1908 ../plugins/itip-formatter/itip-view.c:204
 msgid "Today %l:%M %p"
 msgstr "Hodiaŭ %l:%M %p"
 
-#: ../mail/message-list.c:1854
+#: ../mail/message-list.c:1917
 msgid "Yesterday %l:%M %p"
 msgstr "Hieraŭ %l:%M %p"
 
-#: ../mail/message-list.c:1866
+#: ../mail/message-list.c:1929
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1874
+#: ../mail/message-list.c:1937
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1876
+#: ../mail/message-list.c:1939
 msgid "%b %d %Y"
 msgstr "%d-an de %b %Y"
 
-#: ../mail/message-list.c:2644
+#: ../mail/message-list.c:2738
 msgid "Select all visible messages"
 msgstr "Elekti ĉiujn videblajn mesaĝojn"
 
-#: ../mail/message-list.c:2802 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2874 ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mesaĝoj"
 
+#. default follow-up flag name to use when clicked in the message list column
+#: ../mail/message-list.c:4087
+msgid "Follow-up"
+msgstr ""
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4475 ../mail/message-list.c:4894
+#: ../mail/message-list.c:4602 ../mail/message-list.c:5022
 msgid "Generating message list"
 msgstr ""
 
-#: ../mail/message-list.c:4712
+#: ../mail/message-list.c:4839
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
 
-#: ../mail/message-list.c:4714
+#: ../mail/message-list.c:4841
 msgid "There are no messages in this folder."
 msgstr ""
 
@@ -12709,27 +14384,27 @@ msgid "Subject - Trimmed"
 msgstr ""
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1564
+#: ../modules/mail/e-mail-shell-view-actions.c:1594
 msgid "Body contains"
 msgstr ""
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1571
+#: ../modules/mail/e-mail-shell-view-actions.c:1601
 msgid "Message contains"
 msgstr ""
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1578
+#: ../modules/mail/e-mail-shell-view-actions.c:1608
 msgid "Recipients contain"
 msgstr ""
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1585
+#: ../modules/mail/e-mail-shell-view-actions.c:1615
 msgid "Sender contains"
 msgstr ""
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1592
+#: ../modules/mail/e-mail-shell-view-actions.c:1622
 msgid "Subject contains"
 msgstr ""
 
@@ -12737,48 +14412,48 @@ msgstr ""
 msgid "Subject or Addresses contains"
 msgstr ""
 
-#: ../modules/addressbook/addressbook-config.c:207
+#: ../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:209
+#: ../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:211
+#: ../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:610
+#: ../modules/addressbook/addressbook-config.c:643
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr ""
 
-#: ../modules/addressbook/addressbook-config.c:646
+#: ../modules/addressbook/addressbook-config.c:685
 msgid "Copy _book content locally for offline operation"
 msgstr ""
 
-#: ../modules/addressbook/addressbook-config.c:753
+#: ../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:827
+#: ../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:902
+#: ../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 "
@@ -12786,48 +14461,32 @@ msgid ""
 "one level beneath your base."
 msgstr ""
 
-#: ../modules/addressbook/addressbook-config.c:1018
+#: ../modules/addressbook/addressbook-config.c:1088
 msgid "Server Information"
 msgstr "Servilo-informo"
 
-#: ../modules/addressbook/addressbook-config.c:1023
+#: ../modules/addressbook/addressbook-config.c:1093
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Detaloj"
 
-#: ../modules/addressbook/addressbook-config.c:1024
+#: ../modules/addressbook/addressbook-config.c:1094
 #: ../modules/mail/e-mail-shell-view.c:58
 msgid "Searching"
 msgstr "Serĉante"
 
-#: ../modules/addressbook/addressbook-config.c:1026
+#: ../modules/addressbook/addressbook-config.c:1096
 msgid "Downloading"
 msgstr "Elŝutante"
 
-#: ../modules/addressbook/addressbook-config.c:1232
+#: ../modules/addressbook/addressbook-config.c:1311
 msgid "Address Book Properties"
 msgstr "Adresaro-agordoj"
 
-#: ../modules/addressbook/addressbook-config.c:1234
+#: ../modules/addressbook/addressbook-config.c:1313
 msgid "New Address Book"
 msgstr "Nova adresaro"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
-msgid "Autocomplete length"
-msgstr ""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
-msgid "Contact layout style"
-msgstr ""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
-msgid "Contact preview pane position (horizontal)"
-msgstr ""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
-msgid "Contact preview pane position (vertical)"
-msgstr ""
-
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
 msgid "EFolderList XML for the list of completion URIs"
 msgstr ""
@@ -12836,419 +14495,378 @@ msgstr ""
 msgid "EFolderList XML for the list of completion URIs."
 msgstr ""
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
-msgid "Position of the contact preview pane when oriented horizontally."
-msgstr ""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
-msgid "Position of the contact preview pane when oriented vertically."
-msgstr ""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
-msgid "Primary address book"
-msgstr "Ĉefa adresaro"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
-msgid "Show autocompleted name with an address"
-msgstr ""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
-msgid "Show maps"
-msgstr "Montri mapojn"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
-msgid "Show preview pane"
-msgstr ""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+#: ../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."
 msgstr ""
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
 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."
+"Whether addresses should be formatted according to standard in their "
+"destination country."
 msgstr ""
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:21
+msgid "Whether to show maps in preview pane."
 msgstr ""
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
-msgid "URI for the folder last used in the select names dialog"
+#. 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
+msgid "_Table column:"
 msgstr ""
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
-msgid "URI for the folder last used in the select names dialog."
+#: ../modules/addressbook/autocompletion-config.c:197
+msgid "Address formatting"
 msgstr ""
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
+#: ../modules/addressbook/autocompletion-config.c:200
+msgid "_Format address according to standard of its destination country"
 msgstr ""
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
-msgid "Whether to show maps in preview pane."
-msgstr ""
+#: ../modules/addressbook/autocompletion-config.c:209
+msgid "Autocompletion"
+msgstr "Aŭtomata kompletigo"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
-msgid "Whether to show the preview pane."
+#: ../modules/addressbook/autocompletion-config.c:212
+msgid "Always _show address of the autocompleted contact"
 msgstr ""
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:165
-#: ../modules/mail/em-mailer-prefs.c:1145
-msgid "_Table column:"
+#: ../modules/addressbook/eab-composer-util.c:149
+msgid "Multiple vCards"
 msgstr ""
 
-#: ../modules/addressbook/autocompletion-config.c:168
-msgid "Autocompletion"
-msgstr "Aŭtomata kompletigo"
+#: ../modules/addressbook/eab-composer-util.c:157
+#, c-format
+msgid "vCard for %s"
+msgstr "vCard por %s"
 
-#: ../modules/addressbook/autocompletion-config.c:171
-msgid "Always _show address of the autocompleted contact"
-msgstr ""
+#: ../modules/addressbook/eab-composer-util.c:169
+#: ../modules/addressbook/eab-composer-util.c:196
+#, c-format
+msgid "Contact information"
+msgstr "Kontaktinformo"
+
+#: ../modules/addressbook/eab-composer-util.c:198
+#, c-format
+msgid "Contact information for %s"
+msgstr "Kontaktinformo por %s"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:98
+#: ../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:284
+#: ../modules/addressbook/e-book-shell-backend.c:309
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakto"
 
-#: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:905
+#: ../modules/addressbook/e-book-shell-backend.c:311
+#: ../modules/addressbook/e-book-shell-view-actions.c:909
 msgid "Create a new contact"
 msgstr "Krei novan kontakton"
 
-#: ../modules/addressbook/e-book-shell-backend.c:291
+#: ../modules/addressbook/e-book-shell-backend.c:316
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Kontakt_listo"
 
-#: ../modules/addressbook/e-book-shell-backend.c:293
-#: ../modules/addressbook/e-book-shell-view-actions.c:912
+#: ../modules/addressbook/e-book-shell-backend.c:318
+#: ../modules/addressbook/e-book-shell-view-actions.c:916
 msgid "Create a new contact list"
 msgstr "Krei novan kontaktliston"
 
-#: ../modules/addressbook/e-book-shell-backend.c:301
+#: ../modules/addressbook/e-book-shell-backend.c:326
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Adresaro"
 
-#: ../modules/addressbook/e-book-shell-backend.c:303
-#: ../modules/addressbook/e-book-shell-view-actions.c:835
+#: ../modules/addressbook/e-book-shell-backend.c:328
+#: ../modules/addressbook/e-book-shell-view-actions.c:839
 msgid "Create a new address book"
 msgstr "Krei novan adresaron"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:320
-#: ../modules/addressbook/e-book-shell-view.c:405
-#: ../modules/calendar/e-cal-shell-backend.c:111
+#: ../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:330
+#: ../modules/addressbook/e-book-shell-backend.c:355
 msgid "Certificates"
 msgstr "Atestiloj"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:387
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:391
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "Save as vCard"
 msgstr "Konservi kiel vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:812
+#: ../modules/addressbook/e-book-shell-view-actions.c:816
 msgid "Co_py All Contacts To..."
 msgstr "Ko_pii ĉiujn kontaktojn al..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:818
 msgid "Copy the contacts of the selected address book to another"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:819
+#: ../modules/addressbook/e-book-shell-view-actions.c:823
 msgid "D_elete Address Book"
 msgstr "_Forigi adresaron"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:821
+#: ../modules/addressbook/e-book-shell-view-actions.c:825
 msgid "Delete the selected address book"
 msgstr "Forigi la elektitan adresaron"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:826
+#: ../modules/addressbook/e-book-shell-view-actions.c:830
 msgid "Mo_ve All Contacts To..."
 msgstr "Mo_vi ĉiujn kontaktojn al..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:828
+#: ../modules/addressbook/e-book-shell-view-actions.c:832
 msgid "Move the contacts of the selected address book to another"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:833
+#: ../modules/addressbook/e-book-shell-view-actions.c:837
 msgid "_New Address Book"
 msgstr "_Nova adresaro"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:840
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
 msgid "Address _Book Properties"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:842
+#: ../modules/addressbook/e-book-shell-view-actions.c:846
 msgid "Show properties of the selected address book"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:847
+#: ../modules/addressbook/e-book-shell-view-actions.c:851
 msgid "Address Book _Map"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:849
+#: ../modules/addressbook/e-book-shell-view-actions.c:853
 msgid "Show map with all contacts from selected address book"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:854
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
-#: ../modules/calendar/e-memo-shell-view-actions.c:627
-#: ../modules/calendar/e-task-shell-view-actions.c:751
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../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
 msgid "_Rename..."
 msgstr "_Alinomigi..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:856
+#: ../modules/addressbook/e-book-shell-view-actions.c:860
 msgid "Rename the selected address book"
 msgstr "Alinomi la elektitan adresaron"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:863
+#: ../modules/addressbook/e-book-shell-view-actions.c:867
 msgid "Stop loading"
 msgstr "Ĉesigi ŝargadon"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:868
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
 msgid "_Copy Contact To..."
 msgstr "_Kopii kontakton al..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#: ../modules/addressbook/e-book-shell-view-actions.c:874
 msgid "Copy selected contacts to another address book"
 msgstr "Kopii elektitajn kontaktojn al alia adresaro"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:875
+#: ../modules/addressbook/e-book-shell-view-actions.c:879
 msgid "_Delete Contact"
 msgstr "_Forigi kontakton"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:882
+#: ../modules/addressbook/e-book-shell-view-actions.c:886
 msgid "_Find in Contact..."
 msgstr "_Serĉi en kontakto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
+#: ../modules/addressbook/e-book-shell-view-actions.c:888
 msgid "Search for text in the displayed contact"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:889
+#: ../modules/addressbook/e-book-shell-view-actions.c:893
 msgid "_Forward Contact..."
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:891
+#: ../modules/addressbook/e-book-shell-view-actions.c:895
 msgid "Send selected contacts to another person"
 msgstr "Sendi elektitajn kontaktojn al alia persono"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:896
+#: ../modules/addressbook/e-book-shell-view-actions.c:900
 msgid "_Move Contact To..."
 msgstr "_Movi kontakton al..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:898
+#: ../modules/addressbook/e-book-shell-view-actions.c:902
 msgid "Move selected contacts to another address book"
 msgstr "Movi elektitajn kontaktojn al alia adresaro"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:903
+#: ../modules/addressbook/e-book-shell-view-actions.c:907
 msgid "_New Contact..."
 msgstr "_Nova kontakto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:910
+#: ../modules/addressbook/e-book-shell-view-actions.c:914
 msgid "New Contact _List..."
 msgstr "Nova kontakt_listo..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:917
+#: ../modules/addressbook/e-book-shell-view-actions.c:921
 msgid "_Open Contact"
 msgstr "_Malfermi kontakton"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:919
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
 msgid "View the current contact"
 msgstr "Montri la aktualan kontakton"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:924
+#: ../modules/addressbook/e-book-shell-view-actions.c:928
 msgid "_Send Message to Contact..."
 msgstr "_Sendi mesaĝon al kontakto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:926
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "Send a message to the selected contacts"
 msgstr "Sendi mesaĝon al la elektitaj kontaktoj"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:933
-#: ../modules/calendar/e-cal-shell-view-actions.c:1507
-#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../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
 msgid "_Actions"
 msgstr "_Agoj"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:940
-#: ../modules/calendar/e-memo-shell-view-actions.c:664
-#: ../modules/calendar/e-task-shell-view-actions.c:816
-#: ../modules/mail/e-mail-shell-view-actions.c:1359
+#: ../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
 msgid "_Preview"
 msgstr "_Antaŭrigardi"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:949
-#: ../modules/calendar/e-cal-shell-view-actions.c:1524
-#: ../modules/calendar/e-memo-shell-view-actions.c:677
-#: ../modules/calendar/e-task-shell-view-actions.c:829
+#: ../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:953
+#: ../modules/addressbook/e-book-shell-view-actions.c:957
 msgid "_Properties"
 msgstr "_Ecoj"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:961
 msgid "Address Book Map"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:989
+#: ../modules/addressbook/e-book-shell-view-actions.c:993
 msgid "Contact _Preview"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:991
+#: ../modules/addressbook/e-book-shell-view-actions.c:995
 msgid "Show contact preview window"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:997
+#: ../modules/addressbook/e-book-shell-view-actions.c:1001
 msgid "Show _Maps"
 msgstr "Montri _mapojn"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:999
+#: ../modules/addressbook/e-book-shell-view-actions.c:1003
 msgid "Show maps in contact preview window"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1018
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:898
-#: ../modules/mail/e-mail-shell-view-actions.c:1474
+#: ../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
 msgid "_Classic View"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1020
+#: ../modules/addressbook/e-book-shell-view-actions.c:1024
 msgid "Show contact preview below the contact list"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1025
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:905
-#: ../modules/mail/e-mail-shell-view-actions.c:1481
+#: ../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
 msgid "_Vertical View"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1027
+#: ../modules/addressbook/e-book-shell-view-actions.c:1031
 msgid "Show contact preview alongside the contact list"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1035
-#: ../modules/calendar/e-cal-shell-view-actions.c:1663
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:922
+#: ../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:1042
-#: ../modules/calendar/e-cal-shell-view-actions.c:1677
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../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
 msgid "Unmatched"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1052
-#: ../modules/calendar/e-cal-shell-view-actions.c:1687
-#: ../modules/calendar/e-memo-shell-view-actions.c:768
-#: ../modules/calendar/e-task-shell-view-actions.c:967
-#: ../modules/mail/e-mail-shell-view-actions.c:1557
-#: ../shell/e-shell-content.c:638
+#: ../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
 msgid "Advanced Search"
 msgstr "Detala sercô"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1085
+#: ../modules/addressbook/e-book-shell-view-actions.c:1089
 msgid "Print all shown contacts"
 msgstr "Presi ĉiujn montratajn kontaktojn"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1092
+#: ../modules/addressbook/e-book-shell-view-actions.c:1096
 msgid "Preview the contacts to be printed"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1099
+#: ../modules/addressbook/e-book-shell-view-actions.c:1103
 msgid "Print selected contacts"
 msgstr "Presi elektitajn kontaktojn"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1114
+#: ../modules/addressbook/e-book-shell-view-actions.c:1118
 msgid "S_ave Address Book as vCard"
 msgstr "_Konservi adresaron kiel vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+#: ../modules/addressbook/e-book-shell-view-actions.c:1120
 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:1122
-#: ../modules/addressbook/e-book-shell-view-actions.c:1132
+#: ../modules/addressbook/e-book-shell-view-actions.c:1126
+#: ../modules/addressbook/e-book-shell-view-actions.c:1136
 msgid "_Save as vCard..."
 msgstr "_Konservi kiel vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1124
+#: ../modules/addressbook/e-book-shell-view-actions.c:1128
 msgid "Save selected contacts as a vCard"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view.c:349
+#: ../modules/addressbook/e-book-shell-view.c:346
 msgid "_Forward Contacts"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view.c:351
+#: ../modules/addressbook/e-book-shell-view.c:348
 msgid "_Forward Contact"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view.c:382
+#: ../modules/addressbook/e-book-shell-view.c:379
 msgid "_Send Message to Contacts"
 msgstr "_Sendi mesaĝon al kontaktoj"
 
-#: ../modules/addressbook/e-book-shell-view.c:384
+#: ../modules/addressbook/e-book-shell-view.c:381
 msgid "_Send Message to List"
 msgstr "_Sendi mesaĝon al listo"
 
-#: ../modules/addressbook/e-book-shell-view.c:386
+#: ../modules/addressbook/e-book-shell-view.c:383
 msgid "_Send Message to Contact"
 msgstr "_Sendi mesaĝon al kontakto"
 
-#: ../modules/addressbook/eab-composer-util.c:147
-msgid "Multiple vCards"
-msgstr ""
-
-#: ../modules/addressbook/eab-composer-util.c:155
-#, c-format
-msgid "vCard for %s"
-msgstr "vCard por %s"
-
-#: ../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:196
-#, c-format
-msgid "Contact information for %s"
-msgstr "Kontaktinformo por %s"
-
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:2
 msgid "1"
@@ -13278,612 +14896,234 @@ msgid "One"
 msgstr "Unu"
 
 #: ../modules/addressbook/ldap-config.ui.h:13
+msgid "S_earch filter:"
+msgstr "S_erĉfiltrilo:"
+
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search Filter"
 msgstr "Serĉfiltrilo"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _base:"
 msgstr "Serĉ_bazo:"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
-msgid "Search _filter:"
-msgstr "Serĉ_filtrilo:"
-
 #: ../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\"."
 msgstr ""
 
+#: ../modules/addressbook/ldap-config.ui.h:17
+msgid "Ser_ver:"
+msgstr "Ser_vilo:"
+
 #. 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:18
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Sub"
 msgstr ""
 
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:20
 msgid "Supported Search Bases"
 msgstr ""
 
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../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)"
 msgstr ""
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "Using email address"
 msgstr "Uzas retpoŝtadreson"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Download limit:"
 msgstr ""
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:26
 msgid "_Find Possible Search Bases"
 msgstr ""
 
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Login method:"
 msgstr "_Ensalutmetodo:"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Search scope:"
 msgstr ""
 
-#: ../modules/addressbook/ldap-config.ui.h:30
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Timeout:"
 msgstr "_Tempolimo:"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Use secure connection:"
-msgstr ""
-
 #: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "kartoj"
 
-#: ../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."
-msgstr ""
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:3
-msgid "(Shown in a Day View)"
-msgstr ""
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:4
-msgid "05 minutes"
-msgstr "05 minutoj"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:5
-msgid "10 minutes"
-msgstr "10 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"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:8
-msgid "60 minutes"
-msgstr "60 minutoj"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
-msgid "Alerts"
-msgstr "Avertoj"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:12
-msgid "Day _ends:"
-msgstr "Tago _finos:"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
-msgid "Days"
-msgstr "Tagoj"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:14
-msgid "Default Free/Busy Server"
-msgstr ""
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:15
-msgid "Display"
-msgstr "Montri"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
-msgid "Display alarms in _notification area only"
-msgstr ""
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
-msgid "Hours"
-msgstr "Horoj"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:21
-msgid "Minutes"
-msgstr "Minutoj"
-
-#. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
-msgid "S_un"
-msgstr "_Dim"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
-msgid "Sc_roll Month View by a week"
-msgstr ""
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
-msgid "Se_cond zone:"
-msgstr "_Dua zono:"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
-msgid "Select the calendars for alarm notification"
-msgstr ""
-
-#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
-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:33
-msgid "Show a _reminder"
-msgstr "Montri memo_rigilon"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:34
-msgid "Show r_ecurring events in italic in bottom left calendar"
-msgstr ""
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:35
-msgid "Show week _numbers"
-msgstr "Montri semajn_numerojn"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
-msgid "T_asks due today:"
-msgstr ""
-
-#. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
-msgid "T_hu"
-msgstr "Ĵ_aŭ"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
-msgid "Template:"
-msgstr "Ŝablono:"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
-#: ../widgets/misc/e-dateedit.c:592
-msgid "Time"
-msgstr "Tempo"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
-msgid "Time format:"
-msgstr "Tempoaranĝo:"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
-msgid "Use s_ystem time zone"
-msgstr "Uzi s_isteman horzonon"
-
-#. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
-msgid "Wee_k starts on:"
-msgstr "Semajno _komencas je:"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
-#: ../modules/calendar/e-cal-shell-view-actions.c:1646
-msgid "Work Week"
-msgstr "Laborsemajno"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
-msgid "Work days:"
-msgstr "Labortagoj:"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
-msgid "_12 hour (AM/PM)"
-msgstr "_12 hore (ATM/PTM)"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
-msgid "_24 hour"
-msgstr "_24 hore"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
-msgid "_Ask for confirmation when deleting items"
+#: ../modules/bogofilter/evolution-bogofilter.c:145
+#, c-format
+msgid "Failed to spawn Bogofilter (%s): "
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
-msgid "_Compress weekends in month view"
+#: ../modules/bogofilter/evolution-bogofilter.c:163
+msgid "Failed to stream mail message content to Bogofilter: "
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
-msgid "_Day begins:"
-msgstr "_Tago komencas:"
-
-#. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
-msgid "_Fri"
-msgstr "_Ven"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
-msgid "_Hide completed tasks after"
-msgstr "_Kaŝi plenumitaj taskoj poste"
-
-#. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
-msgid "_Mon"
-msgstr "_Lun"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
-msgid "_Overdue tasks:"
-msgstr ""
-
-#. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
-msgid "_Sat"
-msgstr "_Sab"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
-msgid "_Show appointment end times in week and month view"
+#: ../modules/bogofilter/evolution-bogofilter.c:212
+msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
-msgid "_Time divisions:"
+#: ../modules/bogofilter/evolution-bogofilter.c:311
+msgid "Bogofilter Options"
 msgstr ""
 
-#. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
-msgid "_Tue"
-msgstr "_Mar"
-
-#. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
-msgid "_Wed"
-msgstr "_Mer"
-
-#. 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:73
-msgid "before every anniversary/birthday"
+#: ../modules/bogofilter/evolution-bogofilter.c:320
+msgid "Convert message text to _Unicode"
 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:75
-msgid "before every appointment"
+#: ../modules/bogofilter/evolution-bogofilter.c:476
+msgid "Bogofilter"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
-msgid "Alarm programs"
-msgstr "Alarmprogramoj"
-
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
-msgid "Ask for confirmation when deleting items"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
-msgid "Birthday and anniversary reminder"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
-msgid "Birthday and anniversary reminder units"
-msgstr ""
-
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
-msgid "Birthday and anniversary reminder value"
+msgid "Calendars to run reminders for"
 msgstr ""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
-msgid "Calendars to run alarms for"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
 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)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
-msgid "Compress weekends in month view"
-msgstr ""
-
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
-msgid "Confirm expunge"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
-msgid "Default appointment reminder"
-msgstr "Defaŭlta rendevuo-memorigilo"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
-msgid "Default reminder units"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
-msgid "Default reminder value"
-msgstr ""
-
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
-msgid "Directory for saving alarm audio files"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy server URLs"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
-msgid "Free/busy template URL"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
-msgid "Hide completed tasks"
-msgstr "Kaŝi plenumigitajn taskojn"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
-msgid "Hide task units"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
-msgid "Hide task value"
-msgstr "Kaŝi task-valoron"
-
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
-msgid "Horizontal pane position"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
-msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
-msgid "Last alarm time"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "List of recently used second time zones in a Day View."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
 msgid "List of server URLs for free/busy publishing."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
-msgid "Marcus Bains Line"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
-msgid "Marcus Bains Line Color - Day View"
-msgstr ""
-
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
-msgid "Marcus Bains Line Color - Time bar"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
 msgid "Maximum number of recently used timezones to remember."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
-msgid "Memo layout style"
-msgstr "Noto-stilo"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
-msgid "Memo preview pane position (horizontal)"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
-msgid "Memo preview pane position (vertical)"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
-msgid "Minute the workday ends on, 0 to 59."
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
-msgid "Minute the workday starts on, 0 to 59."
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
-msgid "Month view horizontal pane position"
-msgstr ""
-
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
-msgid "Month view vertical pane position"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
 msgid "Number of units for determining a birthday or anniversary reminder."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
 msgid "Number of units for determining a default reminder."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
 msgid "Number of units for determining when to hide tasks."
 msgstr ""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
-msgid "Overdue tasks color"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the task preview pane when oriented vertically."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+#: ../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."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+#: ../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."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
-msgid "Primary calendar"
-msgstr "Ĉefa kalendaro"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
-msgid "Primary memo list"
-msgstr ""
-
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
-msgid "Primary task list"
-msgstr "Ĉefa tasklisto"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
-msgid "Programs that are allowed to be run by alarms."
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
-msgid "Recently used second time zones in a Day View"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
-msgid "Recurrent Events in Italic"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for alarm audio"
+msgid "Programs that are allowed to be run by reminders."
 msgstr ""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
-msgid "Show RSVP field in the event/task/meeting editor"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
-msgid "Show Role field in the event/task/meeting editor"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
-msgid "Show appointment end times in week and month views"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
-msgid "Show categories field in the event/meeting/task editor"
-msgstr ""
-
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
 msgid "Show days with recurrent events in italic font in bottom left calendar."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
-msgid "Show display alarms in notification tray"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
-msgid "Show status field in the event/task/meeting editor"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
-msgid "Show the memo preview pane"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
-msgid "Show the task preview pane"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
-msgid "Show timezone field in the event/meeting editor"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
-msgid "Show type field in the event/task/meeting editor"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
-msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
-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."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
-msgid "Task layout style"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
-msgid "Task preview pane position (horizontal)"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
-msgid "Task preview pane position (vertical)"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
-msgid "Tasks due today color"
-msgstr ""
-
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
 msgid ""
 "The UID of the selected (or \"primary\") calendar in the sidebar of the "
@@ -13929,30 +15169,16 @@ msgid ""
 "list. \"1\" (Vertical View) places the preview pane next to the task list."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
-msgid "The second timezone for a Day View"
-msgstr ""
-
 #: ../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."
 msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
-msgid "Time divisions"
-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 alarm ran, in time_t."
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
-msgid "Timezone"
-msgstr "Horzono"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
-msgid "Twenty four hour time format"
+msgid "Time the last reminder ran, in time_t."
 msgstr ""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
@@ -13970,10 +15196,6 @@ msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
-msgid "Use system timezone"
-msgstr "Uzi la sisteman horzonon"
-
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr ""
@@ -13983,16 +15205,12 @@ msgstr ""
 msgid "Vertical pane position"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
-msgid "Week start"
-msgstr "Semajnkomenco"
-
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr ""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether or not to use the notification tray for display alarms."
+msgid "Whether or not to use the notification tray for display reminders."
 msgstr ""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
@@ -14034,167 +15252,345 @@ msgstr ""
 msgid "Whether to set a reminder for birthdays and anniversaries."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
-msgid "Whether to show RSVP field in the event/task/meeting editor"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
-msgid "Whether to show categories field in the event/meeting editor"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
+msgid "Whether to show week numbers in various places in the Calendar."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
-msgid "Whether to show role field in the event/task/meeting editor"
+#: ../modules/calendar/e-cal-attachment-handler.c:312
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "I_mport"
+msgstr "I_mporti"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:393
+msgid "Select a Calendar"
+msgstr "Elekti kalendaron"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:420
+msgid "Select a Task List"
+msgstr "Elekti taskliston"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:430
+msgid "I_mport to Calendar"
+msgstr "I_mporti al kalendaro"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:437
+msgid "I_mport to Tasks"
+msgstr "I_mporti al taskoj"
+
+#: ../modules/calendar/e-calendar-preferences.c:461
+msgid "Selected Calendars for Reminders"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
-msgid "Whether to show status field in the event/task/meeting editor"
+#: ../modules/calendar/e-calendar-preferences.c:885
+msgid "Ti_me and date:"
 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/calendar/e-calendar-preferences.c:886
+msgid "_Date only:"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
-msgid "Whether to show timezone field in the event/meeting editor"
+#: ../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."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121
-msgid "Whether to show type field in the event/task/meeting editor"
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
+msgid "(Shown in a Day View)"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
-msgid "Whether to show week numbers in various places in the Calendar."
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
+msgid "05 minutes"
+msgstr "05 minutoj"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
+msgid "10 minutes"
+msgstr "10 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"
+
+#: ../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"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
+msgid "Day _ends:"
+msgstr "Tago _finos:"
+
+#: ../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"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
-msgid "Work days"
-msgstr "Labortagoj"
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
+msgid "Display"
+msgstr "Montri"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
-msgid "Workday end hour"
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
+msgid "Display reminders in _notification area only"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
-msgid "Workday end minute"
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
+msgid "Highlight _overdue tasks"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
-msgid "Workday start hour"
+#: ../modules/calendar/e-calendar-preferences.ui.h:19
+msgid "Highlight t_asks due today"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
-msgid "Workday start minute"
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
+msgid "Hours"
+msgstr "Horoj"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
+msgid "Minutes"
+msgstr "Minutoj"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:24
+msgid "Publishing Information"
 msgstr ""
 
-#: ../modules/calendar/e-cal-attachment-handler.c:286
-#: ../smime/gui/smime-ui.ui.h:22
-msgid "I_mport"
-msgstr "I_mporti"
+#. Sunday
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
+msgid "S_un"
+msgstr "_Dim"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:367
-msgid "Select a Calendar"
-msgstr "Elekti kalendaron"
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
+msgid "Sc_roll Month View by a week"
+msgstr ""
 
-#: ../modules/calendar/e-cal-attachment-handler.c:394
-msgid "Select a Task List"
-msgstr "Elekti taskliston"
+#: ../modules/calendar/e-calendar-preferences.ui.h:30
+msgid "Se_cond zone:"
+msgstr "_Dua zono:"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:404
-msgid "I_mport to Calendar"
-msgstr "I_mporti al kalendaro"
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
+msgid "Select the calendars for reminder notification"
+msgstr ""
 
-#: ../modules/calendar/e-cal-attachment-handler.c:411
-msgid "I_mport to Tasks"
-msgstr "I_mporti al taskoj"
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../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"
+
+#: ../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"
+
+#. Thursday
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
+msgid "T_hu"
+msgstr "Ĵ_aŭ"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
+msgid "Template:"
+msgstr "Ŝablono:"
+
+#: ../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:47
+msgid "Time format:"
+msgstr "Tempoaranĝo:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
+msgid "Use s_ystem time zone"
+msgstr "Uzi s_isteman horzonon"
+
+#. A weekday like "Monday" follows
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+msgid "Wee_k starts on:"
+msgstr "Semajno _komencas je:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+msgid "Work Week"
+msgstr "Laborsemajno"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "Work days:"
+msgstr "Labortagoj:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "_12 hour (AM/PM)"
+msgstr "_12 hore (ATM/PTM)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
+msgid "_24 hour"
+msgstr "_24 hore"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
+msgid "_Compress weekends in month view"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
+msgid "_Day begins:"
+msgstr "_Tago komencas:"
+
+#. 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"
+
+#. Saturday
+#: ../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 ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
+msgid "_Time divisions:"
+msgstr ""
+
+#. Tuesday
+#: ../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"
+
+#. 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
+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"
+msgstr ""
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../modules/calendar/e-cal-shell-backend.c:123
 #: ../modules/calendar/e-cal-shell-migrate.c:198
-#: ../modules/calendar/e-memo-shell-backend.c:100
+#: ../modules/calendar/e-memo-shell-backend.c:110
 #: ../modules/calendar/e-memo-shell-migrate.c:152
-#: ../modules/calendar/e-task-shell-backend.c:100
+#: ../modules/calendar/e-task-shell-backend.c:110
 #: ../modules/calendar/e-task-shell-migrate.c:164
 msgid "On The Web"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-backend.c:115
-#: ../plugins/calendar-weather/calendar-weather.c:125
+#: ../modules/calendar/e-cal-shell-backend.c:125
+#: ../plugins/calendar-weather/calendar-weather.c:127
 msgid "Weather"
 msgstr "Vetero"
 
-#: ../modules/calendar/e-cal-shell-backend.c:202
+#: ../modules/calendar/e-cal-shell-backend.c:212
 #: ../modules/calendar/e-cal-shell-migrate.c:66
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-backend.c:423
+#: ../modules/calendar/e-cal-shell-backend.c:445
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Rendevuo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:425
-#: ../modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../modules/calendar/e-cal-shell-backend.c:447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "Create a new appointment"
 msgstr "Kreii novan rendevuon"
 
-#: ../modules/calendar/e-cal-shell-backend.c:430
+#: ../modules/calendar/e-cal-shell-backend.c:452
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Tuttaga _rendevuo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:432
+#: ../modules/calendar/e-cal-shell-backend.c:454
 msgid "Create a new all-day appointment"
 msgstr "Krei novan tuttagan rendevuon"
 
-#: ../modules/calendar/e-cal-shell-backend.c:437
+#: ../modules/calendar/e-cal-shell-backend.c:459
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Kunsido"
 
-#: ../modules/calendar/e-cal-shell-backend.c:439
+#: ../modules/calendar/e-cal-shell-backend.c:461
 msgid "Create a new meeting request"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-backend.c:447
+#: ../modules/calendar/e-cal-shell-backend.c:469
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_ndaro"
 
-#: ../modules/calendar/e-cal-shell-backend.c:449
-#: ../modules/calendar/e-cal-shell-view-actions.c:1346
+#: ../modules/calendar/e-cal-shell-backend.c:471
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Create a new calendar"
 msgstr "Krei novan kalendaron"
 
-#: ../modules/calendar/e-cal-shell-backend.c:751
-#: ../plugins/itip-formatter/itip-formatter.c:2937
+#: ../modules/calendar/e-cal-shell-backend.c:794
 msgid "Calendar and Tasks"
 msgstr "Kalendaro kaj taskoj"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:227
+#: ../modules/calendar/e-cal-shell-sidebar.c:190
 msgid "Loading calendars"
 msgstr "Ŝarĝante kalendarojn"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:635
+#: ../modules/calendar/e-cal-shell-sidebar.c:761
 msgid "_New Calendar..."
 msgstr "_Nova kalendaro..."
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:652
+#: ../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:1000
+#: ../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:222
-#: ../modules/calendar/e-cal-shell-view-actions.c:251
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
 msgid "Print"
 msgstr "Presi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:310
+#: ../modules/calendar/e-cal-shell-view-actions.c:320
 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 "
@@ -14203,306 +15599,313 @@ 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:327
+#: ../modules/calendar/e-cal-shell-view-actions.c:337
 msgid "Purge events older than"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:541
+#: ../modules/calendar/e-cal-shell-view-actions.c:564
 msgid "Copying Items"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:816
+#: ../modules/calendar/e-cal-shell-view-actions.c:848
 msgid "Moving Items"
 msgstr ""
 
 #. 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:1143
+#: ../modules/calendar/e-cal-shell-view-actions.c:1175
 msgid "event"
 msgstr "evento"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1145
-#: ../modules/calendar/e-cal-shell-view-memopad.c:220
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:511
-#: ../modules/calendar/e-task-shell-view-actions.c:628
+#: ../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
 msgid "Save as iCalendar"
 msgstr "Konservi kiel iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
-#: ../modules/calendar/e-memo-shell-view-actions.c:592
+#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
 msgid "_Copy..."
 msgstr "_Kopii..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1309
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "D_elete Calendar"
 msgstr "_Forigi kalendaron"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1311
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
 msgid "Delete the selected calendar"
 msgstr "Forigi la elektitan kalendaron"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1318
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
 msgid "Go Back"
 msgstr "Reen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
 msgid "Go Forward"
 msgstr "Antaŭen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1332
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
 msgid "Select today"
 msgstr "Elekti hodiaŭ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1370
 msgid "Select _Date"
 msgstr "Elekti _daton"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1339
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
 msgid "Select a specific date"
 msgstr "Elekti specifan daton"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
 msgid "_New Calendar"
 msgstr "_Nova kalendaro"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
-#: ../modules/calendar/e-task-shell-view-actions.c:800
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-task-shell-view-actions.c:813
 msgid "Purg_e"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1360
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "Purge old appointments and meetings"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
-#: ../modules/calendar/e-memo-shell-view-actions.c:620
-#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../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:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "Refresh the selected calendar"
 msgstr "Aktualigi la elektitan kalendaron"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "Rename the selected calendar"
 msgstr "alinomi la elektitan kalendaron"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
 msgid "Show _Only This Calendar"
 msgstr "Montri nur tiun kalendaron"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1386
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Cop_y to Calendar..."
 msgstr "Kopi_i al kalendaro"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1426
 msgid "_Delegate Meeting..."
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "_Delete Appointment"
 msgstr "_Forigi rendevuon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1402
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
 msgid "Delete selected appointments"
 msgstr "Forigi elektitajn rendevuojn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../modules/calendar/e-cal-shell-view-actions.c:1440
 msgid "Delete This _Occurrence"
 msgstr "Forigi tiun _okazon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Delete this occurrence"
 msgstr "Forigi tiun okazon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1414
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
 msgid "Delete All Occ_urrences"
 msgstr "Forigi ĉi_ujn okazojn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1416
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "Delete all occurrences"
 msgstr "Forigi ĉiujn okazojn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1454
 msgid "New All Day _Event..."
 msgstr "Nova tuttaga _evento..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "Create a new all day event"
 msgstr "Kreii novan tuttagan eventon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
-#: ../modules/calendar/e-cal-shell-view-memopad.c:254
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:327
-#: ../modules/calendar/e-memo-shell-view-actions.c:585
-#: ../modules/calendar/e-task-shell-view-actions.c:709
+#: ../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
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1468
 msgid "New _Meeting..."
 msgstr "Nova _kunsido..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
 msgid "Create a new meeting"
 msgstr "Kreii novan kunsidon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_vi al kalendaro..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "New _Appointment..."
 msgstr "Nova _rendevuo..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+#: ../modules/calendar/e-cal-shell-view-actions.c:1489
 msgid "Make this Occurrence _Movable"
 msgstr "Igi tiun okazon _movebla"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1463
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
 msgid "_Open Appointment"
 msgstr "_Malfermi rendevuon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1465
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
 msgid "View the current appointment"
 msgstr "Montri la aktualan rendevuon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-actions.c:1503
 msgid "_Reply"
 msgstr "_Respondi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../modules/calendar/e-cal-shell-view-actions.c:1519
 msgid "Converts an appointment to a meeting"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1491
+#: ../modules/calendar/e-cal-shell-view-actions.c:1524
 msgid "Conv_ert to Appointment..."
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../modules/calendar/e-cal-shell-view-actions.c:1526
 msgid "Converts a meeting to an appointment"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1498
+#: ../modules/calendar/e-cal-shell-view-actions.c:1531
 msgid "Quit"
 msgstr "Ĉesi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-cal-shell-view-actions.c:1651
 msgid "Day"
 msgstr "Tago"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1620
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
 msgid "Show one day"
 msgstr "Montri unu tagon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-cal-shell-view-actions.c:1658
 msgid "List"
 msgstr "Listo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
 msgid "Show as list"
 msgstr "Montri kiel listo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../modules/calendar/e-cal-shell-view-actions.c:1665
 msgid "Month"
 msgstr "Monato"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1634
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
 msgid "Show one month"
 msgstr "Montri unu monaton"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1639
+#: ../modules/calendar/e-cal-shell-view-actions.c:1672
 msgid "Week"
 msgstr "Semajno"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1641
+#: ../modules/calendar/e-cal-shell-view-actions.c:1674
 msgid "Show one week"
 msgstr "Montri unu semajnon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1648
+#: ../modules/calendar/e-cal-shell-view-actions.c:1681
 msgid "Show one work week"
 msgstr "Montri unu laborsemajnon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1656
+#: ../modules/calendar/e-cal-shell-view-actions.c:1689
 msgid "Active Appointments"
 msgstr "Aktivaj rendevuoj"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1670
+#: ../modules/calendar/e-cal-shell-view-actions.c:1703
 msgid "Next 7 Days' Appointments"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1701
-#: ../modules/calendar/e-memo-shell-view-actions.c:782
-#: ../modules/calendar/e-task-shell-view-actions.c:981
+#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+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
 msgid "Description contains"
 msgstr "Priskripo enhavas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1708
-#: ../modules/calendar/e-memo-shell-view-actions.c:789
-#: ../modules/calendar/e-task-shell-view-actions.c:988
+#: ../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
 msgid "Summary contains"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../modules/calendar/e-cal-shell-view-actions.c:1760
 msgid "Print this calendar"
 msgstr "Presi tiun kalendaron"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1727
+#: ../modules/calendar/e-cal-shell-view-actions.c:1767
 msgid "Preview the calendar to be printed"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1749
-#: ../modules/calendar/e-cal-shell-view-memopad.c:295
-msgid "Save as iCalendar..."
-msgstr "Konservi kiel iCalendar..."
+#: ../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
+msgid "_Save as iCalendar..."
+msgstr "_Konservi kiel iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1826
+#: ../modules/calendar/e-cal-shell-view-actions.c:1866
 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:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:509
+#: ../modules/calendar/e-cal-shell-view-memopad.c:217
+#: ../modules/calendar/e-memo-shell-view-actions.c:522
 msgid "memo"
 msgstr "noto"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:261
-#: ../modules/calendar/e-memo-shell-view-actions.c:641
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
 msgid "New _Memo"
 msgstr "Nova _noto"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:263
-#: ../modules/calendar/e-memo-shell-backend.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../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
 msgid "Create a new memo"
 msgstr "Krei novan noton"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:268
-#: ../modules/calendar/e-memo-shell-view-actions.c:648
+#: ../modules/calendar/e-cal-shell-view-memopad.c:267
+#: ../modules/calendar/e-memo-shell-view-actions.c:661
 msgid "_Open Memo"
 msgstr "Malfermi n_oton"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:270
-#: ../modules/calendar/e-memo-shell-view-actions.c:650
+#: ../modules/calendar/e-cal-shell-view-memopad.c:269
+#: ../modules/calendar/e-memo-shell-view-actions.c:663
 msgid "View the selected memo"
 msgstr "Montri la elektitan noton"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:275
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:362
-#: ../modules/calendar/e-memo-shell-view-actions.c:655
-#: ../modules/calendar/e-task-shell-view-actions.c:793
+#: ../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
 msgid "Open _Web Page"
 msgstr "Malfermi _retpaĝon"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:815
+#: ../modules/calendar/e-cal-shell-view-memopad.c:286
+#: ../modules/calendar/e-memo-shell-view-actions.c:828
 msgid "Print the selected memo"
 msgstr "Presi la elektitan noton"
 
@@ -14510,182 +15913,172 @@ msgstr "Presi la elektitan noton"
 #. * 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:285
-#: ../modules/calendar/e-task-shell-view-actions.c:626
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:284
+#: ../modules/calendar/e-task-shell-view-actions.c:639
 msgid "task"
 msgstr "tasko"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:320
-#: ../modules/calendar/e-task-shell-view-actions.c:688
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
+#: ../modules/calendar/e-task-shell-view-actions.c:701
 msgid "_Assign Task"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:334
-#: ../modules/calendar/e-task-shell-view-actions.c:765
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:778
 msgid "_Mark as Complete"
 msgstr "_Marki kiel plenumite"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:336
-#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:335
+#: ../modules/calendar/e-task-shell-view-actions.c:780
 msgid "Mark selected tasks as complete"
 msgstr "Marki elektitajn taskojn kiel plenumite"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:341
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
 msgid "_Mark as Incomplete"
 msgstr "_Marki kiel neplenumite"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:343
-#: ../modules/calendar/e-task-shell-view-actions.c:774
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:342
+#: ../modules/calendar/e-task-shell-view-actions.c:787
 msgid "Mark selected tasks as incomplete"
 msgstr "Marki elektitajn taskojn kiel plenumite"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:348
-#: ../modules/calendar/e-task-shell-view-actions.c:779
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "New _Task"
 msgstr "Nova _tasko"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:350
-#: ../modules/calendar/e-task-shell-backend.c:286
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../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
 msgid "Create a new task"
 msgstr "Krei novan taskon"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:355
-#: ../modules/calendar/e-task-shell-view-actions.c:786
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
+#: ../modules/calendar/e-task-shell-view-actions.c:799
 msgid "_Open Task"
 msgstr "_Malfermi taskon"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:357
-#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
+#: ../modules/calendar/e-task-shell-view-actions.c:801
 msgid "View the selected task"
 msgstr "Montri la elektitan taskon"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:374
-#: ../modules/calendar/e-task-shell-view-actions.c:1014
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../modules/calendar/e-task-shell-view-actions.c:1027
 msgid "Print the selected task"
 msgstr "Presi la elektitajn taskojn"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
-#: ../modules/calendar/e-memo-shell-view-actions.c:830
-#: ../modules/calendar/e-task-shell-view-actions.c:1029
-msgid "_Save as iCalendar..."
-msgstr "_Konservi kiel iCalendar..."
-
-#: ../modules/calendar/e-calendar-preferences.c:440
-msgid "Selected Calendars for Alarms"
-msgstr ""
-
-#: ../modules/calendar/e-calendar-preferences.c:839
-msgid "Ti_me and date:"
-msgstr ""
-
-#: ../modules/calendar/e-calendar-preferences.c:840
-msgid "_Date only:"
-msgstr ""
-
-#: ../modules/calendar/e-memo-shell-backend.c:285
+#: ../modules/calendar/e-memo-shell-backend.c:304
 msgctxt "New"
 msgid "Mem_o"
 msgstr ""
 
-#: ../modules/calendar/e-memo-shell-backend.c:292
+#: ../modules/calendar/e-memo-shell-backend.c:311
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Komuna noto"
 
-#: ../modules/calendar/e-memo-shell-backend.c:294
+#: ../modules/calendar/e-memo-shell-backend.c:313
 msgid "Create a new shared memo"
 msgstr "Krei novan komunan noton"
 
-#: ../modules/calendar/e-memo-shell-backend.c:302
+#: ../modules/calendar/e-memo-shell-backend.c:321
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Notoli_sto"
 
-#: ../modules/calendar/e-memo-shell-backend.c:304
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-memo-shell-backend.c:323
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
 msgid "Create a new memo list"
 msgstr "Krei novan notoliston"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:222
+#: ../modules/calendar/e-memo-shell-sidebar.c:186
 msgid "Loading memos"
 msgstr "Ŝargante notojn"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:577
+#: ../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:887
+#: ../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:222
-#: ../modules/calendar/e-memo-shell-view-actions.c:237
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
 msgid "Print Memos"
 msgstr "Presi notojn"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:571
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
 msgid "_Delete Memo"
 msgstr "_Forigi notojn"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
 msgid "_Find in Memo..."
 msgstr "_Serĉi en noto..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:580
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
 msgid "Search for text in the displayed memo"
 msgstr "Serĉi tekston en la montrata noto"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
 msgid "D_elete Memo List"
 msgstr "_Forigi la notoliston"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
 msgid "Delete the selected memo list"
 msgstr "Forigi la elektitan notoliston"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:606
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
 msgid "_New Memo List"
 msgstr "_Nova notolisto"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
 msgid "Refresh the selected memo list"
 msgstr "Aktualigi la elektitan notoliston"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:629
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Rename the selected memo list"
 msgstr "Alinomi la elektitan notoliston"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:634
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
 msgid "Show _Only This Memo List"
 msgstr "Montri nur tiun notoliston"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:713
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
 msgid "Memo _Preview"
 msgstr "Noto-_antaŭrigardo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:715
+#: ../modules/calendar/e-memo-shell-view-actions.c:728
 msgid "Show memo preview pane"
 msgstr ""
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:736
+#: ../modules/calendar/e-memo-shell-view-actions.c:749
 msgid "Show memo preview below the memo list"
 msgstr ""
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:743
+#: ../modules/calendar/e-memo-shell-view-actions.c:756
 msgid "Show memo preview alongside the memo list"
 msgstr ""
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:801
+#: ../modules/calendar/e-memo-shell-view-actions.c:814
 msgid "Print the list of memos"
 msgstr "Presi la liston de notoj"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:808
+#: ../modules/calendar/e-memo-shell-view-actions.c:821
 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
+msgid "Delete Memos"
+msgstr "Forigi notojn"
+
+#: ../modules/calendar/e-memo-shell-view.c:229
+msgid "Delete Memo"
+msgstr "Forigi noton"
+
 #: ../modules/calendar/e-memo-shell-view-private.c:424
 #, c-format
 msgid "%d memo"
@@ -14694,63 +16087,55 @@ 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:573
+#: ../modules/calendar/e-task-shell-view-private.c:603
 #, c-format
 msgid "%d selected"
 msgstr "%d elektite"
 
-#: ../modules/calendar/e-memo-shell-view.c:227
-msgid "Delete Memos"
-msgstr "Forigi notojn"
-
-#: ../modules/calendar/e-memo-shell-view.c:229
-msgid "Delete Memo"
-msgstr "Forigi noton"
-
-#: ../modules/calendar/e-task-shell-backend.c:284
+#: ../modules/calendar/e-task-shell-backend.c:303
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tasko"
 
-#: ../modules/calendar/e-task-shell-backend.c:291
+#: ../modules/calendar/e-task-shell-backend.c:310
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "_Atribuita tasko"
 
-#: ../modules/calendar/e-task-shell-backend.c:293
+#: ../modules/calendar/e-task-shell-backend.c:312
 msgid "Create a new assigned task"
 msgstr "Krei novan atribuitan taskon"
 
-#: ../modules/calendar/e-task-shell-backend.c:301
+#: ../modules/calendar/e-task-shell-backend.c:320
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Tas_klisto"
 
-#: ../modules/calendar/e-task-shell-backend.c:303
-#: ../modules/calendar/e-task-shell-view-actions.c:732
+#: ../modules/calendar/e-task-shell-backend.c:322
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "Create a new task list"
 msgstr "Krei novan taskliston"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:222
+#: ../modules/calendar/e-task-shell-sidebar.c:186
 msgid "Loading tasks"
 msgstr "Ŝargante taskojn"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:577
+#: ../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:887
+#: ../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:245
-#: ../modules/calendar/e-task-shell-view-actions.c:260
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
 msgid "Print Tasks"
 msgstr "Presi taskojn"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:570
+#: ../modules/calendar/e-task-shell-view-actions.c:583
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -14762,120 +16147,128 @@ msgstr ""
 "\n"
 "Ĉe certe forigi tiujn taskojn?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:577
+#: ../modules/calendar/e-task-shell-view-actions.c:590
 msgid "Do not ask me again"
 msgstr "Ne demandu min denove"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:695
+#: ../modules/calendar/e-task-shell-view-actions.c:708
 msgid "_Delete Task"
 msgstr "_Forigi taskon"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:702
+#: ../modules/calendar/e-task-shell-view-actions.c:715
 msgid "_Find in Task..."
 msgstr "_Serĉi en tasko..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:704
+#: ../modules/calendar/e-task-shell-view-actions.c:717
 msgid "Search for text in the displayed task"
 msgstr "Serĉi tekston en la montrita tasko"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-view-actions.c:729
 msgid "Copy..."
 msgstr "Kopii..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:723
+#: ../modules/calendar/e-task-shell-view-actions.c:736
 msgid "D_elete Task List"
 msgstr "_Forigi taskliston"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-task-shell-view-actions.c:738
 msgid "Delete the selected task list"
 msgstr "Forigi la elektitan taskliston"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:730
+#: ../modules/calendar/e-task-shell-view-actions.c:743
 msgid "_New Task List"
 msgstr "_Nova tasklisto"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-task-shell-view-actions.c:759
 msgid "Refresh the selected task list"
 msgstr "Aktualigi la elektitan taskliston"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:753
+#: ../modules/calendar/e-task-shell-view-actions.c:766
 msgid "Rename the selected task list"
 msgstr "Alinomi la elektitan taskliston"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:758
+#: ../modules/calendar/e-task-shell-view-actions.c:771
 msgid "Show _Only This Task List"
 msgstr "Montri _nur tiun taskliston"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:785
 msgid "Mar_k as Incomplete"
 msgstr "Mar_ki kiel neplenumite"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/calendar/e-task-shell-view-actions.c:815
 msgid "Delete completed tasks"
 msgstr "Forigi plenumitaj taskoj"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:877
+#: ../modules/calendar/e-task-shell-view-actions.c:890
 msgid "Task _Preview"
 msgstr "Tasko_antaŭrigardo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:879
+#: ../modules/calendar/e-task-shell-view-actions.c:892
 msgid "Show task preview pane"
 msgstr ""
 
-#: ../modules/calendar/e-task-shell-view-actions.c:900
+#: ../modules/calendar/e-task-shell-view-actions.c:913
 msgid "Show task preview below the task list"
 msgstr ""
 
-#: ../modules/calendar/e-task-shell-view-actions.c:907
+#: ../modules/calendar/e-task-shell-view-actions.c:920
 msgid "Show task preview alongside the task list"
 msgstr ""
 
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../modules/calendar/e-task-shell-view-actions.c:928
 msgid "Active Tasks"
 msgstr "Aktivaj taskoj"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:929
+#: ../modules/calendar/e-task-shell-view-actions.c:942
 msgid "Completed Tasks"
 msgstr "Plenumigitaj taskoj"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:936
+#: ../modules/calendar/e-task-shell-view-actions.c:949
 msgid "Next 7 Days' Tasks"
 msgstr ""
 
-#: ../modules/calendar/e-task-shell-view-actions.c:943
+#: ../modules/calendar/e-task-shell-view-actions.c:956
 msgid "Overdue Tasks"
 msgstr "Malfruaj taskoj"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:963
 msgid "Tasks with Attachments"
 msgstr "Taskoj kun aldonaĵoj"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1000
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
 msgid "Print the list of tasks"
 msgstr "Presi la liston de taskoj"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1007
+#: ../modules/calendar/e-task-shell-view-actions.c:1020
 msgid "Preview the list of tasks to be printed"
 msgstr ""
 
-#: ../modules/calendar/e-task-shell-view-private.c:472
+#: ../modules/calendar/e-task-shell-view.c:362
+msgid "Delete Tasks"
+msgstr "Forigi taskojn"
+
+#: ../modules/calendar/e-task-shell-view.c:364
+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:569
+#: ../modules/calendar/e-task-shell-view-private.c:599
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tasko"
 msgstr[1] "%d taskoj"
 
-#: ../modules/calendar/e-task-shell-view.c:362
-msgid "Delete Tasks"
-msgstr "Forigi taskojn"
+#: ../modules/mail/em-account-prefs.c:205
+msgid "Evolution Account Assistant"
+msgstr "Konto-asistanto de Evolucio"
 
-#: ../modules/calendar/e-task-shell-view.c:364
-msgid "Delete Task"
-msgstr "Forigi taskon"
+#: ../modules/mail/em-account-prefs.c:249
+msgid "Account Editor"
+msgstr "Kontoredaktilo"
 
 #. Translators: This is only for multiple messages.
 #: ../modules/mail/e-mail-attachment-handler.c:384
@@ -14883,432 +16276,410 @@ msgstr "Forigi taskon"
 msgid "%d attached messages"
 msgstr "%d aldonitaj mesaĝoj"
 
-#. Translators: "None" for a junk hook name,
-#. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:94
-msgctxt "mail-junk-hook"
-msgid "None"
-msgstr "Nenio"
-
-#: ../modules/mail/e-mail-shell-backend.c:195
+#: ../modules/mail/e-mail-shell-backend.c:199
 msgctxt "New"
 msgid "_Mail Message"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:197
+#: ../modules/mail/e-mail-shell-backend.c:201
 msgid "Compose a new mail message"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:205
+#: ../modules/mail/e-mail-shell-backend.c:209
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:211
 msgid "Create a new mail folder"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:408
+#: ../modules/mail/e-mail-shell-backend.c:426
 msgid "Mail Accounts"
 msgstr "Retpoŝtkontoj"
 
-#: ../modules/mail/e-mail-shell-backend.c:416
+#: ../modules/mail/e-mail-shell-backend.c:434
 msgid "Mail Preferences"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:424
+#: ../modules/mail/e-mail-shell-backend.c:442
 msgid "Composer Preferences"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:432
+#: ../modules/mail/e-mail-shell-backend.c:450
 msgid "Network Preferences"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1117
-#: ../modules/mail/e-mail-shell-view.c:945
+#: ../modules/mail/e-mail-shell-view-actions.c:1147
+#: ../modules/mail/e-mail-shell-view.c:944
 msgid "_Disable Account"
 msgstr "_Elŝalti konton"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1119
+#: ../modules/mail/e-mail-shell-view-actions.c:1149
 msgid "Disable this account"
 msgstr "Elŝalti tiun konton"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1126
+#: ../modules/mail/e-mail-shell-view-actions.c:1156
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1131
+#: ../modules/mail/e-mail-shell-view-actions.c:1161
 msgid "_Download Messages for Offline Usage"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1133
+#: ../modules/mail/e-mail-shell-view-actions.c:1163
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1138
+#: ../modules/mail/e-mail-shell-view-actions.c:1168
 msgid "Fl_ush Outbox"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1145
+#: ../modules/mail/e-mail-shell-view-actions.c:1175
 msgid "_Copy Folder To..."
 msgstr "_Kopii dosierujon al..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
+#: ../modules/mail/e-mail-shell-view-actions.c:1177
 msgid "Copy the selected folder into another folder"
 msgstr "Kopii la elektitan dosierujon al alia dosierujo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1154
+#: ../modules/mail/e-mail-shell-view-actions.c:1184
 msgid "Permanently remove this folder"
 msgstr "Daŭre forigi tiun dosierujon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
 msgid "E_xpunge"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1161
+#: ../modules/mail/e-mail-shell-view-actions.c:1191
 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:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
 msgid "Mar_k All Messages as Read"
 msgstr "Mar_ki ĉiujn mesaĝojn kiel legite"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
+#: ../modules/mail/e-mail-shell-view-actions.c:1198
 msgid "Mark all messages in the folder as read"
 msgstr "Mar_ki ĉiujn mesaĝojn en la dosierujo kiel legite"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1173
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
 msgid "_Move Folder To..."
 msgstr "_Movi dosierujon al..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1175
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
 msgid "Move the selected folder into another folder"
 msgstr "Movi la elektitan dosierujon al alia dosierujo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view-actions.c:1210
 msgid "_New..."
 msgstr "_Nova..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1182
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Create a new folder for storing mail"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Refresh the folder"
 msgstr "Aktualigi la dosierujon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1203
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "Change the name of this folder"
 msgstr "Ŝanĝi la nomon de la dosierujo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1208
+#: ../modules/mail/e-mail-shell-view-actions.c:1238
 msgid "Select Message _Thread"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1210
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
+#: ../modules/mail/e-mail-shell-view-actions.c:1245
 msgid "Select Message S_ubthread"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1217
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "Select all replies to the currently selected message"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
 msgid "Empty _Trash"
 msgstr "Malplenigi _rubujon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1231
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1236
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
 msgid "_New Label"
 msgstr "_Nova etikedo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1245
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "N_one"
 msgstr "N_eniu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1289
 msgid "_Manage Subscriptions"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../modules/mail/e-mail-shell-view-actions.c:1291
+#: ../modules/mail/e-mail-shell-view-actions.c:1368
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
-#: ../modules/mail/e-mail-shell-view-actions.c:1287
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1317
 msgid "Send / _Receive"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
+#: ../modules/mail/e-mail-shell-view-actions.c:1298
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
+#: ../modules/mail/e-mail-shell-view-actions.c:1303
 msgid "R_eceive All"
 msgstr "R_icevi ĉiujn"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1305
 msgid "Receive new items from all accounts"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1310
 msgid "_Send All"
 msgstr "_Sendi ĉiujn"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1312
 msgid "Send queued items in all accounts"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1308
+#: ../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:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1340
 msgid "Cancel the current mail operation"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1315
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
 msgid "Collapse All _Threads"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1317
+#: ../modules/mail/e-mail-shell-view-actions.c:1347
 msgid "Collapse all message threads"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1322
+#: ../modules/mail/e-mail-shell-view-actions.c:1352
 msgid "E_xpand All Threads"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1354
 msgid "Expand all message threads"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
+#: ../modules/mail/e-mail-shell-view-actions.c:1359
 msgid "_Message Filters"
 msgstr "_Mesaĝfiltriloj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1361
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#: ../modules/mail/e-mail-shell-view-actions.c:1366
 msgid "_Subscriptions..."
 msgstr "_Subskriboj..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1345
+#: ../modules/mail/e-mail-shell-view-actions.c:1375
 msgid "F_older"
 msgstr "D_osierujo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1352
+#: ../modules/mail/e-mail-shell-view-actions.c:1382
 msgid "_Label"
 msgstr "_Etikedo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1369
+#: ../modules/mail/e-mail-shell-view-actions.c:1399
 msgid "C_reate Search Folder From Search..."
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1376
+#: ../modules/mail/e-mail-shell-view-actions.c:1406
 msgid "Search F_olders"
 msgstr "Serĉ_dosierujoj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1378
+#: ../modules/mail/e-mail-shell-view-actions.c:1408
 msgid "Create or edit search folder definitions"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1409
+#: ../modules/mail/e-mail-shell-view-actions.c:1439
 msgid "_New Folder..."
 msgstr "_Nova dosierujo..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1437
+#: ../modules/mail/e-mail-shell-view-actions.c:1467
 msgid "Show Message _Preview"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1439
+#: ../modules/mail/e-mail-shell-view-actions.c:1469
 msgid "Show message preview pane"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1445
+#: ../modules/mail/e-mail-shell-view-actions.c:1475
 msgid "Show _Deleted Messages"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1447
+#: ../modules/mail/e-mail-shell-view-actions.c:1477
 msgid "Show deleted messages with a line through them"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1453
+#: ../modules/mail/e-mail-shell-view-actions.c:1483
 msgid "_Group By Threads"
 msgstr "_Grupigi laŭ fadenoj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1455
+#: ../modules/mail/e-mail-shell-view-actions.c:1485
 msgid "Threaded message list"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1476
+#: ../modules/mail/e-mail-shell-view-actions.c:1506
 msgid "Show message preview below the message list"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1483
+#: ../modules/mail/e-mail-shell-view-actions.c:1513
 msgid "Show message preview alongside the message list"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1491
+#: ../modules/mail/e-mail-shell-view-actions.c:1521
 msgid "All Messages"
 msgstr "Ĉiuj mesaĝoj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1498
+#: ../modules/mail/e-mail-shell-view-actions.c:1528
 msgid "Important Messages"
 msgstr "Gravaj mesaĝoj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1505
+#: ../modules/mail/e-mail-shell-view-actions.c:1535
 msgid "Last 5 Days' Messages"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../modules/mail/e-mail-shell-view-actions.c:1542
 msgid "Messages Not Junk"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1549
 msgid "Messages with Attachments"
 msgstr "Mesaĝoj kun aldonaĵoj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1526
+#: ../modules/mail/e-mail-shell-view-actions.c:1556
 msgid "No Label"
 msgstr "Neniu etikedo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1533
+#: ../modules/mail/e-mail-shell-view-actions.c:1563
 msgid "Read Messages"
 msgstr "Legitaj mesaĝoj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1540
+#: ../modules/mail/e-mail-shell-view-actions.c:1570
 msgid "Recent Messages"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1547
+#: ../modules/mail/e-mail-shell-view-actions.c:1577
 msgid "Unread Messages"
 msgstr "Nelegitaj mesaĝoj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1599
+#: ../modules/mail/e-mail-shell-view-actions.c:1629
 msgid "Subject or Addresses contain"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1609
+#: ../modules/mail/e-mail-shell-view-actions.c:1639
 msgid "All Accounts"
 msgstr "Ĉiuj kontoj"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1616
+#: ../modules/mail/e-mail-shell-view-actions.c:1646
 msgid "Current Account"
 msgstr "Aktualo konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1623
+#: ../modules/mail/e-mail-shell-view-actions.c:1653
 msgid "Current Folder"
 msgstr "Aktuala dosierujo"
 
-#: ../modules/mail/e-mail-shell-view-private.c:996
+#: ../modules/mail/e-mail-shell-view.c:560
+msgid "All Account Search"
+msgstr ""
+
+#: ../modules/mail/e-mail-shell-view.c:721
+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
 #, 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:1007
+#: ../modules/mail/e-mail-shell-view-private.c:1009
 #, 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:1013
-#: ../modules/mail/e-mail-shell-view-private.c:1020
+#: ../modules/mail/e-mail-shell-view-private.c:1015
+#: ../modules/mail/e-mail-shell-view-private.c:1022
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1028
 #, 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:1032
+#: ../modules/mail/e-mail-shell-view-private.c:1034
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../modules/mail/e-mail-shell-view-private.c:1038
+#: ../modules/mail/e-mail-shell-view-private.c:1040
 #, 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:1050
+#: ../modules/mail/e-mail-shell-view-private.c:1052
 #, 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:1053
+#: ../modules/mail/e-mail-shell-view-private.c:1055
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../modules/mail/e-mail-shell-view-private.c:1073
+#: ../modules/mail/e-mail-shell-view-private.c:1078
 msgid "Trash"
 msgstr "Rubujo"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1541
+#: ../modules/mail/e-mail-shell-view-private.c:1554
 msgid "Send / Receive"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view.c:559
-msgid "All Account Search"
-msgstr ""
-
-#: ../modules/mail/e-mail-shell-view.c:732
-msgid "Account Search"
-msgstr "Kontoserĉo"
-
-#: ../modules/mail/e-mail-shell-view.c:943
-msgid "Proxy _Logout"
-msgstr ""
-
-#: ../modules/mail/em-account-prefs.c:218
-msgid "Evolution Account Assistant"
-msgstr "Konto-asistanto de Evolucio"
-
-#: ../modules/mail/em-account-prefs.c:267
-msgid "Account Editor"
-msgstr "Kontoredaktilo"
-
-#: ../modules/mail/em-composer-prefs.c:490
-#: ../modules/plugin-manager/evolution-plugin-manager.c:359
-#: ../plugins/publish-calendar/publish-calendar.c:831
-#: ../widgets/misc/e-account-tree-view.c:224
-msgid "Enabled"
-msgstr "Enŝaltite"
-
-#: ../modules/mail/em-composer-prefs.c:494
+#: ../modules/mail/em-composer-prefs.c:507
 msgid "Language(s)"
 msgstr "Lingvo(j)"
 
@@ -15328,52 +16699,57 @@ msgstr "Unufoje dum semajno"
 msgid "Once per month"
 msgstr "Unufoje dum monato"
 
-#: ../modules/mail/em-mailer-prefs.c:288
+#: ../modules/mail/em-mailer-prefs.c:291
 msgid "Header"
 msgstr "Paĝokapo"
 
-#: ../modules/mail/em-mailer-prefs.c:292
+#: ../modules/mail/em-mailer-prefs.c:295
 msgid "Contains Value"
 msgstr ""
 
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:698 ../modules/mail/em-mailer-prefs.c:771
-#, c-format
-msgid "%s plugin is available and the binary is installed."
+#. 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
+msgid "_Date header:"
 msgstr ""
 
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:706 ../modules/mail/em-mailer-prefs.c:780
-#, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
+#: ../modules/mail/em-mailer-prefs.c:1049
+msgid "Show _original header value"
 msgstr ""
 
-#: ../modules/mail/em-mailer-prefs.c:744
-msgid "No junk plugin available"
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+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
+#, c-format
+msgid "Your message to %s about \"%s\" on %s has been read."
 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:1147
-msgid "_Date header:"
+#. Translators: %s is the subject of the email message.
+#: ../modules/mdn/evolution-mdn.c:322
+#, c-format
+msgid "Delivery Notification for \"%s\""
 msgstr ""
 
-#: ../modules/mail/em-mailer-prefs.c:1148
-msgid "Show _original header value"
+#: ../modules/mdn/evolution-mdn.c:447
+#, c-format
+msgid "Send a read receipt to '%s'"
 msgstr ""
 
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
+#. name doesn't matter
+#: ../modules/mdn/evolution-mdn.c:452
+msgid "_Notify Sender"
 msgstr ""
 
-#: ../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."
+#: ../modules/mdn/evolution-mdn.error.xml.h:1
+msgid "Sender has been notified that you have read this message."
 msgstr ""
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:146
-msgid "Do you want to make Evolution your default email client?"
-msgstr "Ĉu vi volas igi Evolucion je via defaŭlta retpoŝtumilo?"
+#: ../modules/mdn/evolution-mdn.error.xml.h:2
+msgid "Sender wants to be notified when 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."
@@ -15393,35 +16769,59 @@ msgid ""
 "established."
 msgstr ""
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:70
+#: ../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
 msgid "Author(s)"
 msgstr "Aŭtoro(j)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:254
+#: ../modules/plugin-manager/evolution-plugin-manager.c:255
 msgid "Plugin Manager"
 msgstr "Kromprogram-administrilo"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:269
+#: ../modules/plugin-manager/evolution-plugin-manager.c:270
 msgid "Note: Some changes will not take effect until restart"
 msgstr ""
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:298
+#: ../modules/plugin-manager/evolution-plugin-manager.c:299
 msgid "Overview"
 msgstr "Superrigardo"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:367
-#: ../modules/plugin-manager/evolution-plugin-manager.c:450
+#: ../modules/plugin-manager/evolution-plugin-manager.c:368
+#: ../modules/plugin-manager/evolution-plugin-manager.c:451
 msgid "Plugin"
 msgstr "Kromprogramo"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:488
+#: ../modules/plugin-manager/evolution-plugin-manager.c:489
 msgid "_Plugins"
 msgstr "_Kromprogramoj"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:489
+#: ../modules/plugin-manager/evolution-plugin-manager.c:490
 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"
+msgstr ""
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr ""
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr ""
@@ -15430,36 +16830,66 @@ msgstr ""
 msgid "Python Plugin Loader tests"
 msgstr ""
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
+#: ../modules/spamassassin/evolution-spamassassin.c:190
+#, c-format
+msgid "Failed to spawn SpamAssassin (%s): "
 msgstr ""
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
+#: ../modules/spamassassin/evolution-spamassassin.c:213
+msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr ""
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:280
+#: ../modules/spamassassin/evolution-spamassassin.c:232
+#, c-format
+msgid "Failed to write '%s' to SpamAssassin: "
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.c:260
+msgid "Failed to read output from SpamAssassin: "
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.c:315
+msgid "SpamAssassin either crashed or failed to process a mail message"
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.c:834
+msgid "SpamAssassin Options"
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.c:849
+msgid "I_nclude remote tests"
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.c:863
+msgid "This will make SpamAssassin more reliable, but slower."
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.c:1072
+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:"
 msgstr ""
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:312
+#: ../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:323
+#: ../modules/startup-wizard/evolution-startup-wizard.c:322
 #: ../modules/startup-wizard/evolution-startup-wizard.c:420
 msgid "Importing Files"
 msgstr ""
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:398
-msgid "Import cancelled. Click \"Forward\" to continue."
+msgid "Import cancelled."
 msgstr ""
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:416
-msgid "Import complete. Click \"Forward\" to continue."
+msgid "Import complete."
 msgstr ""
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:490
@@ -15473,12 +16903,10 @@ msgstr "Bonvenon"
 #: ../modules/startup-wizard/evolution-startup-wizard.c:501
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
+"to your email accounts, and to import files from other applications."
 msgstr ""
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:606
+#: ../modules/startup-wizard/evolution-startup-wizard.c:605
 msgid "Loading accounts..."
 msgstr "Ŝargante kontojn..."
 
@@ -15490,18 +16918,12 @@ msgstr "Aldoni lokan adresaron al Evolucio."
 msgid "Local Address Books"
 msgstr "Loka adresaro"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body"
-msgstr ""
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:125
+#: ../plugins/attachment-reminder/attachment-reminder.c:126
 msgid "_Do not show this message again."
 msgstr "_Ne montru tiun mesaĝon denove."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:457
-#: ../plugins/templates/templates.c:450
+#: ../plugins/attachment-reminder/attachment-reminder.c:464
+#: ../plugins/templates/templates.c:460
 msgid "Keywords"
 msgstr "Ŝlosilvortoj"
 
@@ -15539,61 +16961,6 @@ msgstr ""
 msgid "Play audio attachments directly in mail messages."
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:186
-msgid "Select name of the Evolution backup file"
-msgstr ""
-
-#: ../plugins/backup-restore/backup-restore.c:219
-msgid "_Restart Evolution after backup"
-msgstr ""
-
-#: ../plugins/backup-restore/backup-restore.c:245
-msgid "Select name of the Evolution backup file to restore"
-msgstr ""
-
-#: ../plugins/backup-restore/backup-restore.c:258
-msgid "_Restart Evolution after restore"
-msgstr ""
-
-#: ../plugins/backup-restore/backup-restore.c:326
-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."
-msgstr ""
-
-#: ../plugins/backup-restore/backup-restore.c:333
-msgid "_Restore Evolution from the backup file"
-msgstr ""
-
-#: ../plugins/backup-restore/backup-restore.c:340
-msgid "Please select an Evolution Archive to restore:"
-msgstr ""
-
-#: ../plugins/backup-restore/backup-restore.c:343
-msgid "Choose a file to restore"
-msgstr ""
-
-#: ../plugins/backup-restore/backup-restore.c:351
-msgid "Restore from backup"
-msgstr ""
-
-#: ../plugins/backup-restore/backup-restore.c:389
-msgid "_Back up Evolution Data..."
-msgstr ""
-
-#: ../plugins/backup-restore/backup-restore.c:391
-msgid "Back up Evolution data and settings to an archive file"
-msgstr ""
-
-#: ../plugins/backup-restore/backup-restore.c:396
-msgid "R_estore Evolution Data..."
-msgstr "Restarti Evolutiono"
-
-#: ../plugins/backup-restore/backup-restore.c:398
-msgid "Restore Evolution data and settings from an archive file"
-msgstr ""
-
 #: ../plugins/backup-restore/backup.c:77
 msgid "Back up Evolution directory"
 msgstr ""
@@ -15608,94 +16975,148 @@ msgstr ""
 
 #: ../plugins/backup-restore/backup.c:83
 msgid "Restart Evolution"
-msgstr "Restarti Evolucion"
+msgstr "Restartigi Evolucion"
 
 #: ../plugins/backup-restore/backup.c:85
 msgid "With Graphical User Interface"
 msgstr "Per grafika interfaco"
 
 #. FIXME Will the versioned setting always work?
-#: ../plugins/backup-restore/backup.c:295
-#: ../plugins/backup-restore/backup.c:412
+#: ../plugins/backup-restore/backup.c:300
+#: ../plugins/backup-restore/backup.c:424
 msgid "Shutting down Evolution"
 msgstr "Elŝalti Evolucion"
 
-#: ../plugins/backup-restore/backup.c:304
+#: ../plugins/backup-restore/backup.c:309
 msgid "Backing Evolution accounts and settings"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:314
+#: ../plugins/backup-restore/backup.c:321
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:327
+#: ../plugins/backup-restore/backup.c:337
 msgid "Back up complete"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:334
-#: ../plugins/backup-restore/backup.c:521
+#: ../plugins/backup-restore/backup.c:344
+#: ../plugins/backup-restore/backup.c:560
 msgid "Restarting Evolution"
 msgstr "Restartante Evolucion"
 
-#: ../plugins/backup-restore/backup.c:418
+#: ../plugins/backup-restore/backup.c:430
 msgid "Back up current Evolution data"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:426
+#: ../plugins/backup-restore/backup.c:438
 msgid "Extracting files from back up"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:485
+#: ../plugins/backup-restore/backup.c:505
 msgid "Loading Evolution settings"
 msgstr "Ŝargante Evolucio-agordojn"
 
-#: ../plugins/backup-restore/backup.c:502
+#: ../plugins/backup-restore/backup.c:541
 msgid "Removing temporary back up files"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:553
 msgid "Ensuring local sources"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:699
-#, c-format
-msgid "Backing up to the folder %s"
+#: ../plugins/backup-restore/backup.c:748
+msgid "Evolution Back Up"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:704
+#: ../plugins/backup-restore/backup.c:749
 #, c-format
-msgid "Restoring from the folder %s"
+msgid "Backing up to the folder %s"
 msgstr ""
 
-#. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:728
-msgid "Evolution Back up"
+#: ../plugins/backup-restore/backup.c:754
+msgid "Evolution Restore"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:728
-msgid "Evolution Restore"
+#: ../plugins/backup-restore/backup.c:755
+#, c-format
+msgid "Restoring from the folder %s"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:766
+#: ../plugins/backup-restore/backup.c:824
 msgid "Backing up Evolution Data"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:767
+#: ../plugins/backup-restore/backup.c:825
 msgid "Please wait while Evolution is backing up your data."
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:769
+#: ../plugins/backup-restore/backup.c:827
 msgid "Restoring Evolution Data"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:770
+#: ../plugins/backup-restore/backup.c:828
 msgid "Please wait while Evolution is restoring your data."
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:788
+#: ../plugins/backup-restore/backup.c:846
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 
+#: ../plugins/backup-restore/backup-restore.c:223
+msgid "Select name of the Evolution backup file"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:256
+msgid "_Restart Evolution after backup"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:283
+msgid "Select name of the Evolution backup file to restore"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:296
+msgid "_Restart Evolution after restore"
+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."
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:393
+msgid "_Restore Evolution from the backup file"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:403
+msgid "Please select an Evolution Archive to restore:"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:407
+msgid "Choose a file to restore"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:421
+msgid "Restore from backup"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:468
+msgid "_Back up Evolution Data..."
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:470
+msgid "Back up Evolution data and settings to an archive file"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:475
+msgid "R_estore Evolution Data..."
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:477
+msgid "Restore Evolution data and settings from an archive file"
+msgstr ""
+
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
 msgid "Back up and Restore"
@@ -15711,7 +17132,7 @@ msgstr "Ĉu vi vere volas fermi Evolucion?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
 msgid ""
-"Are you sure you want to restore Evolution from the selected back up file?"
+"Are you sure you want to restore Evolution from the selected backup file?"
 msgstr ""
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
@@ -15727,11 +17148,11 @@ msgid "Insufficient Permissions"
 msgstr "Nesufiĉaj permesoj"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-msgid "Invalid Evolution back up file"
+msgid "Invalid Evolution backup file"
 msgstr ""
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid "Please select a valid back up file to restore."
+msgid "Please select a valid backup file to restore."
 msgstr ""
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
@@ -15748,39 +17169,39 @@ msgstr ""
 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 back "
-"up."
+"all your current Evolution data and settings and restore them from your "
+"backup."
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:675 ../plugins/bbdb/bbdb.c:684
+#: ../plugins/bbdb/bbdb.c:666 ../plugins/bbdb/bbdb.c:675
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr ""
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:690
 msgid "Create _address book entries when sending mails"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:705
+#: ../plugins/bbdb/bbdb.c:696
 msgid "Select Address book for Automatic Contacts"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:720
+#: ../plugins/bbdb/bbdb.c:711
 msgid "Instant Messaging Contacts"
 msgstr ""
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:735
+#: ../plugins/bbdb/bbdb.c:726
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:741
+#: ../plugins/bbdb/bbdb.c:732
 msgid "Select Address book for Pidgin buddy list"
 msgstr ""
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:743
 msgid "Synchronize with _buddy list now"
 msgstr ""
 
@@ -15797,185 +17218,134 @@ msgid ""
 "lists."
 msgstr ""
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161
-#, c-format
-msgid "Bogofilter is not available. Please install it first."
-msgstr ""
-
-#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:165
-#, c-format
-msgid "Error occurred while spawning %s: %s."
-msgstr ""
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:194
-#, c-format
-msgid "Bogofilter child process does not respond, killing..."
-msgstr ""
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:196
-#, c-format
-msgid "Wait for Bogofilter child process interrupted, terminating..."
-msgstr ""
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:219
-#, c-format
-msgid "Pipe to Bogofilter failed, error code: %d."
-msgstr ""
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:404
-msgid "Convert message text to _Unicode"
-msgstr ""
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
-msgid "Convert mail messages to Unicode"
-msgstr ""
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
-msgid ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
-msgstr ""
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Junk Filter"
-msgstr ""
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter Options"
-msgstr ""
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filter junk messages using Bogofilter."
-msgstr ""
-
-#: ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:214
 msgid "Authentication failed. Server requires correct login."
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:205
+#: ../plugins/caldav/caldav-browse-server.c:216
 msgid "Given URL cannot be found."
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:209
+#: ../plugins/caldav/caldav-browse-server.c:220
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
 "%d - %s"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:339
-#: ../plugins/caldav/caldav-browse-server.c:663
+#: ../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:433
+#: ../plugins/caldav/caldav-browse-server.c:454
 msgid "Events"
 msgstr "Eventoj"
 
-#: ../plugins/caldav/caldav-browse-server.c:455
+#: ../plugins/caldav/caldav-browse-server.c:476
 msgid "User's calendars"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:564
-#: ../plugins/caldav/caldav-browse-server.c:732
+#: ../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:730
-#: ../plugins/caldav/caldav-browse-server.c:771
-#: ../plugins/caldav/caldav-browse-server.c:1430
+#: ../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:769
+#: ../plugins/caldav/caldav-browse-server.c:800
 msgid "Could not find any user calendar."
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:901
+#: ../plugins/caldav/caldav-browse-server.c:938
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:903
+#: ../plugins/caldav/caldav-browse-server.c:940
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:908
+#: ../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:967
+#: ../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:1213
+#: ../plugins/caldav/caldav-browse-server.c:1266
 msgid "Searching folder content..."
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:1262
-#: ../plugins/caldav/caldav-source.c:258
+#: ../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:1269
+#: ../plugins/caldav/caldav-browse-server.c:1332
 msgid "List of available calendars:"
 msgstr "Listo de disponeblaj kalendaroj:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1307
+#: ../plugins/caldav/caldav-browse-server.c:1370
 msgid "Supports"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:1334
-#: ../plugins/caldav/caldav-source.c:256
-msgid "User e-_mail:"
+#: ../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:1406
+#: ../plugins/caldav/caldav-browse-server.c:1469
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:1515
+#: ../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:1521
+#: ../plugins/caldav/caldav-browse-server.c:1591
 msgid "Browse for a CalDAV calendar"
 msgstr ""
 
-#: ../plugins/caldav/caldav-source.c:237
-#: ../plugins/calendar-http/calendar-http.c:104
+#: ../plugins/caldav/caldav-source.c:240
+#: ../plugins/calendar-http/calendar-http.c:107
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:244
-#: ../plugins/google-account-setup/google-contacts-source.c:351
-msgid "Use _SSL"
-msgstr ""
+#: ../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:246
-#: ../plugins/google-account-setup/google-contacts-source.c:329
-#: ../plugins/google-account-setup/google-source.c:652
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:267
+#: ../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:261
+#: ../plugins/caldav/caldav-source.c:264
 msgid "Brows_e server for a calendar"
 msgstr ""
 
-#: ../plugins/caldav/caldav-source.c:279
-#: ../plugins/calendar-file/calendar-file.c:195
-#: ../plugins/calendar-http/calendar-http.c:123
-#: ../plugins/calendar-weather/calendar-weather.c:403
-#: ../plugins/google-account-setup/google-contacts-source.c:369
-#: ../plugins/google-account-setup/google-source.c:659
+#: ../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:"
 
@@ -15987,31 +17357,31 @@ msgstr ""
 msgid "CalDAV Support"
 msgstr ""
 
-#: ../plugins/calendar-file/calendar-file.c:129
+#: ../plugins/calendar-file/calendar-file.c:134
 msgid "_Customize options"
 msgstr ""
 
-#: ../plugins/calendar-file/calendar-file.c:148
+#: ../plugins/calendar-file/calendar-file.c:153
 msgid "File _name:"
 msgstr "Dosier_nomo:"
 
-#: ../plugins/calendar-file/calendar-file.c:152
+#: ../plugins/calendar-file/calendar-file.c:157
 msgid "Choose calendar file"
 msgstr "Elekti kalendardosieron"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:209
 msgid "On open"
 msgstr ""
 
-#: ../plugins/calendar-file/calendar-file.c:201
+#: ../plugins/calendar-file/calendar-file.c:210
 msgid "On file change"
 msgstr ""
 
-#: ../plugins/calendar-file/calendar-file.c:202
+#: ../plugins/calendar-file/calendar-file.c:211
 msgid "Periodically"
 msgstr ""
 
-#: ../plugins/calendar-file/calendar-file.c:217
+#: ../plugins/calendar-file/calendar-file.c:228
 msgid "Force read _only"
 msgstr ""
 
@@ -16023,11 +17393,7 @@ msgstr "Aldoni lokan kalendaron al Evolucio."
 msgid "Local Calendars"
 msgstr "Lokaj kalendaroj"
 
-#: ../plugins/calendar-http/calendar-http.c:138
-msgid "_Secure connection"
-msgstr "_Sekura konekto"
-
-#: ../plugins/calendar-http/calendar-http.c:198
+#: ../plugins/calendar-http/calendar-http.c:207
 msgid "Userna_me:"
 msgstr "Uzantono_mo:"
 
@@ -16039,62 +17405,62 @@ msgstr "Aldoni ret-kalendarojn al Evolucio."
 msgid "Web Calendars"
 msgstr "Retaj kalendaroj"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Fog"
 msgstr "Vetero: nebulo"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Cloudy"
 msgstr "Vetero: nube"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Cloudy Night"
 msgstr "Vetero: nuba nokto"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Overcast"
 msgstr ""
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Showers"
 msgstr "Vetero: pluvegoj"
 
-#: ../plugins/calendar-weather/calendar-weather.c:69
+#: ../plugins/calendar-weather/calendar-weather.c:70
 msgid "Weather: Snow"
 msgstr "Vetero: neĝo"
 
-#: ../plugins/calendar-weather/calendar-weather.c:70
+#: ../plugins/calendar-weather/calendar-weather.c:71
 msgid "Weather: Sunny"
 msgstr "Vetero: sune"
 
-#: ../plugins/calendar-weather/calendar-weather.c:71
+#: ../plugins/calendar-weather/calendar-weather.c:72
 msgid "Weather: Clear Night"
 msgstr "Vetero: klara nokto"
 
-#: ../plugins/calendar-weather/calendar-weather.c:72
+#: ../plugins/calendar-weather/calendar-weather.c:73
 msgid "Weather: Thunderstorms"
 msgstr "Vetero: fulmotondroj"
 
-#: ../plugins/calendar-weather/calendar-weather.c:230
+#: ../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:336
-#: ../plugins/calendar-weather/calendar-weather.c:381
+#: ../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:456
+#: ../plugins/calendar-weather/calendar-weather.c:477
 msgid "_Units:"
 msgstr "_uUnuoj:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:465
+#: ../plugins/calendar-weather/calendar-weather.c:486
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metrike (Celsiuso, cm, ktp.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:468
+#: ../plugins/calendar-weather/calendar-weather.c:489
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr ""
 
@@ -16106,7 +17472,7 @@ msgstr "Aldoni veter-kalendaroj al Evolucio."
 msgid "Weather Calendars"
 msgstr "Veter-kalendaroj"
 
-#: ../plugins/dbx-import/dbx-importer.c:282
+#: ../plugins/dbx-import/dbx-importer.c:289
 msgid "Importing Outlook Express data"
 msgstr ""
 
@@ -16122,23 +17488,23 @@ msgstr ""
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr ""
 
-#: ../plugins/default-source/default-source.c:87
+#: ../plugins/default-source/default-source.c:169
 msgid "Mark as _default address book"
 msgstr ""
 
-#: ../plugins/default-source/default-source.c:100
+#: ../plugins/default-source/default-source.c:183
 msgid "A_utocomplete with this address book"
 msgstr ""
 
-#: ../plugins/default-source/default-source.c:109
+#: ../plugins/default-source/default-source.c:192
 msgid "Mark as _default calendar"
 msgstr "Marki kiel _defaŭlta kalendaro"
 
-#: ../plugins/default-source/default-source.c:110
+#: ../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:111
+#: ../plugins/default-source/default-source.c:194
 msgid "Mark as _default memo list"
 msgstr ""
 
@@ -16150,74 +17516,63 @@ msgstr "Defaŭltaj fontoj"
 msgid "Mark your preferred address book and calendar as default."
 msgstr ""
 
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Headers"
-msgstr ""
-
-#: ../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 "
-"custom header followed by \"=\" and the values separated by \";\""
-msgstr ""
-
-#: ../plugins/email-custom-header/email-custom-header.c:316
+#: ../plugins/email-custom-header/email-custom-header.c:322
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Sekureco:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:320
+#: ../plugins/email-custom-header/email-custom-header.c:326
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Persona"
 
-#: ../plugins/email-custom-header/email-custom-header.c:321
+#: ../plugins/email-custom-header/email-custom-header.c:327
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Nekategoriigite"
 
-#: ../plugins/email-custom-header/email-custom-header.c:322
+#: ../plugins/email-custom-header/email-custom-header.c:328
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Protektite"
 
-#: ../plugins/email-custom-header/email-custom-header.c:323
+#: ../plugins/email-custom-header/email-custom-header.c:329
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Konfidence"
 
-#: ../plugins/email-custom-header/email-custom-header.c:324
+#: ../plugins/email-custom-header/email-custom-header.c:330
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Sekrete"
 
-#: ../plugins/email-custom-header/email-custom-header.c:325
+#: ../plugins/email-custom-header/email-custom-header.c:331
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Sekretege"
 
-#: ../plugins/email-custom-header/email-custom-header.c:382
+#: ../plugins/email-custom-header/email-custom-header.c:388
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "Neniu"
 
-#: ../plugins/email-custom-header/email-custom-header.c:574
+#: ../plugins/email-custom-header/email-custom-header.c:584
 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:833
+#: ../plugins/email-custom-header/email-custom-header.c:847
 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:887
+#: ../plugins/email-custom-header/email-custom-header.c:901
 msgid "Key"
 msgstr "Ŝlosilo"
 
-#: ../plugins/email-custom-header/email-custom-header.c:903
-#: ../plugins/templates/templates.c:456
+#: ../plugins/email-custom-header/email-custom-header.c:917
+#: ../plugins/templates/templates.c:466
 msgid "Values"
 msgstr "Valoroj"
 
@@ -16238,31 +17593,18 @@ msgstr ""
 msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr ""
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:131
-msgid "Automatically launch when a new mail is edited"
-msgstr ""
-
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
-msgid "Default External Editor"
-msgstr ""
-
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
-msgid "The default command that must be used as the editor."
-msgstr ""
-
-#: ../plugins/external-editor/external-editor.c:120
+#: ../plugins/external-editor/external-editor.c:114
 msgid "Command to be executed to launch the editor: "
 msgstr ""
 
-#: ../plugins/external-editor/external-editor.c:121
+#: ../plugins/external-editor/external-editor.c:115
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
 msgstr ""
 
-#: ../plugins/external-editor/external-editor.c:399
-#: ../plugins/external-editor/external-editor.c:401
+#: ../plugins/external-editor/external-editor.c:394
+#: ../plugins/external-editor/external-editor.c:396
 msgid "Compose in External Editor"
 msgstr ""
 
@@ -16304,33 +17646,23 @@ msgid ""
 "setting a different editor."
 msgstr ""
 
-#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
-msgid "Insert Face picture by default"
-msgstr ""
-
-#: ../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."
-msgstr ""
-
-#: ../plugins/face/face.c:286
+#: ../plugins/face/face.c:292
 msgid "Select a Face Picture"
 msgstr ""
 
-#: ../plugins/face/face.c:296
+#: ../plugins/face/face.c:302
 msgid "Image files"
 msgstr "Bilddosieroj"
 
-#: ../plugins/face/face.c:352
+#: ../plugins/face/face.c:359
 msgid "_Insert Face picture by default"
 msgstr ""
 
-#: ../plugins/face/face.c:363
+#: ../plugins/face/face.c:370
 msgid "Load new _Face picture"
 msgstr ""
 
-#: ../plugins/face/face.c:420
+#: ../plugins/face/face.c:429
 msgid "Include _Face"
 msgstr ""
 
@@ -16362,34 +17694,34 @@ msgstr "La dosiero ne estas legebla"
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr ""
 
-#: ../plugins/google-account-setup/google-contacts-source.c:317
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:243
+#: ../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:443
+#: ../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:560
+#: ../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:560
-#: ../plugins/mail-to-task/mail-to-task.c:738
-#: ../plugins/mail-to-task/mail-to-task.c:957
+#: ../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:663
+#: ../plugins/google-account-setup/google-source.c:670
 msgid "Cal_endar:"
 msgstr "Kal_endaro:"
 
-#: ../plugins/google-account-setup/google-source.c:698
+#: ../plugins/google-account-setup/google-source.c:705
 msgid "Retrieve _List"
 msgstr ""
 
@@ -16409,12 +17741,12 @@ msgstr ""
 msgid "View image attachments directly in mail messages."
 msgstr ""
 
-#: ../plugins/imap-features/imap-headers.c:333
+#: ../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:346
+#: ../plugins/imap-features/imap-headers.c:347
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr ""
@@ -16438,7 +17770,7 @@ msgstr ""
 
 #: ../plugins/imap-features/imap-headers.ui.h:8
 msgid ""
-"_Basic Headers - (Fastest) \n"
+"_Basic Headers (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
 msgstr ""
 
@@ -16455,684 +17787,697 @@ 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:490
+#. * 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:630
+#: ../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:654
+#: ../plugins/itip-formatter/itip-formatter.c:680
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:760
+#: ../plugins/itip-formatter/itip-formatter.c:791
 msgid "Unable to find any calendars"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:767
+#: ../plugins/itip-formatter/itip-formatter.c:798
 msgid "Unable to find this meeting in any calendar"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:771
+#: ../plugins/itip-formatter/itip-formatter.c:802
 msgid "Unable to find this task in any task list"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:775
+#: ../plugins/itip-formatter/itip-formatter.c:806
 msgid "Unable to find this memo in any memo list"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1017
+#: ../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:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1111
 msgid "Searching for an existing version of this appointment"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1293
-msgid "Unable to parse item"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:1382
+#: ../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:1394
+#: ../plugins/itip-formatter/itip-formatter.c:1487
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1398
+#: ../plugins/itip-formatter/itip-formatter.c:1491
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1403
+#: ../plugins/itip-formatter/itip-formatter.c:1496
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1408
+#: ../plugins/itip-formatter/itip-formatter.c:1501
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1502
+#: ../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:1509
+#: ../plugins/itip-formatter/itip-formatter.c:1796
 msgid "Sent a cancelation notice to the delegate"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1511
+#: ../plugins/itip-formatter/itip-formatter.c:1798
 msgid "Could not send the cancelation notice to the delegate"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1622
-msgid "Attendee status could not be updated because the status is invalid"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:1651
+#: ../plugins/itip-formatter/itip-formatter.c:1844
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1655
+#: ../plugins/itip-formatter/itip-formatter.c:1850
 msgid "Attendee status updated"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1659
+#: ../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:1681
+#: ../plugins/itip-formatter/itip-formatter.c:2075
 msgid "Meeting information sent"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1684
+#: ../plugins/itip-formatter/itip-formatter.c:2078
 msgid "Task information sent"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1687
+#: ../plugins/itip-formatter/itip-formatter.c:2081
 msgid "Memo information sent"
 msgstr "Noto-informoj estas sendite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1696
+#: ../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:1699
+#: ../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:1702
+#: ../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:1767
+#: ../plugins/itip-formatter/itip-formatter.c:2162
 msgid "calendar.ics"
 msgstr "kalendaro.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1772
+#: ../plugins/itip-formatter/itip-formatter.c:2167
 msgid "Save Calendar"
 msgstr "Konservi kalendaron"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1830
-#: ../plugins/itip-formatter/itip-formatter.c:1841
+#: ../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:1831
-#: ../plugins/itip-formatter/itip-formatter.c:1842
+#: ../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:1882
-#: ../plugins/itip-formatter/itip-formatter.c:1910
-#: ../plugins/itip-formatter/itip-formatter.c:2019
+#: ../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:1883
-#: ../plugins/itip-formatter/itip-formatter.c:1911
-#: ../plugins/itip-formatter/itip-formatter.c:2020
+#: ../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:1924
+#: ../plugins/itip-formatter/itip-formatter.c:2324
 msgid "The calendar attached contains multiple items"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1925
+#: ../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:2583
+#: ../plugins/itip-formatter/itip-formatter.c:2847
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Nenio"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2599
+#: ../plugins/itip-formatter/itip-formatter.c:2863
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2717
+#: ../plugins/itip-formatter/itip-formatter.c:2981
 msgid "This meeting recurs"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2720
+#: ../plugins/itip-formatter/itip-formatter.c:2984
 msgid "This task recurs"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2723
+#: ../plugins/itip-formatter/itip-formatter.c:2987
 msgid "This memo recurs"
 msgstr ""
 
-#. Delete message after acting
-#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2962
+#: ../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:2972
-#: ../plugins/itip-formatter/itip-formatter.c:3005
+#: ../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:2987
+#: ../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:196
+#. * 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:200
+#. * 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:209
+#. * 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:224
+#. * 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:228
+#. * 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:233
+#. * 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:237
+#. * 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:256
+#: ../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:261
+#. * 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:265
+#. * 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:270
+#. * 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:274
+#. * 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:283
+#. * 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:289
+#. * 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:293
+#. * 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:298
+#. * 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:302
+#. * 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:308
+#: ../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:313
+#. * 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:317
+#. * 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:322
+#. * 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:326
+#. * 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:362
 #: ../plugins/itip-formatter/itip-view.c:363
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:364
 #: ../plugins/itip-formatter/itip-view.c:451
-#: ../plugins/itip-formatter/itip-view.c:538
+#: ../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:367
-#: ../plugins/itip-formatter/itip-view.c:455
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../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:369
-#: ../plugins/itip-formatter/itip-view.c:457
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../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:374
+#: ../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:376
+#: ../plugins/itip-formatter/itip-view.c:377
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../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:384
+#: ../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:386
+#: ../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:392
+#: ../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:394
+#: ../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:398
+#: ../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:400
+#: ../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:404
+#: ../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:406
+#: ../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:410
+#: ../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:412
+#: ../plugins/itip-formatter/itip-view.c:413
 #, c-format
-msgid "%s has canceled the following meeting."
+msgid "%s has canceled the following meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../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:418
+#: ../plugins/itip-formatter/itip-view.c:419
 #, c-format
-msgid "%s has proposed the following meeting changes."
+msgid "%s has proposed the following meeting changes:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:422
+#: ../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:424
+#: ../plugins/itip-formatter/itip-view.c:425
 #, c-format
-msgid "%s has declined the following meeting changes."
+msgid "%s has declined the following meeting changes:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../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:464
+#: ../plugins/itip-formatter/itip-view.c:465
 #, c-format
 msgid "%s has published the following task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:469
+#: ../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:472
+#: ../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:474
+#: ../plugins/itip-formatter/itip-view.c:475
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../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:482
+#: ../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:486
+#: ../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:488
+#: ../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:492
+#: ../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:494
+#: ../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:498
+#: ../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:500
+#: ../plugins/itip-formatter/itip-view.c:501
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:504
+#: ../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:506
+#: ../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:510
+#: ../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:512
+#: ../plugins/itip-formatter/itip-view.c:513
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:549
+#: ../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:551
+#: ../plugins/itip-formatter/itip-view.c:552
 #, c-format
 msgid "%s has published the following memo:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:556
+#: ../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:558
+#: ../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:562
+#: ../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:564
+#: ../plugins/itip-formatter/itip-view.c:565
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:688
+#: ../plugins/itip-formatter/itip-view.c:689
 msgid "All day:"
 msgstr "Tuttage:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:699
 msgid "Start day:"
 msgstr ""
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1054
+#: ../plugins/itip-formatter/itip-view.c:699
+#: ../plugins/itip-formatter/itip-view.c:1062
 msgid "Start time:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:711
 msgid "End day:"
 msgstr ""
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:710
-#: ../plugins/itip-formatter/itip-view.c:1065
+#: ../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:843
+#: ../plugins/itip-formatter/itip-view.c:847
 msgid "_Open Calendar"
 msgstr "_Malfermi kalendaron"
 
-#: ../plugins/itip-formatter/itip-view.c:849
 #: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:859
-#: ../plugins/itip-formatter/itip-view.c:876
-#: ../plugins/itip-formatter/itip-view.c:881
+#: ../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:850
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:862
-#: ../plugins/itip-formatter/itip-view.c:878
-#: ../plugins/itip-formatter/itip-view.c:883
+#: ../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:853
+#: ../plugins/itip-formatter/itip-view.c:857
 msgid "_Decline all"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Tentative all"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:860
-#: ../plugins/itip-formatter/itip-view.c:877
-#: ../plugins/itip-formatter/itip-view.c:882
+#: ../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:855
+#: ../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:866
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Send Information"
 msgstr ""
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:874
 msgid "_Update Attendee Status"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:873
+#: ../plugins/itip-formatter/itip-view.c:877
 msgid "_Update"
 msgstr "Ĝ_isdatigi"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1085
-#: ../plugins/itip-formatter/itip-view.c:1139
+#: ../plugins/itip-formatter/itip-view.c:1093
+#: ../plugins/itip-formatter/itip-view.c:1147
 msgid "Comment:"
 msgstr "Komento:"
 
-#: ../plugins/itip-formatter/itip-view.c:1124
+#: ../plugins/itip-formatter/itip-view.c:1132
 msgid "Send _reply to sender"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1170
 msgid "Send _updates to attendees"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1179
 msgid "_Apply to all instances"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1188
 msgid "Show time as _free"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:1175
+#: ../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:1181
+#: ../plugins/itip-formatter/itip-view.c:1197
 msgid "_Inherit reminder"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:1924
+#: ../plugins/itip-formatter/itip-view.c:1973
 msgid "_Tasks:"
 msgstr "_Taskoj:"
 
-#: ../plugins/itip-formatter/itip-view.c:1926
+#: ../plugins/itip-formatter/itip-view.c:1975
 msgid "_Memos:"
 msgstr "_Notoj:"
 
@@ -17157,73 +18502,131 @@ msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
-msgid "Beep or play sound file."
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:345
+msgid "Get List _Archive"
 msgstr ""
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Enable D-Bus messages."
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:347
+msgid "Get an archive of the list this message belongs to"
 msgstr ""
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
-msgid "Enable icon in notification area."
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:352
+msgid "Get List _Usage Information"
 msgstr ""
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
-msgid "Generates a D-Bus message when new mail messages arrive."
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:354
+msgid "Get information about the usage of the list this message belongs to"
 msgstr ""
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
-msgid ""
-"If \"true\", then beep, otherwise will play sound file when new messages "
-"arrive."
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:359
+msgid "Contact List _Owner"
 msgstr ""
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid "Notify new messages for Inbox only."
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:361
+msgid "Contact the owner of the mailing list this message belongs to"
 msgstr ""
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
-msgid "Play sound when new messages arrive."
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
+msgid "_Post Message to List"
 msgstr ""
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
-msgid "Play themed sound when new messages arrive, if not in beep mode."
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:368
+msgid "Post a message to the mailing list this message belongs to"
 msgstr ""
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-msgid "Popup message together with the icon."
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
+msgid "_Subscribe to List"
+msgstr "_Aboni liston"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:375
+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
+msgid "_Unsubscribe from List"
+msgstr "_Malaboni liston"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
+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
+msgid "Mailing _List"
+msgstr "Dissendo_listo"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Mailing List Actions"
+msgstr "Dissendolist-agoj"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
 msgstr ""
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
-msgid "Show new mail icon in notification area when new messages arrive."
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
+msgid "Action not available"
+msgstr "Ago ne desponeblas"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
+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/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
-msgid "Sound file name to be played."
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
+msgid "Malformed header"
 msgstr ""
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
-msgid "Sound file to be played when new messages arrive, if not in beep mode."
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
+msgid "No e-mail action"
 msgstr ""
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
-msgid "Use sound theme"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
+msgid "Posting not allowed"
 msgstr ""
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
-msgid "Whether play sound or beep when new messages arrive."
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
+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/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
-msgid "Whether show message over the icon when new messages arrive."
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+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
+msgid ""
+"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/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
-msgid "Whether to notify new messages in Inbox folder only."
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
+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:16
+msgid ""
+"This message does not contain the header information required for this "
+"action."
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:396
+#: ../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:384
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17240,58 +18643,57 @@ msgstr[1] ""
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:420
+#: ../plugins/mail-notification/mail-notification.c:409
 #, c-format
 msgid "Subject: %s"
 msgstr "Temo: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:430
+#: ../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:443
-#: ../plugins/mail-notification/mail-notification.c:451
-#: ../plugins/mail-notification/mail-notification.c:454
+#: ../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:509
-msgid "Show icon in _notification area"
-msgstr ""
-
-#: ../plugins/mail-notification/mail-notification.c:539
-msgid "Popup _message together with the icon"
-msgstr ""
+#. Translators: The '%s' is a mail
+#. * folder name.  (e.g. "Show Inbox")
+#: ../plugins/mail-notification/mail-notification.c:461
+#, c-format
+msgid "Show %s"
+msgstr "Montri na %s"
 
-#: ../plugins/mail-notification/mail-notification.c:726
-msgid "_Play sound when new messages arrive"
+#: ../plugins/mail-notification/mail-notification.c:661
+msgid "_Play sound when a new message arrives"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:756
+#: ../plugins/mail-notification/mail-notification.c:691
 msgid "_Beep"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:769
+#: ../plugins/mail-notification/mail-notification.c:702
 msgid "Use sound _theme"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:788
+#: ../plugins/mail-notification/mail-notification.c:719
 msgid "Play _file:"
 msgstr "Lodi _dosieron:"
 
-#: ../plugins/mail-notification/mail-notification.c:799
+#: ../plugins/mail-notification/mail-notification.c:726
 msgid "Select sound file"
 msgstr "Elekti sondosieron"
 
-#: ../plugins/mail-notification/mail-notification.c:857
+#: ../plugins/mail-notification/mail-notification.c:782
 msgid "Notify new messages for _Inbox only"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:866
-msgid "Generate a _D-Bus message"
+#: ../plugins/mail-notification/mail-notification.c:790
+msgid "Show _notification when a new message arrives"
 msgstr ""
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
@@ -17303,168 +18705,131 @@ 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:157
+#: ../plugins/mail-to-task/mail-to-task.c:238
 #, c-format
 msgid "Created from a mail by %s"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:490
+#: ../plugins/mail-to-task/mail-to-task.c:613
 #, 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:493
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, 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:496
+#: ../plugins/mail-to-task/mail-to-task.c:619
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
 "old memo?"
 msgstr ""
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:516
+#: ../plugins/mail-to-task/mail-to-task.c:636
+#, c-format
 msgid ""
-"Selected calendar contains some events for the given mails already. Would "
-"you like to create new events anyway?"
+"You have selected %d mails to be converted to events. Do you really want to "
+"add them all?"
 msgstr ""
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#: ../plugins/mail-to-task/mail-to-task.c:639
+#, c-format
 msgid ""
-"Selected task list contains some tasks for the given mails already. Would "
-"you like to create new tasks anyway?"
+"You have selected %d mails to be converted to tasks. Do you really want to "
+"add them all?"
 msgstr ""
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:528
+#: ../plugins/mail-to-task/mail-to-task.c:642
+#, c-format
 msgid ""
-"Selected memo list contains some memos for the given mails already. Would "
-"you like to create new memos anyway?"
+"You have selected %d mails to be converted to memos. Do you really want to "
+"add them all?"
 msgstr ""
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:549
-msgid ""
-"Selected calendar contains an event for the given mail already. Would you "
-"like to create new event anyway?"
-msgid_plural ""
-"Selected calendar contains events for the given mails already. Would you "
-"like to create new events anyway?"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:558
-msgid ""
-"Selected task list contains a task for the given mail already. Would you "
-"like to create new task anyway?"
-msgid_plural ""
-"Selected task list contains tasks for the given mails already. Would you "
-"like to create new tasks anyway?"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:567
-msgid ""
-"Selected memo list contains a memo for the given mail already. Would you "
-"like to create new memo anyway?"
-msgid_plural ""
-"Selected memo list contains memos for the given mails already. Would you "
-"like to create new memos anyway?"
-msgstr[0] ""
-msgstr[1] ""
+#: ../plugins/mail-to-task/mail-to-task.c:661
+msgid "Do you wish to continue converting remaining mails?"
+msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:626
+#: ../plugins/mail-to-task/mail-to-task.c:736
 msgid "[No Summary]"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:637
+#: ../plugins/mail-to-task/mail-to-task.c:748
 msgid "Invalid object returned from a server"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:710
+#: ../plugins/mail-to-task/mail-to-task.c:798
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:823
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Ne eblis malfermi kalendaron. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:745
+#: ../plugins/mail-to-task/mail-to-task.c:830
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:748
+#: ../plugins/mail-to-task/mail-to-task.c:833
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:751
+#: ../plugins/mail-to-task/mail-to-task.c:836
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:957
+#: ../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:1081
+#: ../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:1083
+#: ../plugins/mail-to-task/mail-to-task.c:1241
 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:1088
+#: ../plugins/mail-to-task/mail-to-task.c:1246
 msgid "Create a Mem_o"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:1090
+#: ../plugins/mail-to-task/mail-to-task.c:1248
 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:1095
+#: ../plugins/mail-to-task/mail-to-task.c:1253
 msgid "Create a _Task"
 msgstr "Krei _taskon"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1097
+#: ../plugins/mail-to-task/mail-to-task.c:1255
 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:1105
+#: ../plugins/mail-to-task/mail-to-task.c:1263
 msgid "Create a _Meeting"
 msgstr "Krei _kunsidon"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1107
+#: ../plugins/mail-to-task/mail-to-task.c:1265
 msgid "Create a new meeting from the selected message"
 msgstr "Krei novan kunsidon de la elektita mesaĝo"
 
@@ -17472,130 +18837,6 @@ msgstr "Krei novan kunsidon de la elektita mesaĝo"
 msgid "Convert a mail message to a task."
 msgstr ""
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:345
-msgid "Get List _Archive"
-msgstr ""
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:347
-msgid "Get an archive of the list this message belongs to"
-msgstr ""
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:352
-msgid "Get List _Usage Information"
-msgstr ""
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:354
-msgid "Get information about the usage of the list this message belongs to"
-msgstr ""
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:359
-msgid "Contact List _Owner"
-msgstr ""
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:361
-msgid "Contact the owner of the mailing list this message belongs to"
-msgstr ""
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
-msgid "_Post Message to List"
-msgstr ""
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:368
-msgid "Post a message to the mailing list this message belongs to"
-msgstr ""
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
-msgid "_Subscribe to List"
-msgstr "_Aboni liston"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:375
-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
-msgid "_Unsubscribe from List"
-msgstr "_Malaboni liston"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
-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
-msgid "Mailing _List"
-msgstr "Dissendo_listo"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
-msgid "Mailing List Actions"
-msgstr "Dissendolist-agoj"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
-msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
-msgstr ""
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
-msgid "Action not available"
-msgstr "Ago ne desponeblas"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
-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"
-msgstr ""
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
-msgid "Posting not allowed"
-msgstr ""
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
-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
-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
-msgid ""
-"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:13
-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:16
-msgid ""
-"This message does not contain the header information required for this "
-"action."
-msgstr ""
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h: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/mark-all-read/mark-all-read.c:42
 msgid "Also mark messages in subfolders?"
 msgstr ""
@@ -17606,15 +18847,15 @@ msgid ""
 "current folder as well as all subfolders?"
 msgstr ""
 
-#: ../plugins/mark-all-read/mark-all-read.c:213
+#: ../plugins/mark-all-read/mark-all-read.c:215
 msgid "In Current Folder and _Subfolders"
 msgstr ""
 
-#: ../plugins/mark-all-read/mark-all-read.c:227
+#: ../plugins/mark-all-read/mark-all-read.c:229
 msgid "In Current _Folder Only"
 msgstr ""
 
-#: ../plugins/mark-all-read/mark-all-read.c:565
+#: ../plugins/mark-all-read/mark-all-read.c:568
 msgid "Mark Me_ssages as Read"
 msgstr "Marki me_saĝojn kiel legite"
 
@@ -17639,39 +18880,39 @@ msgstr ""
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:241
+#: ../plugins/prefer-plain/prefer-plain.c:250
 msgid "Show HTML if present"
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:241
+#: ../plugins/prefer-plain/prefer-plain.c:251
 msgid "Let Evolution choose the best part to show."
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:242
+#: ../plugins/prefer-plain/prefer-plain.c:254
 msgid "Show plain text if present"
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:242
+#: ../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:243
+#: ../plugins/prefer-plain/prefer-plain.c:259
 msgid "Only ever show plain text"
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:243
+#: ../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:290
+#: ../plugins/prefer-plain/prefer-plain.c:311
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:310
+#: ../plugins/prefer-plain/prefer-plain.c:331
 msgid "HTML _Mode"
 msgstr "HTML-_reĝomo"
 
@@ -17687,42 +18928,38 @@ msgstr ""
 msgid "Outlook personal folders (.pst)"
 msgstr ""
 
-#: ../plugins/pst-import/pst-importer.c:308
+#: ../plugins/pst-import/pst-importer.c:542
 msgid "_Mail"
 msgstr "_Retpoŝto"
 
-#: ../plugins/pst-import/pst-importer.c:326
+#: ../plugins/pst-import/pst-importer.c:564
 msgid "Destination folder:"
 msgstr "Celdosierujo:"
 
-#. Address book
-#: ../plugins/pst-import/pst-importer.c:332
+#: ../plugins/pst-import/pst-importer.c:572
 msgid "_Address Book"
 msgstr "_Adresaro"
 
-#. Appointments
-#: ../plugins/pst-import/pst-importer.c:339
+#: ../plugins/pst-import/pst-importer.c:577
 msgid "A_ppointments"
 msgstr "_Rendevuoj"
 
-#. Tasks
-#: ../plugins/pst-import/pst-importer.c:345 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:582 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Taskoj"
 
-#. Journal
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:587
 msgid "_Journal entries"
 msgstr ""
 
-#: ../plugins/pst-import/pst-importer.c:366
+#: ../plugins/pst-import/pst-importer.c:698
 msgid "Importing Outlook data"
 msgstr ""
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:146
-#: ../plugins/publish-calendar/publish-calendar.c:154
-#: ../plugins/publish-calendar/publish-calendar.c:156
+#: ../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 ""
 
@@ -17734,49 +18971,49 @@ msgstr "Lokoj"
 msgid "Publish calendars to the web."
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:212
-#: ../plugins/publish-calendar/publish-calendar.c:453
+#: ../plugins/publish-calendar/publish-calendar.c:216
+#: ../plugins/publish-calendar/publish-calendar.c:463
 #, c-format
 msgid "Could not open %s:"
 msgstr "Ne eblis malfemi %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:214
+#: ../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:234
+#: ../plugins/publish-calendar/publish-calendar.c:238
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:236
+#: ../plugins/publish-calendar/publish-calendar.c:240
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:280
+#: ../plugins/publish-calendar/publish-calendar.c:284
 #, c-format
 msgid "Mount of %s failed:"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:600
+#: ../plugins/publish-calendar/publish-calendar.c:611
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "E_nable"
 msgstr "E_nŝalti"
 
-#: ../plugins/publish-calendar/publish-calendar.c:743
+#: ../plugins/publish-calendar/publish-calendar.c:759
 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:1057
+#. * 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
 msgid "Could not create publish thread."
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:1065
+#: ../plugins/publish-calendar/publish-calendar.c:1099
 msgid "_Publish Calendar Information"
 msgstr ""
 
@@ -17813,8 +19050,8 @@ msgid "Publishing _Frequency:"
 msgstr ""
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:15
-msgid "Secure FTP (SSH)"
-msgstr "Sekura FTP (SSH)"
+msgid "Secure FTP (SFTP)"
+msgstr "Sekura FTP (SFTP)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "Secure WebDAV (HTTPS)"
@@ -17868,158 +19105,102 @@ msgstr "_Uzantonomo:"
 msgid "iCal"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-format-fb.c:88
-#: ../plugins/publish-calendar/publish-format-ical.c:86
+#: ../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/url-editor-dialog.c:487
+#: ../plugins/publish-calendar/url-editor-dialog.c:518
 msgid "New Location"
 msgstr "Nova loko"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:489
+#: ../plugins/publish-calendar/url-editor-dialog.c:520
 msgid "Edit Location"
 msgstr "Redakti lokon"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
-#, c-format
-msgid "SpamAssassin not found, code: %d"
-msgstr ""
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
-#, c-format
-msgid "Failed to create pipe: %s"
-msgstr ""
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
-#, c-format
-msgid "Error after fork: %s"
-msgstr ""
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
-#, c-format
-msgid "SpamAssassin child process does not respond, killing..."
-msgstr ""
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
-#, c-format
-msgid "Wait for SpamAssassin child process interrupted, terminating..."
-msgstr ""
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:252
-#, c-format
-msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr ""
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:519
-#, c-format
-msgid "SpamAssassin is not available. Please install it first."
-msgstr ""
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
-msgid "This will make SpamAssassin more reliable, but slower"
-msgstr ""
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:944
-msgid "I_nclude remote tests"
-msgstr ""
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid "Filter junk messages using SpamAssassin."
-msgstr ""
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Junk Filter"
-msgstr ""
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin Options"
-msgstr ""
-
 #. Translators: the %F %T is the third argument for a
 #. * strftime function.  It lets you define the formatting
 #. * of the date in the csv-file.
-#: ../plugins/save-calendar/csv-format.c:160
+#: ../plugins/save-calendar/csv-format.c:168
 msgid "%F %T"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "UID"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "Description List"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Categories List"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Comment List"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:389
 msgid "Contact List"
 msgstr "Kontaktlisto"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "Start"
 msgstr "Komenco"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:391
 msgid "End"
 msgstr "Fino"
 
-#: ../plugins/save-calendar/csv-format.c:379
+#: ../plugins/save-calendar/csv-format.c:392
 msgid "Due"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:380
+#: ../plugins/save-calendar/csv-format.c:393
 msgid "percent Done"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:395
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:396
 msgid "Attendees List"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:398
 msgid "Modified"
 msgstr "Modifite"
 
-#: ../plugins/save-calendar/csv-format.c:560
+#: ../plugins/save-calendar/csv-format.c:573
 msgid "A_dvanced options for the CSV format"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:568
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Prepend a _header"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:577
+#: ../plugins/save-calendar/csv-format.c:590
 msgid "_Value delimiter:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:588
+#: ../plugins/save-calendar/csv-format.c:601
 msgid "_Record delimiter:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:599
+#: ../plugins/save-calendar/csv-format.c:612
 msgid "_Encapsulate values with:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:625
-msgid "Comma separated value format (.csv)"
+#: ../plugins/save-calendar/csv-format.c:638
+msgid "Comma separated values (.csv)"
 msgstr ""
 
-#: ../plugins/save-calendar/ical-format.c:166
-msgid "iCalendar format (.ics)"
-msgstr ""
+#: ../plugins/save-calendar/ical-format.c:173 ../shell/e-shell-utils.c:199
+msgid "iCalendar (.ics)"
+msgstr "iCalendar (.ics)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
@@ -18034,40 +19215,34 @@ msgstr ""
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:147
+#: ../plugins/save-calendar/rdf-format.c:152
 msgid "%FT%T"
 msgstr ""
 
-#: ../plugins/save-calendar/rdf-format.c:375
-msgid "RDF format (.rdf)"
-msgstr "RDF-formo (.rdf)"
+#: ../plugins/save-calendar/rdf-format.c:385
+msgid "RDF (.rdf)"
+msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:122
+#: ../plugins/save-calendar/save-calendar.c:127
 msgid "_Format:"
 msgstr "_Formo:"
 
-#: ../plugins/save-calendar/save-calendar.c:183
+#: ../plugins/save-calendar/save-calendar.c:189
 msgid "Select destination file"
 msgstr "Elekti celdosieron"
 
-#: ../plugins/save-calendar/save-calendar.c:336
+#: ../plugins/save-calendar/save-calendar.c:344
 msgid "Save the selected calendar to disk"
 msgstr "Konservi la elektitan kalendaron al disko"
 
-#: ../plugins/save-calendar/save-calendar.c:367
+#: ../plugins/save-calendar/save-calendar.c:375
 msgid "Save the selected memo list to disk"
 msgstr "Konversi la elektitan notoliston al datumportilo"
 
-#: ../plugins/save-calendar/save-calendar.c:398
+#: ../plugins/save-calendar/save-calendar.c:406
 msgid "Save the selected task list to disk"
 msgstr "Konservi la elektitan taskliston al disko"
 
-#: ../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 ""
-
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
@@ -18075,15 +19250,15 @@ msgid ""
 "an email you are replying to."
 msgstr ""
 
-#: ../plugins/templates/templates.c:1066
+#: ../plugins/templates/templates.c:1099
 msgid "No Title"
 msgstr "Sen titolo"
 
-#: ../plugins/templates/templates.c:1167
+#: ../plugins/templates/templates.c:1211
 msgid "Save as _Template"
 msgstr "Konservi kiel ŝ_ablono"
 
-#: ../plugins/templates/templates.c:1169
+#: ../plugins/templates/templates.c:1213
 msgid "Save as Template"
 msgstr "Savu kiel ŝablono"
 
@@ -18103,27 +19278,27 @@ msgstr ""
 msgid "Show vCards directly in mail messages."
 msgstr ""
 
-#: ../plugins/vcard-inline/vcard-inline.c:200
-#: ../plugins/vcard-inline/vcard-inline.c:285
+#: ../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:203
+#: ../plugins/vcard-inline/vcard-inline.c:211
 msgid "Show Compact vCard"
 msgstr ""
 
-#: ../plugins/vcard-inline/vcard-inline.c:264
+#: ../plugins/vcard-inline/vcard-inline.c:272
 msgid "There is one other contact."
 msgstr ""
 
-#: ../plugins/vcard-inline/vcard-inline.c:273
+#: ../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:294
+#: ../plugins/vcard-inline/vcard-inline.c:302
 msgid "Save in Address Book"
 msgstr "Konservi en adresaro"
 
@@ -18135,15 +19310,15 @@ msgstr ""
 msgid "WebDAV contacts"
 msgstr "WebDAV-kontaktoj"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:67
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:255
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:281
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:283
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr ""
 
@@ -18155,14 +19330,6 @@ msgstr ""
 msgid "Automatic proxy configuration URL"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
-msgid "Configuration version"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid "Default sidebar width"
-msgstr ""
-
 #: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window X coordinate"
 msgstr ""
@@ -18183,22 +19350,14 @@ msgstr ""
 msgid "Default window width"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
-msgid "Enable express mode"
-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:12
-msgid "Flag that enables a much simplified user interface."
-msgstr ""
-
 #: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy host name"
-msgstr ""
+msgstr "HTTP-prokura komputilnomo"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy password"
@@ -18212,10 +19371,6 @@ msgstr "HTTP-prokura pordo"
 msgid "HTTP proxy username"
 msgstr "HTTP-prokura uzantonomo"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
-msgid "ID or alias of the component to be shown by default at start-up."
-msgstr ""
-
 #: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
@@ -18224,62 +19379,40 @@ msgid ""
 "gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
-msgid "Initial attachment view"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:20
-msgid "Initial file chooser folder"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:21
-msgid "Initial folder for GtkFileChooser dialogs."
-msgstr ""
-
 #: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid ""
-"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
-"View."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:23
-msgid "Last upgraded configuration version"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Non-proxy hosts"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../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:27
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Proxy configuration mode"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "SOCKS proxy host name"
-msgstr ""
+msgstr "SOCKS-prokura komputilnomo"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "SOCKS proxy port"
-msgstr ""
+msgstr "SOCKS-prokura pordo"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Secure HTTP proxy host name"
-msgstr ""
+msgstr "Sekura HTTP-prokura komputilnomo"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Secure HTTP proxy port"
-msgstr ""
+msgstr "Sekura HTTP-prokura pordo"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../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 "
@@ -18287,92 +19420,53 @@ msgid ""
 "\" respectively."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
-msgid "Sidebar is visible"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:34
-msgid "Skip development warning dialog"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:314
-msgid "Start in offline mode"
-msgstr ""
-
 #: ../shell/apps_evolution_shell.schemas.in.h:36
-msgid "Statusbar is visible"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid ""
-"The configuration version of Evolution, with major/minor/configuration level "
-"(for example \"2.6.0\")."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default X coordinate for the main window."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../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:40
+#: ../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:41
+#: ../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 default width for the sidebar, in pixels."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:43
-msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy HTTP through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../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:46
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy socks through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../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:48
+#: ../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:49
+#: ../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:50
-msgid ""
-"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
-"by the GNOME toolbar setting."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../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 "
@@ -18380,64 +19474,39 @@ msgid ""
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
-msgid "Toolbar is visible"
-msgstr "Ilobreto estas videbla"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "URL that provides proxy configuration values."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Use HTTP proxy"
 msgstr "Uzi HTTP-prokurilon"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "User name to pass as authentication when doing HTTP proxying."
+#: ../shell/apps_evolution_shell.schemas.in.h:53
+msgid "Username to pass as authentication when doing HTTP proxying."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
-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?"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether or not the window should be maximized."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
-msgid "Whether the sidebar should be visible."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:59
-msgid "Whether the status bar should be visible."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:60
-msgid "Whether the toolbar should be visible."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:61
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:62
-msgid "Whether the window buttons should be visible."
+#: ../shell/e-shell.c:312
+msgid "Preparing to go offline..."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:63
-msgid "Window button style"
+#: ../shell/e-shell.c:365
+msgid "Preparing to go online..."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:64
-msgid "Window buttons are visible"
+#: ../shell/e-shell.c:435
+msgid "Preparing to quit..."
 msgstr ""
 
-#: ../shell/e-shell-content.c:699 ../shell/e-shell-content.c:700
+#: ../shell/e-shell-content.c:727 ../shell/e-shell-content.c:728
 msgid "Searches"
 msgstr "Serĉoj"
 
-#: ../shell/e-shell-content.c:742
+#: ../shell/e-shell-content.c:771
 msgid "Save Search"
 msgstr "Konservi serĉon"
 
@@ -18445,42 +19514,38 @@ 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:938
+#: ../shell/e-shell-searchbar.c:940
 msgid "Sho_w:"
 msgstr "_Montri:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:971
+#: ../shell/e-shell-searchbar.c:973
 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:1034
+#: ../shell/e-shell-searchbar.c:1036
 msgid "i_n"
 msgstr "e_n"
 
-#: ../shell/e-shell-utils.c:223
+#: ../shell/e-shell-utils.c:197
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:225
-msgid "iCalendar (.ics)"
-msgstr "iCalendar (.ics)"
-
-#: ../shell/e-shell-utils.c:246
+#: ../shell/e-shell-utils.c:220
 msgid "All Files (*)"
 msgstr "Ĉiuj dosieroj (*)"
 
-#: ../shell/e-shell-view.c:295
+#: ../shell/e-shell-view.c:303
 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:648
+#: ../shell/e-shell-window-actions.c:645
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -18489,6 +19554,8 @@ msgstr ""
 "  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"
@@ -18496,305 +19563,290 @@ msgstr ""
 "  maku https://launchpad.net/~markus-niemisto\n"
 "  trio https://launchpad.net/~trio-esperanto"
 
-#: ../shell/e-shell-window-actions.c:659
+#: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "Retpaĝaro de Evolucio"
 
-#: ../shell/e-shell-window-actions.c:921
+#: ../shell/e-shell-window-actions.c:914
 msgid "Categories Editor"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1256
+#: ../shell/e-shell-window-actions.c:1249
 msgid "Bug Buddy is not installed."
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1258
+#: ../shell/e-shell-window-actions.c:1251
 msgid "Bug Buddy could not be run."
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1432
 msgid "Show information about Evolution"
 msgstr "Montri informojn pri Evolucio"
 
-#: ../shell/e-shell-window-actions.c:1444
-#: ../shell/e-shell-window-actions.c:1458
+#: ../shell/e-shell-window-actions.c:1437
+#: ../shell/e-shell-window-actions.c:1451
 msgid "_Close Window"
 msgstr "_Fermi fenestron"
 
-#: ../shell/e-shell-window-actions.c:1465
+#: ../shell/e-shell-window-actions.c:1458
 msgid "_Contents"
 msgstr "_Enhavoj"
 
-#: ../shell/e-shell-window-actions.c:1467
+#: ../shell/e-shell-window-actions.c:1460
 msgid "Open the Evolution User Guide"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1493
-msgid "Evolution _FAQ"
-msgstr ""
-
-#: ../shell/e-shell-window-actions.c:1495
-msgid "Open the Frequently Asked Questions webpage"
-msgstr ""
-
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1486
 msgid "_Forget Passwords"
 msgstr "_Forgesigi pasvortojn"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1488
 msgid "Forget all remembered passwords"
 msgstr "Forgesigi ĉiujn pasvortojn"
 
-#: ../shell/e-shell-window-actions.c:1507
+#: ../shell/e-shell-window-actions.c:1493
 msgid "I_mport..."
 msgstr "I_mporto..."
 
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:1495
 msgid "Import data from other programs"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1500
 msgid "New _Window"
 msgstr "Nova _fenestro"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Create a new window displaying this view"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:1514
 msgid "Available Cate_gories"
 msgstr "Disponeblaj kate_gorioj"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1516
 msgid "Manage available categories"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:1528
 msgid "_Quick Reference"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1530
 msgid "Show Evolution's shortcut keys"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1537
 msgid "Exit the program"
 msgstr "Eliri de la programon"
 
-#: ../shell/e-shell-window-actions.c:1556
+#: ../shell/e-shell-window-actions.c:1542
 msgid "_Advanced Search..."
 msgstr "_Detala serĉo..."
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1544
 msgid "Construct a more advanced search"
 msgstr "Krei pli specialan serĉon"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1551
 msgid "Clear the current search parameters"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1556
 msgid "_Edit Saved Searches..."
 msgstr "_Redakti konservitajn serĉojn..."
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1558
 msgid "Manage your saved searches"
 msgstr "Administri viajn konservitajn serĉojn"
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1565
 msgid "Click here to change the search type"
 msgstr "Klaku ĉi tie por ŝanĝi la serĉtipon"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1570
 msgid "_Find Now"
 msgstr "_Serĉi nun"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1572
 msgid "Execute the current search parameters"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1577
 msgid "_Save Search..."
 msgstr "_Konservi serĉon..."
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Save the current search parameters"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1591
 msgid "Submit _Bug Report..."
 msgstr "Transsendi __cimraporton..."
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1593
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Transsendi cimraporton per Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1598
 msgid "_Work Offline"
 msgstr "Labori _senkonekte"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1600
 msgid "Put Evolution into offline mode"
 msgstr "Ŝalti Evolucion al nekonektita reĝimo"
 
-#: ../shell/e-shell-window-actions.c:1619
+#: ../shell/e-shell-window-actions.c:1605
 msgid "_Work Online"
 msgstr "_Labori konektite"
 
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1607
 msgid "Put Evolution into online mode"
 msgstr "Ŝalti Evolucion al konektita reĝimo"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1635
 msgid "Lay_out"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1642
 msgid "_New"
 msgstr "_Nova"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1649
 msgid "_Search"
 msgstr "_Serĉi"
 
-#: ../shell/e-shell-window-actions.c:1670
+#: ../shell/e-shell-window-actions.c:1656
 msgid "_Switcher Appearance"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1684
+#: ../shell/e-shell-window-actions.c:1670
 msgid "_Window"
 msgstr "_Fenestro"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1699
 msgid "Show Side _Bar"
 msgstr "Montri flankan _breton"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1701
 msgid "Show the side bar"
 msgstr "Montri la flankan breton"
 
-#: ../shell/e-shell-window-actions.c:1721
+#: ../shell/e-shell-window-actions.c:1707
 msgid "Show _Buttons"
 msgstr "Montri _butonojn"
 
-#: ../shell/e-shell-window-actions.c:1723
+#: ../shell/e-shell-window-actions.c:1709
 msgid "Show the switcher buttons"
 msgstr "Montri la ŝaltbutonojn"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1715
 msgid "Show _Status Bar"
 msgstr "Montri _statbreton"
 
-#: ../shell/e-shell-window-actions.c:1731
+#: ../shell/e-shell-window-actions.c:1717
 msgid "Show the status bar"
 msgstr "Montri la statbreton"
 
-#: ../shell/e-shell-window-actions.c:1737
+#: ../shell/e-shell-window-actions.c:1723
 msgid "Show _Tool Bar"
 msgstr "Montri _ilobreton"
 
-#: ../shell/e-shell-window-actions.c:1739
+#: ../shell/e-shell-window-actions.c:1725
 msgid "Show the tool bar"
 msgstr "Montri la ilobreton"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1747
 msgid "_Icons Only"
 msgstr "Nur _bildsimboloj"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Display window buttons with icons only"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1754
 msgid "_Text Only"
 msgstr "Nur _teksto"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Display window buttons with text only"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1761
 msgid "Icons _and Text"
 msgstr "Bildsimboloj _kaj tekto"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1763
 msgid "Display window buttons with icons and text"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1782
+#: ../shell/e-shell-window-actions.c:1768
 msgid "Tool_bar Style"
 msgstr "Ilo_bret-stilo"
 
-#: ../shell/e-shell-window-actions.c:1784
+#: ../shell/e-shell-window-actions.c:1770
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1778
 msgid "Define Views..."
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1780
 msgid "Create or edit views"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1799
+#: ../shell/e-shell-window-actions.c:1785
 msgid "Save Custom View..."
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1787
 msgid "Save current custom view"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1808
+#: ../shell/e-shell-window-actions.c:1794
 msgid "C_urrent View"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1818
+#: ../shell/e-shell-window-actions.c:1804
 msgid "Custom View"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1820
+#: ../shell/e-shell-window-actions.c:1806
 msgid "Current view is a customized view"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1830
+#: ../shell/e-shell-window-actions.c:1816
 msgid "Change the page settings for your current printer"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:2215
+#: ../shell/e-shell-window-actions.c:2206
 #, c-format
 msgid "Switch to %s"
 msgstr "Ŝanĝi al %s"
 
-#: ../shell/e-shell-window-actions.c:2430
+#: ../shell/e-shell-window-actions.c:2326
+#, c-format
+msgid "Select view: %s"
+msgstr "Elekti vidon: %s"
+
+#: ../shell/e-shell-window-actions.c:2426
 msgid "Execute these search parameters"
 msgstr ""
 
+#: ../shell/e-shell-window.c:445
+msgid "New"
+msgstr "Nova"
+
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:584
+#: ../shell/e-shell-window-private.c:577
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolucio"
 
-#: ../shell/e-shell-window.c:442
-msgid "New"
-msgstr "Nova"
-
-#: ../shell/e-shell.c:361
-msgid "Preparing to go offline..."
-msgstr ""
-
-#: ../shell/e-shell.c:414
-msgid "Preparing to go online..."
-msgstr ""
-
-#: ../shell/e-shell.c:476
-msgid "Preparing to quit..."
-msgstr ""
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:195
+#: ../shell/main.c:189
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18814,7 +19866,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: ../shell/main.c:219
+#: ../shell/main.c:213
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18822,70 +19874,70 @@ msgstr ""
 "Dankon\n"
 "La Evolucio-teamo\n"
 
-#: ../shell/main.c:226
+#: ../shell/main.c:220
 msgid "Do not tell me again"
 msgstr ""
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:308
+#: ../shell/main.c:311
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 msgstr ""
 
-#: ../shell/main.c:312
+#: ../shell/main.c:315
 msgid "Apply the given geometry to the main window"
 msgstr ""
 
-#: ../shell/main.c:316
+#: ../shell/main.c:319
 msgid "Start in online mode"
 msgstr ""
 
-#: ../shell/main.c:318
+#: ../shell/main.c:321
 msgid "Ignore network availability"
 msgstr ""
 
-#: ../shell/main.c:320
+#: ../shell/main.c:323
 msgid "Start in \"express\" mode"
 msgstr ""
 
-#: ../shell/main.c:323
+#: ../shell/main.c:326
 msgid "Forcibly shut down Evolution"
 msgstr ""
 
-#: ../shell/main.c:326
+#: ../shell/main.c:329
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: ../shell/main.c:328
+#: ../shell/main.c:331
 msgid "Disable loading of any plugins."
 msgstr ""
 
-#: ../shell/main.c:330
+#: ../shell/main.c:333
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr ""
 
-#: ../shell/main.c:334
+#: ../shell/main.c:337
 msgid "Import URIs or file names given as rest of arguments."
 msgstr ""
 
-#: ../shell/main.c:336
+#: ../shell/main.c:339
 msgid "Request a running Evolution process to quit"
 msgstr ""
 
-#: ../shell/main.c:511 ../shell/main.c:519
+#: ../shell/main.c:510 ../shell/main.c:518
 msgid "- The Evolution PIM and Email Client"
 msgstr ""
 
-#: ../shell/main.c:582
+#: ../shell/main.c:583
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
 msgstr ""
 
-#: ../shell/main.c:588
+#: ../shell/main.c:589
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -18937,55 +19989,56 @@ msgid ""
 "data.\n"
 msgstr ""
 
-#: ../shell/test/e-test-shell-backend.c:56
+#: ../shell/test/e-test-shell-backend.c:52
 msgctxt "New"
 msgid "_Test Item"
 msgstr ""
 
-#: ../shell/test/e-test-shell-backend.c:58
+#: ../shell/test/e-test-shell-backend.c:54
 msgid "Create a new test item"
 msgstr ""
 
-#: ../shell/test/e-test-shell-backend.c:66
+#: ../shell/test/e-test-shell-backend.c:62
 msgctxt "New"
 msgid "Test _Source"
 msgstr ""
 
-#: ../shell/test/e-test-shell-backend.c:68
+#: ../shell/test/e-test-shell-backend.c:64
 msgid "Create a new test source"
 msgstr ""
 
-#: ../smclient/eggdesktopfile.c:165
+#: ../smclient/eggdesktopfile.c:166
 #, c-format
 msgid "File is not a valid .desktop file"
 msgstr "Dosiero ne estas valida .desktop-dosiero"
 
-#: ../smclient/eggdesktopfile.c:188
+#: ../smclient/eggdesktopfile.c:189
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Nerekonata versio '%s' de labortabla dosiero"
 
-#: ../smclient/eggdesktopfile.c:957
+#: ../smclient/eggdesktopfile.c:959
 #, c-format
 msgid "Starting %s"
 msgstr "Lanĉante %s"
 
-#: ../smclient/eggdesktopfile.c:1098
+#: ../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:1166
+#: ../smclient/eggdesktopfile.c:1170
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Nerekonata lanĉparametro: %d"
 
-#: ../smclient/eggdesktopfile.c:1365
+#: ../smclient/eggdesktopfile.c:1370
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr "Ne eblas transdoni URI-dokumentojn al labortabla elemento 'Type=Link'"
+msgstr ""
+"Ne eblas transdoni URI-ojn de dokumentoj al labortabla elemento 'Type=Link'"
 
-#: ../smclient/eggdesktopfile.c:1386
+#: ../smclient/eggdesktopfile.c:1391
 #, c-format
 msgid "Not a launchable item"
 msgstr "Nelanĉebla ero"
@@ -19018,7 +20071,7 @@ msgstr "Agordoj de la seancoadministrilo:"
 msgid "Show session management options"
 msgstr "Montri agordojn de la seancoadministrilo"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:107
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19026,20 +20079,6 @@ msgid ""
 "Edit trust settings:"
 msgstr ""
 
-#: ../smime/gui/cert-trust-dialog.c:144
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
-msgstr ""
-
-#: ../smime/gui/cert-trust-dialog.c:148
-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:73 ../smime/gui/certificate-manager.c:92
 #: ../smime/gui/certificate-manager.c:112
 msgid "Certificate Name"
@@ -19055,7 +20094,7 @@ 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:566
+#: ../smime/lib/e-cert.c:565
 msgid "Serial Number"
 msgstr "Seria numero"
 
@@ -19106,26 +20145,26 @@ msgstr ""
 
 #: ../smime/gui/certificate-manager.c:93
 #: ../smime/gui/certificate-manager.c:113
-msgid "E-Mail Address"
+msgid "Email Address"
 msgstr "Retpoŝtadreso"
 
-#: ../smime/gui/certificate-manager.c:574
+#: ../smime/gui/certificate-manager.c:575
 msgid "Select a certificate to import..."
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:587
+#: ../smime/gui/certificate-manager.c:588
 msgid "All files"
 msgstr "Ĉiuj dosieroj"
 
-#: ../smime/gui/certificate-manager.c:622
+#: ../smime/gui/certificate-manager.c:623
 msgid "Failed to import certificate"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:990
+#: ../smime/gui/certificate-manager.c:992
 msgid "All PKCS12 files"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1008
+#: ../smime/gui/certificate-manager.c:1009
 msgid "All email certificate files"
 msgstr ""
 
@@ -19133,41 +20172,55 @@ msgstr ""
 msgid "All CA certificate files"
 msgstr ""
 
-#: ../smime/gui/certificate-viewer.c:338
+#: ../smime/gui/certificate-viewer.c:345
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 
-#: ../smime/gui/component.c:46
+#: ../smime/gui/cert-trust-dialog.c:146
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: ../smime/gui/cert-trust-dialog.c: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/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:69
+#: ../smime/gui/component.c:76
 msgid "Enter new password for certificate database"
 msgstr ""
 
-#: ../smime/gui/component.c:71
+#: ../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:116
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: ../smime/gui/e-cert-selector.c:117
+#: ../smime/gui/e-cert-selector.c:119
 #, c-format
 msgid ""
 "Issued by:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: ../smime/gui/e-cert-selector.c:169
+#: ../smime/gui/e-cert-selector.c:172
 msgid "Select certificate"
 msgstr ""
 
@@ -19189,7 +20242,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1088
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1093
 msgid "Certificate"
 msgstr "Atestilo"
 
@@ -19265,11 +20318,11 @@ msgstr ""
 msgid "Organizational Unit (OU)"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:825
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:829
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -19282,15 +20335,15 @@ msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: ../smime/gui/smime-ui.ui.h:35
-msgid "Trust this CA to identify email users."
+msgid "Trust this CA to identify _email users."
 msgstr ""
 
 #: ../smime/gui/smime-ui.ui.h:36
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify _software developers."
 msgstr ""
 
 #: ../smime/gui/smime-ui.ui.h:37
-msgid "Trust this CA to identify websites."
+msgid "Trust this CA to identify _websites."
 msgstr ""
 
 #: ../smime/gui/smime-ui.ui.h:38
@@ -19323,36 +20376,32 @@ msgstr "_Sekurkopio"
 msgid "_Edit CA Trust"
 msgstr ""
 
-#: ../smime/lib/e-cert-db.c:906
-msgid "Certificate already exists"
-msgstr "Atestilo jam ekzistas"
-
-#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
+#: ../smime/lib/e-cert.c:226 ../smime/lib/e-cert.c:236
 msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:414
+#: ../smime/lib/e-cert.c:413
 msgid "Sign"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:415
+#: ../smime/lib/e-cert.c:414
 msgid "Encrypt"
 msgstr "Ĉifradi"
 
-#: ../smime/lib/e-cert.c:527
+#: ../smime/lib/e-cert.c:526
 msgid "Version"
 msgstr "Versio"
 
-#: ../smime/lib/e-cert.c:542
+#: ../smime/lib/e-cert.c:541
 msgid "Version 1"
 msgstr "Versio 1"
 
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:544
 msgid "Version 2"
 msgstr "Versio 2"
 
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:547
 msgid "Version 3"
 msgstr "Versio 3"
 
@@ -19401,79 +20450,79 @@ msgstr ""
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:744
+#: ../smime/lib/e-cert.c:745
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-cert.c:753
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:775
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:779
+#: ../smime/lib/e-cert.c:780
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:794
+#: ../smime/lib/e-cert.c:795
 msgid "Subject's Public Key"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:816 ../smime/lib/e-cert.c:866
 msgid "Error: Unable to process extension"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
+#: ../smime/lib/e-cert.c:837 ../smime/lib/e-cert.c:849
 msgid "Object Signer"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:840
+#: ../smime/lib/e-cert.c:841
 msgid "SSL Certificate Authority"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:844
+#: ../smime/lib/e-cert.c:845
 msgid "Email Certificate Authority"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-cert.c:874
 msgid "Signing"
 msgstr "Signado"
 
-#: ../smime/lib/e-cert.c:876
+#: ../smime/lib/e-cert.c:878
 msgid "Non-repudiation"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:880
+#: ../smime/lib/e-cert.c:882
 msgid "Key Encipherment"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:884
+#: ../smime/lib/e-cert.c:886
 msgid "Data Encipherment"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:888
+#: ../smime/lib/e-cert.c:890
 msgid "Key Agreement"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:892
+#: ../smime/lib/e-cert.c:894
 msgid "Certificate Signer"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:896
+#: ../smime/lib/e-cert.c:898
 msgid "CRL Signer"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:947
 msgid "Critical"
 msgstr "Kritike"
 
-#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
+#: ../smime/lib/e-cert.c:949 ../smime/lib/e-cert.c:952
 msgid "Not Critical"
 msgstr "Ne kritike"
 
-#: ../smime/lib/e-cert.c:970
+#: ../smime/lib/e-cert.c:973
 msgid "Extensions"
 msgstr "Etendaĵoj"
 
@@ -19485,40 +20534,44 @@ msgstr "Etendaĵoj"
 #. * change this string, unless changing the order of
 #. * name and value.  As a result example:
 #. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-cert.c:1047
+#: ../smime/lib/e-cert.c:1051
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1102 ../smime/lib/e-cert.c:1225
+#: ../smime/lib/e-cert.c:1107 ../smime/lib/e-cert.c:1230
 msgid "Certificate Signature Algorithm"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:1111
+#: ../smime/lib/e-cert.c:1116
 msgid "Issuer"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:1166
+#: ../smime/lib/e-cert.c:1171
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:1185
+#: ../smime/lib/e-cert.c:1190
 msgid "Subject Unique ID"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:1231
+#: ../smime/lib/e-cert.c:1236
 msgid "Certificate Signature Value"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../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"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:250
+#: ../smime/lib/e-pkcs12.c:256
 msgid "Enter password for PKCS12 file:"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:352
+#: ../smime/lib/e-pkcs12.c:362
 msgid "Imported Certificate"
 msgstr ""
 
@@ -19599,41 +20652,41 @@ msgstr ""
 #: ../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:780
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:789
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
+#: ../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:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
 msgid "Time Zones"
 msgstr "Horzonoj"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
+#: ../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:5
+#: ../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:7
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:6
 msgid "_Selection"
 msgstr "_Elekto"
 
-#: ../widgets/menus/gal-define-views-dialog.c:348
+#: ../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:356
-#: ../widgets/menus/gal-define-views-dialog.c:358
+#: ../widgets/menus/gal-define-views-dialog.c:367
+#: ../widgets/menus/gal-define-views-dialog.c:369
 msgid "Define Views"
 msgstr ""
 
@@ -19646,7 +20699,7 @@ msgstr ""
 msgid "Table"
 msgstr "Tabelo"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:275
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Konservi aktualan vidon"
 
@@ -19674,17 +20727,79 @@ msgstr "Tipo de la vido"
 msgid "Type of view:"
 msgstr "Tipo de la vido:"
 
-#: ../widgets/misc/e-account-manager.c:353
-msgid "De_fault"
-msgstr "De_faŭlto"
+#: ../widgets/misc/ea-calendar-item.c:306
+#: ../widgets/misc/ea-calendar-item.c:315
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
 
-#: ../widgets/misc/e-account-tree-view.c:243
-msgid "Account Name"
-msgstr "Kontonomo"
+#: ../widgets/misc/ea-calendar-item.c:318
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Kalendaro: de %s al %s"
+
+#: ../widgets/misc/ea-calendar-item.c:354
+msgid "evolution calendar item"
+msgstr "Kalendar-elemento de Evolucio"
+
+#: ../widgets/misc/e-alert-bar.c:116
+msgid "Close this message"
+msgstr "Fermi tiun mesaĝon"
+
+#. 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"
+
+#. 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"
+
+#: ../widgets/misc/e-attachment.c:1850 ../widgets/misc/e-attachment.c:2647
+msgid "A load operation is already in progress"
+msgstr ""
+
+#: ../widgets/misc/e-attachment.c:1858 ../widgets/misc/e-attachment.c:2655
+msgid "A save operation is already in progress"
+msgstr ""
+
+#: ../widgets/misc/e-attachment.c:1950
+#, c-format
+msgid "Could not load '%s'"
+msgstr "Ne eblis ŝargi na '%s'"
+
+#: ../widgets/misc/e-attachment.c:1953
+#, c-format
+msgid "Could not load the attachment"
+msgstr ""
+
+#: ../widgets/misc/e-attachment.c:2226
+#, c-format
+msgid "Could not open '%s'"
+msgstr "Ne eblis malfermi na '%s'"
+
+#: ../widgets/misc/e-attachment.c:2229
+#, c-format
+msgid "Could not open the attachment"
+msgstr "Ne eblis malfermi aldonaĵon"
 
-#: ../widgets/misc/e-account-tree-view.c:274
-msgid "Protocol"
-msgstr "Protokolo"
+#: ../widgets/misc/e-attachment.c:2663
+msgid "Attachment contents not loaded"
+msgstr ""
+
+#: ../widgets/misc/e-attachment.c:2739
+#, c-format
+msgid "Could not save '%s'"
+msgstr "Ne eblis konservi na '%s'"
+
+#: ../widgets/misc/e-attachment.c:2742
+#, c-format
+msgid "Could not save the attachment"
+msgstr "Ne eblis konservi la aldonaĵon"
 
 #: ../widgets/misc/e-attachment-dialog.c:308
 msgid "Attachment Properties"
@@ -19699,7 +20814,7 @@ msgid "MIME Type:"
 msgstr "MIME-tipo:"
 
 #: ../widgets/misc/e-attachment-dialog.c:373
-#: ../widgets/misc/e-attachment-store.c:559
+#: ../widgets/misc/e-attachment-store.c:439
 msgid "_Suggest automatic display of attachment"
 msgstr ""
 
@@ -19735,133 +20850,81 @@ msgstr "Ŝargante"
 msgid "Saving"
 msgstr "Konservante"
 
-#: ../widgets/misc/e-attachment-paned.c:97
+#: ../widgets/misc/e-attachment-paned.c:100
 msgid "Hide Attachment _Bar"
 msgstr "Kaŝi aldonaĵ_breton"
 
-#: ../widgets/misc/e-attachment-paned.c:99
-#: ../widgets/misc/e-attachment-paned.c:639
+#: ../widgets/misc/e-attachment-paned.c:102
+#: ../widgets/misc/e-attachment-paned.c:712
 msgid "Show Attachment _Bar"
 msgstr "Montri aldonaĵ_breton"
 
-#: ../widgets/misc/e-attachment-store.c:547
+#: ../widgets/misc/e-attachment-store.c:427
 msgid "Add Attachment"
 msgstr "Aldoni aldonaĵo"
 
-#: ../widgets/misc/e-attachment-store.c:550
+#: ../widgets/misc/e-attachment-store.c:430
 msgid "A_ttach"
 msgstr "_Aldoni"
 
-#: ../widgets/misc/e-attachment-store.c:613
+#: ../widgets/misc/e-attachment-store.c:493
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Konservi aldonaĵon"
 msgstr[1] "Konservi aldonaĵojn"
 
-#. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:642
-#: ../widgets/misc/e-attachment.c:1809 ../widgets/misc/e-attachment.c:2351
-msgid "attachment.dat"
-msgstr "aldonajxo.dat"
+#: ../widgets/misc/e-attachment-view.c:404
+msgid "Open With Other Application..."
+msgstr ""
 
-#: ../widgets/misc/e-attachment-view.c:352
+#: ../widgets/misc/e-attachment-view.c:411
 msgid "S_ave All"
 msgstr "_Konservi ĉiujn"
 
-#: ../widgets/misc/e-attachment-view.c:378
+#: ../widgets/misc/e-attachment-view.c:437
 msgid "A_dd Attachment..."
 msgstr "_Alsodni aldonaĵon..."
 
-#: ../widgets/misc/e-attachment-view.c:402
+#: ../widgets/misc/e-attachment-view.c:461
 msgid "_Hide"
-msgstr "Kaŝi"
+msgstr "_Kaŝi"
 
-#: ../widgets/misc/e-attachment-view.c:409
+#: ../widgets/misc/e-attachment-view.c:468
 msgid "Hid_e All"
 msgstr "Kaŝ_i ĉiujn"
 
-#: ../widgets/misc/e-attachment-view.c:416
+#: ../widgets/misc/e-attachment-view.c:475
 msgid "_View Inline"
 msgstr ""
 
-#: ../widgets/misc/e-attachment-view.c:423
+#: ../widgets/misc/e-attachment-view.c:482
 msgid "Vie_w All Inline"
 msgstr ""
 
-#: ../widgets/misc/e-attachment-view.c:741
+#: ../widgets/misc/e-attachment-view.c:803
 #, c-format
-msgid "Open with \"%s\""
+msgid "Open With \"%s\""
 msgstr "Malfermi per \"%s\""
 
-#: ../widgets/misc/e-attachment-view.c:744
+#: ../widgets/misc/e-attachment-view.c:806
 #, c-format
 msgid "Open this attachment in %s"
 msgstr ""
 
-#. 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:997
-msgid "Attached message"
-msgstr "Aldonita mesaĝo"
-
-#: ../widgets/misc/e-attachment.c:1852 ../widgets/misc/e-attachment.c:2653
-msgid "A load operation is already in progress"
-msgstr ""
-
-#: ../widgets/misc/e-attachment.c:1860 ../widgets/misc/e-attachment.c:2661
-msgid "A save operation is already in progress"
-msgstr ""
-
-#: ../widgets/misc/e-attachment.c:1952
-#, c-format
-msgid "Could not load '%s'"
-msgstr ""
-
-#: ../widgets/misc/e-attachment.c:1955
-#, c-format
-msgid "Could not load the attachment"
-msgstr ""
-
-#: ../widgets/misc/e-attachment.c:2231
-#, c-format
-msgid "Could not open '%s'"
-msgstr "Ne povis malfermi '%s'"
-
-#: ../widgets/misc/e-attachment.c:2234
-#, c-format
-msgid "Could not open the attachment"
-msgstr "Ne eblis malfermi aldonaĵon"
-
-#: ../widgets/misc/e-attachment.c:2669
-msgid "Attachment contents not loaded"
-msgstr ""
-
-#: ../widgets/misc/e-attachment.c:2745
-#, c-format
-msgid "Could not save '%s'"
-msgstr "Ne eblis konservi '%s'"
-
-#: ../widgets/misc/e-attachment.c:2748
-#, c-format
-msgid "Could not save the attachment"
-msgstr "Ne ablis konservi la aldonaĵ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:363
+#: ../widgets/misc/e-buffer-tagger.c:387
 msgid "Ctrl-click to open a link"
 msgstr ""
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1247
-msgid "%B %Y"
-msgstr "%B %Y"
-
 #: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr "Monata kalendaro"
 
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../widgets/misc/e-calendar-item.c:1250
+msgid "%B %Y"
+msgstr "%B %Y"
+
 #: ../widgets/misc/e-charset-combo-box.c:96
 msgid "Character Encoding"
 msgstr ""
@@ -19874,7 +20937,7 @@ msgstr ""
 msgid "Other..."
 msgstr "Alia..."
 
-#: ../widgets/misc/e-contact-map-window.c:347
+#: ../widgets/misc/e-contact-map-window.c:355
 msgid "Contacts Map"
 msgstr "Kontakt-mapo"
 
@@ -19903,23 +20966,23 @@ msgid "_Today"
 msgstr "_Hodiaŭ"
 
 #. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
+#. * is not permitted.
 #: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "_Neniu"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1686 ../widgets/misc/e-dateedit.c:1918
+#: ../widgets/misc/e-dateedit.c:1688 ../widgets/misc/e-dateedit.c:1921
 msgctxt "date"
 msgid "None"
 msgstr "Neniu"
 
-#: ../widgets/misc/e-dateedit.c:1813
+#: ../widgets/misc/e-dateedit.c:1815
 msgid "Invalid Date Value"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:1857
+#: ../widgets/misc/e-dateedit.c:1859
 msgid "Invalid Time Value"
 msgstr ""
 
@@ -19943,7 +21006,7 @@ msgid "File _type:"
 msgstr "Dosier-_tipo:"
 
 #: ../widgets/misc/e-import-assistant.c:333
-#: ../widgets/misc/e-import-assistant.c:910
+#: ../widgets/misc/e-import-assistant.c:913
 msgid "Choose the destination for this import"
 msgstr ""
 
@@ -19967,64 +21030,64 @@ msgid ""
 msgstr ""
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:767
+#: ../widgets/misc/e-import-assistant.c:768
 msgid "_Cancel Import"
 msgstr ""
 
-#: ../widgets/misc/e-import-assistant.c:909
+#: ../widgets/misc/e-import-assistant.c:912
 msgid "Preview data to be imported"
 msgstr ""
 
-#: ../widgets/misc/e-import-assistant.c:915
-#: ../widgets/misc/e-import-assistant.c:928
-#: ../widgets/misc/e-import-assistant.c:1273
-#: ../widgets/misc/e-import-assistant.c:1349
-#: ../widgets/misc/e-import-assistant.c:1358
+#: ../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 ""
 
-#: ../widgets/misc/e-import-assistant.c:923
+#: ../widgets/misc/e-import-assistant.c:926
 msgid "Select what type of file you want to import from the list."
 msgstr ""
 
-#: ../widgets/misc/e-import-assistant.c:1263
-#: ../widgets/misc/e-import-assistant.c:1298
+#: ../widgets/misc/e-import-assistant.c:1266
+#: ../widgets/misc/e-import-assistant.c:1301
 msgid "Evolution Import Assistant"
 msgstr "Enport-asistanto de Evolucio"
 
-#: ../widgets/misc/e-import-assistant.c:1280
-#: ../widgets/misc/e-import-assistant.c:1336
+#: ../widgets/misc/e-import-assistant.c:1283
+#: ../widgets/misc/e-import-assistant.c:1339
 msgid "Import Location"
 msgstr ""
 
-#: ../widgets/misc/e-import-assistant.c:1291
+#: ../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 ""
 
-#: ../widgets/misc/e-import-assistant.c:1308
+#: ../widgets/misc/e-import-assistant.c:1311
 msgid "Importer Type"
 msgstr ""
 
-#: ../widgets/misc/e-import-assistant.c:1318
+#: ../widgets/misc/e-import-assistant.c:1321
 msgid "Select Information to Import"
 msgstr ""
 
-#: ../widgets/misc/e-import-assistant.c:1327
+#: ../widgets/misc/e-import-assistant.c:1330
 msgid "Select a File"
 msgstr "Elekti dosieron"
 
-#: ../widgets/misc/e-import-assistant.c:1344
+#: ../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."
 
-#: ../widgets/misc/e-map.c:869
+#: ../widgets/misc/e-map.c:883
 msgid "World Map"
 msgstr "Mondmapo"
 
-#: ../widgets/misc/e-map.c:872
+#: ../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."
@@ -20048,52 +21111,52 @@ msgstr "Evolucio nun estas nekonektite ĉar la reto ne disponeblas."
 msgid "Evolution Preferences"
 msgstr "Evolucio-agordoj"
 
-#: ../widgets/misc/e-search-bar.c:79
+#: ../widgets/misc/e-search-bar.c:81
 #, c-format
 msgid "Matches: %d"
 msgstr ""
 
-#: ../widgets/misc/e-search-bar.c:561
+#: ../widgets/misc/e-search-bar.c:563
 msgid "Close the find bar"
 msgstr ""
 
-#: ../widgets/misc/e-search-bar.c:569
+#: ../widgets/misc/e-search-bar.c:571
 msgid "Fin_d:"
 msgstr "_Serĉi:"
 
-#: ../widgets/misc/e-search-bar.c:581
+#: ../widgets/misc/e-search-bar.c:583
 msgid "Clear the search"
 msgstr ""
 
-#: ../widgets/misc/e-search-bar.c:605
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Previous"
 msgstr "_Antaŭa"
 
-#: ../widgets/misc/e-search-bar.c:611
+#: ../widgets/misc/e-search-bar.c:613
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../widgets/misc/e-search-bar.c:624
+#: ../widgets/misc/e-search-bar.c:626
 msgid "_Next"
 msgstr "_Sekva"
 
-#: ../widgets/misc/e-search-bar.c:630
+#: ../widgets/misc/e-search-bar.c:632
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../widgets/misc/e-search-bar.c:643
+#: ../widgets/misc/e-search-bar.c:645
 msgid "Mat_ch case"
 msgstr ""
 
-#: ../widgets/misc/e-search-bar.c:671
+#: ../widgets/misc/e-search-bar.c:673
 msgid "Reached bottom of page, continued from top"
 msgstr ""
 
-#: ../widgets/misc/e-search-bar.c:693
+#: ../widgets/misc/e-search-bar.c:695
 msgid "Reached top of page, continued from bottom"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.c:543
+#: ../widgets/misc/e-send-options.c:552
 msgid "When de_leted:"
 msgstr ""
 
@@ -20278,67 +21341,53 @@ msgstr ""
 msgid "Click here to go to URL"
 msgstr ""
 
-#: ../widgets/misc/e-web-view.c:408
+#: ../widgets/misc/e-web-view.c:410
 msgid "_Copy Link Location"
 msgstr ""
 
-#: ../widgets/misc/e-web-view.c:410
+#: ../widgets/misc/e-web-view.c:412
 msgid "Copy the link to the clipboard"
 msgstr ""
 
-#: ../widgets/misc/e-web-view.c:418
+#: ../widgets/misc/e-web-view.c:420
 msgid "_Open Link in Browser"
 msgstr "_Malfermi ligilon per foliumilo"
 
-#: ../widgets/misc/e-web-view.c:420
+#: ../widgets/misc/e-web-view.c:422
 msgid "Open the link in a web browser"
 msgstr "Malfermi la ligilon per foliumilo"
 
-#: ../widgets/misc/e-web-view.c:428
+#: ../widgets/misc/e-web-view.c:430
 msgid "_Copy Email Address"
 msgstr "_Kopii la retpoŝtadreson"
 
-#: ../widgets/misc/e-web-view.c:445
+#: ../widgets/misc/e-web-view.c:447
 msgid "_Copy Image"
 msgstr "_Kopii bildon"
 
-#: ../widgets/misc/e-web-view.c:447
+#: ../widgets/misc/e-web-view.c:449
 msgid "Copy the image to the clipboard"
 msgstr "Kopii la bildon en la tondujon"
 
-#: ../widgets/misc/e-web-view.c:467 ../widgets/misc/e-web-view.c:1292
+#: ../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"
 
-#: ../widgets/misc/e-web-view.c:956 ../widgets/misc/e-web-view.c:958
-#: ../widgets/misc/e-web-view.c:960
+#: ../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 ""
 
-#: ../widgets/misc/e-web-view.c:962
+#: ../widgets/misc/e-web-view.c:988
 msgid "Click to hide/unhide addresses"
 msgstr ""
 
-#: ../widgets/misc/e-web-view.c:964
+#: ../widgets/misc/e-web-view.c:990
 #, c-format
 msgid "Click to open %s"
 msgstr "Klaki por malfermi %s"
 
-#: ../widgets/misc/ea-calendar-item.c:302
-#: ../widgets/misc/ea-calendar-item.c:311
-msgid "%d %B %Y"
-msgstr "%d %B %Y"
-
-#: ../widgets/misc/ea-calendar-item.c:314
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "Kalendaro: de %s al %s"
-
-#: ../widgets/misc/ea-calendar-item.c:350
-msgid "evolution calendar item"
-msgstr "Kalendar-elemento de Evolucio"
-
 #: ../widgets/table/e-cell-combo.c:187
 msgid "popup list"
 msgstr ""
@@ -20362,38 +21411,38 @@ msgstr ""
 msgid "The time must be in the format: %s"
 msgstr ""
 
-#: ../widgets/table/e-cell-percent.c:76
+#: ../widgets/table/e-cell-percent.c:80
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: ../widgets/table/e-table-click-to-add.c:594
+#: ../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:141
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:143
 msgid "click to add"
 msgstr "klaku por aldoni"
 
-#: ../widgets/table/e-table-config.c:387 ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
 msgid "(Ascending)"
 msgstr ""
 
-#: ../widgets/table/e-table-config.c:387 ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
 msgid "(Descending)"
 msgstr ""
 
-#: ../widgets/table/e-table-config.c:394
+#: ../widgets/table/e-table-config.c:400
 msgid "Not sorted"
 msgstr "Ne ordigite"
 
-#: ../widgets/table/e-table-config.c:435
+#: ../widgets/table/e-table-config.c:441
 msgid "No grouping"
 msgstr "Ne grupite"
 
-#: ../widgets/table/e-table-config.c:659
+#: ../widgets/table/e-table-config.c:666
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Montri kampojn"
 
-#: ../widgets/table/e-table-config.c:679
+#: ../widgets/table/e-table-config.c:686
 msgid "Available Fields"
 msgstr "Disponeblaj kampoj"
 
@@ -20402,20 +21451,20 @@ msgid "A_vailable Fields:"
 msgstr "_Disponeblaj kampoj:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1679
+#: ../widgets/table/e-table-header-item.c:1721
 msgid "Ascending"
 msgstr "Kreskante"
 
 #: ../widgets/table/e-table-config.ui.h:3
 msgid "Clear All"
-msgstr "Vakigii ĉion"
+msgstr "Vakigi ĉion"
 
 #: ../widgets/table/e-table-config.ui.h:4
 msgid "Clear _All"
-msgstr "Vakigii ĉi_on"
+msgstr "Vakigi ĉi_on"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1679
+#: ../widgets/table/e-table-header-item.c:1721
 msgid "Descending"
 msgstr "Malkreskante"
 
@@ -20479,24 +21528,24 @@ msgstr ""
 msgid "_Sort..."
 msgstr "_Ordigi..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:119
-msgid "Add a Column"
-msgstr ""
-
 #: ../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 ""
 
+#: ../widgets/table/e-table-field-chooser-dialog.c:119
+msgid "Add a Column"
+msgstr ""
+
 #. 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)"
+#. * 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:353
+#: ../widgets/table/e-table-group-container.c:361
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -20504,75 +21553,79 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. 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)"
+#. * 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:365
+#: ../widgets/table/e-table-group-container.c:373
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../widgets/table/e-table-header-item.c:1523
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "Customize Current View"
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1544
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Sort _Ascending"
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1547
+#: ../widgets/table/e-table-header-item.c:1586
 msgid "Sort _Descending"
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1550
+#: ../widgets/table/e-table-header-item.c:1589
 msgid "_Unsort"
 msgstr "_Neordigite"
 
-#: ../widgets/table/e-table-header-item.c:1553
+#: ../widgets/table/e-table-header-item.c:1592
 msgid "Group By This _Field"
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1556
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "Group By _Box"
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1599
 msgid "Remove This _Column"
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1563
+#: ../widgets/table/e-table-header-item.c:1602
 msgid "Add a C_olumn..."
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1567
+#: ../widgets/table/e-table-header-item.c:1606
 msgid "A_lignment"
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1570
+#: ../widgets/table/e-table-header-item.c:1609
 msgid "B_est Fit"
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1573
+#: ../widgets/table/e-table-header-item.c:1612
 msgid "Format Column_s..."
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1577
+#: ../widgets/table/e-table-header-item.c:1616
 msgid "Custo_mize Current View..."
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1636
+#: ../widgets/table/e-table-header-item.c:1678
 msgid "_Sort By"
 msgstr "_Ordigi laŭ"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1654
+#: ../widgets/table/e-table-header-item.c:1696
 msgid "_Custom"
 msgstr "_Propre"
 
+#: ../widgets/table/gal-a11y-e-cell.c:123
+msgid "Table Cell"
+msgstr "Tabela ĉelo"
+
 #. Translators: description of a "popup" action
 #: ../widgets/table/gal-a11y-e-cell-popup.c:125
 msgid "popup a child"
@@ -20593,26 +21646,100 @@ msgstr ""
 msgid "collapses the row in the ETree containing this cell"
 msgstr "maletendas la vicon en la ETree enhavanta ĉi tiun ĉelon"
 
-#: ../widgets/table/gal-a11y-e-cell.c:121
-msgid "Table Cell"
-msgstr "Tabela ĉelo"
-
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:71
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:72
 msgid "click"
 msgstr "klaki"
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:157
+#: ../widgets/table/gal-a11y-e-table-column-header.c:158
 msgid "sort"
 msgstr "ordigi"
 
-#: ../widgets/text/e-text.c:2306
+#: ../widgets/text/e-text.c:2328
 msgid "Select All"
 msgstr "Elekti ĉiujn"
 
-#: ../widgets/text/e-text.c:2318
+#: ../widgets/text/e-text.c:2340
 msgid "Input Methods"
 msgstr "Enigaj metodoj"
 
+#~ msgid "Edit Alarm"
+#~ msgstr "Redakti alarmon"
+
+#~ msgid "Add Alarm"
+#~ msgstr "Aldoni alarmon"
+
+#~ msgid "Alarm"
+#~ msgstr "Alarmo"
+
+#~ msgid "Alarms"
+#~ msgstr "Alarmoj"
+
+#~ msgid "Click here to save the current window"
+#~ msgstr "Klaku ĉi tie por konservi la aktualan fenestron"
+
+#~ msgid "Click here to attach a file"
+#~ msgstr "Klaku ĉi tie por aldoni dosieron"
+
+#~ msgid "_Alarms"
+#~ msgstr "_Alarmoj"
+
+#~ msgctxt "cal-alarms"
+#~ msgid "None"
+#~ msgstr "Neniu"
+
+#~ msgid "Custom Alarm:"
+#~ msgstr "Propra alarm:"
+
+#~ msgid "_Alarm"
+#~ msgstr "_Alarmo"
+
+#~ msgid "_Group:"
+#~ msgstr "_Grupo:"
+
+#~ msgid "It has alarms."
+#~ msgstr "Ĝi havas alarmojn."
+
+#~ msgctxt "iCalImp"
+#~ 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."
+
+#~ msgid "Migrating..."
+#~ msgstr "Migrigado..."
+
+#~ msgid "Migration"
+#~ msgstr "Migrigado"
+
+#~ msgid "Migrating '%s':"
+#~ msgstr "Migrigado '%s'"
+
+#~ msgid "Migrating Folders"
+#~ msgstr "Migrigad-dosierujoj"
+
+#~ msgid "Local Folders"
+#~ msgstr "Lokaj dosierujoj"
+
+#~ msgid "Alarm programs"
+#~ msgstr "Alarmprogramoj"
+
+#~ msgid "Save as iCalendar..."
+#~ msgstr "Konservi kiel iCalendar..."
+
+#~ msgctxt "mail-junk-hook"
+#~ msgid "None"
+#~ msgstr "Nenio"
+
+#~ msgid "E-Mail Address"
+#~ msgstr "Retpoŝtadreso"
+
+#~ msgid "Protocol"
+#~ msgstr "Protokolo"
+
 #~ msgid "(map)"
 #~ msgstr "(mapo)"
 
@@ -20739,9 +21866,6 @@ msgstr "Enigaj metodoj"
 #~ msgid "iCalendar Error"
 #~ msgstr "iCalendar-eraro"
 
-#~ msgid "Meeting Information"
-#~ msgstr "Kunsidinformo"
-
 #~ msgid "Task Information"
 #~ msgstr "Taskinformo"
 
@@ -20810,9 +21934,6 @@ msgstr "Enigaj metodoj"
 #~ msgid "(Note: Requires restart of the application)"
 #~ msgstr "(Rimarkigo: Tio ĉi necesigas restartigon de la programo)"
 
-#~ msgid "Checks incoming mail messages to be Junk"
-#~ msgstr "Kontrolu alvenantajn poŝtaĵojn pri nedezirateco"
-
 #~ msgid "KB"
 #~ msgstr "KB"
 
@@ -20838,8 +21959,5 @@ msgstr "Enigaj metodoj"
 #~ msgid "Sent from Ubuntu"
 #~ msgstr "Sendita de Ubuntu"
 
-#~ msgid "Evolution Mail"
-#~ msgstr "Retpoŝto de Evolucio"
-
 #~ msgid "Read and write emails"
 #~ msgstr "Legi kaj skribi retpoŝtojn"
author	Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>	2012-01-06 22:29:13 +0800
committer	Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>	2012-01-06 22:29:13 +0800
commit	885a1f44666b6f6e51c9b6bc4b170410befbd41d (patch)
tree	b7220a4971abc133b1b59946416913fb470bc6d1 /po
parent	0a016671ee2b5004df4fd2bca80f0e34e68476c3 (diff)
download	gsoc2013-evolution-885a1f44666b6f6e51c9b6bc4b170410befbd41d.tar gsoc2013-evolution-885a1f44666b6f6e51c9b6bc4b170410befbd41d.tar.gz gsoc2013-evolution-885a1f44666b6f6e51c9b6bc4b170410befbd41d.tar.bz2 gsoc2013-evolution-885a1f44666b6f6e51c9b6bc4b170410befbd41d.tar.lz gsoc2013-evolution-885a1f44666b6f6e51c9b6bc4b170410befbd41d.tar.xz gsoc2013-evolution-885a1f44666b6f6e51c9b6bc4b170410befbd41d.tar.zst gsoc2013-evolution-885a1f44666b6f6e51c9b6bc4b170410befbd41d.zip