Merge branch 'master' into wip/gsettings

5 files changed, 2995 insertions, 2218 deletions

diff --git a/help/de/de.po b/help/de/de.po
index 1a3358079b..e92d098b69 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -29,15 +29,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: manual_evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 13:04+0000\n"
-"PO-Revision-Date: 2011-09-24 23:11+0100\n"
+"POT-Creation-Date: 2011-10-13 12:49+0000\n"
+"PO-Revision-Date: 2011-10-14 21:17+0100\n"
 "Last-Translator: Mario Blättermann <mariobl@freenet.de>\n"
-"Language-Team: Deutsch <gnome-de@gnome.org>\n"
+"Language-Team: Deutsch <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: \n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Lokalize 0.3\n"
 "X-Poedit-Language: German\n"
 "X-Poedit-Country: GERMANY\n"
@@ -46,6 +46,8 @@ msgstr ""
 msgid ""
 "Using and managing categories for appointments, contacts, memos and tasks."
 msgstr ""
+"Kategorien für Termine, Kontakte, Notizen und Aufgaben verwenden und "
+"verwalten."
 
 #: C/using-categories.page:13(name) C/tasks-webdav.page:11(name)
 #: C/tasks-using-several-tasklists.page:11(name) C/tasks-usage.page:11(name)
@@ -599,7 +601,6 @@ msgid "Using Categories"
 msgstr "Kategorien verwenden"
 
 #: C/using-categories.page:27(p)
-#, fuzzy
 msgid ""
 "Another way to group contacts, appointments, tasks and memos (summarized by "
 "the term \"objects\" in the following text) is to mark them as belonging to "
@@ -608,12 +609,12 @@ msgid ""
 "the \"Business\" category because he works with you and the \"Friends\" "
 "category because he is a friend."
 msgstr ""
-"Eine andere Art Kontakte zu gruppieren ist es, diese als verschiedenen "
-"Kategorien zugehörig zu markieren. Sie können einem Kontakt mehrere oder gar "
-"keine Kategorien zuweisen. Sie können einen Kontakt zum Beispiel in die "
-"<guilabel>Geschäftlich</guilabel>-Kategorie einordnen, da er mit Ihnen "
-"arbeitet, und in die <guilabel>Persönlich</guilabel>-Kategorie da er ein "
-"Freund ist."
+"Eine andere Methode, wie Sie Kontakte, Termine, Aufgaben und Notizen (im "
+"Folgenden unter dem Begriff »Objekte« zusammengefasst) ordnen können, besteht "
+"darin, ihnen verschiedene Kategorien zuzuweisen. Sie können einem Objekt "
+"mehrere oder gar keine Kategorien zuordnen. Sie können zum Beispiel in Ihrem "
+"Adressbuch einen Freund in der Kategorie »Geschäftlich« einordnen, da er mit "
+"Ihnen arbeitet, und in die Kategorie »Freunde«, da er ein Freund ist."
 
 #: C/using-categories.page:29(p)
 msgid ""
@@ -621,10 +622,13 @@ msgid ""
 "corresponding category in the quick <link xref=\"searching-items\">search</"
 "link> bar."
 msgstr ""
+"Um nur die Objekte einer bestimmten Kategorie anzuzeigen, wählen Sie die "
+"entsprechende Kategorie in der Leiste für die schnelle <link xref=\"searching-"
+"items\">Suche</link>."
 
 #: C/using-categories.page:32(title)
 msgid "Setting categories for an object"
-msgstr ""
+msgstr "Einem Objekt Kategorien zuweisen"
 
 #: C/using-categories.page:34(p)
 msgid "To mark an object as belonging to a category,"
@@ -641,6 +645,9 @@ msgid ""
 "Click <gui style=\"button\">Categories...</gui>. (If this button is not "
 "available, select <guiseq><gui>View</gui><gui>Categories</gui></guiseq>.)"
 msgstr ""
+"Klicken Sie auf <gui style=\"button\">Kategorien …</gui> (Wenn dieser Knopf "
+"nicht vorhanden ist, wählen Sie <guiseq><gui>Ansicht</gui><gui>Kategorien</"
+"gui></guiseq>.)"
 
 #: C/using-categories.page:38(p)
 msgid ""
@@ -660,13 +667,16 @@ msgid ""
 "own categories either directly via <guiseq><gui>Edit</gui><gui>Available "
 "Categories</gui></guiseq>, or indirectly when editing an object:"
 msgstr ""
+"Wenn die vorgegebene Kategorienliste Ihren Bedürfnisse nicht entspricht, "
+"können Sie Ihre eigenen Kategorien hinzufügen, entweder direkt über "
+"<guiseq><gui>Bearbeiten</gui><gui>Verfügbare Kategorien</gui></guiseq> oder "
+"indirekt, wenn Sie ein Objekt bearbeiten:"
 
 #: C/using-categories.page:48(p)
-#, fuzzy
 msgid "Double-click any object to bring up th corresponding editor."
 msgstr ""
-"Klicken Sie doppelt auf den Kontakt, damit das Kontakt-Editor-Fenster "
-"geöffnet wird."
+"Klicken Sie doppelt auf ein beliebiges Objekt, um den entsprechenden Editor "
+"zu öffnen."
 
 #: C/using-categories.page:50(p)
 msgid "Enter the new category in the entry box at the top."
@@ -689,56 +699,57 @@ msgid "Click <gui style=\"button\">OK</gui>."
 msgstr "Klicken Sie auf <gui style=\"button\">OK</gui>."
 
 #: C/using-categories.page:52(p)
-#, fuzzy
 msgid ""
 "You can now see the category in the <gui>Categories</gui> text field in the "
 "editor."
 msgstr ""
-"Sie können sehen, dass der Kategoriename im Textfeld rechts neben dem "
-"»Kategorien«-Knopf im Kontakt-Editor erscheint."
+"Sie können nun die Kategorie im Textfeld <gui>Kategorien</gui> im Editor "
+"sehen."
 
 #: C/using-categories.page:56(p)
-#, fuzzy
 msgid ""
 "In the <gui>Categories Editor</gui> you can edit or set the color and icon "
 "for each category available by clicking <gui style=\"button\">Edit</gui> at "
 "the bottom of the <gui>Categories</gui> window. Press <gui style=\"button"
 "\">Delete</gui> to delete categories from the list."
 msgstr ""
-"Sie können in der Kategorienliste jeder Kategorie eine Farbe und ein kleines "
-"Symbol zuweisen, indem Sie auf »Bearbeiten« unten im Kategorien-Fenster "
-"klicken. Klicken Sie auf »Löschen«, wenn Sie Kategorien aus der Liste "
-"entfernen möchten."
+"Im <gui>Kategorie-Editor</gui> können Sie für jede Kategorie die Farbe und "
+"das Symbol bearbeiten oder zuweisen, indem Sie auf <gui style=\"button"
+"\">Bearbeiten</gui> unten im <gui>Kategorien</gui>-Fenster klicken. Klicken "
+"Sie auf <gui style=\"button\">Löschen</gui>, wenn Sie Kategorien aus der "
+"Liste entfernen möchten."
 
 #: C/tasks-webdav.page:5(desc)
 msgid "Using an online WebDAV task list or memo list."
-msgstr ""
+msgstr "Eine Online-WebDAV-Aufgaben- oder -Notizenliste verwenden."
 
 #: C/tasks-webdav.page:20(title)
 msgid "Using a WebDAV task or memo list"
-msgstr ""
+msgstr "Eine WebDAV-Aufgaben- oder -Notizenliste verwenden"
 
 #: C/tasks-webdav.page:22(p)
 msgid "Lists of this type are read-only."
-msgstr ""
+msgstr "Listen dieser Art können nur gelesen werden."
 
 #: C/tasks-webdav.page:24(p) C/tasks-caldav.page:22(p)
 msgid ""
 "To add such a task list or memo list to Evolution, perform the following "
 "steps:"
-msgstr ""
+msgstr "So fügen Sie eine Aufgaben- oder Notizenliste zu Evolution hinzu:"
 
 #: C/tasks-webdav.page:26(p) C/tasks-local.page:24(p) C/tasks-caldav.page:24(p)
 msgid ""
 "Click <guiseq><gui>File</gui><gui>New</gui><gui>Task List</gui></guiseq> or "
 "<guiseq><gui>File</gui><gui>New</gui><gui>Memo List</gui></guiseq>."
 msgstr ""
+"Klicken Sie <guiseq><gui>Datei</gui><gui>Neu</gui><gui>Aufgabenliste</gui></"
+"guiseq> oder <guiseq><gui>Datei</gui><gui>Neu</gui><gui>Notizliste</gui></"
+"guiseq>."
 
 #: C/tasks-webdav.page:27(p) C/tasks-caldav.page:25(p)
 #: C/calendar-webdav.page:27(p)
-#, fuzzy
 msgid "Select the type <gui>On the Web</gui>."
-msgstr "gpg <placeholder-1/>"
+msgstr "Wählen Sie die Art <gui>Im Web</gui>."
 
 #: C/tasks-webdav.page:28(p) C/tasks-local.page:26(p) C/tasks-caldav.page:26(p)
 #: C/contacts-using-contact-lists.page:33(p) C/contacts-local.page:26(p)
@@ -747,14 +758,14 @@ msgstr "gpg <placeholder-1/>"
 #: C/calendar-local.page:26(p) C/calendar-google.page:30(p)
 #: C/calendar-caldav.page:29(p)
 msgid "Enter a name that you prefer."
-msgstr ""
+msgstr "Geben Sie den gewünschten Namen ein."
 
 #: C/tasks-webdav.page:29(p) C/tasks-local.page:27(p) C/tasks-caldav.page:27(p)
 #: C/calendar-webdav.page:29(p) C/calendar-weather.page:29(p)
 #: C/calendar-local.page:27(p) C/calendar-google.page:31(p)
 #: C/calendar-caldav.page:30(p)
 msgid "Optionally choose a color that you prefer."
-msgstr ""
+msgstr "Wählen Sie optional die gewünschte Farbe."
 
 #: C/tasks-webdav.page:30(p) C/tasks-caldav.page:28(p)
 #: C/contacts-google.page:28(p) C/calendar-webdav.page:30(p)
@@ -763,11 +774,11 @@ msgstr ""
 msgid ""
 "Choose if you want to be able to view the content also when being offline."
 msgstr ""
+"Wählen Sie, ob Sie den Inhalt auch sehen können wollen, wenn Sie offline sind."
 
 #: C/tasks-webdav.page:31(p) C/tasks-caldav.page:29(p)
-#, fuzzy
 msgid "Enter the address of the list in the <gui>URL</gui> field."
-msgstr "Geben Sie den Namen des neuen Ordners in das Ordnername-Feld ein."
+msgstr "Geben Sie die Adresse der Liste im <gui>URL</gui>-Feld ein."
 
 #: C/tasks-webdav.page:32(p) C/tasks-caldav.page:30(p)
 #: C/mail-sending-options-smtp.page:39(p) C/contacts-google.page:30(p)
@@ -775,6 +786,8 @@ msgstr "Geben Sie den Namen des neuen Ordners in das Ordnername-Feld ein."
 #: C/calendar-caldav.page:33(p)
 msgid "Choose <gui>Use secure connection</gui> if you want to connect securely."
 msgstr ""
+"Wählen Sie <gui>Sichere Verbindung verwenden</gui>, wenn Sie sich sicher "
+"verbinden wollen."
 
 #: C/tasks-webdav.page:33(p) C/mail-sending-options-smtp.page:36(p)
 #: C/calendar-webdav.page:33(p)
@@ -790,20 +803,19 @@ msgid "Click <gui style=\"button\">Apply</gui>."
 msgstr "Klicken Sie auf <gui style=\"button\">Anwenden</gui>."
 
 #: C/tasks-webdav.page:37(p)
-#, fuzzy
 msgid "The list will be added in Evolution."
-msgstr "Wetterkalender zu Evolution hinzufügen."
+msgstr "Die Liste wird zu Evolution hinzugefügt."
 
 #: C/tasks-using-several-tasklists.page:5(desc)
 msgid "Adding and using more than one task list or memo list."
 msgstr ""
+"Aufgaben- und Notizenlisten hinzufügen und mehr als eine Liste verwenden."
 
 #: C/tasks-using-several-tasklists.page:20(title)
 msgid "Using several task lists or memo lists"
-msgstr ""
+msgstr "Mehrere Aufgaben- oder Notizenlisten verwenden"
 
 #: C/tasks-using-several-tasklists.page:22(p)
-#, fuzzy
 msgid ""
 "You can have multiple task or memo lists and choose which of your lists get "
 "displayed. For example, you might have tasks for work, tasks for home, and "
@@ -811,60 +823,61 @@ msgid ""
 "lists, and you can select or deselect any of the boxes next to them to show "
 "and hide the corresponding tasks or memos in your view."
 msgstr ""
-"In Evolution können Sie mehrere Kalender benutzen und diese gleichzeitig "
-"darstellen lassen. So können Sie zum Beispiel einen Kalender für Ihre "
-"Arbeitstermine, einen Kalender für Ihre privaten Termine, und einen für Ihre "
-"Lieblingssportmannschaft haben. In der Seitenleiste werden diese Kalender "
-"aufgelistet, und Sie können durch das Aus- und Abwählen der Ankreuzfelder "
-"neben den Namen entscheiden, welche Einträge in Ihrer Kalenderansicht "
-"angezeigt werden sollen. Indem Sie verschiedene Auswahlen von Termine "
-"anzeigen lassen, können Sie Terminkonflikte und zu viel Durcheinander in der "
-"Kalenderansicht vermeiden."
+"Sie können mehrere Aufgaben- oder Notizenlisten verwenden und auswählen, "
+"welche Ihrer Listen angezeigt werden. So können Sie zum Beispiel Aufgaben für "
+"die Arbeit, für zu Hause und für den Gesangverein, in dem Sie Mitglied sind, "
+"haben. In der Seitenleiste werden diese Listen aufgelistet, und Sie können "
+"durch das Aus- und Abwählen der Ankreuzfelder neben den Namen entscheiden, ob "
+"die entsprechenden Aufgaben und Notizen in Ihrer Ansicht angezeigt oder "
+"verborgen werden."
 
 #: C/tasks-using-several-tasklists.page:24(p)
-#, fuzzy
 msgid "Tasks and memos from each task or memo list appear as different colors."
-msgstr "Die Termine jeden Kalenders erscheinen in einer anderen Farbe."
+msgstr ""
+"Die Aufgaben und Notizen jeder Aufgaben- oder Notizenliste erscheinen in "
+"einer anderen Farbe."
 
 #: C/tasks-using-several-tasklists.page:26(p)
 msgid ""
 "You can also use lists that are not on your computer, such as on the internet."
 msgstr ""
+"Sie können auch Listen verwenden, die nicht auf Ihrem Rechner sind, etwa "
+"solche im Internet."
 
 #: C/tasks-usage.page:5(desc)
 msgid "On adding, editing, and deleting tasks."
-msgstr ""
+msgstr "Über das Hinzufügen, Bearbeiten und Löschen von Aufgaben."
 
 #: C/tasks-usage.page:20(title)
 msgid "Add, Edit, and Delete Tasks"
 msgstr "Aufgaben hinzufügen, bearbeiten und löschen"
 
 #: C/tasks-usage-edit-task.page:5(desc)
-#, fuzzy
 msgid "Editing a task in your task list."
-msgstr "Diese Aufgabe wurde in keiner Aufgabenliste gefunden"
+msgstr "Eine Aufgabe in Ihrer Aufgabenliste bearbeiten."
 
 #: C/tasks-usage-edit-task.page:20(title)
 msgid "Editing a Task"
 msgstr "Eine Aufgabe bearbeiten"
 
 #: C/tasks-usage-edit-task.page:22(p)
-#, fuzzy
 msgid "If you want to change a task that already exists in your task lists,"
 msgstr ""
-"Wenn Sie Kontaktinformationen eines bereits bestehenden Kontakts ändern "
-"möchten,"
+"Wenn Sie eine Aufgabe ändern möchten, die bereits in Ihren Aufgabenlisten "
+"vorhanden ist,"
 
 #: C/tasks-usage-edit-task.page:25(p)
 msgid ""
 "Double-click on the task that you want to edit in the list of tasks, or right-"
 "click on the task and click <key>Open Task</key>."
 msgstr ""
+"Klicken Sie in der Aufgabenliste doppelt auf die zu bearbeitende Aufgabe oder "
+"klicken Sie mit der rechten Maustaste auf die Aufgabe und wählen Sie "
+"<key>Aufgabe öffnen</key>."
 
 #: C/tasks-usage-edit-task.page:26(p)
-#, fuzzy
 msgid "Edit the task information."
-msgstr "Geben Sie die Informationen ein."
+msgstr "Geben Sie die Informationen zur Aufgabe ein."
 
 #: C/tasks-usage-edit-task.page:27(p) C/tasks-usage-add-task.page:29(p)
 #: C/memos-usage-edit-memo.page:27(p) C/memos-usage-add-memo.page:29(p)
@@ -874,6 +887,8 @@ msgid ""
 "Click the <gui style=\"button\">Save</gui> button, or <guiseq><gui>File</"
 "gui><gui>Save</gui></guiseq>."
 msgstr ""
+"Klicken Sie auf den <gui style=\"button\">Speichern</gui>-Knopf oder "
+"<guiseq><gui>Datei</gui><gui>Speichern</gui></guiseq>."
 
 #: C/tasks-usage-delete-task.page:5(desc)
 msgid "Deleting a task from your task list."
@@ -904,16 +919,17 @@ msgid ""
 "Click <guiseq><gui>File</gui><gui>New</gui><gui>Task</gui></guiseq>, or press "
 "<keyseq><key>Shift</key><key>Ctrl</key><key>T</key></keyseq>."
 msgstr ""
+"Klicken Sie <guiseq><gui>Datei</gui><gui>Neu</gui><gui>Aufgabe</gui></guiseq> "
+"oder drücken Sie <keyseq><key>Umschalttaste</key><key>Strg</key><key>T</key></"
+"keyseq>."
 
 #: C/tasks-usage-add-task.page:27(p)
-#, fuzzy
 msgid "Select a task list in the <gui>List</gui> dropdown list."
-msgstr "Wählen Sie einen Kalender in der Kalender-Auswahlliste."
+msgstr "Wählen Sie eine Aufgabe in der <gui>Liste</gui>-Auswahlliste."
 
 #: C/tasks-usage-add-task.page:28(p)
-#, fuzzy
 msgid "Enter the task information."
-msgstr "Geben Sie die Informationen ein."
+msgstr "Geben Sie die Informationen zur Aufgabe ein."
 
 #: C/tasks-usage-add-task.page:32(p)
 msgid ""
@@ -937,7 +953,6 @@ msgid "Evolution can be used to assign a task to multiple people."
 msgstr "Evolution kann Aufgaben mehreren Personen zuweisen."
 
 #: C/tasks-usage-add-task.page:40(p)
-#, fuzzy
 msgid ""
 "When you assign a task, you can specify the attendees in several categories, "
 "such as \"chair\" or \"required\". When you save the task, each attendee is "
@@ -945,10 +960,9 @@ msgid ""
 "respond."
 msgstr ""
 "Wenn Sie eine Aufgabe zuweisen, so können Sie die Teilnehmer in mehrere "
-"Kategorien einordnen, wie zum Beispiel als <quote>Vorsitzender</quote> oder "
-"<quote>Benötigter Teilnehmer</quote>. Wenn Sie eine Aufgabe speichern wird "
-"jedem Teilnehmer eine E-Mail mit Informationen zur Aufgabe und der "
-"Möglichkeit zur Antwort geschickt."
+"Kategorien einordnen, wie zum Beispiel als »Vorsitzender« oder »Benötigter "
+"Teilnehmer«. Wenn Sie eine Aufgabe speichern, wird jedem Teilnehmer eine E-"
+"Mail mit Informationen zur Aufgabe und der Möglichkeit zur Antwort geschickt."
 
 #: C/tasks-usage-add-task.page:41(p)
 msgid ""
@@ -961,6 +975,8 @@ msgid ""
 "To create an Assigned Task, click <guiseq><gui>File</gui><gui>New</"
 "gui><gui>Assigned Task</gui></guiseq>."
 msgstr ""
+"Um eine zugewiesene Aufgabe zu erstellen, klicken Sie auf <guiseq><gui>Datei</"
+"gui><gui>Neu</gui><gui>Zugewiesene Aufgabe</gui></guiseq>."
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
@@ -1004,9 +1020,8 @@ msgstr ""
 
 #: C/tasks-searching.page:32(p) C/memos-searching.page:32(p)
 #: C/calendar-searching.page:32(p)
-#, fuzzy
 msgid "Searching by summary:"
-msgstr "Suchen nach Nachrichten"
+msgstr "Nach Zusammenfassung suchen:"
 
 #: C/tasks-searching.page:34(p) C/memos-searching.page:34(p)
 #: C/contacts-searching.page:34(p) C/calendar-searching.page:34(p)
@@ -1041,15 +1056,13 @@ msgstr "Evolution zeigt die Suchergebnisse an."
 
 #: C/tasks-searching.page:39(p) C/memos-searching.page:39(p)
 #: C/contacts-searching.page:39(p) C/calendar-searching.page:39(p)
-#, fuzzy
 msgid "Searching by category:"
-msgstr "Beliebige Kategorie:"
+msgstr "Nach Kategorie suchen:"
 
 #: C/tasks-searching.page:41(p) C/memos-searching.page:41(p)
 #: C/contacts-searching.page:41(p) C/calendar-searching.page:41(p)
-#, fuzzy
 msgid "Click the <gui>Show</gui> drop-down list."
-msgstr "Klicken Sie neben »Anzeigen« auf die Auswahlliste."
+msgstr "Klicken Sie auf die Auswahlliste <gui>Anzeigen</gui>."
 
 #: C/tasks-searching.page:42(p) C/memos-searching.page:42(p)
 #: C/contacts-searching.page:42(p) C/calendar-searching.page:42(p)
@@ -1087,13 +1100,12 @@ msgstr ""
 #: C/tasks-searching.page:53(p) C/memos-searching.page:53(p)
 #: C/mail-searching.page:49(p) C/contacts-searching.page:53(p)
 #: C/calendar-searching.page:53(p)
-#, fuzzy
 msgid ""
 "Select the condition from the dropdown list, and then type a search entry in "
 "the field."
 msgstr ""
-"Wählen Sie die Suchkriterien aus und geben Sie danach einen Suchbegriff in "
-"das Feld ein."
+"Wählen Sie die Bedingung in der Auswahlliste aus und geben Sie danach einen "
+"Suchbegriff in das Feld ein."
 
 #: C/tasks-searching.page:54(p) C/memos-searching.page:54(p)
 #: C/mail-searching.page:50(p) C/contacts-searching.page:54(p)
@@ -1167,13 +1179,12 @@ msgstr ""
 #: C/tasks-searching.page:74(p) C/memos-searching.page:74(p)
 #: C/mail-searching.page:70(p) C/contacts-searching.page:74(p)
 #: C/calendar-searching.page:74(p)
-#, fuzzy
 msgid ""
 "Click the <gui style=\"button\">Edit</gui> button to open the <gui>Edit Rule</"
 "gui> window."
 msgstr ""
-"Klicken Sie auf den Bearbeiten-Knopf. Das »Regel bearbeiten«-Fenster öffnet "
-"sich."
+"Klicken Sie auf den <gui style=\"button\">Bearbeiten</gui>-Knopf, um das "
+"<gui>Regel bearbeiten</gui>-Fenster zu öffnen."
 
 #: C/tasks-searching.page:75(p) C/memos-searching.page:75(p)
 #: C/mail-searching.page:71(p) C/contacts-searching.page:75(p)
@@ -1190,19 +1201,19 @@ msgstr "Klicken Sie auf <gui>OK</gui>."
 
 #: C/tasks-organizing.page:5(desc)
 msgid "On task and memo lists, searching, and categories."
-msgstr ""
+msgstr "Über Aufgaben- und Notizlisten, Suchvorgänge und Kategorien."
 
 #: C/tasks-organizing.page:21(title)
 msgid "Sorting and organizing tasks and memos"
-msgstr ""
+msgstr "Aufgaben und Notizen sortieren und organisieren"
 
 #: C/tasks-local.page:5(desc)
 msgid "Adding another local task or memo list."
-msgstr ""
+msgstr "Eine weitere lokale Aufgaben- oder Notizliste hinzufügen."
 
 #: C/tasks-local.page:20(title)
 msgid "Adding another local task or memo list"
-msgstr ""
+msgstr "Eine weitere lokale Aufgaben- oder Notizliste hinzufügen"
 
 #: C/tasks-local.page:22(p)
 msgid ""
@@ -1220,12 +1231,11 @@ msgstr ""
 
 #: C/tasks-display-settings.page:5(desc)
 msgid "Options for displaying task completion and due dates."
-msgstr ""
+msgstr "Optionen für die Anzeige für Aufgabenabschlüsse und Fälligkeitsdaten."
 
 #: C/tasks-display-settings.page:23(title)
-#, fuzzy
 msgid "Displaying of tasks"
-msgstr "Anzeige gesendeter Objekte"
+msgstr "Aufgaben anzeigen"
 
 #. TODO:POST-3-2: Just listing the partially busted UI options (also see calendar-layout-appointment-display) here is very poor and not task-oriented, but that's it for the time being. Better ideas welcome.
 #: C/tasks-display-settings.page:27(p)
@@ -1269,11 +1279,11 @@ msgstr ""
 
 #: C/tasks-caldav.page:5(desc)
 msgid "Using an online CalDAV task list or memo list."
-msgstr ""
+msgstr "Eine CalDAV-Aufgaben- oder -Notizliste hinzufügen"
 
 #: C/tasks-caldav.page:20(title)
 msgid "Using a CalDAV task or memo list"
-msgstr ""
+msgstr "Eine CalDAV-Aufgaben- oder -Notizliste hinzufügen"
 
 #: C/tasks-caldav.page:31(p) C/calendar-caldav.page:34(p)
 msgid "Enter your username and your email address."
@@ -1281,15 +1291,15 @@ msgstr "Bitte geben Sie Ihren Benutzernamen und Ihre E-Mail-Adresse ein."
 
 #: C/sync-with-other-devices.page:5(desc)
 msgid "Synchronize Evolution data with handheld devices and mobile phones."
-msgstr ""
+msgstr "Die Evolution-Daten mit Handheld-Geräten und Mobiltelefonen abgleichen."
 
 #: C/sync-with-other-devices.page:23(title)
 msgid "Synchronize <em>Evolution</em> with other devices"
-msgstr ""
+msgstr "<em>Evolution</em> mit anderen Geräten abgleichen"
 
 #: C/sync-with-other-devices.page:25(p)
 msgid "There are currently no \"recommended instructions\" for users."
-msgstr ""
+msgstr "Derzeit gibt es keine »empfohlenen Anweisungen« für Benutzer."
 
 #: C/sync-with-other-devices.page:27(p)
 msgid ""
@@ -1298,6 +1308,10 @@ msgid ""
 "support <link href=\"https://secure.wikimedia.org/wikipedia/en/wiki/SyncML"
 "\">SyncML</link>."
 msgstr ""
+"Viele Distributionen stellen die Anwendung <link href=\"http://syncevolution."
+"org/\">SyncEvolution</link> bereit, welches in Kombination mit Geräten, die "
+"<link href=\"https://secure.wikimedia.org/wikipedia/en/wiki/SyncML\">SyncML</"
+"link> unterstützen, verwendet werden kann."
 
 #: C/sync-with-other-devices.page:29(p)
 msgid ""
@@ -1429,13 +1443,13 @@ msgid ""
 msgstr "Neue Daten werden vom Rechner auf das tragbare Gerät kopiert."
 
 #: C/sync-with-other-devices.page:50(p)
-#, fuzzy
 msgid ""
 "Select the behavior you want for each conduit you choose to use. If you're "
 "not sure, use <gui>Synchronize</gui>."
 msgstr ""
 "Wählen Sie das gewünschte Verhalten für jedes Conduit, welches Sie benutzen "
-"wollen. Falls Sie sich nicht sicher sind, so benutzen Sie »Abgleichen«."
+"wollen. Falls Sie sich nicht sicher sind, so benutzen Sie <gui>Abgleichen</"
+"gui>."
 
 #: C/sync-with-other-devices.page:54(title)
 msgid "Synchronizing Information"
@@ -1450,14 +1464,13 @@ msgstr ""
 "Evolution abzugleichen:"
 
 #: C/sync-with-other-devices.page:57(p)
-#, fuzzy
 msgid ""
 "If you want to back up your information before synchronizing, make a copy of "
 "the <file>.local/share/evolution</file> directory inside your home directory."
 msgstr ""
-"Falls Sie eine Sicherheitskopie Ihrer Evolution-Daten machen möchten, bevor "
-"Sie abgleichen, so kopieren Sie den <command>.evolution</command>-Ordner in "
-"Ihrem persönlichen Ordner."
+"Falls Sie vor dem Abgleich eine Sicherheitskopie Ihrer Evolution-Daten machen "
+"möchten, bevor Sie abgleichen, so kopieren Sie die Datei <command>.local/"
+"share/evolution</command>-Ordner in Ihrem persönlichen Ordner."
 
 #: C/sync-with-other-devices.page:58(p)
 msgid ""
@@ -1481,27 +1494,24 @@ msgstr ""
 "Rechner ab, und aktivieren Sie dann wieder den Passwortschutz."
 
 #: C/sync-with-other-devices.page:61(p)
-#, fuzzy
 msgid "Now your Palm OS device will synchronize data with Evolution."
 msgstr "Nun sollte Ihr Palm-OS-Gerät Daten mit Evolution abgleichen."
 
 #: C/searching-items.page:5(desc)
 msgid "Searching content and data within <em>Evolution</em>."
-msgstr ""
+msgstr "Nach Daten und Inhalten in <em>Evolution</em> suchen."
 
 #: C/searching-items.page:18(title)
-#, fuzzy
 msgid "Searching items"
-msgstr "Suchen"
+msgstr "Nach Objekten suchen"
 
 #: C/problems-reporting-bugs.page:5(desc)
-#, fuzzy
 msgid "How to report mistakes in the application."
-msgstr "Daten aus anderen Programmen importieren"
+msgstr "Über Fehler in der Anwendung berichten."
 
 #: C/problems-reporting-bugs.page:21(title)
 msgid "How to report bugs"
-msgstr ""
+msgstr "Melden von Fehlern"
 
 #: C/problems-reporting-bugs.page:23(p)
 msgid ""
@@ -1540,7 +1550,7 @@ msgstr ""
 
 #: C/problems-getting-help.page:22(title)
 msgid "How to get help"
-msgstr ""
+msgstr "Hilfe erhalten"
 
 #: C/problems-getting-help.page:24(p)
 msgid ""
@@ -1589,9 +1599,8 @@ msgid "Sorting and organizing"
 msgstr ""
 
 #: C/minimize-to-system-tray.page:5(desc)
-#, fuzzy
 msgid "On minimizing Evolution to the notification area."
-msgstr "Blinkendes Symbol im Benachrichtigungsfeld:"
+msgstr "Über das Minimieren von Evolution in das Benachrichtigungsfeld."
 
 #: C/minimize-to-system-tray.page:11(name)
 #: C/mail-two-trash-folders.page:11(name) C/mail-spam-settings.page:16(name)
@@ -1636,9 +1645,8 @@ msgid "loonycookie@gmail.com"
 msgstr "loonycookie@gmail.com"
 
 #: C/minimize-to-system-tray.page:25(title)
-#, fuzzy
 msgid "Minimizing Evolution to the system tray"
-msgstr "LDAP-Server benutzen"
+msgstr "Evolution in das Benachrichtigungsfeld minimieren"
 
 #: C/minimize-to-system-tray.page:27(p)
 msgid ""
@@ -1660,7 +1668,7 @@ msgstr ""
 
 #: C/memos-usage.page:5(desc)
 msgid "On adding, editing, and deleting memos."
-msgstr ""
+msgstr "Über Hinzufügen, Bearbeiten und Löschen von Notizen."
 
 #: C/memos-usage.page:20(title)
 msgid "Add, Edit and Delete Memos"
@@ -1712,6 +1720,11 @@ msgid ""
 "select <gui>Delete</gui>, or click on the memo and click <gui>Delete</gui> in "
 "the tool bar, or click <guiseq><gui>Edit</gui><gui>Delete Memo</gui></guiseq>."
 msgstr ""
+"Wenn Sie eine Notiz auf Ihrer Notizliste löschen wollen, klicken Sie mit der "
+"rechten Maustaste auf die Notiz und wählen Sie <gui>Löschen</gui> oder "
+"klicken Sie auf die Notiz und klicken Sie in der Werkzeugliste auf "
+"<gui>Löschen</gui> oder klicken Sie <guiseq><gui>Bearbeiten</gui><gui>Notiz "
+"löschen</gui></guiseq>."
 
 #: C/memos-usage-add-memo.page:5(desc)
 msgid "Adding a memo to your memo list."
@@ -1726,6 +1739,9 @@ msgid ""
 "Click <guiseq><gui>File</gui><gui>New</gui><gui>Memo</gui></guiseq>, or press "
 "<keyseq><key>Shift</key><key>Ctrl</key><key>O</key></keyseq>."
 msgstr ""
+"Klicken Sie <guiseq><gui>Datei</gui><gui>Neu</gui><gui>Notiz</gui></guiseq> "
+"oder drücken Sie <keyseq><key>Umschalttaste</key><key>Strg</key><key>O</key></"
+"keyseq>."
 
 #: C/memos-usage-add-memo.page:27(p)
 #, fuzzy
@@ -1780,6 +1796,9 @@ msgid ""
 "Click <guiseq><gui>File</gui><gui>New</gui><gui>Shared Memo</gui></guiseq>, "
 "or press <keyseq><key>Shift</key><key>Ctrl</key><key>H</key></keyseq>."
 msgstr ""
+"Klicken Sie <guiseq><gui>Datei</gui><gui>Neu</gui><gui>Gemeinsame Notiz</"
+"gui></guiseq> oder drücken Sie <keyseq><key>Umschalttaste</key><key>Strg</"
+"key><key>H</key></keyseq>."
 
 #: C/memos-usage-add-memo.page:44(p)
 msgid ""
@@ -1834,7 +1853,7 @@ msgstr ""
 
 #: C/mail-wrong-fonts-in-3-0.page:5(desc)
 msgid "A known problem that is fixed in newer versions."
-msgstr ""
+msgstr "Ein bekanntes Problem, das in neueren Versionen beseitigt ist."
 
 #: C/mail-wrong-fonts-in-3-0.page:21(title)
 #, fuzzy
@@ -1872,7 +1891,6 @@ msgid "Working Offline"
 msgstr "Offline arbeiten"
 
 #: C/mail-working-offline.page:25(p)
-#, fuzzy
 msgid ""
 "Offline mode helps you communicate with remote mail storage systems like "
 "GroupWise, IMAP or Exchange, in situations where you are not connected to the "
@@ -1880,12 +1898,12 @@ msgid ""
 "allow you to compose messages, storing them in your Outbox to be sent the "
 "next time you connect."
 msgstr ""
-"Der Offline-Modus hilft Ihnen, mit entfernten Mail-Systemen wie <trademark "
-"class=\"registered\">GroupWise</trademark>, IMAP oder Exchange ohne "
-"durchgehende Verbindung zum Netzwerk zu arbeiten. Evolution hält eine lokale "
-"Kopie von einem oder mehreren Ordner vorrätig, damit Sie Nachrichten "
-"schreiben und im Ausgangsordner speichern können, so dass diese bei der "
-"nächsten Verbindung mit einem Netzwerk verschickt werden können."
+"Der Offline-Modus hilft Ihnen, mit entfernten Mail-Systemen wie GroupWise, "
+"IMAP oder Exchange ohne durchgehende Verbindung zum Netzwerk zu arbeiten. "
+"Evolution hält eine lokale Kopie von einem oder mehreren Ordner vorrätig, "
+"damit Sie Nachrichten schreiben und im Ausgangsordner speichern können, so "
+"dass diese bei der nächsten Verbindung mit einem Netzwerk verschickt werden "
+"können."
 
 #: C/mail-working-offline.page:27(p)
 msgid ""
@@ -1905,7 +1923,6 @@ msgid "Marking folders for offline usage"
 msgstr "Ordner für die Offline-Nutzung markieren"
 
 #: C/mail-working-offline.page:31(p)
-#, fuzzy
 msgid "To mark a mail folder for offline use,"
 msgstr "Um einen Ordner für die Offline-Nutzung zu markieren,"
 
@@ -1925,7 +1942,6 @@ msgid "Syncing messages for offline usage"
 msgstr "Nachrichten für Offline-Benutzung herunterladen"
 
 #: C/mail-working-offline.page:40(p)
-#, fuzzy
 msgid ""
 "Your connection status is shown by the small icon in the lower left corner of "
 "the Evolution main window. When you are online, it displays two connected "
@@ -1934,9 +1950,12 @@ msgid ""
 "whether you want to go offline immediately or synchronize folders locally "
 "before you go offline."
 msgstr ""
-"Der Verbindungsstatus wird als kleinen Symbol in der linken unteren Ecke des "
+"Der Verbindungsstatus wird als kleines Symbol in der linken unteren Ecke des "
 "Evolution-Hauptfensters gezeigt. Wenn Sie online sind, werden zwei verbundene "
-"Kabel angezeigt. Wenn Sie offline gehen, werden die beiden Kabel getrennt."
+"Kabel angezeigt. Wenn Sie durch Anklicken des Symbols oder mittels "
+"<guiseq><gui>Datei</gui><gui>Offline arbeiten</gui></guiseq> offline gehen, "
+"werden die beiden Kabel getrennt. Sie werden gefragt, ob Sie unverzüglich "
+"offline gehen wollen oder vorher lokale Ordber abgeglichen werden sollen."
 
 #: C/mail-working-offline.page:41(p)
 #, fuzzy
@@ -2007,11 +2026,12 @@ msgstr ""
 "Monitore mit breitem Bildschirm (zum Beispiel 16:9 oder Widescreen-Format) an."
 
 #: C/mail-vertical-view.page:26(p)
-#, fuzzy
 msgid ""
 "To switch to vertical view, click <guiseq><gui>View</gui><gui>Preview</"
 "gui><gui>Vertical View</gui></guiseq>."
-msgstr "Wählen Sie Ansicht &gt; Vorschau &gt; Vertikale Ansicht."
+msgstr ""
+"Um in die vertikale Ansicht zu wechseln, wählen Sie <guiseq><gui>Ansicht</"
+"gui><gui>Vorschau</gui><gui>Vertikale Ansicht</gui></guiseq>."
 
 #: C/mail-vertical-view.page:28(p)
 msgid ""
@@ -2076,7 +2096,7 @@ msgstr ""
 
 #: C/mail-two-trash-folders.page:20(title)
 msgid "Two Trash folders shown for the same account"
-msgstr ""
+msgstr "Für ein Konto werden zwei Müllordner angezeigt"
 
 #: C/mail-two-trash-folders.page:22(p)
 msgid ""
@@ -2135,7 +2155,7 @@ msgstr "So aktivieren Sie die Plugins:"
 
 #: C/mail-spam-settings.page:36(p)
 msgid "Click <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>."
-msgstr ""
+msgstr "Klicken Sie <guiseq><gui>Bearbeiten</gui><gui>Plugins</gui></guiseq>."
 
 #: C/mail-spam-settings.page:37(p)
 #, fuzzy
@@ -2174,6 +2194,9 @@ msgid ""
 "Click <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> or press "
 "<keyseq><key>Shift</key><key>Ctrl</key><key>S</key></keyseq>."
 msgstr ""
+"Klicken Sie <guiseq><gui>Bearbeiten</gui><gui>Einstellungen</gui></guiseq> "
+"oder drücken Sie <keyseq><key>Umschalttaste</key><key>Strg</key><key>S</key></"
+"keyseq>."
 
 #: C/mail-spam-settings.page:48(p)
 msgid "Select <gui>Mail Preferences</gui>."
@@ -2205,9 +2228,8 @@ msgstr ""
 "_Nachrichten nicht als Unerwünscht markieren, wenn Absender im Adressbuch"
 
 #: C/mail-spam-settings.page:55(p)
-#, fuzzy
 msgid "The default junk filter."
-msgstr "Vorgabe-Plugin für die Unerwünscht-Erkennung"
+msgstr "Der vorgegebene Unerwünscht-Filter."
 
 #: C/mail-spam-settings.page:56(p)
 msgid ""
@@ -2224,9 +2246,8 @@ msgid "Junk and Spam Mail Handling"
 msgstr "Handhaben unerwünschter Nachrichten"
 
 #: C/mail-spam.page:23(title)
-#, fuzzy
 msgid "Novell Groupwise specific differences"
-msgstr "Novell GroupWise-Empfangsoptionen"
+msgstr "Spezielle Unterschiede für Novell GroupWise"
 
 #: C/mail-spam-marking.page:5(desc)
 msgid "How to mark unwanted junk and spam mail."
@@ -2328,6 +2349,10 @@ msgid ""
 "the message and press <keyseq><key>Shift</key><key>Ctrl</key><key>J</key></"
 "keyseq>."
 msgstr ""
+"Klicken Sie mit der rechten Maustaste auf die Nachricht, klicken Sie dann "
+"<gui>Als nicht unerwünscht markieren</gui> oder wählen Sie die Nachricht und "
+"drücken Sie <keyseq><key>Umschalttaste</key><key>Strg</key><key>J</key></"
+"keyseq>."
 
 #: C/mail-spam-groupwise-unmark-message.page:30(p)
 msgid ""
@@ -2346,36 +2371,36 @@ msgstr ""
 msgid "Removing an Email Address from Your Junk List"
 msgstr "Eine E-Mail von Ihrer Unerwünscht-Liste entfernen"
 
+# GUI-Element nicht gefunden -gk
+# Ist in der aktuellen de.po nur noch in den ungenutzten Strings am Ende -mb
 #: C/mail-spam-groupwise-remove-from-list.page:26(p)
-#, fuzzy
 msgid "Right-click a message, then click <gui>Junk Mail Settings</gui>."
 msgstr ""
 "Klicken Sie mit der rechten Maustaste auf eine Nachricht und wählen Sie "
-"»Einstellungen zu unerwünschten Nachrichten«."
+"<gui>Einstellungen zu unerwünschten Nachrichten</gui>."
 
 #: C/mail-spam-groupwise-remove-from-list.page:27(p)
-#, fuzzy
 msgid "Select the email address to remove, then click <gui>Remove</gui>."
 msgstr ""
 "Wählen Sie die zu entfernende E-Mail-Adresse aus und klicken Sie auf "
-"Entfernen."
+"<gui>Entfernen</gui>."
 
 #: C/mail-spam-groupwise-mark-message.page:5(desc)
 msgid "How to mark a message in Novell Groupwise as junk."
-msgstr ""
+msgstr "Eine Nachricht in Novell Groupwise als Unerwünscht markieren."
 
 #: C/mail-spam-groupwise-mark-message.page:23(title)
 msgid "Marking a Message As Junk Mail"
 msgstr "Eine Nachricht als Unerwünscht markieren"
 
 #: C/mail-spam-groupwise-mark-message.page:25(p)
-#, fuzzy
 msgid ""
 "Select the message to mark as junk, then click the <gui>Junk</gui> button or "
 "press <keyseq><key>Ctrl</key><key>J</key></keyseq>."
 msgstr ""
 "Wählen Sie die als Unerwünscht zu markierende E-Mail und klicken Sie dann auf "
-"den Unerwünscht-Knopf in der Werkzeugleiste oder drücken Sie Strg+J."
+"den <gui>Unerwünscht-Knopf</gui> in der Werkzeugleiste oder drücken Sie "
+"<keyseq><key>Strg</key><key>J</key></keyseq>."
 
 #: C/mail-spam-groupwise-mark-message.page:26(p)
 msgid ""
@@ -2387,7 +2412,7 @@ msgstr ""
 
 #: C/mail-spam-groupwise-manage-list.page:5(desc)
 msgid "How to manage your junk mail list in Novell Groupwise."
-msgstr ""
+msgstr "Verwaltung Ihrer Unerwünscht-Listen in Novell Groupwise."
 
 #: C/mail-spam-groupwise-manage-list.page:27(title)
 msgid "Enabling or Disabling Your Junk Mail List"
@@ -2395,14 +2420,13 @@ msgstr "Die Liste unerwünschter E-Mails ein- oder ausschalten"
 
 #: C/mail-spam-groupwise-manage-list.page:29(p)
 #: C/mail-spam-groupwise-add-to-list.page:29(p)
-#, fuzzy
 msgid ""
 "Right-click on a message and select the <gui>Junk Mail Settings</gui> option."
 msgstr ""
-"Klicken Sie mit der rechten Maustaste auf die Nachricht in der E-Mail-Liste."
+"Klicken Sie mit der rechten Maustaste auf eine Nachricht und wählen Sie die "
+"Option <gui>Einstellungen für unerwünschte Nachrichten</gui>."
 
 #: C/mail-spam-groupwise-manage-list.page:30(p)
-#, fuzzy
 msgid "Specify whether you wish to Enable or Disable junk mail handling."
 msgstr ""
 "Wählen Sie dies, um die Verarbeitung von unerwünschten Nachrichten zu "
@@ -2531,9 +2555,8 @@ msgid "Drag and drop the column header bars"
 msgstr ""
 
 #: C/mail-sorting-message-list.page:48(p)
-#, fuzzy
 msgid "Right-click on the header."
-msgstr "Klicken Sie mit rechts auf den Kalender."
+msgstr "Klicken Sie mit der rechten Maustaste auf die Kopfzeile."
 
 #: C/mail-sorting-message-list.page:49(p)
 msgid ""
@@ -2549,7 +2572,7 @@ msgstr ""
 
 #: C/mail-sorting-message-list.page:56(title)
 msgid "Using Other Sorting Options"
-msgstr ""
+msgstr "Weitere Sortieroptionen anwenden"
 
 #: C/mail-sorting-message-list.page:57(p)
 msgid ""
@@ -2805,9 +2828,8 @@ msgid "On receiving mail and sending written emails."
 msgstr ""
 
 #: C/mail-send-and-receive.page:20(title)
-#, fuzzy
 msgid "Sending and receiving mail"
-msgstr "Verschicken und Abrufen von E-Mails"
+msgstr "Verschicken und Abrufen von Nachrichten"
 
 #: C/mail-send-and-receive.page:22(p)
 msgid ""
@@ -2817,9 +2839,8 @@ msgid ""
 msgstr ""
 
 #: C/mail-send-and-receive-manual.page:5(desc)
-#, fuzzy
 msgid "Force sending and receiving emails."
-msgstr "Verschicken und Abrufen von E-Mails"
+msgstr "Verschicken und Abrufen von E-Mails erzwingen."
 
 #: C/mail-send-and-receive-manual.page:20(title)
 msgid "Manually send and receive message"
@@ -2865,14 +2886,12 @@ msgid ""
 msgstr ""
 
 #: C/mail-searching.page:5(desc)
-#, fuzzy
 msgid "Searching messages."
-msgstr "Suchen nach Nachrichten"
+msgstr "Suchen nach Nachrichten."
 
 #: C/mail-searching.page:28(title)
-#, fuzzy
 msgid "Searching Mail"
-msgstr "E-Mail wird abgerufen"
+msgstr "Nach Nachrichten suchen"
 
 #: C/mail-searching.page:31(p)
 msgid ""
@@ -2880,18 +2899,17 @@ msgid ""
 msgstr ""
 
 #: C/mail-searching.page:33(p)
-#, fuzzy
 msgid ""
 "Click on the search icon <media type=\"image\" mime=\"image/png\" src="
 "\"figures/search-icon.png\"/> to expand the drop-down list."
 msgstr ""
-"Klicken Sie auf das Such-Symbol <inlinegraphic format=\"PNG\" fileref="
-"\"figures/stock_search.png\"/>, um den Suchtypen auszuwählen."
+"Klicken Sie auf das Such-Symbol <media type=\"image\" mime=\"image/png\" src="
+"\"figures/search-icon.png\"/>, um die Auswahlliste auszuklappen."
 
 #: C/mail-searching.page:35(p)
-#, fuzzy
 msgid "Select the scope from the drop-down list right to the text box."
-msgstr "Wählen Sie den gewünschten Suchtypen aus der Auswahlliste aus."
+msgstr ""
+"Wählen Sie den Bereich aus der Auswahlliste rechts neben dem Textfeld aus."
 
 #: C/mail-searching.page:39(p)
 msgid ""
@@ -2917,11 +2935,11 @@ msgstr "Erweiterte Suche:"
 
 #: C/mail-searching-attachment-type.page:5(desc)
 msgid "Unfortunately this is not possible."
-msgstr ""
+msgstr "Leider ist dies nicht möglich."
 
 #: C/mail-searching-attachment-type.page:21(title)
 msgid "Searching for emails with a specific attachment type"
-msgstr ""
+msgstr "Nach Nachrichten mit einem speziellen Anhangstyp suchen"
 
 #: C/mail-searching-attachment-type.page:23(p)
 msgid ""
@@ -3023,9 +3041,8 @@ msgid "Available conditions for setting up search folders."
 msgstr ""
 
 #: C/mail-search-folders-conditions.page:23(title)
-#, fuzzy
 msgid "Available Search folder conditions"
-msgstr "Suchordner aktivieren"
+msgstr "Verfügbare Bedingungen für Suchordner"
 
 #: C/mail-search-folders-conditions.page:26(p)
 #: C/mail-filters-conditions.page:26(p)
@@ -3355,9 +3372,8 @@ msgid "Click <gui style=\"button\">Add</gui>."
 msgstr ""
 
 #: C/mail-search-folders-add.page:28(p) C/mail-filters.page:38(p)
-#, fuzzy
 msgid "Enter a name in the <gui>Rule name</gui> field."
-msgstr "Geben Sie die Anzahl der anzuzeigenden Adressen in das Feld ein."
+msgstr "Geben Sie einen Namen in das Feld <gui>Regelname</gui> ein."
 
 #: C/mail-search-folders-add.page:29(p) C/mail-filters.page:39(p)
 msgid ""
@@ -3366,13 +3382,13 @@ msgid ""
 msgstr ""
 
 #: C/mail-search-folders-add.page:29(p)
-#, fuzzy
 msgid ""
 "For more information on the available conditions see <link xref=\"mail-search-"
 "folders-conditions\">Available Search Folder conditions</link>."
 msgstr ""
-"Für weitere Informationen zu Alarmen lesen Sie bitte <link linkend=\"bshly4v"
-"\">Erinnerungen</link>."
+"Für weitere Informationen zu den verfügbaren Bedingungen lesen Sie bitte "
+"<link xref=\"mail-search-folders-conditions\">Verfügbare Bedingungen für "
+"Suchordner</link>."
 
 #: C/mail-search-folders-add.page:30(p) C/mail-filters.page:40(p)
 msgid ""
@@ -3694,7 +3710,6 @@ msgid "Receiving options for standard Unix mbox spool file accounts."
 msgstr "Empfangsoptionen für Standard-Unix-mbox-Spool-Datei"
 
 #: C/mail-receiving-options-unix-mbox-spool-file.page:20(title)
-#, fuzzy
 msgid "Standard Unix mbox spool file receiving options"
 msgstr "Empfangsoptionen für Standard-Unix-mbox-Spool-Datei"
 
@@ -3715,9 +3730,8 @@ msgid ""
 msgstr ""
 
 #: C/mail-receiving-options-unix-mbox-spool-directory.page:5(desc)
-#, fuzzy
 msgid "Receiving options for standard Unix mbox spool directory accounts."
-msgstr "Standard-Unix-mbox-Spool-Ordner:"
+msgstr "Empfangsoptionen für Standard-Unix-mbox-Spool-Ordnerkonten."
 
 #: C/mail-receiving-options-unix-mbox-spool-directory.page:20(title)
 msgid "Standard Unix mbox spool directory receiving options"
@@ -3816,7 +3830,6 @@ msgid "Receiving options for MH-format mail directories accounts."
 msgstr ""
 
 #: C/mail-receiving-options-mh-format-directories.page:20(title)
-#, fuzzy
 msgid "MH-format mail directories receiving options"
 msgstr "Empfangsoptionen für E-Mail-Ordner im MH-Format"
 
@@ -3825,7 +3838,6 @@ msgid "Receiving options for Maildir-format mail directories accounts."
 msgstr ""
 
 #: C/mail-receiving-options-maildir-format-directories.page:20(title)
-#, fuzzy
 msgid "Maildir-format mail directories receiving options"
 msgstr "Empfangsoptionen für E-Mail-Ordner im Maildir-Format"
 
@@ -3901,7 +3913,6 @@ msgid "Receiving options for Exchange MAPI accounts."
 msgstr "Ein neues Exchange-Konto erstellen"
 
 #: C/mail-receiving-options-exchange-mapi.page:20(title)
-#, fuzzy
 msgid "Exchange MAPI receiving options"
 msgstr "Exchange MAPI-Empfangsoptionen"
 
@@ -3923,20 +3934,16 @@ msgstr ""
 "Wählen Sie, ob Evolution nach neuen Nachrichten in allen Ordnern schauen soll."
 
 #: C/mail-receiving-options-evolution-exchange.page:5(desc)
-#, fuzzy
 msgid "Receiving options for Evolution Exchange accounts."
-msgstr ""
-"Ein bestehendes Konto als das Konto für Evolution Exchange konfigurieren"
+msgstr "Empfangsoptionen für Evolution Exchange-Konten."
 
 #: C/mail-receiving-options-evolution-exchange.page:23(title)
-#, fuzzy
 msgid "Evolution Exchange receiving options"
-msgstr "Microsoft Exchange-Empfangsoptionen"
+msgstr "Evolution Exchange-Empfangsoptionen"
 
 #: C/mail-receiving-options-evolution-exchange.page:31(p)
-#, fuzzy
 msgid "Enter your username for that server."
-msgstr "Tragen Sie Ihren Benutzernamen in das »Benutzername«-Feld ein."
+msgstr "Geben Sie Ihren Benutzernamen für den Server ein."
 
 #: C/mail-receiving-options-evolution-exchange.page:32(p)
 msgid "Enter the OWA URL for that server."
@@ -3956,13 +3963,12 @@ msgid ""
 msgstr ""
 
 #: C/mail-receiving-options-evolution-exchange.page:50(p)
-#, fuzzy
 msgid ""
 "Select if you want to limit the number of Global Address List (GAL) responses "
 "as this may increase speed. The GAL contains a list of all email addresses."
 msgstr ""
 "Wählen Sie, ob die Anzahl der Antworten von der Globalen Adressliste (GAL) "
-"begrenzt werden soll."
+"begrenzt werden soll. Die GAL enthält eine Liste aller E-Mail-Adressen."
 
 #: C/mail-receiving-options-evolution-exchange.page:51(p)
 msgid ""
@@ -3989,12 +3995,11 @@ msgstr ""
 
 #: C/mail-received-notification.page:5(desc)
 msgid "Options on notifications of newly received mail."
-msgstr ""
+msgstr "Optionen für Benachrichtigungen für neu eingegangene Nachrichten."
 
 #: C/mail-received-notification.page:20(title)
-#, fuzzy
 msgid "Getting notified of new mail"
-msgstr "Nach neuen E-Mails sehen"
+msgstr "Benachrichtigungen bei neuen E-Mails"
 
 #: C/mail-received-notification.page:22(p)
 msgid ""
@@ -4018,9 +4023,8 @@ msgid ""
 msgstr ""
 
 #: C/mail-read-receipts.page:5(desc)
-#, fuzzy
 msgid "How to enable requesting read receipts."
-msgstr "Lesebestätigung immer anfordern"
+msgstr "Aktivieren von Lesebestätigungen."
 
 #: C/mail-read-receipts.page:33(title)
 msgid "Read receipts for emails"
@@ -4058,7 +4062,7 @@ msgstr ""
 
 #: C/mail-reading-keyboard-shortcuts.page:24(title)
 msgid "Using shortcut keys to read mail"
-msgstr ""
+msgstr "Tastenkürzel beim Lesen von Nachrichten verwenden"
 
 #: C/mail-reading-keyboard-shortcuts.page:27(title)
 msgid "Viewing an email"
@@ -4395,15 +4399,15 @@ msgid ""
 msgstr ""
 
 #: C/mail-imap-headers.page:29(p)
-#, fuzzy
 msgid ""
 "Evolution allows you for IMAP accounts to choose the headers that you want to "
 "download so that you can reduce the download time and filter or move your "
 "mail around the way you like it. The IMAP Mail header options are as follows:"
 msgstr ""
-"Evolution ermöglicht es Ihnen zu wählen, welche Kopfzeilen heruntergeladen "
-"werden sollen. Dadurch kann die Downloadzeit verringert werden. Die "
-"Möglichkeiten hierbei sind:"
+"Evolution ermöglicht es Ihnen, bei IMAP-Konten zu wählen, welche Kopfzeilen "
+"heruntergeladen werden sollen. Dadurch kann die Downloadzeit verringert "
+"werden, und Sie können Ihre Nachrichten nach Wunsch filtern und verschieben. "
+"Die Möglichkeiten hierbei sind:"
 
 #: C/mail-imap-headers.page:31(p)
 msgid "Fetch All Headers:"
@@ -4483,12 +4487,11 @@ msgstr "Wählen Sie das IMAP-Konto aus."
 
 #: C/mail-imap-headers.page:40(p)
 msgid "Click <gui>Edit</gui>."
-msgstr ""
+msgstr "Klicken Sie auf <gui>Bearbeiten</gui>."
 
 #: C/mail-imap-headers.page:41(p)
-#, fuzzy
 msgid "Click the <gui>IMAP Headers</gui> tab."
-msgstr "gpg <placeholder-1/>"
+msgstr "Klicken Sie auf den Reiter <gui>IMAP-Kopfzeilen</gui>."
 
 #: C/mail-imap-headers.page:42(p)
 msgid ""
@@ -4611,7 +4614,7 @@ msgstr ""
 
 #: C/mail-folders.page:5(desc)
 msgid "Use folders to organize your mail."
-msgstr ""
+msgstr "Ordner zum Organisieren Ihrer Nachrichten verwenden."
 
 #: C/mail-folders.page:28(title)
 msgid "Using Folders"
@@ -4897,7 +4900,7 @@ msgstr ""
 
 #: C/mail-filters-conditions.page:5(desc)
 msgid "Available conditions for setting up filtering."
-msgstr ""
+msgstr "Verfügbare Bedingungen zum Einrichten von Filtern."
 
 #: C/mail-filters-conditions.page:23(title)
 msgid "Available Filter conditions"
@@ -4944,7 +4947,7 @@ msgstr "Filtert gemäß den Ergebnissen des Unerwünscht (Spam)-Tests."
 
 #: C/mail-filters-actions.page:5(desc)
 msgid "Available actions for setting up filtering."
-msgstr ""
+msgstr "Verfügbare Bedingungen zum Einrichten von Filtern"
 
 #: C/mail-filters-actions.page:23(title)
 msgid "Available Filter actions"
@@ -5947,15 +5950,13 @@ msgid "Collapsible Message Headers"
 msgstr "Empfängerkopfzeilen verkleinern"
 
 #: C/mail-displaying-collapsible-headers.page:25(p)
-#, fuzzy
 msgid ""
 "Evolution compresses the To, Cc and Bcc headers of received mail and shows "
 "only five addresses in the message preview."
 msgstr ""
 "Evolution kann die An-, Kopie- und Blindkopie-Kopfzeilen erhaltener E-Mails "
 "verkleinern, indem nur eine bestimmte Anzahl von Adressen in der "
-"Nachrichtenvorschau angezeigt wird. Sie können die Anzahl der anzuzeigenden "
-"Adressen selbst bestimmen."
+"Nachrichtenvorschau angezeigt wird."
 
 #: C/mail-displaying-collapsible-headers.page:27(p)
 msgid ""
@@ -6074,7 +6075,6 @@ msgstr ""
 "&gt; Gelöschte Nachrichten verbergen deaktivieren."
 
 #: C/mail-delete-and-undelete.page:42(p)
-#, fuzzy
 msgid ""
 "If you have marked a message for deletion, undeleting it unmarks it, and the "
 "message is not shown anymore in the Trash folder."
@@ -6646,11 +6646,11 @@ msgstr "Nachrichtenvorlagen einrichten"
 #: C/mail-composer-custom-header-lines.page:31(p)
 #: C/mail-attachments-sending.page:46(p)
 msgid "Select <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>."
-msgstr ""
+msgstr "wählen Sie <guiseq><gui>Bearbeiten</gui><gui>Plugins</gui></guiseq>."
 
 #: C/mail-composer-message-templates.page:78(p)
 msgid "Click <gui>Templates</gui>."
-msgstr ""
+msgstr "Klicken Sie auf <gui>Vorlagen</gui>."
 
 #: C/mail-composer-message-templates.page:79(p)
 #: C/mail-composer-custom-header-lines.page:33(p)
@@ -6785,7 +6785,7 @@ msgstr ""
 
 #: C/mail-composer-mail-signatures-manage.page:5(desc)
 msgid "Add, change, edit or delete email signatures."
-msgstr ""
+msgstr "Nachrichtensignaturen hinzufügen, ändern, bearbeiten oder löschen."
 
 #: C/mail-composer-mail-signatures-manage.page:20(title)
 msgid "Managing signatures"
@@ -6824,15 +6824,14 @@ msgstr ""
 "der Menüleiste."
 
 #: C/mail-composer-html-text.page:26(p)
-#, fuzzy
 msgid ""
 "The icons in the tool bar are explained in tooltips which appear when you "
 "hold your mouse pointer over the buttons. The buttons fall into five "
 "categories:"
 msgstr ""
-"Die Symbole in der Werkzeugleiste werden in den <link linkend=\"tooltip"
-"\">Minihilfen</link> erklärt, diese erscheinen wenn sich der Mauszeiger über "
-"den Knöpfen befindet. Die Knöpfe fallen in fünf Kategorien:"
+"Die Symbole in der Werkzeugleiste werden in den Minihilfen erklärt, welche "
+"erscheinen, wenn sich der Mauszeiger über den Knöpfen befindet. Die Knöpfe "
+"fallen in fünf Kategorien:"
 
 #: C/mail-composer-html-text.page:29(title)
 msgid "Headers and Lists:"
@@ -7017,9 +7016,10 @@ msgid "Define the type of layout for the table."
 msgstr "Wählen Sie das Layout für die Tabelle."
 
 #: C/mail-composer-html-table.page:28(p)
-#, fuzzy
 msgid "Optionally: Select a background color or image for the table."
-msgstr "Wählen Sie einen Hintergrund für die Tabelle."
+msgstr ""
+"Optional: Wählen Sie eine Hintergrundfarbe oder ein Hintergrundbild für die "
+"Tabelle."
 
 #: C/mail-composer-html-rule.page:5(desc)
 #, fuzzy
@@ -7047,7 +7047,6 @@ msgid ""
 msgstr ""
 
 #: C/mail-composer-html-rule.page:26(p)
-#, fuzzy
 msgid "Select width, size, and alignment."
 msgstr "Wählen Sie die Breite, Größe und Ausrichtung."
 
@@ -7169,6 +7168,8 @@ msgstr ""
 msgid ""
 "Click <guiseq><gui>Insert</gui><gui>Image...</gui></guiseq> in the menubar."
 msgstr ""
+"Klicken Sie in der Menüleiste auf <guiseq><gui>Einfügen</gui><gui>Bild …</"
+"gui></guiseq>."
 
 #: C/mail-composer-html-image.page:26(p)
 #, fuzzy
@@ -7177,7 +7178,7 @@ msgstr "Wählen Sie das einzufügende Bild aus."
 
 #: C/mail-composer-html-image.page:27(p)
 msgid "Click <gui>Open</gui>."
-msgstr ""
+msgstr "Klicken Sie auf <gui>Öffnen</gui>."
 
 #: C/mail-composer-html-image.page:30(p)
 msgid ""
@@ -7186,9 +7187,8 @@ msgid ""
 msgstr ""
 
 #: C/mail-composer-forward.page:5(desc)
-#, fuzzy
 msgid "Forwarding a received email to somebody."
-msgstr "Die gewählte Nachricht an jemanden weiterleiten"
+msgstr "Eine empfangene Nachricht an jemanden weiterleiten."
 
 #: C/mail-composer-forward.page:23(title)
 msgid "Forwarding a message"
@@ -7217,9 +7217,8 @@ msgid ""
 msgstr ""
 
 #: C/mail-composer-forward.page:29(p)
-#, fuzzy
 msgid "To forward a message that you are reading:"
-msgstr "Um eine Nachricht die Sie lesen weiterzuleiten:"
+msgstr "So leiten Sie eine gelesene Nachricht an jemanden weiter:"
 
 #: C/mail-composer-forward.page:31(p)
 msgid ""
@@ -7232,14 +7231,12 @@ msgid ""
 msgstr ""
 
 #: C/mail-composer-forward.page:32(p)
-#, fuzzy
 msgid ""
 "Select a recipient for the message. The subject is already entered, although "
 "you can alter it if you want."
 msgstr ""
-"Wählen Sie einen Empfänger aus, genau so wie wenn Sie eine neue Nachricht "
-"schreiben würden. Die Betreffzeile ist bereits ausgefüllt, diese kann aber "
-"geändert werden."
+"Wählen Sie einen Empfänger für die Nachricht aus. Die Betreffzeile ist "
+"bereits ausgefüllt, diese kann aber geändert werden."
 
 #: C/mail-composer-forward.page:33(p)
 msgid "Add your comments on the message in the text field."
@@ -7262,9 +7259,8 @@ msgstr ""
 "keine Anhänge weiter."
 
 #: C/mail-composer-forward-as-attachment.page:5(desc)
-#, fuzzy
 msgid "How to forward a message with its attachments."
-msgstr "Nachrichten mit Anlagen"
+msgstr "Nachrichten mit Anlagen weiterleiten."
 
 #: C/mail-composer-forward-as-attachment.page:21(title)
 msgid "Forwarding a message with its attachments"
@@ -7305,9 +7301,8 @@ msgstr ""
 "Klicken Sie auf Hinzufügen, um benutzerdefinierte Kopfzeilen hinzuzufügen."
 
 #: C/mail-composer-custom-header-lines.page:29(p)
-#, fuzzy
 msgid "To set up the Custom Header plugin:"
-msgstr "Um das Plugin »Benutzerdefinierte Kopfzeilen« zu aktivieren:"
+msgstr "So aktivieren Sie das Plugin »Benutzerdefinierte Kopfzeilen«:"
 
 #: C/mail-composer-custom-header-lines.page:32(p)
 msgid "Enable <gui>Custom Header</gui>."
@@ -7329,9 +7324,8 @@ msgstr ""
 "müssen durch Kommata getrennt werden."
 
 #: C/mail-composer-custom-header-lines.page:39(title)
-#, fuzzy
 msgid "Inserting custom headers in a message"
-msgstr "Ausgehenden Nachrichten eine angepasste Kopfzeile hinzufügen."
+msgstr "Benutzerdefinierte Kopfzeilen in eine Nachricht einfügen"
 
 #: C/mail-composer-custom-header-lines.page:41(p)
 msgid ""
@@ -7439,7 +7433,7 @@ msgstr "philbull@gmail.com"
 
 #: C/mail-cannot-see.page:20(title)
 msgid "I cannot see some emails, where are they?"
-msgstr ""
+msgstr "Ich kann einige Nachrichten nicht sehen, wo sind sie geblieben?"
 
 #: C/mail-cannot-see.page:24(p)
 msgid ""
@@ -7584,12 +7578,16 @@ msgstr "Dateien beilegen"
 msgid "To attach a file to your email in the composer:"
 msgstr ""
 
+# Erste Variante kann ich nicht nachvollziehen, GK
 #: C/mail-attachments-sending.page:30(p)
 msgid ""
 "Click <gui>Add Attachment...</gui>, or click <guiseq><gui>Insert</"
 "gui><gui>Attachment</gui></guiseq>, or press <keyseq><key>Ctrl</key><key>M</"
 "key></keyseq>."
 msgstr ""
+"Klicken Sie auf <gui>Anlage hinzufügen …</gui> oder klicken Sie "
+"<guiseq><gui>Einfügen</gui><gui>Anlage</gui></guiseq> oder drücken Sie "
+"<keyseq><key>Strg</key><key>M</key></keyseq>."
 
 #: C/mail-attachments-sending.page:31(p)
 msgid "Select the file you want to attach."
@@ -7640,7 +7638,6 @@ msgid ""
 msgstr ""
 
 #: C/mail-attachments-sending.page:51(p)
-#, fuzzy
 msgid ""
 "Based on the keywords you have added, Evolution searches the text of every "
 "mail you are going to send. If it finds any of the keywords in your email and "
@@ -7798,9 +7795,8 @@ msgstr "Identität"
 #: C/mail-account-manage-local-delivery.page:30(p)
 #: C/mail-account-manage-imap-plus.page:30(p)
 #: C/mail-account-manage-imap.page:30(p) C/intro-first-run.page:26(p)
-#, fuzzy
 msgid "Here you define your name and your email address."
-msgstr "Bitte geben Sie Ihre E-Mail-Adresse ein."
+msgstr "Hier können Sie Ihren Namen und Ihre E-Mail-Adresse angeben."
 
 #: C/mail-account-manage-usenet-news.page:31(p)
 #: C/mail-account-manage-unix-mbox-spool-file.page:31(p)
@@ -7835,9 +7831,8 @@ msgstr ""
 #: C/mail-account-manage-local-delivery.page:35(title)
 #: C/mail-account-manage-imap-plus.page:35(title)
 #: C/mail-account-manage-imap.page:35(title)
-#, fuzzy
 msgid "Receiving Email and Receiving options"
-msgstr "E-Mail-Empfangsoptionen"
+msgstr "Nachrichten empfangen und Empfangsoptionen"
 
 #: C/mail-account-manage-usenet-news.page:39(title)
 #: C/mail-account-manage-unix-mbox-spool-file.page:39(title)
@@ -8016,7 +8011,7 @@ msgstr "Konteneinstellungen für E-Mail-Ordner im MH-Format"
 
 #: C/mail-account-management.page:5(desc)
 msgid "Adding, editing and managing mail accounts."
-msgstr ""
+msgstr "Hinzufügen, Bearbeiten und Verwalten von Nachrichtenkonten."
 
 #: C/mail-account-management.page:20(title)
 msgid "Account Management"
@@ -8237,7 +8232,7 @@ msgstr "Barbara M. Tobias"
 
 #: C/intro-main-window.page:29(title)
 msgid "The <em>Evolution</em> main window"
-msgstr ""
+msgstr "Das Hauptfenster von <em>Evolution</em>"
 
 #. This section fixes https://bugzilla.gnome.org/show_bug.cgi?id=657028
 #: C/intro-main-window.page:32(p)
@@ -8418,30 +8413,40 @@ msgid ""
 "<media type=\"image\" src=\"./figures/color-c4a000.png\" width=\"10\"/> Menu "
 "bar"
 msgstr ""
+"<media type=\"image\" src=\"./figures/color-c4a000.png\" width=\"10\"/> "
+"Menüleiste"
 
 #: C/intro-main-window.page:96(p) C/intro-main-window.page:142(p)
 msgid ""
 "<media type=\"image\" src=\"./figures/color-ce5c00.png\" width=\"10\"/> Tool "
 "bar"
 msgstr ""
+"<media type=\"image\" src=\"./figures/color-ce5c00.png\" width=\"10\"/> "
+"Werkzeugleiste"
 
 #: C/intro-main-window.page:99(p)
 msgid ""
 "<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> "
 "Calendar list"
 msgstr ""
+"<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> "
+"Kalenderliste"
 
 #: C/intro-main-window.page:100(p) C/intro-main-window.page:146(p)
 msgid ""
 "<media type=\"image\" src=\"./figures/color-4e9a06.png\" width=\"10\"/> "
 "Search bar"
 msgstr ""
+"<media type=\"image\" src=\"./figures/color-4e9a06.png\" width=\"10\"/> "
+"Suchleiste"
 
 #: C/intro-main-window.page:103(p)
 msgid ""
 "<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
 "Appointment list"
 msgstr ""
+"<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
+"Terminliste"
 
 #: C/intro-main-window.page:104(p)
 msgid "Task list"
@@ -8467,11 +8472,12 @@ msgid ""
 "<media type=\"image\" src=\"./figures/color-2e3436.png\" width=\"10\"/> "
 "Status bar"
 msgstr ""
+"<media type=\"image\" src=\"./figures/color-2e3436.png\" width=\"10\"/> "
+"Statusleiste"
 
 #: C/intro-main-window.page:119(title)
-#, fuzzy
 msgid "Appointment List"
-msgstr "Kalenderansicht:"
+msgstr "Terminliste"
 
 #: C/intro-main-window.page:120(p)
 #, fuzzy
@@ -8522,18 +8528,24 @@ msgid ""
 "<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> "
 "Address book list"
 msgstr ""
+"<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> "
+"Adressbuchliste"
 
 #: C/intro-main-window.page:149(p)
 msgid ""
 "<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
 "Contacts list"
 msgstr ""
+"<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
+"Kontaktliste"
 
 #: C/intro-main-window.page:153(p)
 msgid ""
 "<media type=\"image\" src=\"./figures/color-5c3566.png\" width=\"10\"/> "
 "Contact preview"
 msgstr ""
+"<media type=\"image\" src=\"./figures/color-5c3566.png\" width=\"10\"/> "
+"Kontaktvorschau"
 
 #: C/intro-main-window.page:159(p)
 msgid ""
@@ -9180,7 +9192,7 @@ msgstr ""
 
 #: C/import-apps-outlook.page:29(title)
 msgid "Prerequisites under Windows"
-msgstr ""
+msgstr "Voraussetzungen unter Windows"
 
 #: C/import-apps-outlook.page:30(p)
 msgid "First, while using Microsoft Windows, prepare your messages for import:"
@@ -9321,25 +9333,27 @@ msgstr ""
 
 #: C/google-services.page:5(desc)
 msgid "Using Google services."
-msgstr ""
+msgstr "Google-Dienste verwenden."
 
 #: C/google-services.page:18(title)
 msgid "Using Google services"
-msgstr ""
+msgstr "Google-Dienste verwenden"
 
 #: C/express-mode.page:5(desc)
 msgid "What to do when using a small screen or netbook."
-msgstr ""
+msgstr "Besonderheiten bei einem kleinen Bildschirm oder einem Netbook."
 
 #: C/express-mode.page:20(title)
 msgid "Some windows are too large for small screens."
-msgstr ""
+msgstr "Einige Fenster sind für kleine Bildschirme zu groß."
 
 #: C/express-mode.page:22(p)
 msgid ""
 "This is a known problem and hard to solve for a complex application with many "
 "settings such as Evolution."
 msgstr ""
+"Dies ist ein bekanntes Problem, welches für eine komplexe Anwendung wie "
+"Evolution mit zahlreichen Einstellungsmöglichkeiten schwierig zu lösen ist."
 
 #: C/express-mode.page:23(p)
 msgid ""
@@ -9356,15 +9370,15 @@ msgstr ""
 
 #: C/exporting-data.page:5(desc)
 msgid "How to export data from <em>Evolution</em>."
-msgstr ""
+msgstr "Daten aus <em>Evolution</em> exportieren."
 
 #: C/exporting-data.page:20(title)
 msgid "Exporting data from <em>Evolution</em>"
-msgstr ""
+msgstr "Daten aus <em>Evolution</em> exportieren"
 
 #: C/exporting-data-mail.page:5(desc)
 msgid "How to export mail data from <em>Evolution</em>."
-msgstr ""
+msgstr "Über den Export von Nachrichtendaten aus <em>Evolution</em>."
 
 #: C/exporting-data-mail.page:20(title)
 msgid "Exporting mail data"
@@ -9386,7 +9400,7 @@ msgstr ""
 
 #: C/exporting-data-contacts.page:5(desc)
 msgid "How to export contacts data from <em>Evolution</em>."
-msgstr ""
+msgstr "Über den Export von Kontaktdaten aus <em>Evolution</em>."
 
 #: C/exporting-data-contacts.page:23(title)
 msgid "Exporting contacts data"
@@ -9396,6 +9410,8 @@ msgstr "Kontaktdaten exportieren"
 msgid ""
 "Contacts files are stored in a database, but can be saved as a vCard file."
 msgstr ""
+"Kontaktdateien sind in einer Datenbank gespeichert, können aber als vCard-"
+"Datei gespeichert werden."
 
 #: C/exporting-data-contacts.page:26(p)
 msgid ""
@@ -9449,7 +9465,7 @@ msgstr ""
 
 #: C/exchange-connectors-overview.page:20(title)
 msgid "Choosing the right connector"
-msgstr ""
+msgstr "Die richtige Anbindung wählen"
 
 #: C/exchange-connectors-overview.page:22(p)
 msgid ""
@@ -9457,6 +9473,9 @@ msgid ""
 "to connect to it is required to make sure that an additional package is "
 "installed that provides this functionality."
 msgstr ""
+"Abhängig von der Version des Microsoft Exchange-Servers, zu dem Sie eine "
+"Verbindung herstellen wollen, müssen Sie sicher stellen, dass ein "
+"zusätzliches Paket installiert ist, welches diese Funktionalität bereitstellt."
 
 #: C/exchange-connectors-overview.page:24(p)
 msgid ""
@@ -9496,18 +9515,21 @@ msgid ""
 "Deleting emails and calendar entries to reduce the size of the files used by "
 "Evolution."
 msgstr ""
+"Nachrichten oder Kalendereinträge löschen, um die Größe der von Evolution "
+"verwendeten Dateien zu verringern."
 
 #: C/deleting-to-free-disk-space.page:20(title)
 msgid "Freeing disk space by deleting items"
-msgstr ""
+msgstr "Platz durch Löschen von Objekten freigeben"
 
 #: C/deleting-emails.page:5(desc)
 msgid "Deleting emails or attachments to reduce the size of the mailbox."
 msgstr ""
+"Nachrichten oder Anhänge löschen, um die Größe des Postfachs zu verringern."
 
 #: C/deleting-emails.page:25(title)
 msgid "Deleting emails or attachments permanently"
-msgstr ""
+msgstr "Nachrichten oder Anhänge dauerhaft löschen"
 
 #: C/deleting-emails.page:28(title)
 msgid "Emails"
@@ -9539,11 +9561,11 @@ msgstr ""
 
 #: C/deleting-appointments.page:5(desc)
 msgid "Deleting calendar entries to reduce the size of the mailbox."
-msgstr ""
+msgstr "Kalendereinträge löschen, um die Größe des Postfachs zu verringern."
 
 #: C/deleting-appointments.page:20(title)
 msgid "Deleting old appointments permanently"
-msgstr ""
+msgstr "Alte Termine dauerhaft löschen"
 
 #: C/deleting-appointments.page:22(p)
 msgid ""
@@ -9556,7 +9578,7 @@ msgstr ""
 
 #: C/default-browser.page:5(desc)
 msgid "How to define the default browser to open links with."
-msgstr ""
+msgstr "Den Standardbrowser zum Öffnen von Verweisen festlegen."
 
 #: C/default-browser.page:20(title)
 msgid "Setting the default browser"
@@ -9605,9 +9627,8 @@ msgid ""
 msgstr ""
 
 #: C/data-storage.page:30(title)
-#, fuzzy
 msgid "The user's data files"
-msgstr "Um die Dateien zu importieren:"
+msgstr "Die Dateien mit den Benutzerdaten"
 
 #: C/data-storage.page:31(p)
 msgid "$HOME/.local/share/evolution"
@@ -9744,7 +9765,7 @@ msgstr ""
 
 #: C/contacts-using-contact-lists.page:5(desc)
 msgid "Using contact lists for grouping contacts."
-msgstr ""
+msgstr "Kontaktlisten zum Gruppieren von Kontakten verwenden."
 
 #: C/contacts-using-contact-lists.page:23(title)
 msgid "Using Contact Lists"
@@ -9787,6 +9808,8 @@ msgstr "Eine Kontaktliste erstellen"
 msgid ""
 "Click <guiseq><gui>File</gui><gui>New</gui><gui>Contact List</gui></guiseq>."
 msgstr ""
+"Klicken Sie auf <guiseq><gui>Datei</gui><gui>Neu</gui><gui>Kontaktliste</"
+"gui></guiseq>."
 
 #: C/contacts-using-contact-lists.page:34(p)
 #: C/contacts-usage-add-contact.page:24(p)
@@ -9811,7 +9834,6 @@ msgstr ""
 "sollen, wenn Sie eine Nachricht an die Kontaktliste senden."
 
 #: C/contacts-using-contact-lists.page:36(p)
-#, fuzzy
 msgid ""
 "Unless it is a very small list, it is recommended that you leave the "
 "addresses hidden. This is the same thing as using the “Bcc:” feature "
@@ -9820,9 +9842,9 @@ msgid ""
 msgstr ""
 "Falls es sich nicht um eine sehr kleine Liste handelt, wird empfohlen, die "
 "Adressen nicht anzeigen zu lassen. Hierbei handelt es sich um dieselbe "
-"Funktion wie die unter <link linkend=\"usage-mail-getnsend-send-to-types"
+"Funktion wie die unter <link xref=\"mail-composer-several-recipients"
 "\">Weitere Empfänger zu einer E-Mail hinzufügen</link> beschriebene "
-"<quote>Blindkopie</quote>-Funktion."
+"»Blindkopie«-Funktion."
 
 #: C/contacts-using-contact-lists.page:40(p)
 msgid "The contact list will be added to the chosen address book in Evolution."
@@ -10020,7 +10042,7 @@ msgstr "Die freigegebenen Adressbücher im Netzwerk verwenden."
 
 #: C/contacts-ldap.page:23(title)
 msgid "Adding LDAP access"
-msgstr ""
+msgstr "LDAP-Zugriff ermöglichen"
 
 #: C/contacts-ldap.page:25(p)
 msgid ""
@@ -10055,7 +10077,7 @@ msgstr ""
 
 #: C/contacts-ldap.page:37(p)
 msgid "In the <gui>Details</gui> tab you can define the following settings:"
-msgstr ""
+msgstr "Im Reiter <gui>Details</gui> können Sie Folgendes einstellen:"
 
 #: C/contacts-ldap.page:39(p)
 #, fuzzy
@@ -10097,24 +10119,27 @@ msgstr ""
 
 #: C/contacts-ldap.page:48(p)
 msgid "<code>ObjectClass=*</code>: Lists all the objects from the server."
-msgstr ""
+msgstr "<code>ObjectClass=*</code>: Listet alle Objekte des Servers auf."
 
 #: C/contacts-ldap.page:49(p)
 msgid "<code>ObjectClass=User</code>: Lists only the users."
-msgstr ""
+msgstr "<code>ObjectClass=User</code>: Listet nur die Benutzer auf."
 
 #: C/contacts-ldap.page:50(p)
-#, fuzzy
 msgid ""
 "<code>Filter (|(ObjectClass=User)(ObjectClass=groupOfNames))</code>: "
 "Retrieves the User and Contact List objects."
-msgstr "Filter (|(ObjectClass=User)(ObjectClass=groupOfNames))"
+msgstr ""
+"<code>Filter (|(ObjectClass=User)(ObjectClass=groupOfNames))</code>: Holt die "
+"Benutzer- und Kontaktlistenobjekte."
 
 #: C/contacts-ldap.page:51(p)
 msgid ""
 "<code>(&amp;(mail=*)(ObjectClass=*))</code>: Lists the objects associated "
 "with the email addresses."
 msgstr ""
+"<code>(&amp;(mail=*)(ObjectClass=*))</code>: Listet den E-Mail-Adressen "
+"zugeordnete Objekte auf."
 
 #: C/contacts-ldap.page:54(p)
 #, fuzzy
@@ -10145,15 +10170,16 @@ msgstr ""
 "Administrator."
 
 #: C/contacts-ldap.page:65(title)
-#, fuzzy
 msgid "Differences to local address books"
-msgstr "Lokale Adressbuchordner auflisten"
+msgstr "unterschiede zu lokalen Adressbüchern"
 
 #: C/contacts-ldap.page:67(p)
 msgid ""
 "LDAP address books work like local address books on your computer, with the "
 "following exceptions:"
 msgstr ""
+"LDAP-Adressbücher verhalten sich wie lokale Adressbücher auf Ihrem Rechner, "
+"mit folgenden Ausnahmen:"
 
 #: C/contacts-ldap.page:69(p)
 msgid ""
@@ -10201,9 +10227,8 @@ msgstr ""
 "Systemadministrator, falls Sie andere Einstellungen benötigen."
 
 #: C/contacts-google.page:5(desc)
-#, fuzzy
 msgid "Use the online address book of your Google account."
-msgstr "Erzeugt ein lokales Adressbuch auf Ihrem Rechner."
+msgstr "Das Online-Adressbuch Ihres Google-Kontos nutzen."
 
 #: C/contacts-google.page:21(title)
 msgid "Using a Google addressbook"
@@ -10212,6 +10237,7 @@ msgstr "Ein Google-Adressbuch verwenden"
 #: C/contacts-google.page:23(p)
 msgid "To add such an address book to Evolution, perform the following steps:"
 msgstr ""
+"um ein solches Adressbuch in Evolution hinzuzufügen, gehen Sie wie folgt vor:"
 
 #: C/contacts-google.page:26(p) C/calendar-google.page:29(p)
 msgid "Select the type <gui>Google</gui>."
@@ -10663,9 +10689,8 @@ msgid ""
 msgstr ""
 
 #: C/calendar-recurrence.page:5(desc)
-#, fuzzy
 msgid "Repeating appointments."
-msgstr "Termine erstellen"
+msgstr "Wiederkehrende Termine."
 
 #: C/calendar-recurrence.page:23(title)
 msgid "Using Recurrence"
@@ -11060,7 +11085,7 @@ msgstr "Die Anordnung des Kalenders ändern"
 
 #: C/calendar-layout-general-formatting.page:5(desc)
 msgid "General formatting options for the calendar."
-msgstr ""
+msgstr "Allgemeine Formatierungsoptionen für den Kalender."
 
 #: C/calendar-layout-general-formatting.page:25(title)
 msgid "General formatting options"
@@ -11209,9 +11234,8 @@ msgstr ""
 "Seitenleiste an."
 
 #: C/calendar-layout-appointment-display.page:42(p)
-#, fuzzy
 msgid "Show recurring events in italic in bottom left calendar"
-msgstr "Wi_ederkehrende Ereignisse im Kalender unten links kursiv anzeigen"
+msgstr "Wiederkehrende Ereignisse im Kalender unten links kursiv anzeigen"
 
 #: C/calendar-layout-appointment-display.page:43(p)
 msgid "Scroll Month View by a week"
@@ -11228,9 +11252,8 @@ msgid ""
 msgstr ""
 
 #: C/calendar-google.page:5(desc)
-#, fuzzy
 msgid "Using the online calendar of your Google account."
-msgstr "Geben Sie den Benutzernamen für Ihr Google-Konto ein."
+msgstr "Den Online-Kalender Ihres Google-Kontos nutzen."
 
 #: C/calendar-google.page:24(title)
 msgid "Using a Google calendar"
@@ -11401,9 +11424,8 @@ msgid ""
 msgstr ""
 
 #: C/calendar-caldav.page:5(desc)
-#, fuzzy
 msgid "Using an online CalDAV calendar."
-msgstr "Nach einem CalDAV-Kalender suchen"
+msgstr "Einen Online-CalDAV-Kalender nutzen."
 
 #: C/calendar-caldav.page:23(title)
 msgid "Using a CalDAV calendar"
@@ -11492,12 +11514,16 @@ msgid ""
 "Choose a filename and the folder where you want to save the backup file, and "
 "click <gui style=\"button\">Save</gui>."
 msgstr ""
+"Wählen Sie einen Dateinamen und den Ordner, in dem Sie die Sicherungsdatei "
+"speichern wollen, und klicken Sie auf <gui style=\"button\">Speichern</gui>."
 
 #: C/backup-restore.page:30(p) C/backup-restore.page:39(p)
 msgid ""
 "You will get asked to close Evolution. Answer with <gui style=\"button\">Yes</"
 "gui>."
 msgstr ""
+"Sie werden darum gebeten, Evolution zu schließen. Antworten Sie mit <gui "
+"style=\"button\">Ja</gui>."
 
 #: C/backup-restore.page:35(title)
 msgid "Restoring"
@@ -11507,6 +11533,8 @@ msgstr "Wiederherstellung"
 msgid ""
 "Select <guiseq><gui>File</gui><gui>Restore Evolution Data...</gui></guiseq>."
 msgstr ""
+"Wählen Sie <guiseq><gui>Datei</gui><gui>Evolution-Daten wiederherstellen …</"
+"gui></guiseq>"
 
 #: C/backup-restore.page:38(p)
 msgid "Choose the file, and click <gui style=\"button\">Open</gui>."
diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c
index 0687d7561f..c14bdd56d8 100644
--- a/mail/e-mail-session.c
+++ b/mail/e-mail-session.c
@@ -1096,6 +1096,125 @@ mail_session_get_socks_proxy (CamelSession *session,
 	g_free (uri);
 }
 
+static gboolean
+mail_session_authenticate_sync (CamelSession *session,
+                                CamelService *service,
+                                const gchar *mechanism,
+                                GCancellable *cancellable,
+                                GError **error)
+{
+	CamelServiceAuthType *authtype = NULL;
+	CamelAuthenticationResult result;
+	CamelProvider *provider;
+	CamelURL *url;
+	const gchar *password;
+	guint32 password_flags;
+	GError *local_error = NULL;
+
+	/* Do not chain up.  Camel's default method is only an example for
+	 * subclasses to follow.  Instead we mimic most of its logic here. */
+
+	url = camel_service_get_camel_url (service);
+	provider = camel_service_get_provider (service);
+
+	/* APOP is one case where a non-SASL mechanism name is passed, so
+	 * don't bail if the CamelServiceAuthType struct comes back NULL. */
+	if (mechanism != NULL)
+		authtype = camel_sasl_authtype (mechanism);
+
+	/* If the SASL mechanism does not involve a user
+	 * password, then it gets one shot to authenticate. */
+	if (authtype != NULL && !authtype->need_password) {
+		result = camel_service_authenticate_sync (
+			service, mechanism, cancellable, error);
+		if (result == CAMEL_AUTHENTICATION_REJECTED)
+			g_set_error (
+				error, CAMEL_SERVICE_ERROR,
+				CAMEL_SERVICE_ERROR_CANT_AUTHENTICATE,
+				_("%s authentication failed"), mechanism);
+		return (result == CAMEL_AUTHENTICATION_ACCEPTED);
+	}
+
+	/* Some SASL mechanisms can attempt to authenticate without a
+	 * user password being provided (e.g. single-sign-on credentials),
+	 * but can fall back to a user password.  Handle that case next. */
+	if (mechanism != NULL) {
+		CamelProvider *provider;
+		CamelSasl *sasl;
+		const gchar *service_name;
+		gboolean success = FALSE;
+
+		provider = camel_service_get_provider (service);
+		service_name = provider->protocol;
+
+		/* XXX Would be nice if camel_sasl_try_empty_password_sync()
+		 *     returned CamelAuthenticationResult so it's easier to
+		 *     detect errors. */
+		sasl = camel_sasl_new (service_name, mechanism, service);
+		if (sasl != NULL) {
+			success = camel_sasl_try_empty_password_sync (
+				sasl, cancellable, &local_error);
+			g_object_unref (sasl);
+		}
+
+		if (success)
+			return TRUE;
+	}
+
+	/* Abort authentication if we got cancelled.
+	 * Otherwise clear any errors and press on. */
+	if (g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+		return FALSE;
+
+	g_clear_error (&local_error);
+
+	password_flags = CAMEL_SESSION_PASSWORD_SECRET;
+
+retry:
+	password = camel_service_get_password (service);
+
+	if (password == NULL) {
+		gchar *prompt;
+		gchar *new_passwd;
+
+		prompt = camel_session_build_password_prompt (
+			provider->name, url->user, url->host);
+
+		new_passwd = camel_session_get_password (
+			session, service, prompt, "password",
+			password_flags, &local_error);
+		camel_service_set_password (service, new_passwd);
+		password = camel_service_get_password (service);
+		g_free (new_passwd);
+
+		g_free (prompt);
+
+		if (local_error != NULL) {
+			g_propagate_error (error, local_error);
+			return FALSE;
+		}
+
+		if (password == NULL) {
+			g_set_error (
+				error, CAMEL_SERVICE_ERROR,
+				CAMEL_SERVICE_ERROR_CANT_AUTHENTICATE,
+				_("No password was provided"));
+			return FALSE;
+		}
+	}
+
+	result = camel_service_authenticate_sync (
+		service, mechanism, cancellable, error);
+
+	if (result == CAMEL_AUTHENTICATION_REJECTED) {
+		password_flags |= CAMEL_SESSION_PASSWORD_REPROMPT;
+		camel_service_set_password (service, NULL);
+		goto retry;
+	}
+
+	return (result == CAMEL_AUTHENTICATION_ACCEPTED);
+}
+
 static void
 e_mail_session_class_init (EMailSessionClass *class)
 {
@@ -1121,6 +1240,7 @@ e_mail_session_class_init (EMailSessionClass *class)
 	session_class->lookup_addressbook = mail_session_lookup_addressbook;
 	session_class->forward_to = mail_session_forward_to;
 	session_class->get_socks_proxy = mail_session_get_socks_proxy;
+	session_class->authenticate_sync = mail_session_authenticate_sync;
 
 	g_object_class_install_property (
 		object_class,
diff --git a/mail/em-subscription-editor.c b/mail/em-subscription-editor.c
index 09b74bcb3c..d92713f8be 100644
--- a/mail/em-subscription-editor.c
+++ b/mail/em-subscription-editor.c
@@ -48,6 +48,7 @@
 	((obj), EM_TYPE_SUBSCRIPTION_EDITOR, EMSubscriptionEditorPrivate))
 
 typedef struct _AsyncContext AsyncContext;
+typedef struct _AsyncData AsyncData;
 typedef struct _StoreData StoreData;
 
 struct _EMSubscriptionEditorPrivate {
@@ -58,7 +59,9 @@ struct _EMSubscriptionEditorPrivate {
 	GtkWidget *entry;		/* not referenced */
 	GtkWidget *notebook;		/* not referenced */
 	GtkWidget *subscribe_button;	/* not referenced */
+	GtkWidget *subscribe_arrow;	/* not referenced */
 	GtkWidget *unsubscribe_button;	/* not referenced */
+	GtkWidget *unsubscribe_arrow;	/* not referenced */
 	GtkWidget *collapse_all_button;	/* not referenced */
 	GtkWidget *expand_all_button;	/* not referenced */
 	GtkWidget *refresh_button;	/* not referenced */
@@ -76,12 +79,16 @@ struct _EMSubscriptionEditorPrivate {
 	guint timeout_id;
 };
 
-struct _AsyncContext {
-	EMSubscriptionEditor *editor;
+struct _AsyncData {
 	CamelFolderInfo *folder_info;
 	GtkTreeRowReference *reference;
 };
 
+struct _AsyncContext {
+	EMSubscriptionEditor *editor;
+	GSList *async_datas; /* newly allocated AsyncData structures */
+};
+
 struct _StoreData {
 	CamelStore *store;
 	GtkTreeView *tree_view;
@@ -110,10 +117,21 @@ enum {
 G_DEFINE_TYPE (EMSubscriptionEditor, em_subscription_editor, GTK_TYPE_DIALOG)
 
 static void
+async_data_free (AsyncData *data)
+{
+	g_return_if_fail (data != NULL);
+
+	gtk_tree_row_reference_free (data->reference);
+	g_free (data);
+}
+
+static void
 async_context_free (AsyncContext *context)
 {
 	g_object_unref (context->editor);
-	gtk_tree_row_reference_free (context->reference);
+
+	g_slist_foreach (context->async_datas, (GFunc) async_data_free, NULL);
+	g_slist_free (context->async_datas);
 
 	g_slice_free (AsyncContext, context);
 }
@@ -293,6 +311,7 @@ subscription_editor_subscribe_folder_done (CamelSubscribable *subscribable,
 	GtkTreeIter iter;
 	GdkWindow *window;
 	GError *error = NULL;
+	AsyncData *async_data;
 
 	camel_subscribable_subscribe_folder_finish (
 		subscribable, result, &error);
@@ -303,14 +322,41 @@ subscription_editor_subscribe_folder_done (CamelSubscribable *subscribable,
 		goto exit;
 	}
 
+	async_data = context->async_datas->data;
+	context->async_datas = g_slist_remove (context->async_datas, async_data);
+
 	/* XXX Do something smarter with errors. */
 	if (error == NULL)
-		context->folder_info->flags |= CAMEL_FOLDER_SUBSCRIBED;
+		async_data->folder_info->flags |= CAMEL_FOLDER_SUBSCRIBED;
 	else {
 		g_warning ("%s", error->message);
 		g_error_free (error);
+		async_data_free (async_data);
+		goto exit;
+	}
+
+	/* Update the toggle renderer in the selected row. */
+	tree_model = gtk_tree_row_reference_get_model (async_data->reference);
+	path = gtk_tree_row_reference_get_path (async_data->reference);
+	gtk_tree_model_get_iter (tree_model, &iter, path);
+	gtk_tree_model_row_changed (tree_model, path, &iter);
+	gtk_tree_path_free (path);
+
+	async_data_free (async_data);
+
+	if (context->async_datas) {
+		/* continue with the next to subscribe */
+		async_data = context->async_datas->data;
+
+		camel_subscribable_subscribe_folder (
+			subscribable,
+			async_data->folder_info->full_name, G_PRIORITY_DEFAULT,
+			context->editor->priv->active->cancellable, (GAsyncReadyCallback)
+			subscription_editor_subscribe_folder_done, context);
+		return;
 	}
 
+ exit:
 	gtk_widget_set_sensitive (context->editor->priv->notebook, TRUE);
 	gtk_widget_set_sensitive (context->editor->priv->refresh_button, TRUE);
 	gtk_widget_set_sensitive (context->editor->priv->stop_button, FALSE);
@@ -323,15 +369,60 @@ subscription_editor_subscribe_folder_done (CamelSubscribable *subscribable,
 	selection = gtk_tree_view_get_selection (tree_view);
 	g_signal_emit_by_name (selection, "changed");
 
-	/* Update the toggle renderer in the selected row. */
-	tree_model = gtk_tree_row_reference_get_model (context->reference);
-	path = gtk_tree_row_reference_get_path (context->reference);
-	gtk_tree_model_get_iter (tree_model, &iter, path);
-	gtk_tree_model_row_changed (tree_model, path, &iter);
-	gtk_tree_path_free (path);
-
-exit:
 	async_context_free (context);
+
+	gtk_widget_grab_focus (GTK_WIDGET (tree_view));
+}
+
+
+static void
+subscription_editor_subscribe_many (EMSubscriptionEditor *editor,
+				    GSList *async_datas)
+{
+	AsyncData *async_data;
+	AsyncContext *context;
+	CamelStore *active_store;
+	GdkCursor *cursor;
+	GdkWindow *window;
+
+	g_return_if_fail (editor != NULL);
+
+	if (!async_datas)
+		return;
+
+	async_data = async_datas->data;
+	g_return_if_fail (async_data != NULL);
+
+	/* Cancel any operation on this store still in progress. */
+	gtk_button_clicked (GTK_BUTTON (editor->priv->stop_button));
+
+	/* Start a new 'subscription' operation. */
+	editor->priv->active->cancellable = g_cancellable_new ();
+
+	gtk_widget_set_sensitive (editor->priv->notebook, FALSE);
+	gtk_widget_set_sensitive (editor->priv->subscribe_button, FALSE);
+	gtk_widget_set_sensitive (editor->priv->subscribe_arrow, FALSE);
+	gtk_widget_set_sensitive (editor->priv->unsubscribe_button, FALSE);
+	gtk_widget_set_sensitive (editor->priv->unsubscribe_arrow, FALSE);
+	gtk_widget_set_sensitive (editor->priv->refresh_button, FALSE);
+	gtk_widget_set_sensitive (editor->priv->stop_button, TRUE);
+
+	cursor = gdk_cursor_new (GDK_WATCH);
+	window = gtk_widget_get_window (GTK_WIDGET (editor));
+	gdk_window_set_cursor (window, cursor);
+	g_object_unref (cursor);
+
+	context = g_slice_new0 (AsyncContext);
+	context->editor = g_object_ref (editor);
+	context->async_datas = async_datas; /* takes ownership of the pointer */
+
+	active_store = editor->priv->active->store;
+
+	camel_subscribable_subscribe_folder (
+		CAMEL_SUBSCRIBABLE (active_store),
+		async_data->folder_info->full_name, G_PRIORITY_DEFAULT,
+		context->editor->priv->active->cancellable, (GAsyncReadyCallback)
+		subscription_editor_subscribe_folder_done, context);
 }
 
 static void
@@ -346,6 +437,7 @@ subscription_editor_unsubscribe_folder_done (CamelSubscribable *subscribable,
 	GtkTreeIter iter;
 	GdkWindow *window;
 	GError *error = NULL;
+	AsyncData *async_data;
 
 	camel_subscribable_unsubscribe_folder_finish (
 		subscribable, result, &error);
@@ -356,14 +448,40 @@ subscription_editor_unsubscribe_folder_done (CamelSubscribable *subscribable,
 		goto exit;
 	}
 
+	async_data = context->async_datas->data;
+	context->async_datas = g_slist_remove (context->async_datas, async_data);
+
 	/* XXX Do something smarter with errors. */
 	if (error == NULL)
-		context->folder_info->flags &= ~CAMEL_FOLDER_SUBSCRIBED;
+		async_data->folder_info->flags &= ~CAMEL_FOLDER_SUBSCRIBED;
 	else {
 		g_warning ("%s", error->message);
 		g_error_free (error);
+		async_data_free (async_data);
+		goto exit;
 	}
 
+	/* Update the toggle renderer in the selected row. */
+	tree_model = gtk_tree_row_reference_get_model (async_data->reference);
+	path = gtk_tree_row_reference_get_path (async_data->reference);
+	gtk_tree_model_get_iter (tree_model, &iter, path);
+	gtk_tree_model_row_changed (tree_model, path, &iter);
+	gtk_tree_path_free (path);
+
+	async_data_free (async_data);
+
+	if (context->async_datas) {
+		/* continue with the next to unsubscribe */
+		async_data = context->async_datas->data;
+
+		camel_subscribable_unsubscribe_folder (
+			subscribable,
+			async_data->folder_info->full_name, G_PRIORITY_DEFAULT,
+			context->editor->priv->active->cancellable, (GAsyncReadyCallback)
+			subscription_editor_unsubscribe_folder_done, context);
+		return;
+	}
+ exit:
 	gtk_widget_set_sensitive (context->editor->priv->notebook, TRUE);
 	gtk_widget_set_sensitive (context->editor->priv->refresh_button, TRUE);
 	gtk_widget_set_sensitive (context->editor->priv->stop_button, FALSE);
@@ -376,39 +494,29 @@ subscription_editor_unsubscribe_folder_done (CamelSubscribable *subscribable,
 	selection = gtk_tree_view_get_selection (tree_view);
 	g_signal_emit_by_name (selection, "changed");
 
-	/* Update the toggle renderer in the selected row. */
-	tree_model = gtk_tree_row_reference_get_model (context->reference);
-	path = gtk_tree_row_reference_get_path (context->reference);
-	gtk_tree_model_get_iter (tree_model, &iter, path);
-	gtk_tree_model_row_changed (tree_model, path, &iter);
-	gtk_tree_path_free (path);
-
-exit:
 	async_context_free (context);
+
+	gtk_widget_grab_focus (GTK_WIDGET (tree_view));
 }
 
+
 static void
-subscription_editor_subscribe (EMSubscriptionEditor *editor)
+subscription_editor_unsubscribe_many (EMSubscriptionEditor *editor,
+				      GSList *async_datas)
 {
+	AsyncData *async_data;
+	AsyncContext *context;
 	CamelStore *active_store;
-	CamelFolderInfo *folder_info;
-	GtkTreeRowReference *reference;
-	GtkTreeSelection *selection;
-	GtkTreeModel *tree_model;
-	GtkTreeView *tree_view;
-	GtkTreePath *path;
-	GtkTreeIter iter;
 	GdkCursor *cursor;
 	GdkWindow *window;
-	AsyncContext *context;
-	gboolean have_selection;
 
-	tree_view = editor->priv->active->tree_view;
-	selection = gtk_tree_view_get_selection (tree_view);
+	g_return_if_fail (editor != NULL);
 
-	have_selection = gtk_tree_selection_get_selected (
-		selection, &tree_model, &iter);
-	g_return_if_fail (have_selection);
+	if (!async_datas)
+		return;
+
+	async_data = async_datas->data;
+	g_return_if_fail (async_data != NULL);
 
 	/* Cancel any operation on this store still in progress. */
 	gtk_button_clicked (GTK_BUTTON (editor->priv->stop_button));
@@ -418,7 +526,9 @@ subscription_editor_subscribe (EMSubscriptionEditor *editor)
 
 	gtk_widget_set_sensitive (editor->priv->notebook, FALSE);
 	gtk_widget_set_sensitive (editor->priv->subscribe_button, FALSE);
+	gtk_widget_set_sensitive (editor->priv->subscribe_arrow, FALSE);
 	gtk_widget_set_sensitive (editor->priv->unsubscribe_button, FALSE);
+	gtk_widget_set_sensitive (editor->priv->unsubscribe_arrow, FALSE);
 	gtk_widget_set_sensitive (editor->priv->refresh_button, FALSE);
 	gtk_widget_set_sensitive (editor->priv->stop_button, TRUE);
 
@@ -427,42 +537,252 @@ subscription_editor_subscribe (EMSubscriptionEditor *editor)
 	gdk_window_set_cursor (window, cursor);
 	g_object_unref (cursor);
 
-	gtk_tree_model_get (
-		tree_model, &iter, COL_FOLDER_INFO, &folder_info, -1);
-
-	path = gtk_tree_model_get_path (tree_model, &iter);
-	reference = gtk_tree_row_reference_new (tree_model, path);
-	gtk_tree_path_free (path);
-
 	context = g_slice_new0 (AsyncContext);
 	context->editor = g_object_ref (editor);
-	context->folder_info = folder_info;
-	context->reference = reference;
+	context->async_datas = async_datas; /* takes ownership of the pointer */
 
 	active_store = editor->priv->active->store;
 
-	camel_subscribable_subscribe_folder (
+	camel_subscribable_unsubscribe_folder (
 		CAMEL_SUBSCRIBABLE (active_store),
-		folder_info->full_name, G_PRIORITY_DEFAULT,
+		async_data->folder_info->full_name, G_PRIORITY_DEFAULT,
 		editor->priv->active->cancellable, (GAsyncReadyCallback)
-		subscription_editor_subscribe_folder_done, context);
+		subscription_editor_unsubscribe_folder_done, context);
+}
+
+static GtkWidget *
+subscription_editor_create_menu_item (const gchar *label,
+				      gboolean sensitive,
+				      GCallback activate_cb,
+				      EMSubscriptionEditor *editor)
+{
+	GtkWidget *item;
+
+	item = gtk_menu_item_new_with_mnemonic (label);
+	gtk_widget_set_sensitive (item, sensitive);
+
+	gtk_widget_show (item);
+
+	g_signal_connect_swapped (item, "activate", activate_cb, editor);
+
+	return item;
 }
 
 static void
-subscription_editor_unsubscribe (EMSubscriptionEditor *editor)
+position_below_widget_cb (GtkMenu *menu,
+			  gint *x,
+			  gint *y,
+			  gboolean *push_in,
+			  gpointer under_widget)
 {
-	CamelStore *active_store;
-	CamelFolderInfo *folder_info;
+	GtkRequisition menu_requisition;
+	GtkTextDirection direction;
+	GtkAllocation allocation;
+	GdkRectangle monitor;
+	GdkScreen *screen;
+	GdkWindow *window;
+	GtkWidget *widget;
+	gint monitor_num;
+
+	widget = under_widget;
+	gtk_widget_get_preferred_size (GTK_WIDGET (menu), &menu_requisition, NULL);
+
+	window = gtk_widget_get_parent_window (widget);
+	screen = gtk_widget_get_screen (GTK_WIDGET (menu));
+	monitor_num = gdk_screen_get_monitor_at_window (screen, window);
+	if (monitor_num < 0)
+		monitor_num = 0;
+	gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+
+	gtk_widget_get_allocation (widget, &allocation);
+
+	gdk_window_get_origin (window, x, y);
+	*x += allocation.x;
+	*y += allocation.y + 2 + gtk_widget_get_allocated_height (under_widget);
+
+	direction = gtk_widget_get_direction (widget);
+	if (direction == GTK_TEXT_DIR_LTR)
+		*x += MAX (allocation.width - menu_requisition.width, 0);
+	else if (menu_requisition.width > allocation.width)
+		*x -= menu_requisition.width - allocation.width;
+
+	*push_in = FALSE;
+}
+
+static AsyncData *
+subscription_editor_async_data_from_iter (GtkTreeView *tree_view,
+					  GtkTreeModel *model,
+					  GtkTreeIter *iter,
+					  gboolean *is_expanded)
+{
+	AsyncData *data;
+	CamelFolderInfo *folder_info = NULL;
 	GtkTreeRowReference *reference;
+	GtkTreePath *path;
+
+	g_return_val_if_fail (tree_view != NULL, NULL);
+	g_return_val_if_fail (model != NULL, NULL);
+	g_return_val_if_fail (iter != NULL, NULL);
+
+	gtk_tree_model_get (
+		model, iter, COL_FOLDER_INFO, &folder_info, -1);
+
+	if (!FOLDER_CAN_SELECT (folder_info))
+		return NULL;
+
+	path = gtk_tree_model_get_path (model, iter);
+	reference = gtk_tree_row_reference_new (model, path);
+	if (is_expanded)
+		*is_expanded = gtk_tree_view_row_expanded (tree_view, path);
+	gtk_tree_path_free (path);
+
+	data = g_new0 (AsyncData, 1);
+	data->folder_info = folder_info;
+	data->reference = reference;
+
+	return data;
+}
+
+typedef enum {
+	PICK_ALL,
+	PICK_SUBSCRIBED,
+	PICK_UNSUBSCRIBED
+} EPickMode;
+
+static gboolean
+can_pick_folder_info (CamelFolderInfo *fi, EPickMode mode)
+{
+	if (!FOLDER_CAN_SELECT (fi))
+		return FALSE;
+
+	if (mode == PICK_ALL)
+		return TRUE;
+
+	return (FOLDER_SUBSCRIBED (fi) ? 1 : 0) == (mode == PICK_SUBSCRIBED ? 1 : 0);
+}
+
+struct PickAllData {
+	GtkTreeView *tree_view;
+	EPickMode mode;
+	GHashTable *skip_folder_infos;
+	GSList *async_datas;
+};
+
+static gboolean
+pick_all_cb (GtkTreeModel *model,
+	     GtkTreePath *path,
+	     GtkTreeIter *iter,
+	     gpointer user_data)
+{
+	struct PickAllData *data = user_data;
+	AsyncData *async_data;
+
+	g_return_val_if_fail (model != NULL, TRUE);
+	g_return_val_if_fail (data != NULL, TRUE);
+	g_return_val_if_fail (data->tree_view != NULL, TRUE);
+
+	async_data = subscription_editor_async_data_from_iter (data->tree_view, model, iter, NULL);
+	if (!async_data)
+		return FALSE;
+
+	if (can_pick_folder_info (async_data->folder_info, data->mode) &&
+	    (data->skip_folder_infos == NULL ||
+	    !g_hash_table_lookup_extended (data->skip_folder_infos, async_data->folder_info, NULL, NULL))) {
+		data->async_datas = g_slist_prepend (data->async_datas, async_data);
+	} else
+		async_data_free (async_data);
+
+	return FALSE;
+}
+
+/* skip_folder_infos contains CamelFolderInfo-s to skip;
+   these should come from the tree view; can be NULL
+   to include everything.
+*/
+static GSList *
+subscription_editor_pick_all (EMSubscriptionEditor *editor,
+			      EPickMode mode,
+			      GHashTable *skip_folder_infos)
+{
+	GtkTreeView *tree_view;
+	GtkTreeModel *tree_model;
+	struct PickAllData data;
+
+	tree_view = editor->priv->active->tree_view;
+	tree_model = gtk_tree_view_get_model (tree_view);
+
+	data.tree_view = tree_view;
+	data.mode = mode;
+	data.skip_folder_infos = skip_folder_infos;
+	data.async_datas = NULL;
+
+	gtk_tree_model_foreach (tree_model, pick_all_cb, &data);
+
+	return data.async_datas;
+}
+
+static GSList *
+subscription_editor_pick_shown (EMSubscriptionEditor *editor,
+				EPickMode mode)
+{
+	GtkTreeView *tree_view;
+	GtkTreeModel *tree_model;
+	GtkTreeIter iter, iter2;
+	GSList *async_datas = NULL;
+	gboolean found;
+
+	tree_view = editor->priv->active->tree_view;
+	tree_model = gtk_tree_view_get_model (tree_view);
+
+	if (!gtk_tree_model_get_iter_first (tree_model, &iter))
+		return NULL;
+
+	found = TRUE;
+	while (found) {
+		AsyncData *async_data;
+		gboolean is_expanded = FALSE;
+
+		found = FALSE;
+		async_data = subscription_editor_async_data_from_iter (tree_view, tree_model, &iter, &is_expanded);
+
+		if (async_data && can_pick_folder_info (async_data->folder_info, mode)) {
+			async_datas = g_slist_prepend (async_datas, async_data);
+		} else if (async_data) {
+			async_data_free (async_data);
+		}
+
+		if (is_expanded && gtk_tree_model_iter_children (tree_model, &iter2, &iter)) {
+			iter = iter2;
+			found = TRUE;
+		} else {
+			iter2 = iter;
+			if (gtk_tree_model_iter_next (tree_model, &iter2)) {
+				iter = iter2;
+				found = TRUE;
+			} else {
+				while (found = gtk_tree_model_iter_parent (tree_model, &iter2, &iter), found) {
+					iter = iter2;
+					if (gtk_tree_model_iter_next (tree_model, &iter2)) {
+						iter = iter2;
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	return async_datas;
+}
+
+static void
+subscription_editor_subscribe (EMSubscriptionEditor *editor)
+{
 	GtkTreeSelection *selection;
 	GtkTreeModel *tree_model;
 	GtkTreeView *tree_view;
-	GtkTreePath *path;
 	GtkTreeIter iter;
-	GdkCursor *cursor;
-	GdkWindow *window;
-	AsyncContext *context;
 	gboolean have_selection;
+	GSList *async_datas;
 
 	tree_view = editor->priv->active->tree_view;
 	selection = gtk_tree_view_get_selection (tree_view);
@@ -471,42 +791,167 @@ subscription_editor_unsubscribe (EMSubscriptionEditor *editor)
 		selection, &tree_model, &iter);
 	g_return_if_fail (have_selection);
 
-	/* Cancel any operation on this store still in progress. */
-	gtk_button_clicked (GTK_BUTTON (editor->priv->stop_button));
+	async_datas = g_slist_append (NULL,
+		subscription_editor_async_data_from_iter (tree_view, tree_model, &iter, NULL));
 
-	/* Start a new 'unsubscription' operation. */
-	editor->priv->active->cancellable = g_cancellable_new ();
+	subscription_editor_subscribe_many (editor, async_datas);
+}
 
-	gtk_widget_set_sensitive (editor->priv->notebook, FALSE);
-	gtk_widget_set_sensitive (editor->priv->subscribe_button, FALSE);
-	gtk_widget_set_sensitive (editor->priv->unsubscribe_button, FALSE);
-	gtk_widget_set_sensitive (editor->priv->refresh_button, FALSE);
-	gtk_widget_set_sensitive (editor->priv->stop_button, TRUE);
+static void
+subscription_editor_subscribe_shown (EMSubscriptionEditor *editor)
+{
+	subscription_editor_subscribe_many (editor,
+		subscription_editor_pick_shown (editor, PICK_UNSUBSCRIBED));
+}
 
-	cursor = gdk_cursor_new (GDK_WATCH);
-	window = gtk_widget_get_window (GTK_WIDGET (editor));
-	gdk_window_set_cursor (window, cursor);
-	g_object_unref (cursor);
+static void
+subscription_editor_subscribe_all (EMSubscriptionEditor *editor)
+{
+	subscription_editor_subscribe_many (editor,
+		subscription_editor_pick_all (editor, PICK_UNSUBSCRIBED, NULL));
+}
 
-	gtk_tree_model_get (
-		tree_model, &iter, COL_FOLDER_INFO, &folder_info, -1);
+static void
+subscription_editor_subscribe_popup_cb (EMSubscriptionEditor *editor)
+{
+	GtkWidget *menu;
+	GtkTreeIter iter;
+	gboolean tree_filled;
+
+	tree_filled = editor->priv->active &&
+		gtk_tree_model_get_iter_first (
+			editor->priv->active->filtered_view
+			? editor->priv->active->list_store
+			: editor->priv->active->tree_store,
+			&iter);
+
+	menu = gtk_menu_new ();
+
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu),
+		subscription_editor_create_menu_item (
+			_("_Subscribe"),
+			gtk_widget_get_sensitive (editor->priv->subscribe_button),
+			G_CALLBACK (subscription_editor_subscribe),
+			editor));
+
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu),
+		subscription_editor_create_menu_item (
+			_("Su_bscribe to shown"),
+			tree_filled,
+			G_CALLBACK (subscription_editor_subscribe_shown),
+			editor));
+
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu),
+		subscription_editor_create_menu_item (
+			_("Subscribe to _all"),
+			tree_filled,
+			G_CALLBACK (subscription_editor_subscribe_all),
+			editor));
+
+	gtk_menu_popup (
+		GTK_MENU (menu), NULL, NULL, position_below_widget_cb, editor->priv->subscribe_button,
+		0, gtk_get_current_event_time ());
+}
 
-	path = gtk_tree_model_get_path (tree_model, &iter);
-	reference = gtk_tree_row_reference_new (tree_model, path);
-	gtk_tree_path_free (path);
+static void
+subscription_editor_unsubscribe_hidden (EMSubscriptionEditor *editor)
+{
+	GSList *all_shown, *ll;
+	GHashTable *skip_shown;
 
-	context = g_slice_new0 (AsyncContext);
-	context->editor = g_object_ref (editor);
-	context->folder_info = folder_info;
-	context->reference = reference;
+	all_shown = subscription_editor_pick_shown (editor, PICK_ALL);
+	g_return_if_fail (all_shown != NULL);
 
-	active_store = editor->priv->active->store;
+	skip_shown = g_hash_table_new (g_direct_hash, g_direct_equal);
 
-	camel_subscribable_unsubscribe_folder (
-		CAMEL_SUBSCRIBABLE (active_store),
-		folder_info->full_name, G_PRIORITY_DEFAULT,
-		editor->priv->active->cancellable, (GAsyncReadyCallback)
-		subscription_editor_unsubscribe_folder_done, context);
+	for (ll = all_shown; ll; ll = ll->next) {
+		AsyncData *data = ll->data;
+
+		if (!data)
+			continue;
+
+		g_hash_table_insert (skip_shown, data->folder_info, GINT_TO_POINTER (1));
+		async_data_free (data);
+	}
+
+	g_slist_free (all_shown);
+
+	subscription_editor_unsubscribe_many (editor,
+		subscription_editor_pick_all (editor, PICK_SUBSCRIBED, skip_shown));
+
+	g_hash_table_destroy (skip_shown);
+}
+
+static void
+subscription_editor_unsubscribe_all (EMSubscriptionEditor *editor)
+{
+	subscription_editor_unsubscribe_many (editor,
+		subscription_editor_pick_all (editor, PICK_SUBSCRIBED, NULL));
+}
+
+static void
+subscription_editor_unsubscribe (EMSubscriptionEditor *editor)
+{
+	GtkTreeSelection *selection;
+	GtkTreeModel *tree_model;
+	GtkTreeView *tree_view;
+	GtkTreeIter iter;
+	gboolean have_selection;
+	GSList *async_datas;
+
+	tree_view = editor->priv->active->tree_view;
+	selection = gtk_tree_view_get_selection (tree_view);
+
+	have_selection = gtk_tree_selection_get_selected (
+		selection, &tree_model, &iter);
+	g_return_if_fail (have_selection);
+
+	async_datas = g_slist_append (NULL,
+		subscription_editor_async_data_from_iter (tree_view, tree_model, &iter, NULL));
+
+	subscription_editor_unsubscribe_many (editor, async_datas);
+}
+
+static void
+subscription_editor_unsubscribe_popup_cb (EMSubscriptionEditor *editor)
+{
+	GtkWidget *menu;
+	GtkTreeIter iter;
+	gboolean tree_filled;
+
+	tree_filled = editor->priv->active &&
+		gtk_tree_model_get_iter_first (
+			editor->priv->active->filtered_view
+			? editor->priv->active->list_store
+			: editor->priv->active->tree_store,
+			&iter);
+
+	menu = gtk_menu_new ();
+
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu),
+		subscription_editor_create_menu_item (
+			_("_Unsubscribe"),
+			gtk_widget_get_sensitive (editor->priv->unsubscribe_button),
+			G_CALLBACK (subscription_editor_unsubscribe),
+			editor));
+
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu),
+		subscription_editor_create_menu_item (
+			_("Unsu_bscribe from hidden"),
+			tree_filled,
+			G_CALLBACK (subscription_editor_unsubscribe_hidden),
+			editor));
+
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu),
+		subscription_editor_create_menu_item (
+			_("Unsubscribe from _all"),
+			tree_filled,
+			G_CALLBACK (subscription_editor_unsubscribe_all),
+			editor));
+
+	gtk_menu_popup (
+		GTK_MENU (menu), NULL, NULL, position_below_widget_cb, editor->priv->unsubscribe_button,
+		0, gtk_get_current_event_time ());
 }
 
 static void
@@ -535,7 +980,9 @@ subscription_editor_refresh (EMSubscriptionEditor *editor)
 
 	gtk_widget_set_sensitive (editor->priv->notebook, FALSE);
 	gtk_widget_set_sensitive (editor->priv->subscribe_button, FALSE);
+	gtk_widget_set_sensitive (editor->priv->subscribe_arrow, FALSE);
 	gtk_widget_set_sensitive (editor->priv->unsubscribe_button, FALSE);
+	gtk_widget_set_sensitive (editor->priv->unsubscribe_arrow, FALSE);
 	gtk_widget_set_sensitive (editor->priv->refresh_button, FALSE);
 	gtk_widget_set_sensitive (editor->priv->stop_button, TRUE);
 
@@ -567,9 +1014,12 @@ subscription_editor_stop (EMSubscriptionEditor *editor)
 
 	gtk_widget_set_sensitive (editor->priv->notebook, TRUE);
 	gtk_widget_set_sensitive (editor->priv->subscribe_button, TRUE);
+	gtk_widget_set_sensitive (editor->priv->subscribe_arrow, TRUE);
 	gtk_widget_set_sensitive (editor->priv->unsubscribe_button, TRUE);
+	gtk_widget_set_sensitive (editor->priv->unsubscribe_arrow, TRUE);
 	gtk_widget_set_sensitive (editor->priv->refresh_button, TRUE);
 	gtk_widget_set_sensitive (editor->priv->stop_button, FALSE);
+	gtk_widget_grab_focus (GTK_WIDGET (editor->priv->active->tree_view));
 
 	window = gtk_widget_get_window (GTK_WIDGET (editor));
 	gdk_window_set_cursor (window, NULL);
@@ -811,8 +1261,11 @@ subscription_editor_selection_changed_cb (GtkTreeSelection *selection,
 		gtk_widget_set_sensitive (
 			editor->priv->subscribe_button, FALSE);
 		gtk_widget_set_sensitive (
-			editor->priv->subscribe_button, FALSE);
+			editor->priv->unsubscribe_button, FALSE);
 	}
+
+	gtk_widget_set_sensitive (editor->priv->subscribe_arrow, TRUE);
+	gtk_widget_set_sensitive (editor->priv->unsubscribe_arrow, TRUE);
 }
 
 static void
@@ -1264,20 +1717,25 @@ em_subscription_editor_init (EMSubscriptionEditor *editor)
 		G_BINDING_BIDIRECTIONAL |
 		G_BINDING_SYNC_CREATE);
 
-	widget = gtk_vbutton_box_new ();
+	widget = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
 	gtk_box_set_spacing (GTK_BOX (widget), 6);
 	gtk_button_box_set_layout (
 		GTK_BUTTON_BOX (widget), GTK_BUTTONBOX_START);
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
 	gtk_widget_show (widget);
 
+	container = box = widget;
+
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
+	gtk_widget_show (widget);
+
 	container = widget;
 
 	tooltip = _("Subscribe to the selected folder");
 	widget = gtk_button_new_with_mnemonic (_("Su_bscribe"));
 	gtk_widget_set_sensitive (widget, FALSE);
 	gtk_widget_set_tooltip_text (widget, tooltip);
-	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	editor->priv->subscribe_button = widget;
 	gtk_widget_show (widget);
 
@@ -1285,11 +1743,35 @@ em_subscription_editor_init (EMSubscriptionEditor *editor)
 		widget, "clicked",
 		G_CALLBACK (subscription_editor_subscribe), editor);
 
+	widget = gtk_button_new ();
+	gtk_button_set_image (GTK_BUTTON (widget), gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
+	editor->priv->subscribe_arrow = widget;
+	gtk_widget_show (widget);
+
+	g_signal_connect_swapped (
+		widget, "clicked",
+		G_CALLBACK (subscription_editor_subscribe_popup_cb), editor);
+
+	if (gtk_widget_get_direction (container) == GTK_TEXT_DIR_LTR) {
+		gtk_box_pack_start (GTK_BOX (container), editor->priv->subscribe_button, TRUE, TRUE, 0);
+		gtk_box_pack_start (GTK_BOX (container), editor->priv->subscribe_arrow, FALSE, FALSE, 0);
+	} else {
+		gtk_box_pack_start (GTK_BOX (container), editor->priv->subscribe_arrow, FALSE, FALSE, 0);
+		gtk_box_pack_start (GTK_BOX (container), editor->priv->subscribe_button, TRUE, TRUE, 0);
+	}
+
+	container = box;
+
+	widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
+	gtk_widget_show (widget);
+
+	container = widget;
+
 	tooltip = _("Unsubscribe from the selected folder");
 	widget = gtk_button_new_with_mnemonic (_("_Unsubscribe"));
 	gtk_widget_set_sensitive (widget, FALSE);
 	gtk_widget_set_tooltip_text (widget, tooltip);
-	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	editor->priv->unsubscribe_button = widget;
 	gtk_widget_show (widget);
 
@@ -1297,6 +1779,25 @@ em_subscription_editor_init (EMSubscriptionEditor *editor)
 		widget, "clicked",
 		G_CALLBACK (subscription_editor_unsubscribe), editor);
 
+	widget = gtk_button_new ();
+	gtk_button_set_image (GTK_BUTTON (widget), gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
+	editor->priv->unsubscribe_arrow = widget;
+	gtk_widget_show (widget);
+
+	g_signal_connect_swapped (
+		widget, "clicked",
+		G_CALLBACK (subscription_editor_unsubscribe_popup_cb), editor);
+
+	if (gtk_widget_get_direction (container) == GTK_TEXT_DIR_LTR) {
+		gtk_box_pack_start (GTK_BOX (container), editor->priv->unsubscribe_button, TRUE, TRUE, 0);
+		gtk_box_pack_start (GTK_BOX (container), editor->priv->unsubscribe_arrow, FALSE, FALSE, 0);
+	} else {
+		gtk_box_pack_start (GTK_BOX (container), editor->priv->unsubscribe_arrow, FALSE, FALSE, 0);
+		gtk_box_pack_start (GTK_BOX (container), editor->priv->unsubscribe_button, TRUE, TRUE, 0);
+	}
+
+	container = box;
+
 	tooltip = _("Collapse all folders");
 	widget = gtk_button_new_with_mnemonic (_("C_ollapse All"));
 	gtk_widget_set_tooltip_text (widget, tooltip);
diff --git a/po/gl.po b/po/gl.po
index a0132f23b1..4527aeb279 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -18,13 +18,13 @@
 # Fran Diéguez <frandieguez@gnome.org>, 2009, 2010, 2011.
 # Fran Dieguez <frandieguez@gnome.org>, 2010, 2011.
 #
-#: ../shell/main.c:570
+#: ../shell/main.c:566
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-master-po-gl-53747.merged\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-21 23:12+0200\n"
-"PO-Revision-Date: 2011-09-21 23:11+0200\n"
+"POT-Creation-Date: 2011-10-15 16:03+0200\n"
+"PO-Revision-Date: 2011-10-15 16:22+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
 "Language: gl\n"
@@ -113,7 +113,7 @@ msgid "Delete address book '{0}'?"
 msgstr "Desexa eliminar a axenda de enderezos «{0}»?"
 
 #: ../addressbook/addressbook.error.xml.h:15
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:37 ../mail/mail.error.xml.h:45
 msgid "Do _Not Delete"
 msgstr "_Non eliminar"
 
@@ -260,7 +260,7 @@ msgid ""
 msgstr ""
 "Os contactos para {0} non estarán dispoñíbeis até que reinicie o Evolution."
 
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:618
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:594
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "Eng_adir"
@@ -283,7 +283,7 @@ msgstr "_Usar tal como está"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:715
-#: ../calendar/gui/e-calendar-view.c:2104
+#: ../calendar/gui/e-calendar-view.c:2068
 msgid "Anniversary"
 msgstr "Aniversario"
 
@@ -294,8 +294,8 @@ msgstr "Aniversario"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:714
-#: ../calendar/gui/e-calendar-view.c:2103 ../capplet/anjal-settings-main.c:79
-#: ../shell/main.c:140
+#: ../calendar/gui/e-calendar-view.c:2067 ../capplet/anjal-settings-main.c:79
+#: ../shell/main.c:138
 msgid "Birthday"
 msgstr "Aniversario"
 
@@ -315,24 +315,24 @@ msgid "Calendar:"
 msgstr "_Calendario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:991
+#: ../addressbook/importers/evolution-vcard-importer.c:990
 msgid "Contact"
 msgstr "Contacto"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:654
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:676
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2925
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2943
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:386
+#: ../addressbook/gui/merging/eab-contact-merging.c:390
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:633
 #: ../addressbook/gui/widgets/eab-contact-display.c:641
 #: ../addressbook/gui/widgets/eab-contact-display.c:1019
-#: ../smime/lib/e-cert.c:837
+#: ../smime/lib/e-cert.c:833
 msgid "Email"
 msgstr "Correo electrónico"
 
@@ -389,7 +389,7 @@ msgstr "Notas"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:199
 #: ../addressbook/gui/widgets/eab-contact-display.c:79
 #: ../addressbook/gui/widgets/eab-contact-display.c:409
-#: ../calendar/gui/e-calendar-view.c:1806
+#: ../calendar/gui/e-cal-model.c:3421
 msgid "Other"
 msgstr "Outros"
 
@@ -564,7 +564,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:220
-#: ../addressbook/gui/widgets/eab-gui-util.c:469
+#: ../addressbook/gui/widgets/eab-gui-util.c:473
 msgid "Error adding contact"
 msgstr "Produciuse un erro ao engadir o contacto"
 
@@ -577,20 +577,20 @@ msgid "Error removing contact"
 msgstr "Produciuse un erro ao eliminar o contacto"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:670
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2919
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2937
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3398
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3416
 msgid "Please select an image for this contact"
 msgstr "Escolla unha imaxe para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3399
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3417
 msgid "_No image"
 msgstr "_Sen imaxe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3730
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3744
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -598,43 +598,43 @@ msgstr ""
 "Os datos do contacto son incorrectos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3735
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3749
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» ten un formato incorrecto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3743
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3757
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s«%s» ten un formato incorrecto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3756
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3770
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3784
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» está baleiro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3785
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3799
 msgid "Invalid contact."
 msgstr "Contacto incorrecto."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:437
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:438
 msgid "Contact Quick-Add"
 msgstr "Adición rápida de contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:440
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
 msgid "_Edit Full"
 msgstr "_Editar completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:488
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:490
 msgid "_Full name"
 msgstr "Nome _completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:499
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:501
 msgid "E_mail"
 msgstr "Correo _electrónico"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:510
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:512
 msgid "_Select Address Book"
 msgstr "_Seleccionar a axenda de enderezos"
 
@@ -704,7 +704,7 @@ msgid "_Suffix:"
 msgstr "_Sufixo:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:742
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
 msgid "Contact List Editor"
 msgstr "Editor da lista de contactos"
 
@@ -721,7 +721,7 @@ msgid "_List name:"
 msgstr "Nome da _lista:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:164
 msgid "_Select..."
 msgstr "_Seleccionar…"
 
@@ -730,26 +730,26 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "_Escriba un enderezo de correo ou arrastre un contacto á lista de embaixo:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:865
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:885
 msgid "Contact List Members"
 msgstr "Membros da lista de contactos"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1440
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1402
+msgid "_Members"
+msgstr "_Membros"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1516
 msgid "Error adding list"
 msgstr "Produciuse un erro ao engadir a lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1455
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1531
 msgid "Error modifying list"
 msgstr "Produciuse un erro ao modificar a lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1470
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1546
 msgid "Error removing list"
 msgstr "Produciuse un erro ao eliminar a lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1601
-msgid "_Members"
-msgstr "_Membros"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Contacto modificado:"
@@ -789,11 +789,11 @@ msgstr ""
 "cartafol. Desexa engadilo de todas as formas?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:332
+#: ../addressbook/gui/merging/eab-contact-merging.c:336
 msgid "_Merge"
 msgstr "_Combinar"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:315
+#: ../addressbook/gui/merging/eab-contact-merging.c:319
 msgid "Merge Contact"
 msgstr "Combinar o contacto"
 
@@ -801,7 +801,7 @@ msgstr "Combinar o contacto"
 #: ../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:1727
+#: ../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"
@@ -832,7 +832,7 @@ msgstr[1] "%d contactos"
 msgid "Error getting book view"
 msgstr "Produciuse un erro a vista da axenda"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:771
+#: ../addressbook/gui/widgets/e-addressbook-model.c:774
 msgid "Search Interrupted"
 msgstr "Busca interrumpida"
 
@@ -1151,7 +1151,7 @@ msgstr "Outro correo electrónico"
 
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:97
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:106
-#: ../addressbook/gui/widgets/ea-minicard-view.c:187
+#: ../addressbook/gui/widgets/ea-minicard-view.c:189
 msgid "evolution address book"
 msgstr "axenda de enderezos do Evolution"
 
@@ -1163,7 +1163,7 @@ msgstr "Contacto novo"
 msgid "New Contact List"
 msgstr "Lista de contactos nova"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:170
+#: ../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"
@@ -1234,8 +1234,8 @@ msgstr "Videoconferencia"
 #: ../calendar/gui/dialogs/calendar-setup.c:449
 #: ../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:513
-#: ../modules/online-accounts/e-online-accounts-google.c:294
+#: ../modules/calendar/e-cal-shell-view.c:523
+#: ../modules/online-accounts/e-online-accounts-google.c:296
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
 #: ../widgets/misc/e-send-options.c:528
 msgid "Calendar"
@@ -1406,23 +1406,23 @@ msgstr "card.vcf"
 msgid "Select Address Book"
 msgstr "Seleccionar a axenda de enderezos"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:371
+#: ../addressbook/gui/widgets/eab-gui-util.c:375
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:552
+#: ../addressbook/gui/widgets/eab-gui-util.c:559
 msgid "Move contact to"
 msgstr "Mover o contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:554
+#: ../addressbook/gui/widgets/eab-gui-util.c:561
 msgid "Copy contact to"
 msgstr "Copiar o contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:557
+#: ../addressbook/gui/widgets/eab-gui-util.c:564
 msgid "Move contacts to"
 msgstr "Mover os contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:559
+#: ../addressbook/gui/widgets/eab-gui-util.c:566
 msgid "Copy contacts to"
 msgstr "Copiar os contactos a"
 
@@ -1434,32 +1434,32 @@ msgstr "Vista de tarxetas"
 #: ../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:902
-#: ../calendar/importers/icalendar-importer.c:941 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:903
+#: ../calendar/importers/icalendar-importer.c:942 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importando…"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1072
+#: ../addressbook/importers/evolution-csv-importer.c:1075
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1073
+#: ../addressbook/importers/evolution-csv-importer.c:1076
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV e importador Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1081
+#: ../addressbook/importers/evolution-csv-importer.c:1084
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1082
+#: ../addressbook/importers/evolution-csv-importer.c:1085
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV e importador Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1090
+#: ../addressbook/importers/evolution-csv-importer.c:1093
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1091
+#: ../addressbook/importers/evolution-csv-importer.c:1094
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV e importador Tab"
 
@@ -1471,11 +1471,11 @@ msgstr "Formato de intercambio de datos LDAP (.ldif)"
 msgid "Evolution LDIF importer"
 msgstr "Importador LDIF do Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:658
+#: ../addressbook/importers/evolution-vcard-importer.c:657
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:659
+#: ../addressbook/importers/evolution-vcard-importer.c:658
 msgid "Evolution vCard Importer"
 msgstr "Importador de vCard do Evolution"
 
@@ -1499,13 +1499,11 @@ msgstr "Non foi posíbel obter unha lista das axendas de enderezos: %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:2923
-#: ../calendar/gui/dialogs/memo-page.c:938
-#: ../calendar/gui/dialogs/task-page.c:1759 ../em-format/em-format.c:2324
-#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:658
+#: ../calendar/gui/dialogs/memo-page.c:938 ../em-format/em-format.c:2324
+#: ../mail/em-folder-tree.c:679 ../mail/mail-ops.c:662
 #: ../plugins/caldav/caldav-browse-server.c:220
 #: ../plugins/caldav/caldav-browse-server.c:1469 ../plugins/face/face.c:174
-#: ../smime/gui/certificate-manager.c:314
+#: ../smime/gui/certificate-manager.c:313
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
@@ -1576,6 +1574,14 @@ msgstr "Erro non manipulado"
 #. 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 ""
+"«{0}» no admite asignación de tarefas, seleccione unha lista de tarefas "
+"diferentes."
+
+#. 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 ""
@@ -1583,7 +1589,7 @@ msgstr ""
 "un calendario diferente na barra lateral da vista de Calendario."
 
 #. 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."
@@ -1591,7 +1597,7 @@ msgstr ""
 "«{0}» é un calendario só de lectura e non é posíbel modificalo. Seleccione "
 "un calendario diferente que poida aceptar citas."
 
-#: ../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."
@@ -1599,7 +1605,7 @@ msgstr ""
 "Engadir un resumo significativo á súa cita daralle unha idea sobre o contido "
 "desta."
 
-#: ../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."
@@ -1607,19 +1613,19 @@ msgstr ""
 "Engadir un resumo significativo á súa tarefa daralle unha idea sobre o "
 "contido desta."
 
-#: ../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 ""
 "Vaise eliminar toda a información destas notas e non será posíbel "
 "restabelecela."
 
-#: ../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 ""
 "Vaise eliminar toda a información desta nota e non será posíbel "
 "restabelecela."
 
-#: ../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."
@@ -1627,137 +1633,141 @@ msgstr ""
 "Vaise eliminar toda a información destas citas e non será posíbel "
 "restabelecela."
 
-#: ../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 ""
 "Vaise eliminar toda a información destas tarefas e non será posíbel "
 "restabelecela."
 
-#: ../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 ""
 "Vaise eliminar toda a información desta cita e non será posíbel "
 "restabelecela."
 
-#: ../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 ""
 "Vaise eliminar toda a información desta reunión e non será posíbel "
 "restabelecela."
 
-#: ../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 ""
 "Vaise eliminar toda a información desta nota e non será posíbel "
 "restabelecela."
 
-#: ../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 ""
 "Vaise eliminar toda a información desta tarefa e non será posíbel "
 "restabelecela."
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Está seguro de que desexa eliminar a tarefa «{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 "Está seguro de que desexa eliminar a cita titulada «{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 "Está seguro de que desexa eliminar a reunión titulada «{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 "Está seguro de que desexa eliminar a nota «{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 "Está seguro de que desexa eliminar estas {0} citas?"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "Está seguro de que desexa eliminar estas {0} notas?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:23
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Está seguro de que desexa eliminar estas {0} tarefas?"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:24
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Está seguro de que desexa eliminar esta cita?"
 
-#: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:191
+#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/gui/dialogs/delete-comp.c:190
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Está seguro de que desexa eliminar esta reunión?"
 
-#: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:197
+#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/gui/dialogs/delete-comp.c:196
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Está seguro de que desexa eliminar esta nota?"
 
-#: ../calendar/calendar.error.xml.h:25
-#: ../calendar/gui/dialogs/delete-comp.c:194
+#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/gui/dialogs/delete-comp.c:193
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Está seguro de que desexa eliminar esta tarefa?"
 
-#: ../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 "Está seguro de que desexa gardar a cita sen un 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 "Está seguro que desexa gardar a nota sen un 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 "Está seguro de que desexa gardar a tarefa sen un resumo?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:31
 msgid "Cannot create a new event"
 msgstr "Non é posíbel crear unha nova actividade"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:32
 msgid "Cannot save event"
 msgstr "Non é posíbel gardar a actividade"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:33
+msgid "Cannot save task"
+msgstr "Non é posíbel gardar a tarefa"
+
+#: ../calendar/calendar.error.xml.h:34
 msgid "Delete calendar '{0}'?"
 msgstr "Desexa eliminar o calendario «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Delete memo list '{0}'?"
 msgstr "Desexa eliminar a lista de notas «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Delete task list '{0}'?"
 msgstr "Desexa eliminar a lista de tarefas «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:38
 msgid "Do _not Send"
 msgstr "_Non enviar"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:39
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Hai unha descarga en progreso. Desexa gardar a cita?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Hai unha descarga en progreso. Desexa gardar a tarefa?"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 msgid "Editor could not be loaded."
 msgstr "Non foi posíbel cargar o editor."
 
-#: ../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."
@@ -1765,32 +1775,32 @@ msgstr ""
 "Enviaranse convites por correo electrónico a todos os participantes e "
 "permitiráselles aceptar esta tarefa."
 
-#: ../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 ""
 "Enviaranse convites por correo electrónico a todos os participantes e "
 "permitiráselles responder."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:44
 msgid "Error loading calendar"
 msgstr "Produciuse un erro ao cargar o calendario"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
 msgid "Error loading memo list"
 msgstr "Produciuse un erro ao cargar a lista de notas"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid "Error loading task list"
 msgstr "Produciuse un erro ao cargar a lista de tarefas"
 
 #. 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 "Erro en {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."
@@ -1798,7 +1808,7 @@ msgstr ""
 "Se non envía unha notificación de cancelación, os outros participantes "
 "quizais non saiban que se cancelou a cita."
 
-#: ../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."
@@ -1806,7 +1816,7 @@ msgstr ""
 "Se non envía unha notificación de cancelación, os outros participantes "
 "quizais non saiban que se eliminou a nota."
 
-#: ../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."
@@ -1814,7 +1824,7 @@ msgstr ""
 "Se non envía unha notificación de cancelación, os outros participantes "
 "quizais non saiban que se eliminou a tarefa."
 
-#: ../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."
@@ -1822,7 +1832,7 @@ msgstr ""
 "Ao enviar información actualizada permite que outros participantes manteñan "
 "os seus calendarios ao día."
 
-#: ../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."
@@ -1830,7 +1840,7 @@ msgstr ""
 "Ao enviar información actualizada permite que outros participantes manteñan "
 "a súa lista de tarefas ao día."
 
-#: ../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."
@@ -1838,7 +1848,7 @@ msgstr ""
 "Estanse descargando algúns anexos. Se garda a cita fará que se perdan eses "
 "anexos."
 
-#: ../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."
@@ -1846,94 +1856,94 @@ msgstr ""
 "Estanse descargando algúns anexos. Se garda a tarefa fará que se perdan eses "
 "anexos."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Pode que algunhas características non funcionen axeitadamente co servidor "
 "actual."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "O calendario do Evolution saíu inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Os calendarios do Evolution saíron inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "A nota do Evolution saíu inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "As tarefas do Evolution saíron inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "The calendar is not marked for offline usage."
 msgstr "O calendario non está marcado para o seu uso sen conexión."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "The memo list is not marked for offline usage."
 msgstr "A lista de notas non está marcada para o seu uso sen conexión."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "The task list is not marked for offline usage."
 msgstr "A lista de tarefas non está marcada para o seu uso sen conexión."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "This calendar will be removed permanently."
 msgstr "Este calendario eliminarase permanentemente."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "This memo list will be removed permanently."
 msgstr "Esta lista de notas eliminarase permanentemente."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "This task list will be removed permanently."
 msgstr "Esta lista de tarefas eliminarase permanentemente."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Desexa gardar as modificacións feitas nesta cita?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this meeting?"
 msgstr "Desexa gardar as modificacións feitas nesta reunión?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to save your changes to this memo?"
 msgstr "Desexa gardar as modificacións feitas nesta nota?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to save your changes to this task?"
 msgstr "Desexa gardar as modificacións feitas nesta tarefa?"
 
-#: ../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 "Desexa enviar unha notificación de cancelación para esta nota?"
 
-#: ../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 ""
 "Desexa enviar a todos os participantes unha notificación de cancelación?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Desexa enviar aos participantes convites para a reunión?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send this task to participants?"
 msgstr "Desexa enviar esta tarefa aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Desexa enviar información actualizada da reunión aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send updated task information to participants?"
 msgstr "Desexa enviar información actualizada das tarefas aos participantes?"
 
-#: ../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 "
@@ -1943,55 +1953,55 @@ msgstr ""
 "problemas ao usar o Evolution. Para mellorar os resultados, o servidor "
 "debería anovarse a unha versión compatíbel."
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Modificou esta cita pero aínda non a gardou."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "Modificou esta reunión pero aínda non a gardou."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:81
 msgid "You have changed this task, but not yet saved it."
 msgstr "Modificou esta tarefa pero aínda non a gardou."
 
-#: ../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 "Modificou esta nota pero aínda non gardou os cambios."
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:83
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Os seus calendarios non estarán dispoñíbeis até que reinicie o Evolution."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:84
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "As súas notas non estarán dispoñíbeis até que reinicie o Evolution."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:85
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "As súas tarefas non estarán dispoñíbeis até que reinicie o Evolution."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:86
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "_Rexeitar as modificacións"
 
-#: ../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 "_Gardar"
 
-#: ../calendar/calendar.error.xml.h:85
+#: ../calendar/calendar.error.xml.h:88
 msgid "_Save Changes"
 msgstr "_Gardar as modificacións"
 
-#: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:165
+#: ../calendar/calendar.error.xml.h:89
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:167
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../calendar/calendar.error.xml.h:87
+#: ../calendar/calendar.error.xml.h:90
 msgid "_Send Notice"
 msgstr "_Enviar a notificación"
 
@@ -2011,7 +2021,7 @@ msgstr[1] "horas"
 #. * (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:133
-#: ../calendar/gui/dialogs/recurrence-page.c:1190
+#: ../calendar/gui/dialogs/recurrence-page.c:1188
 msgid "day"
 msgid_plural "days"
 msgstr[0] "día"
@@ -2031,8 +2041,8 @@ msgstr "Ignorar _todo"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1739
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1749
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1738
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1748
 #: ../plugins/itip-formatter/itip-view.c:1052
 msgid "Location:"
 msgstr "Localización:"
@@ -2081,33 +2091,33 @@ msgstr "localización da cita"
 msgid "minutes"
 msgstr "minutos"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1588
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1587
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1719
 msgid "No summary available."
 msgstr "Non hai un resumo dispoñíbel."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1596
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
 msgid "No description available."
 msgstr "Non hai unha descrición dispoñíbel."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1607
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1606
 msgid "No location information available."
 msgstr "Non hai información da localización dispoñíbel."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1652
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "Ten %d recordatorio"
 msgstr[1] "Ten %d recordatorios"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1853
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1888
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1852
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1887
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1857
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1856
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2119,7 +2129,7 @@ msgstr ""
 "para enviar unha mensaxe de correo electrónico. No seu lugar\n"
 "O Evolution vai mostrar un diálogo de aviso normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1894
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1893
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2136,7 +2146,7 @@ msgstr ""
 "\n"
 "Está seguro de que desexa executar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1909
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1908
 msgid "Do not ask me about this program again."
 msgstr "Non volver preguntar sobre este programa."
 
@@ -2146,7 +2156,7 @@ msgstr "hora incorrecta"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
 #: ../calendar/gui/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:405
-#: ../calendar/gui/misc.c:118
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -2155,7 +2165,7 @@ msgstr[1] "%d horas"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
 #: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:411
-#: ../calendar/gui/misc.c:124
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -2166,26 +2176,26 @@ msgstr[1] "%d minutos"
 #. 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:81 ../calendar/gui/e-alarm-list.c:417
-#: ../calendar/gui/misc.c:128
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../calendar/gui/calendar-view-factory.c:116
+#: ../calendar/gui/calendar-view-factory.c:111
 msgid "Day View"
 msgstr "Vista diaria"
 
-#: ../calendar/gui/calendar-view-factory.c:119
+#: ../calendar/gui/calendar-view-factory.c:114
 msgid "Work Week View"
 msgstr "Vista de semana laboral"
 
-#: ../calendar/gui/calendar-view-factory.c:122
+#: ../calendar/gui/calendar-view-factory.c:117
 msgid "Week View"
 msgstr "Vista semanal"
 
-#: ../calendar/gui/calendar-view-factory.c:125
+#: ../calendar/gui/calendar-view-factory.c:120
 msgid "Month View"
 msgstr "Vista mensual"
 
@@ -2215,14 +2225,14 @@ msgid "Classification"
 msgstr "Clasificación"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:243
-#: ../calendar/gui/e-cal-model.c:774 ../calendar/gui/e-task-table.c:504
+#: ../calendar/gui/e-cal-model.c:779 ../calendar/gui/e-task-table.c:504
 #: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Confidencial"
 
 #: ../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"
@@ -2238,44 +2248,60 @@ msgstr "A descrición contén"
 msgid "Do Not Exist"
 msgstr "Non existe"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:11
+msgid "Exactly"
+msgstr "Exactamente"
+
+#: ../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 "Existe"
 
-#: ../calendar/gui/caltypes.xml.h:12
+#: ../calendar/gui/caltypes.xml.h:13
+msgid "Less Than"
+msgstr "Menor que"
+
+#: ../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:863
+#: ../plugins/publish-calendar/publish-calendar.c:855
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:397
 msgid "Location"
 msgstr "Localización"
 
-#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:15
+msgid "More Than"
+msgstr "Máis que"
+
+#: ../calendar/gui/caltypes.xml.h:16
+msgid "Occurs"
+msgstr "Acontece"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:11
 #: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "Organizador"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:503
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:777 ../calendar/gui/e-task-table.c:503
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privado"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:763 ../calendar/gui/e-cal-model.c:770
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:768 ../calendar/gui/e-cal-model.c:775
 #: ../calendar/gui/e-task-table.c:502 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Público"
 
-#: ../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 "Repetición"
 
-#: ../calendar/gui/caltypes.xml.h:17
+#: ../calendar/gui/caltypes.xml.h:21
 #: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
@@ -2284,51 +2310,51 @@ msgstr "Repetición"
 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 "O resumo contén"
 
-#: ../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 "contén"
 
-#: ../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 "non contén"
 
-#: ../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 "é"
 
-#: ../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 "non é"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:636
+#: ../calendar/gui/dialogs/alarm-dialog.c:635
 msgid "Edit Reminder"
 msgstr "Editar recordatorio"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:827
+#: ../calendar/gui/dialogs/alarm-dialog.c:826
 #: ../calendar/gui/e-alarm-list.c:447
 msgid "Pop up an alert"
 msgstr "Alerta emerxente"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:828
+#: ../calendar/gui/dialogs/alarm-dialog.c:827
 #: ../calendar/gui/e-alarm-list.c:443
 msgid "Play a sound"
 msgstr "Reproducir un son"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:829
+#: ../calendar/gui/dialogs/alarm-dialog.c:828
 #: ../calendar/gui/e-alarm-list.c:455
 msgid "Run a program"
 msgstr "Executar un programa"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:830
+#: ../calendar/gui/dialogs/alarm-dialog.c:829
 #: ../calendar/gui/e-alarm-list.c:451
 msgid "Send an email"
 msgstr "Enviar un correo"
@@ -2419,7 +2445,7 @@ msgstr "minuto(s)"
 msgid "start of appointment"
 msgstr "inicio da cita"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:245
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "Acción/Activador"
 
@@ -2438,11 +2464,11 @@ msgid "Type:"
 msgstr "Tipo:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:185
-#: ../modules/addressbook/addressbook-config.c:530
+#: ../modules/addressbook/addressbook-config.c:527
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:155
+#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:156
 #: ../modules/addressbook/ldap-config.ui.h:26
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:284
@@ -2478,10 +2504,10 @@ msgstr "Co_r:"
 #: ../calendar/gui/dialogs/calendar-setup.c:460
 #: ../calendar/gui/dialogs/calendar-setup.c:471
 #: ../mail/em-folder-properties.c:235 ../mail/mail-config.ui.h:52
-#: ../modules/addressbook/addressbook-config.c:1080
-#: ../modules/addressbook/autocompletion-config.c:228
+#: ../modules/addressbook/addressbook-config.c:1077
+#: ../modules/addressbook/autocompletion-config.c:240
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
-#: ../plugins/itip-formatter/itip-formatter.c:3045
+#: ../plugins/itip-formatter/itip-formatter.c:3038
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
@@ -2520,50 +2546,50 @@ msgstr "Propiedades da lista de notas"
 msgid "New Memo List"
 msgstr "Lista de notas nova"
 
-#: ../calendar/gui/dialogs/changed-comp.c:62
+#: ../calendar/gui/dialogs/changed-comp.c:61
 msgid "This event has been deleted."
 msgstr "Esta actividade eliminouse."
 
-#: ../calendar/gui/dialogs/changed-comp.c:66
+#: ../calendar/gui/dialogs/changed-comp.c:65
 msgid "This task has been deleted."
 msgstr "Esta tarefa eliminouse."
 
-#: ../calendar/gui/dialogs/changed-comp.c:70
+#: ../calendar/gui/dialogs/changed-comp.c:69
 msgid "This memo has been deleted."
 msgstr "Esta nota eliminouse."
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Realizou modificacións. Desexa ignorar estas modificacións e pechar o "
 "editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:81
+#: ../calendar/gui/dialogs/changed-comp.c:80
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Non realizou modificacións. Desexa pechar o editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:86
+#: ../calendar/gui/dialogs/changed-comp.c:85
 msgid "This event has been changed."
 msgstr "Esta actividade modificouse"
 
-#: ../calendar/gui/dialogs/changed-comp.c:90
+#: ../calendar/gui/dialogs/changed-comp.c:89
 msgid "This task has been changed."
 msgstr "Esta tarefa modificouse."
 
-#: ../calendar/gui/dialogs/changed-comp.c:94
+#: ../calendar/gui/dialogs/changed-comp.c:93
 msgid "This memo has been changed."
 msgstr "Esta nota modificouse."
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Realizou modificacións. Desexa ignorar estas modificacións e actualizar "
 "o editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:105
+#: ../calendar/gui/dialogs/changed-comp.c:104
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Non realizou modificacións. Desexa actualizar o editor?"
@@ -2573,241 +2599,241 @@ msgstr "%s  Non realizou modificacións. Desexa actualizar o editor?"
 msgid "Validation error: %s"
 msgstr "Erro de validación: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:273
+#: ../calendar/gui/dialogs/comp-editor.c:274
 msgid "Could not save attachments"
 msgstr "Non foi posíbel gardar os anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:613
+#: ../calendar/gui/dialogs/comp-editor.c:620
 msgid "Could not update object"
 msgstr "Non foi posíbel actualizar o obxecto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:741
+#: ../calendar/gui/dialogs/comp-editor.c:748
 msgid "Edit Appointment"
 msgstr "Editar a cita"
 
-#: ../calendar/gui/dialogs/comp-editor.c:748
+#: ../calendar/gui/dialogs/comp-editor.c:755
 #, c-format
 msgid "Meeting - %s"
 msgstr "Reunión - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:750
+#: ../calendar/gui/dialogs/comp-editor.c:757
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:756
+#: ../calendar/gui/dialogs/comp-editor.c:763
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarefa asignada - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:758
+#: ../calendar/gui/dialogs/comp-editor.c:765
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:763
+#: ../calendar/gui/dialogs/comp-editor.c:770
 #, c-format
 msgid "Memo - %s"
 msgstr "Nota - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:779
+#: ../calendar/gui/dialogs/comp-editor.c:786
 msgid "No Summary"
 msgstr "Sen resumo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:900
+#: ../calendar/gui/dialogs/comp-editor.c:907
 msgid "Keep original item?"
 msgstr "Desexa gardar o elemento orixinal?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1101
+#: ../calendar/gui/dialogs/comp-editor.c:1120
 msgid "Close the current window"
 msgstr "Pechar a xanela actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1108 ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1455
+#: ../calendar/gui/dialogs/comp-editor.c:1127 ../mail/e-mail-browser.c:141
+#: ../shell/e-shell-window-actions.c:1464
 #: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
 #: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
 msgid "Copy the selection"
 msgstr "Copiar a selección"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115 ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1462
+#: ../calendar/gui/dialogs/comp-editor.c:1134 ../mail/e-mail-browser.c:148
+#: ../shell/e-shell-window-actions.c:1471
 #: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
 #: ../widgets/misc/e-web-view.c:1300
 msgid "Cut the selection"
 msgstr "Cortar a selección"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122
-#: ../shell/e-shell-window-actions.c:1469
+#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../shell/e-shell-window-actions.c:1478
 #: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "Eliminar a selección"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
+#: ../calendar/gui/dialogs/comp-editor.c:1148
 msgid "View help"
 msgstr "Ver a axuda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136 ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1497
+#: ../calendar/gui/dialogs/comp-editor.c:1155 ../mail/e-mail-browser.c:155
+#: ../shell/e-shell-window-actions.c:1506
 #: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
 #: ../widgets/misc/e-web-view.c:1312
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do portapapeis"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1157
+#: ../calendar/gui/dialogs/comp-editor.c:1176
 msgid "Save current changes"
 msgstr "Gardar os cambios actuais"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1574
+#: ../calendar/gui/dialogs/comp-editor.c:1183 ../mail/e-mail-browser.c:162
+#: ../shell/e-shell-window-actions.c:1583
 #: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "Seleccionar todo o texto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1171
+#: ../calendar/gui/dialogs/comp-editor.c:1190
 msgid "_Classification"
 msgstr "_Clasificación"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1178
+#: ../calendar/gui/dialogs/comp-editor.c:1197
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
 #: ../mail/e-mail-browser.c:176
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1602
+#: ../shell/e-shell-window-actions.c:1611
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1185 ../mail/e-mail-browser.c:169
-#: ../shell/e-shell-window-actions.c:1609
+#: ../calendar/gui/dialogs/comp-editor.c:1204 ../mail/e-mail-browser.c:169
+#: ../shell/e-shell-window-actions.c:1618
 #: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1192
-#: ../shell/e-shell-window-actions.c:1616
+#: ../calendar/gui/dialogs/comp-editor.c:1211
+#: ../shell/e-shell-window-actions.c:1625
 msgid "_Help"
 msgstr "A_xuda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1199
+#: ../calendar/gui/dialogs/comp-editor.c:1218
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1206
-#: ../composer/e-composer-actions.c:340
+#: ../calendar/gui/dialogs/comp-editor.c:1225
+#: ../composer/e-composer-actions.c:339
 msgid "_Options"
 msgstr "_Opcións"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1213 ../mail/e-mail-browser.c:183
-#: ../shell/e-shell-window-actions.c:1651 ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1232 ../mail/e-mail-browser.c:183
+#: ../shell/e-shell-window-actions.c:1660 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "_Vista"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1223
-#: ../composer/e-composer-actions.c:289
+#: ../calendar/gui/dialogs/comp-editor.c:1242
+#: ../composer/e-composer-actions.c:288
 msgid "_Attachment..."
 msgstr "_Anexo…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1225
-#: ../composer/e-composer-actions.c:291
+#: ../calendar/gui/dialogs/comp-editor.c:1244
+#: ../composer/e-composer-actions.c:290
 #: ../widgets/misc/e-attachment-view.c:439
 msgid "Attach a file"
 msgstr "Anexar un ficheiro"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1233
+#: ../calendar/gui/dialogs/comp-editor.c:1252
 msgid "_Categories"
 msgstr "_Categorías"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1235
+#: ../calendar/gui/dialogs/comp-editor.c:1254
 msgid "Toggles whether to display categories"
 msgstr "Alterna a vista das categorías"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1241
+#: ../calendar/gui/dialogs/comp-editor.c:1260
 msgid "Time _Zone"
 msgstr "_Fuso horario"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1243
+#: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "Toggles whether the time zone is displayed"
 msgstr "Alterna a vista do fuso horario"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1252
+#: ../calendar/gui/dialogs/comp-editor.c:1271
 msgid "Pu_blic"
 msgstr "Pú_blico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1254
+#: ../calendar/gui/dialogs/comp-editor.c:1273
 msgid "Classify as public"
 msgstr "Clasificar como público"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1259
+#: ../calendar/gui/dialogs/comp-editor.c:1278
 msgid "_Private"
 msgstr "_Privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1261
+#: ../calendar/gui/dialogs/comp-editor.c:1280
 msgid "Classify as private"
 msgstr "Clasificar como privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1266
+#: ../calendar/gui/dialogs/comp-editor.c:1285
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1268
+#: ../calendar/gui/dialogs/comp-editor.c:1287
 msgid "Classify as confidential"
 msgstr "Clasificar como confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1295
 msgid "R_ole Field"
 msgstr "Campo da _función"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1278
+#: ../calendar/gui/dialogs/comp-editor.c:1297
 msgid "Toggles whether the Role field is displayed"
 msgstr "Alterna a vista do campo da función"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1284
+#: ../calendar/gui/dialogs/comp-editor.c:1303
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1286
+#: ../calendar/gui/dialogs/comp-editor.c:1305
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Alterna a vista do campo RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292
+#: ../calendar/gui/dialogs/comp-editor.c:1311
 msgid "_Status Field"
 msgstr "Campo de e_stado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1294
+#: ../calendar/gui/dialogs/comp-editor.c:1313
 msgid "Toggles whether the Status field is displayed"
 msgstr "Alterna a vista do campo de estado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1300
+#: ../calendar/gui/dialogs/comp-editor.c:1319
 msgid "_Type Field"
 msgstr "Campo do _tipo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1302
+#: ../calendar/gui/dialogs/comp-editor.c:1321
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Alterna a vista do campo de tipo de participante"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../calendar/gui/dialogs/comp-editor.c:1345
 #: ../composer/e-composer-private.c:77
 msgid "Recent _Documents"
 msgstr "_Documentos recentes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2059
-#: ../composer/e-composer-actions.c:508
+#: ../calendar/gui/dialogs/comp-editor.c:2078
+#: ../composer/e-composer-actions.c:507
 msgid "Attach"
 msgstr "Anexar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2397
-#: ../calendar/gui/dialogs/comp-editor.c:2560
-#: ../calendar/gui/dialogs/comp-editor.c:3549
+#: ../calendar/gui/dialogs/comp-editor.c:2426
+#: ../calendar/gui/dialogs/comp-editor.c:2589
+#: ../calendar/gui/dialogs/comp-editor.c:3581
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "As modificacións realizadas neste elemento pódense rexeitar se chega unha "
 "actualización"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3513
+#: ../calendar/gui/dialogs/comp-editor.c:3545
 #: ../plugins/prefer-plain/prefer-plain.c:67
 msgid "attachment"
 msgstr "anexo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3581
+#: ../calendar/gui/dialogs/comp-editor.c:3613
 msgid "Unable to use current version!"
 msgstr "Non é posíbel usar a versión actual!"
 
@@ -2827,75 +2853,75 @@ msgstr "Non é posíbel crear o obxecto"
 msgid "Could not open source"
 msgstr "Non foi posíbel abrir a fonte"
 
-#: ../calendar/gui/dialogs/delete-comp.c:214
+#: ../calendar/gui/dialogs/delete-comp.c:213
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "Desexa eliminar este elemento _das caixas de correo dos outros destinatarios?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:217
+#: ../calendar/gui/dialogs/delete-comp.c:216
 msgid "_Retract comment"
 msgstr "_Retirar o comentario"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:56
 #, c-format
 msgid "The event could not be deleted due to a dbus error: %s"
 msgstr "Non foi posíbel eliminar a actividade debido a un erro dbus: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:61
+#: ../calendar/gui/dialogs/delete-error.c:60
 #, c-format
 msgid "The task could not be deleted due to a dbus error: %s"
 msgstr "Non foi posíbel eliminar a tarefa debido a un erro dbus: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:65
+#: ../calendar/gui/dialogs/delete-error.c:64
 #, c-format
 msgid "The memo could not be deleted due to a dbus error: %s"
 msgstr "Non foi posíbel eliminar a nota debido a un erro dbus: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:69
+#: ../calendar/gui/dialogs/delete-error.c:68
 #, c-format
 msgid "The item could not be deleted due to a dbus error: %s"
 msgstr "Non foi posíbel eliminar o elemento debido a un erro dbus: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The event could not be deleted because permission was denied"
 msgstr "Non foi posíbel eliminar a actividade porque se denegou o permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The task could not be deleted because permission was denied"
 msgstr "Non foi posíbel eliminar a tarefa porque se denegou o permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:82
+#: ../calendar/gui/dialogs/delete-error.c:81
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Non foi posíbel eliminar a nota porque se denegou o permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:85
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The item could not be deleted because permission was denied"
 msgstr "Non foi posíbel eliminar o elemento porque se denegou o permiso"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:93
+#: ../calendar/gui/dialogs/delete-error.c:92
 #, c-format
 msgid "The event could not be deleted due to an error: %s"
 msgstr "Non foi posíbel eliminar a actividade debido a un erro: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:97
+#: ../calendar/gui/dialogs/delete-error.c:96
 #, c-format
 msgid "The task could not be deleted due to an error: %s"
 msgstr "Non foi posíbel eliminar a tarefa debido a un erro: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:101
+#: ../calendar/gui/dialogs/delete-error.c:100
 #, c-format
 msgid "The memo could not be deleted due to an error: %s"
 msgstr "Non foi posíbel eliminar a nota debido a un erro: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:105
+#: ../calendar/gui/dialogs/delete-error.c:104
 #, c-format
 msgid "The item could not be deleted due to an error: %s"
 msgstr "Non foi posíbel eliminar o elemento debido a un erro: %s"
@@ -2962,7 +2988,7 @@ msgstr "_Dispoñibilidade"
 msgid "Query free / busy information for the attendees"
 msgstr "Consultar a información de dispoñibilidade para os participantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3310
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3308
 msgid "Appointment"
 msgstr "Cita"
 
@@ -2993,7 +3019,7 @@ msgstr ""
 "organizador"
 
 #: ../calendar/gui/dialogs/event-page.c:651
-#: ../calendar/gui/dialogs/event-page.c:3080
+#: ../calendar/gui/dialogs/event-page.c:3082
 msgid "This event has reminders"
 msgstr "Esta actividade ten recordatorios"
 
@@ -3013,7 +3039,7 @@ msgstr "Actividade sen data de finalización"
 
 #: ../calendar/gui/dialogs/event-page.c:1439
 #: ../calendar/gui/dialogs/memo-page.c:708
-#: ../calendar/gui/dialogs/task-page.c:819
+#: ../calendar/gui/dialogs/task-page.c:825
 msgid "Start date is wrong"
 msgstr "A data de inicio é incorrecta"
 
@@ -3031,12 +3057,12 @@ msgstr "A hora de finalización é incorrecta"
 
 #: ../calendar/gui/dialogs/event-page.c:1644
 #: ../calendar/gui/dialogs/memo-page.c:749
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/task-page.c:879
 msgid "An organizer is required."
 msgstr "Requírese un organizador."
 
 #: ../calendar/gui/dialogs/event-page.c:1678
-#: ../calendar/gui/dialogs/task-page.c:907
+#: ../calendar/gui/dialogs/task-page.c:913
 msgid "At least one attendee is required."
 msgstr "Requírese polo menos un participante."
 
@@ -3048,7 +3074,7 @@ msgstr "_Delegados"
 msgid "Atte_ndees"
 msgstr "_Participantes"
 
-#: ../calendar/gui/dialogs/event-page.c:2921
+#: ../calendar/gui/dialogs/event-page.c:2922
 #, c-format
 msgid "Unable to open the calendar '%s': %s"
 msgstr "Non foi posíbel abrir o calendario «%s»: %s"
@@ -3059,40 +3085,40 @@ msgstr "Non foi posíbel abrir o calendario «%s»: %s"
 #. * 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:2998
+#: ../calendar/gui/dialogs/event-page.c:3000
 #: ../calendar/gui/dialogs/memo-page.c:1012
-#: ../calendar/gui/dialogs/task-page.c:1838
+#: ../calendar/gui/dialogs/task-page.c:1845
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Está actuando no nome de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3325
+#: ../calendar/gui/dialogs/event-page.c:3327
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d día antes da cita"
 msgstr[1] "%d días antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3331
+#: ../calendar/gui/dialogs/event-page.c:3333
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora antes da cita"
 msgstr[1] "%d horas antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3337
+#: ../calendar/gui/dialogs/event-page.c:3339
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto antes da cita"
 msgstr[1] "%d minutos antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3356
+#: ../calendar/gui/dialogs/event-page.c:3358
 msgid "Customize"
 msgstr "Personalizar"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3362
+#: ../calendar/gui/dialogs/event-page.c:3364
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ningunha"
@@ -3227,7 +3253,7 @@ msgstr "Seleccionar o día de _hoxe"
 msgid "September"
 msgstr "Setembro"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3314
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3312
 msgid "Memo"
 msgstr "Nota"
 
@@ -3257,8 +3283,8 @@ msgid "Unable to open memos in '%s': %s"
 msgstr "Non é posíbel abrir as notas en «%s»: %s"
 
 #: ../calendar/gui/dialogs/memo-page.c:1144 ../em-format/em-format-quote.c:319
-#: ../em-format/em-format.c:1062 ../mail/em-format-html.c:2592
-#: ../mail/em-format-html.c:2657 ../mail/em-format-html.c:2681
+#: ../em-format/em-format.c:1062 ../mail/em-format-html.c:2626
+#: ../mail/em-format-html.c:2691 ../mail/em-format-html.c:2715
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "Para"
@@ -3278,63 +3304,63 @@ msgid "T_o:"
 msgstr "_Para:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:333
+#: ../calendar/gui/dialogs/task-page.c:339
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_List:"
 msgstr "_Lista:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Está modificando unha actividade con repetición. Que desexa modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:57
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Está delegando unha actividade con repetición. Que desexa delegar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:61
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Está modificando unha tarefa con repetición. Que desexa modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:65
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Está modificando unha nota con repetición. Que desexa modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "Unicamente esta instancia"
 
-#: ../calendar/gui/dialogs/recur-comp.c:95
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "Esta instancia e as anteriores"
 
-#: ../calendar/gui/dialogs/recur-comp.c:101
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "Esta instancia e as futuras"
 
-#: ../calendar/gui/dialogs/recur-comp.c:106
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "Todas as instancias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:575
+#: ../calendar/gui/dialogs/recurrence-page.c:573
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita contén repeticións que o Evolution non pode editar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:964
+#: ../calendar/gui/dialogs/recurrence-page.c:962
 msgid "Recurrence date is invalid"
 msgstr "A data da repetición non é correcta"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1004
+#: ../calendar/gui/dialogs/recurrence-page.c:1002
 msgid "End time of the recurrence was before event's start"
 msgstr ""
 "A hora de finalización da repetición era anterior á do inicio da actividade"
 
 #. 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:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1032
 msgid "on"
 msgstr "en"
 
@@ -3342,7 +3368,7 @@ msgstr "en"
 #. * (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:1097
+#: ../calendar/gui/dialogs/recurrence-page.c:1095
 msgid "first"
 msgstr "primeiro"
 
@@ -3351,7 +3377,7 @@ msgstr "primeiro"
 #. * (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:1103
+#: ../calendar/gui/dialogs/recurrence-page.c:1101
 msgid "second"
 msgstr "segundo"
 
@@ -3359,7 +3385,7 @@ msgstr "segundo"
 #. * (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:1108
+#: ../calendar/gui/dialogs/recurrence-page.c:1106
 msgid "third"
 msgstr "terceiro"
 
@@ -3367,7 +3393,7 @@ msgstr "terceiro"
 #. * (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:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "fourth"
 msgstr "cuarto"
 
@@ -3375,7 +3401,7 @@ msgstr "cuarto"
 #. * (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:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 msgid "fifth"
 msgstr "quinto"
 
@@ -3383,13 +3409,13 @@ msgstr "quinto"
 #. * (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:1123
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
 msgid "last"
 msgstr "último"
 
 #. 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:1147
+#: ../calendar/gui/dialogs/recurrence-page.c:1145
 msgid "Other Date"
 msgstr "Outra data"
 
@@ -3397,7 +3423,7 @@ msgstr "Outra data"
 #. * 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:1153
+#: ../calendar/gui/dialogs/recurrence-page.c:1151
 msgid "1st to 10th"
 msgstr "Do 1 ao 10"
 
@@ -3405,7 +3431,7 @@ msgstr "Do 1 ao 10"
 #. * 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:1159
+#: ../calendar/gui/dialogs/recurrence-page.c:1157
 msgid "11th to 20th"
 msgstr "do 11 ao 20"
 
@@ -3413,41 +3439,41 @@ msgstr "do 11 ao 20"
 #. * 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:1165
+#: ../calendar/gui/dialogs/recurrence-page.c:1163
 msgid "21st to 31st"
 msgstr "Do 21 ao 31"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1191
+#: ../calendar/gui/dialogs/recurrence-page.c:1189
 #: ../modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Monday"
 msgstr "Luns"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1192
+#: ../calendar/gui/dialogs/recurrence-page.c:1190
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
 msgid "Tuesday"
 msgstr "Martes"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1193
+#: ../calendar/gui/dialogs/recurrence-page.c:1191
 #: ../modules/calendar/e-calendar-preferences.ui.h:49
 msgid "Wednesday"
 msgstr "Mércores"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1194
+#: ../calendar/gui/dialogs/recurrence-page.c:1192
 #: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Thursday"
 msgstr "Xoves"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../calendar/gui/dialogs/recurrence-page.c:1193
 #: ../modules/calendar/e-calendar-preferences.ui.h:16
 msgid "Friday"
 msgstr "Venres"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1196
+#: ../calendar/gui/dialogs/recurrence-page.c:1194
 #: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "Saturday"
 msgstr "Sábado"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1197
+#: ../calendar/gui/dialogs/recurrence-page.c:1195
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Sunday"
 msgstr "Domingo"
@@ -3455,31 +3481,31 @@ msgstr "Domingo"
 #. 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:1321
+#: ../calendar/gui/dialogs/recurrence-page.c:1319
 msgid "on the"
 msgstr "no"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1496
+#: ../calendar/gui/dialogs/recurrence-page.c:1494
 msgid "occurrences"
 msgstr "aparicións"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2214
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Add exception"
 msgstr "Engadir unha excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2255
+#: ../calendar/gui/dialogs/recurrence-page.c:2251
 msgid "Could not get a selection to modify."
 msgstr "Non foi posíbel obter unha selección para modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2261
+#: ../calendar/gui/dialogs/recurrence-page.c:2257
 msgid "Modify exception"
 msgstr "Modificar a excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2305
+#: ../calendar/gui/dialogs/recurrence-page.c:2301
 msgid "Could not get a selection to delete."
 msgstr "Non foi posíbel obter unha selección para eliminar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2439
+#: ../calendar/gui/dialogs/recurrence-page.c:2435
 msgid "Date/Time"
 msgstr "Data e hora"
 
@@ -3541,11 +3567,11 @@ msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: ../calendar/gui/dialogs/send-comp.c:198
+#: ../calendar/gui/dialogs/send-comp.c:197
 msgid "Send my reminders with this event"
 msgstr "Enviar os meus recordatorios con esta actividade"
 
-#: ../calendar/gui/dialogs/send-comp.c:200
+#: ../calendar/gui/dialogs/send-comp.c:199
 msgid "Notify new attendees _only"
 msgstr "Notificar só aos participantes n_ovos"
 
@@ -3564,7 +3590,7 @@ msgstr "Páxina web"
 #: ../calendar/gui/e-cal-model-tasks.c:440
 #: ../calendar/gui/e-cal-model-tasks.c:725 ../calendar/gui/e-task-table.c:219
 #: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:606
-#: ../calendar/gui/print.c:3400 ../mail/em-sync-stream.c:152
+#: ../calendar/gui/print.c:3398 ../mail/em-sync-stream.c:152
 #: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
@@ -3577,7 +3603,7 @@ msgstr "Cancelada"
 #: ../calendar/gui/e-cal-model-tasks.c:723
 #: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
 #: ../calendar/gui/e-task-table.c:217 ../calendar/gui/e-task-table.c:232
-#: ../calendar/gui/e-task-table.c:605 ../calendar/gui/print.c:3397
+#: ../calendar/gui/e-task-table.c:605 ../calendar/gui/print.c:3395
 #: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:387
 msgid "Completed"
 msgstr "Completada"
@@ -3597,7 +3623,7 @@ msgstr "Alta"
 #: ../calendar/gui/e-cal-model-tasks.c:721
 #: ../calendar/gui/e-cal-model-tasks.c:799 ../calendar/gui/e-task-table.c:215
 #: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:604
-#: ../calendar/gui/print.c:3394
+#: ../calendar/gui/print.c:3392
 msgid "In Progress"
 msgstr "En progreso"
 
@@ -3612,7 +3638,7 @@ msgstr "Baixa"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:321
-#: ../calendar/gui/e-cal-model.c:1578 ../calendar/gui/e-task-table.c:527
+#: ../calendar/gui/e-cal-model.c:1583 ../calendar/gui/e-task-table.c:527
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1273
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
@@ -3624,7 +3650,7 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-model-tasks.c:434
 #: ../calendar/gui/e-cal-model-tasks.c:719 ../calendar/gui/e-task-table.c:213
 #: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:603
-#: ../calendar/gui/print.c:3391 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/print.c:3389 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Non iniciada"
 
@@ -3639,8 +3665,8 @@ msgstr "Esta_do:"
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
+#: ../calendar/gui/e-cal-model.c:3472
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1854
 #: ../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
@@ -3680,7 +3706,7 @@ msgstr "Prema para cambiar ou ver a información do estado da tarefa"
 msgid "_Send Options"
 msgstr "Opción_s de envío"
 
-#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3312
+#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3310
 #: ../widgets/misc/e-send-options.c:535
 msgid "Task"
 msgstr "Tarefa"
@@ -3713,16 +3739,24 @@ msgstr ""
 "Non é posíbel editar a tarefa na súa totalidade porque vostede non é o "
 "organizador"
 
-#: ../calendar/gui/dialogs/task-page.c:341
+#: ../calendar/gui/dialogs/task-page.c:294
+msgid ""
+"Task cannot be edited, because the selected task list does not support "
+"assigned tasks"
+msgstr ""
+"Non é posíbel editar a tarefa porque a lista de tarefas seleccionada non "
+"admite asignación de tarefas"
+
+#: ../calendar/gui/dialogs/task-page.c:347
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zador:"
 
-#: ../calendar/gui/dialogs/task-page.c:801
+#: ../calendar/gui/dialogs/task-page.c:807
 msgid "Due date is wrong"
 msgstr "A data de vencemento é incorrecta"
 
-#: ../calendar/gui/dialogs/task-page.c:1757
+#: ../calendar/gui/dialogs/task-page.c:1764
 #, c-format
 msgid "Unable to open tasks in '%s': %s"
 msgstr "Non é posíbel abrir as tarefas en «%s»: %s"
@@ -3902,43 +3936,75 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ningún"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1584
+#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1589
 #: ../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 "Si"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1584
+#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1589
 #: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "Non"
 
-#: ../calendar/gui/e-cal-model.c:776 ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-cal-model.c:781 ../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:1151
-#: ../calendar/gui/print.c:1168 ../e-util/e-charset.c:52
-#: ../modules/plugin-manager/evolution-plugin-manager.c:102
+#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1149
+#: ../calendar/gui/print.c:1166 ../e-util/e-charset.c:52
+#: ../modules/plugin-manager/evolution-plugin-manager.c:101
 #: ../plugins/itip-formatter/itip-formatter.c:469
-#: ../plugins/itip-formatter/itip-formatter.c:2697
+#: ../plugins/itip-formatter/itip-formatter.c:2690
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: ../calendar/gui/e-cal-model.c:1580
+#: ../calendar/gui/e-cal-model.c:1585
 msgid "Recurring"
 msgstr "Repetición"
 
-#: ../calendar/gui/e-cal-model.c:1582
+#: ../calendar/gui/e-cal-model.c:1587
 msgid "Assigned"
 msgstr "Asignada"
 
-#: ../calendar/gui/e-cal-model.c:2937
+#: ../calendar/gui/e-cal-model.c:2971
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
 
+#: ../calendar/gui/e-cal-model.c:3416
+#: ../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:2678
+msgid "Accepted"
+msgstr "Aceptado"
+
+#: ../calendar/gui/e-cal-model.c:3417
+#: ../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:2684
+msgid "Declined"
+msgstr "Rexeitado"
+
+#: ../calendar/gui/e-cal-model.c:3418
+#: ../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:546
+msgid "Tentative"
+msgstr "Provisional"
+
+#: ../calendar/gui/e-cal-model.c:3419
+#: ../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:2687
+msgid "Delegated"
+msgstr "Delegado"
+
+#: ../calendar/gui/e-cal-model.c:3420
+msgid "Needs action"
+msgstr "Necesita unha acción"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
@@ -3978,69 +4044,37 @@ msgstr "Data de inicio"
 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 "Cortar as actividades seleccionadas para o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:426
+#: ../calendar/gui/e-calendar-view.c:429
 msgid "Copy selected events to the clipboard"
 msgstr "Copiar as actividades seleccionadas para o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:432
+#: ../calendar/gui/e-calendar-view.c:435
 msgid "Paste events from the clipboard"
 msgstr "Pegar as actividades desde o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:438
+#: ../calendar/gui/e-calendar-view.c:441
 msgid "Delete selected events"
 msgstr "Eliminar as actividades seleccionadas"
 
-#: ../calendar/gui/e-calendar-view.c:457 ../calendar/gui/e-memo-table.c:182
+#: ../calendar/gui/e-calendar-view.c:460 ../calendar/gui/e-memo-table.c:182
 #: ../calendar/gui/e-task-table.c:269
 msgid "Deleting selected objects"
 msgstr "Eliminando os obxectos seleccionados"
 
-#: ../calendar/gui/e-calendar-view.c:650 ../calendar/gui/e-memo-table.c:862
-#: ../calendar/gui/e-task-table.c:1104
+#: ../calendar/gui/e-calendar-view.c:656 ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-task-table.c:1105
 msgid "Updating objects"
 msgstr "Actualizando os obxectos"
 
-#: ../calendar/gui/e-calendar-view.c:1801
-#: ../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:2685
-msgid "Accepted"
-msgstr "Aceptado"
-
-#: ../calendar/gui/e-calendar-view.c:1802
-#: ../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:2691
-msgid "Declined"
-msgstr "Rexeitado"
-
-#: ../calendar/gui/e-calendar-view.c:1803
-#: ../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:546
-msgid "Tentative"
-msgstr "Provisional"
-
-#: ../calendar/gui/e-calendar-view.c:1804
-#: ../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:2694
-msgid "Delegated"
-msgstr "Delegado"
-
-#: ../calendar/gui/e-calendar-view.c:1805
-msgid "Needs action"
-msgstr "Necesita unha acción"
-
 #. 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:1949 ../calendar/gui/e-memo-table.c:539
-#: ../calendar/gui/e-task-table.c:770
+#: ../calendar/gui/e-calendar-view.c:1912 ../calendar/gui/e-memo-table.c:539
+#: ../calendar/gui/e-task-table.c:771
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizador: %s <%s>"
@@ -4048,20 +4082,20 @@ msgstr "Organizador: %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:1953 ../calendar/gui/e-memo-table.c:544
-#: ../calendar/gui/e-task-table.c:774
+#: ../calendar/gui/e-calendar-view.c:1916 ../calendar/gui/e-memo-table.c:544
+#: ../calendar/gui/e-task-table.c:775
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1969 ../calendar/gui/print.c:3346
+#: ../calendar/gui/e-calendar-view.c:1932 ../calendar/gui/print.c:3344
 #, c-format
 msgid "Location: %s"
 msgstr "Localización: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2000
+#: ../calendar/gui/e-calendar-view.c:1963
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -4119,8 +4153,8 @@ msgstr "Seleccionar…"
 #. * 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:1819
-#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1968
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1821
+#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1966
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
@@ -4130,7 +4164,7 @@ msgstr "%A %d de %B"
 #. * %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:1836
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1838
 #: ../calendar/gui/e-week-view-main-item.c:224
 #: ../calendar/gui/ea-gnome-calendar.c:204
 #: ../modules/calendar/e-cal-shell-view-private.c:1054
@@ -4142,7 +4176,7 @@ msgstr "%a, %d de %b"
 #. 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:1852
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1854
 #: ../calendar/gui/e-week-view-main-item.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:234
 #: ../modules/calendar/e-cal-shell-view-private.c:1090
@@ -4150,21 +4184,21 @@ msgid "%d %b"
 msgstr "%d de %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1019 ../calendar/gui/e-week-view.c:757
-#: ../calendar/gui/print.c:977 ../calendar/gui/print.c:996
-#: ../calendar/gui/print.c:2484 ../calendar/gui/print.c:2504
+#: ../calendar/gui/e-day-view.c:1021 ../calendar/gui/e-week-view.c:757
+#: ../calendar/gui/print.c:975 ../calendar/gui/print.c:994
+#: ../calendar/gui/print.c:2482 ../calendar/gui/print.c:2502
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1022 ../calendar/gui/e-week-view.c:760
-#: ../calendar/gui/print.c:982 ../calendar/gui/print.c:998
-#: ../calendar/gui/print.c:2489 ../calendar/gui/print.c:2506
+#: ../calendar/gui/e-day-view.c:1024 ../calendar/gui/e-week-view.c:760
+#: ../calendar/gui/print.c:980 ../calendar/gui/print.c:996
+#: ../calendar/gui/print.c:2487 ../calendar/gui/print.c:2504
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2636
+#: ../calendar/gui/e-day-view.c:2638
 #, c-format
 msgid "Week %d"
 msgstr "Semana %d"
@@ -4187,49 +4221,49 @@ msgstr "Recursos"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/e-meeting-store.c:1047 ../calendar/gui/print.c:1147
+#: ../calendar/gui/e-meeting-store.c:1047 ../calendar/gui/print.c:1145
 msgid "Individual"
 msgstr "Individual"
 
 #: ../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:1148 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/print.c:1146 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Grupo"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
 #: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1149
+#: ../calendar/gui/print.c:1147
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../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:1150
+#: ../calendar/gui/print.c:1148
 msgid "Room"
 msgstr "Sala"
 
 #: ../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:1164
+#: ../calendar/gui/print.c:1162
 msgid "Chair"
 msgstr "Presidente"
 
 #: ../calendar/gui/e-meeting-list-view.c:189
 #: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/e-meeting-store.c:1050 ../calendar/gui/print.c:1165
+#: ../calendar/gui/e-meeting-store.c:1050 ../calendar/gui/print.c:1163
 msgid "Required Participant"
 msgstr "Participante necesario"
 
 #: ../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:1166
+#: ../calendar/gui/print.c:1164
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
 #: ../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:1167
+#: ../calendar/gui/print.c:1165
 msgid "Non-Participant"
 msgstr "Non-participante"
 
@@ -4268,9 +4302,9 @@ msgstr "Razón do fallo: %s"
 
 #: ../calendar/gui/e-meeting-store.c:1891
 #: ../plugins/caldav/caldav-browse-server.c:957
-#: ../plugins/google-account-setup/google-source.c:460
-#: ../plugins/publish-calendar/publish-calendar.c:345
-#: ../smime/gui/component.c:53
+#: ../plugins/google-account-setup/google-source.c:458
+#: ../plugins/publish-calendar/publish-calendar.c:337
+#: ../smime/gui/component.c:54
 msgid "Enter password"
 msgstr "Introduza o contrasinal"
 
@@ -4389,17 +4423,17 @@ msgstr "Integrante"
 msgid "Memos"
 msgstr "Notas"
 
-#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:733
+#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:734
 msgid "* No Summary *"
 msgstr "* Sen resumo *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:588 ../calendar/gui/e-task-table.c:817
+#: ../calendar/gui/e-memo-table.c:588 ../calendar/gui/e-task-table.c:818
 msgid "Start: "
 msgstr "Inicio: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:607 ../calendar/gui/e-task-table.c:835
+#: ../calendar/gui/e-memo-table.c:607 ../calendar/gui/e-task-table.c:836
 msgid "Due: "
 msgstr "Vencemento: "
 
@@ -4437,9 +4471,9 @@ msgstr "Prema para engadir unha nota"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:652 ../calendar/gui/print.c:2273
+#: ../calendar/gui/e-task-table.c:652 ../calendar/gui/print.c:2271
 #: ../calendar/importers/icalendar-importer.c:85
-#: ../calendar/importers/icalendar-importer.c:1043
+#: ../calendar/importers/icalendar-importer.c:1044
 #: ../modules/calendar/e-calendar-preferences.ui.h:41
 #: ../modules/calendar/e-cal-shell-content.c:434
 #: ../modules/calendar/e-task-shell-view-actions.c:254
@@ -4449,24 +4483,24 @@ msgstr "%d%%"
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: ../calendar/gui/e-task-table.c:968
+#: ../calendar/gui/e-task-table.c:969
 msgid "Cut selected tasks to the clipboard"
 msgstr "Cortar as tarefas seleccionadas ao portapapeis"
 
-#: ../calendar/gui/e-task-table.c:974
+#: ../calendar/gui/e-task-table.c:975
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copiar as tarefas seleccionadas ao portapapeis"
 
-#: ../calendar/gui/e-task-table.c:980
+#: ../calendar/gui/e-task-table.c:981
 msgid "Paste tasks from the clipboard"
 msgstr "Pegar as tarefas desde o portapapeis"
 
-#: ../calendar/gui/e-task-table.c:986
+#: ../calendar/gui/e-task-table.c:987
 #: ../modules/calendar/e-task-shell-view-actions.c:710
 msgid "Delete selected tasks"
 msgstr "Eliminar as tarefas seleccionadas"
 
-#: ../calendar/gui/e-task-table.c:992
+#: ../calendar/gui/e-task-table.c:993
 msgid "Select all visible tasks"
 msgstr "Seleccionar todas as tarefas visíbeis"
 
@@ -4478,7 +4512,7 @@ msgstr "Seleccionar un fuso horario"
 #. 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:1949
+#: ../calendar/gui/e-week-view-main-item.c:232 ../calendar/gui/print.c:1947
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -4575,7 +4609,7 @@ msgstr "vista de calendario para un ou máis días"
 
 #: ../calendar/gui/ea-gnome-calendar.c:50
 #: ../calendar/gui/ea-gnome-calendar.c:58
-#: ../calendar/importers/icalendar-importer.c:1077
+#: ../calendar/importers/icalendar-importer.c:1078
 msgid "Gnome Calendar"
 msgstr "Calendario do GNOME"
 
@@ -4630,36 +4664,36 @@ msgstr "vista de calendario para un mes"
 msgid "calendar view for one or more weeks"
 msgstr "vista de calendario para unha ou máis semanas"
 
-#: ../calendar/gui/gnome-cal.c:2250
+#: ../calendar/gui/gnome-cal.c:2262
 msgid "Purging"
 msgstr "Purgando"
 
-#: ../calendar/gui/itip-utils.c:511 ../calendar/gui/itip-utils.c:566
-#: ../calendar/gui/itip-utils.c:669
+#: ../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 "Debe estabelecerse un organizador."
 
-#: ../calendar/gui/itip-utils.c:558
+#: ../calendar/gui/itip-utils.c:560
 msgid "At least one attendee is necessary"
 msgstr "É necesario polo menos un participante"
 
-#: ../calendar/gui/itip-utils.c:755 ../calendar/gui/itip-utils.c:916
+#: ../calendar/gui/itip-utils.c:767 ../calendar/gui/itip-utils.c:928
 msgid "Event information"
 msgstr "Información da actividade"
 
-#: ../calendar/gui/itip-utils.c:758 ../calendar/gui/itip-utils.c:919
+#: ../calendar/gui/itip-utils.c:770 ../calendar/gui/itip-utils.c:931
 msgid "Task information"
 msgstr "Información da tarefa"
 
-#: ../calendar/gui/itip-utils.c:761 ../calendar/gui/itip-utils.c:922
+#: ../calendar/gui/itip-utils.c:773 ../calendar/gui/itip-utils.c:934
 msgid "Memo information"
 msgstr "Información da nota"
 
-#: ../calendar/gui/itip-utils.c:764 ../calendar/gui/itip-utils.c:940
+#: ../calendar/gui/itip-utils.c:776 ../calendar/gui/itip-utils.c:952
 msgid "Free/Busy information"
 msgstr "Información de dispoñibilidade"
 
-#: ../calendar/gui/itip-utils.c:767
+#: ../calendar/gui/itip-utils.c:779
 msgid "Calendar information"
 msgstr "Información do calendario"
 
@@ -4667,7 +4701,7 @@ msgstr "Información do calendario"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:816
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Aceptado"
@@ -4676,7 +4710,7 @@ msgstr "Aceptado"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:811
+#: ../calendar/gui/itip-utils.c:823
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
@@ -4688,7 +4722,7 @@ msgstr "Aceptado provisionalmente"
 #. 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:818 ../calendar/gui/itip-utils.c:866
+#: ../calendar/gui/itip-utils.c:830 ../calendar/gui/itip-utils.c:878
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Rexeitado"
@@ -4697,7 +4731,7 @@ msgstr "Rexeitado"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:825
+#: ../calendar/gui/itip-utils.c:837
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegado"
@@ -4705,7 +4739,7 @@ msgstr "Delegado"
 #. 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:838
+#: ../calendar/gui/itip-utils.c:850
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Actualizado"
@@ -4713,7 +4747,7 @@ msgstr "Actualizado"
 #. 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:845
+#: ../calendar/gui/itip-utils.c:857
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancelar"
@@ -4721,7 +4755,7 @@ msgstr "Cancelar"
 #. 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:852
+#: ../calendar/gui/itip-utils.c:864
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Actualizar"
@@ -4729,254 +4763,254 @@ msgstr "Actualizar"
 #. 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:859
+#: ../calendar/gui/itip-utils.c:871
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Contraproposta"
 
-#: ../calendar/gui/itip-utils.c:937
+#: ../calendar/gui/itip-utils.c:949
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Información de dispoñibilidade (de %s a %s)"
 
-#: ../calendar/gui/itip-utils.c:945
+#: ../calendar/gui/itip-utils.c:957
 msgid "iCalendar information"
 msgstr "Información de iCalendar"
 
-#: ../calendar/gui/itip-utils.c:970
+#: ../calendar/gui/itip-utils.c:984
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "Non foi posíbel reservar un recurso, a nova actividade colisiona con algunha "
 "outra."
 
-#: ../calendar/gui/itip-utils.c:974
+#: ../calendar/gui/itip-utils.c:988
 msgid "Unable to book a resource, error: "
 msgstr "Non foi posíbel reservar un recurso, erro: "
 
-#: ../calendar/gui/itip-utils.c:1137
+#: ../calendar/gui/itip-utils.c:1153
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante na actividade."
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:579
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:579
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:579
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:579
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:579
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:580
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:580
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:580
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:580
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:580
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:581
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:581
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:581
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:581
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:581
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:582
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:582
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:582
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:582
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:582
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:583
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:583
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:583
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:583
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:583
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:584
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:584
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:584
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:584
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:584
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:587
+#: ../calendar/gui/print.c:585
 msgid "31st"
 msgstr "31"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:644
+#: ../calendar/gui/print.c:642
 msgid "Su"
 msgstr "Do"
 
-#: ../calendar/gui/print.c:644
+#: ../calendar/gui/print.c:642
 msgid "Mo"
 msgstr "Lu"
 
-#: ../calendar/gui/print.c:644
+#: ../calendar/gui/print.c:642
 msgid "Tu"
 msgstr "Ma"
 
-#: ../calendar/gui/print.c:644
+#: ../calendar/gui/print.c:642
 msgid "We"
 msgstr "Mé"
 
-#: ../calendar/gui/print.c:645
+#: ../calendar/gui/print.c:643
 msgid "Th"
 msgstr "Xo"
 
-#: ../calendar/gui/print.c:645
+#: ../calendar/gui/print.c:643
 msgid "Fr"
 msgstr "Ve"
 
-#: ../calendar/gui/print.c:645
+#: ../calendar/gui/print.c:643
 msgid "Sa"
 msgstr "Sá"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3139
+#: ../calendar/gui/print.c:3137
 msgid " to "
 msgstr " para "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3149
+#: ../calendar/gui/print.c:3147
 msgid " (Completed "
 msgstr " (Completado "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3155
+#: ../calendar/gui/print.c:3153
 msgid "Completed "
 msgstr "Completado "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3165
+#: ../calendar/gui/print.c:3163
 msgid " (Due "
 msgstr " (Vencemento "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3172
+#: ../calendar/gui/print.c:3170
 msgid "Due "
 msgstr "Vencemento "
 
-#: ../calendar/gui/print.c:3337
+#: ../calendar/gui/print.c:3335
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
 
-#: ../calendar/gui/print.c:3364
+#: ../calendar/gui/print.c:3362
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:3407
+#: ../calendar/gui/print.c:3405
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:3422
+#: ../calendar/gui/print.c:3420
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: ../calendar/gui/print.c:3440
+#: ../calendar/gui/print.c:3438
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaxe completada: %i"
 
-#: ../calendar/gui/print.c:3451
+#: ../calendar/gui/print.c:3449
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3464
+#: ../calendar/gui/print.c:3462
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorías: %s"
 
-#: ../calendar/gui/print.c:3475
+#: ../calendar/gui/print.c:3473
 msgid "Contacts: "
 msgstr "Contactos: "
 
@@ -5031,155 +5065,155 @@ msgstr "Ficheiros vCalendar (.vcs)"
 msgid "Evolution vCalendar importer"
 msgstr "Importador de vCalendar do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:1038
+#: ../calendar/importers/icalendar-importer.c:1039
 msgid "Calendar Events"
 msgstr "Actividades do calendario"
 
-#: ../calendar/importers/icalendar-importer.c:1078
+#: ../calendar/importers/icalendar-importer.c:1079
 msgid "Evolution Calendar intelligent importer"
 msgstr "Importador intelixente do calendario do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:1146
-#: ../calendar/importers/icalendar-importer.c:1464
+#: ../calendar/importers/icalendar-importer.c:1147
+#: ../calendar/importers/icalendar-importer.c:1465
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Reunión"
 
-#: ../calendar/importers/icalendar-importer.c:1146
-#: ../calendar/importers/icalendar-importer.c:1464
+#: ../calendar/importers/icalendar-importer.c:1147
+#: ../calendar/importers/icalendar-importer.c:1465
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Actividade"
 
-#: ../calendar/importers/icalendar-importer.c:1149
-#: ../calendar/importers/icalendar-importer.c:1465
+#: ../calendar/importers/icalendar-importer.c:1150
+#: ../calendar/importers/icalendar-importer.c:1466
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Tarefa"
 
-#: ../calendar/importers/icalendar-importer.c:1152
-#: ../calendar/importers/icalendar-importer.c:1466
+#: ../calendar/importers/icalendar-importer.c:1153
+#: ../calendar/importers/icalendar-importer.c:1467
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Nota"
 
-#: ../calendar/importers/icalendar-importer.c:1161
+#: ../calendar/importers/icalendar-importer.c:1162
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "ten repeticións"
 
-#: ../calendar/importers/icalendar-importer.c:1166
+#: ../calendar/importers/icalendar-importer.c:1167
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "é unha instancia"
 
-#: ../calendar/importers/icalendar-importer.c:1171
+#: ../calendar/importers/icalendar-importer.c:1172
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "Ten recordatorios"
 
-#: ../calendar/importers/icalendar-importer.c:1176
+#: ../calendar/importers/icalendar-importer.c:1177
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "ten anexos"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1189
+#: ../calendar/importers/icalendar-importer.c:1190
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Público"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1192
+#: ../calendar/importers/icalendar-importer.c:1193
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Privado"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1195
+#: ../calendar/importers/icalendar-importer.c:1196
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Confidencial"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1199
+#: ../calendar/importers/icalendar-importer.c:1200
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Clasificación"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:1204
-#: ../calendar/importers/icalendar-importer.c:1505
+#: ../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:1210
+#: ../calendar/importers/icalendar-importer.c:1211
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Localización"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:1218
-#: ../calendar/importers/icalendar-importer.c:1501
+#: ../calendar/importers/icalendar-importer.c:1219
+#: ../calendar/importers/icalendar-importer.c:1502
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Inicio"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1229
+#: ../calendar/importers/icalendar-importer.c:1230
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Vencemento"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1241
+#: ../calendar/importers/icalendar-importer.c:1242
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Final"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1251
+#: ../calendar/importers/icalendar-importer.c:1252
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Categorías"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1275
+#: ../calendar/importers/icalendar-importer.c:1276
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Completada"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1283
+#: ../calendar/importers/icalendar-importer.c:1284
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1294
-#: ../calendar/importers/icalendar-importer.c:1297
+#: ../calendar/importers/icalendar-importer.c:1295
+#: ../calendar/importers/icalendar-importer.c:1298
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organizador"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1317
-#: ../calendar/importers/icalendar-importer.c:1320
+#: ../calendar/importers/icalendar-importer.c:1318
+#: ../calendar/importers/icalendar-importer.c:1321
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Participantes"
 
-#: ../calendar/importers/icalendar-importer.c:1334
+#: ../calendar/importers/icalendar-importer.c:1335
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Descrición"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1497
+#: ../calendar/importers/icalendar-importer.c:1498
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Tipo"
@@ -6741,160 +6775,160 @@ msgstr "Pacífico/Yap"
 msgid "Save as..."
 msgstr "Gardar como…"
 
-#: ../composer/e-composer-actions.c:296
+#: ../composer/e-composer-actions.c:295
 #: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
 msgstr "_Pechar"
 
-#: ../composer/e-composer-actions.c:298
+#: ../composer/e-composer-actions.c:297
 msgid "Close the current file"
 msgstr "Pechar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:303
+#: ../composer/e-composer-actions.c:302
 msgid "New _Message"
 msgstr "_Mensaxe nova"
 
-#: ../composer/e-composer-actions.c:305
+#: ../composer/e-composer-actions.c:304
 msgid "Open New Message window"
 msgstr "Abrir unha xanela de mensaxe nova"
 
-#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1511
+#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1520
 msgid "Configure Evolution"
 msgstr "Configurar o Evolution"
 
-#: ../composer/e-composer-actions.c:319
+#: ../composer/e-composer-actions.c:318
 msgid "Save the current file"
 msgstr "Gardar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:323
 msgid "Save _As..."
 msgstr "Gardar _como…"
 
-#: ../composer/e-composer-actions.c:326
+#: ../composer/e-composer-actions.c:325
 msgid "Save the current file with a different name"
 msgstr "Gardar o ficheiro actual con un nome diferente"
 
-#: ../composer/e-composer-actions.c:333
+#: ../composer/e-composer-actions.c:332
 msgid "Character _Encoding"
 msgstr "C_odificación de caracteres"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:349
 msgid "_Print..."
 msgstr "_Imprimir…"
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:356
 msgid "Print Pre_view"
 msgstr "_Vista previa de impresión"
 
-#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-actions.c:363
 msgid "Save as _Draft"
 msgstr "Gardar como borra_dor"
 
-#: ../composer/e-composer-actions.c:366
+#: ../composer/e-composer-actions.c:365
 msgid "Save as draft"
 msgstr "Gardar como borrador"
 
-#: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:352
+#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:353
 msgid "S_end"
 msgstr "_Enviar"
 
-#: ../composer/e-composer-actions.c:373
+#: ../composer/e-composer-actions.c:372
 msgid "Send this message"
 msgstr "Enviar esta mensaxe"
 
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:380
 msgid "PGP _Encrypt"
 msgstr "C_ifrar con PGP"
 
-#: ../composer/e-composer-actions.c:383
+#: ../composer/e-composer-actions.c:382
 msgid "Encrypt this message with PGP"
 msgstr "Cifrar esta mensaxe con PGP"
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:388
 msgid "PGP _Sign"
 msgstr "A_sinar con PGP"
 
-#: ../composer/e-composer-actions.c:391
+#: ../composer/e-composer-actions.c:390
 msgid "Sign this message with your PGP key"
 msgstr "Asinar esta mensaxe coa súa chave PGP"
 
-#: ../composer/e-composer-actions.c:397
+#: ../composer/e-composer-actions.c:396
 msgid "_Picture Gallery"
 msgstr "_Galería de imaxes"
 
-#: ../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 "Mostrar unha colección de imaxes que poida arrastrar a unha mensaxe"
 
-#: ../composer/e-composer-actions.c:405
+#: ../composer/e-composer-actions.c:404
 msgid "_Prioritize Message"
 msgstr "_Priorizar a mensaxe"
 
-#: ../composer/e-composer-actions.c:407
+#: ../composer/e-composer-actions.c:406
 msgid "Set the message priority to high"
 msgstr "Definir a prioridade da mensaxe como alta"
 
-#: ../composer/e-composer-actions.c:413
+#: ../composer/e-composer-actions.c:412
 msgid "Re_quest Read Receipt"
 msgstr "_Solicitar a confirmación de lectura"
 
-#: ../composer/e-composer-actions.c:415
+#: ../composer/e-composer-actions.c:414
 msgid "Get delivery notification when your message is read"
 msgstr "Obter unha notificación de entrega cando se lea a súa mensaxe"
 
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:420
 msgid "S/MIME En_crypt"
 msgstr "_Cifrar con S/MIME"
 
-#: ../composer/e-composer-actions.c:423
+#: ../composer/e-composer-actions.c:422
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Cifrar esta mensaxe co seu certificado de cifrado S/MIME"
 
-#: ../composer/e-composer-actions.c:429
+#: ../composer/e-composer-actions.c:428
 msgid "S/MIME Sig_n"
 msgstr "Asi_nar con S/MIME"
 
-#: ../composer/e-composer-actions.c:431
+#: ../composer/e-composer-actions.c:430
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Asinar esta mensaxe co seu certificado de sinatura S/MIME"
 
-#: ../composer/e-composer-actions.c:437
+#: ../composer/e-composer-actions.c:436
 msgid "_Bcc Field"
 msgstr "Campo _Cco"
 
-#: ../composer/e-composer-actions.c:439
+#: ../composer/e-composer-actions.c:438
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Alterna a vista do campo «CCO»"
 
-#: ../composer/e-composer-actions.c:445
+#: ../composer/e-composer-actions.c:444
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ../composer/e-composer-actions.c:447
+#: ../composer/e-composer-actions.c:446
 msgid "Toggles whether the CC field is displayed"
 msgstr "Alterna a vista do campo «CC»"
 
-#: ../composer/e-composer-actions.c:453
+#: ../composer/e-composer-actions.c:452
 msgid "_Reply-To Field"
 msgstr "Campo _Responder a"
 
-#: ../composer/e-composer-actions.c:455
+#: ../composer/e-composer-actions.c:454
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Alterna a vista do campo «Responder a»"
 
-#: ../composer/e-composer-actions.c:514
+#: ../composer/e-composer-actions.c:513
 msgid "Save Draft"
 msgstr "Gardar o borrador"
 
-#: ../composer/e-composer-header-table.c:40
+#: ../composer/e-composer-header-table.c:39
 msgid "Enter the recipients of the message"
 msgstr "Introducir os destinatarios da mensaxe"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Introducir os enderezos que recibirán unha copia da mensaxe"
 
-#: ../composer/e-composer-header-table.c:45
+#: ../composer/e-composer-header-table.c:44
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -6902,35 +6936,35 @@ msgstr ""
 "Introducir os enderezos que recibirán unha copia da mensaxe sen aparecerer "
 "na lista de destinatarios"
 
-#: ../composer/e-composer-header-table.c:1021
+#: ../composer/e-composer-header-table.c:1018
 msgid "Fr_om:"
 msgstr "_De:"
 
-#: ../composer/e-composer-header-table.c:1030
+#: ../composer/e-composer-header-table.c:1027
 msgid "_Reply-To:"
 msgstr "_Responder a:"
 
-#: ../composer/e-composer-header-table.c:1034
+#: ../composer/e-composer-header-table.c:1031
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-composer-header-table.c:1039
+#: ../composer/e-composer-header-table.c:1036
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:1044
+#: ../composer/e-composer-header-table.c:1041
 msgid "_Bcc:"
 msgstr "_Cco:"
 
-#: ../composer/e-composer-header-table.c:1049
+#: ../composer/e-composer-header-table.c:1046
 msgid "_Post To:"
 msgstr "_Publicar en:"
 
-#: ../composer/e-composer-header-table.c:1053
+#: ../composer/e-composer-header-table.c:1050
 msgid "S_ubject:"
 msgstr "_Asunto:"
 
-#: ../composer/e-composer-header-table.c:1062
+#: ../composer/e-composer-header-table.c:1059
 msgid "Si_gnature:"
 msgstr "Si_natura:"
 
@@ -6942,27 +6976,27 @@ msgstr "Premer aquí para ir á axenda de enderezos"
 msgid "Click here to select folders to post to"
 msgstr "Premer aquí para seleccionar os cartafoles de destino"
 
-#: ../composer/e-composer-private.c:249
+#: ../composer/e-composer-private.c:250
 msgid "Undo the last action"
 msgstr "Desfacer a última acción"
 
-#: ../composer/e-composer-private.c:253
+#: ../composer/e-composer-private.c:254
 msgid "Redo the last undone action"
 msgstr "Refacer a última acción desfeita"
 
-#: ../composer/e-composer-private.c:257
+#: ../composer/e-composer-private.c:258
 msgid "Search for text"
 msgstr "Busca de texto"
 
-#: ../composer/e-composer-private.c:261
+#: ../composer/e-composer-private.c:262
 msgid "Search for and replace text"
 msgstr "Buscar e substituír un texto"
 
-#: ../composer/e-composer-private.c:372
+#: ../composer/e-composer-private.c:373
 msgid "Save draft"
 msgstr "Gardar o borrador"
 
-#: ../composer/e-msg-composer.c:812
+#: ../composer/e-msg-composer.c:815
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -6970,7 +7004,7 @@ msgstr ""
 "Non é posíbel asinar a mensaxe saínte: non hai un certificado de sinatura "
 "estabelecido para esta conta"
 
-#: ../composer/e-msg-composer.c:821
+#: ../composer/e-msg-composer.c:824
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -6979,17 +7013,17 @@ msgstr ""
 "Non é posíbel cifrar a mensaxe saínte: non hai un certificado de cifrado "
 "estabelecido para esta conta"
 
-#: ../composer/e-msg-composer.c:1699 ../composer/e-msg-composer.c:2083
+#: ../composer/e-msg-composer.c:1702 ../composer/e-msg-composer.c:2091
 msgid "Compose Message"
 msgstr "Escribir unha mensaxe"
 
-#: ../composer/e-msg-composer.c:4228
+#: ../composer/e-msg-composer.c:4260
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "O editor contén un corpo de mensaxe sen texto, polo que non é posíbel a "
 "edición."
 
-#: ../composer/e-msg-composer.c:4933
+#: ../composer/e-msg-composer.c:4964
 msgid "Untitled Message"
 msgstr "Mensaxe sen título"
 
@@ -7099,7 +7133,7 @@ msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 "O ficheiro «{0}» non é un ficheiro normal e non pode enviarse nunha mensaxe."
 
-#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:124
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:126
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "O informe de erro foi «{0}»."
 
@@ -7183,8 +7217,8 @@ msgstr "CalDAV"
 
 #: ../capplet/settings/mail-account-view.c:361
 #: ../capplet/settings/mail-account-view.c:413
-#: ../modules/online-accounts/e-online-accounts-google.c:287
-#: ../modules/online-accounts/e-online-accounts-google.c:359
+#: ../modules/online-accounts/e-online-accounts-google.c:289
+#: ../modules/online-accounts/e-online-accounts-google.c:362
 #: ../plugins/google-account-setup/google-contacts-source.c:55
 #: ../plugins/google-account-setup/google-source.c:87
 msgid "Google"
@@ -7281,7 +7315,7 @@ msgstr ""
 "o seu correo electrónico"
 
 #: ../capplet/settings/mail-account-view.c:630
-#: ../mail/em-account-editor.c:2289 ../mail/em-account-editor.c:2425
+#: ../mail/em-account-editor.c:2290 ../mail/em-account-editor.c:2426
 msgid "Identity"
 msgstr "Identidade"
 
@@ -7333,7 +7367,7 @@ msgid "Back - Receiving options"
 msgstr "Anterior - Opcións de recepción"
 
 #: ../capplet/settings/mail-account-view.c:635
-#: ../mail/em-account-editor.c:3377
+#: ../mail/em-account-editor.c:3378
 msgid "Defaults"
 msgstr "Predefinicións"
 
@@ -7409,10 +7443,7 @@ msgstr "Asistente de contas do Evolution"
 
 #. create the local source group
 #: ../capplet/settings/mail-capplet-shell.c:377 ../mail/e-mail-local.c:81
-#: ../mail/e-mail-migrate.c:750 ../mail/em-folder-tree-model.c:153
-#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:159
-#: ../mail/em-folder-tree-model.c:161 ../mail/em-folder-tree-model.c:168
-#: ../mail/em-folder-tree-model.c:170
+#: ../mail/e-mail-migrate.c:748 ../mail/em-folder-tree-model.c:167
 #: ../modules/addressbook/e-book-shell-backend.c:100
 #: ../modules/addressbook/e-book-shell-migrate.c:136
 #: ../modules/calendar/e-cal-shell-backend.c:113
@@ -7421,6 +7452,13 @@ msgstr "Asistente de contas do Evolution"
 #: ../modules/calendar/e-memo-shell-migrate.c:109
 #: ../modules/calendar/e-task-shell-backend.c:102
 #: ../modules/calendar/e-task-shell-migrate.c:121
+#: ../widgets/misc/e-account-tree-view.c:99
+#: ../widgets/misc/e-account-tree-view.c:291
+#: ../widgets/misc/e-account-tree-view.c:922
+#: ../widgets/misc/e-account-tree-view.c:980
+#: ../widgets/misc/e-account-tree-view.c:1053
+#: ../widgets/misc/e-account-tree-view.c:1130
+#: ../widgets/misc/e-account-tree-view.c:1359
 msgid "On This Computer"
 msgstr "Neste computador"
 
@@ -7449,7 +7487,7 @@ msgstr "Notificacións de actividades do calendario"
 msgid "Evolution Alarm Notify"
 msgstr "Notificador de alarmas do Evolution"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:999
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1000
 #: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:257
 msgid "Evolution"
@@ -7589,7 +7627,7 @@ msgstr "Visual"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:206
-#: ../modules/calendar/e-cal-shell-view-actions.c:1856
+#: ../modules/calendar/e-cal-shell-view-actions.c:1863
 #: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
@@ -7669,19 +7707,19 @@ msgstr "Usar a localización predeterminada"
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../e-util/e-file-utils.c:151
+#: ../e-util/e-file-utils.c:150
 msgid "(Unknown Filename)"
 msgstr "(Nome de ficheiro descoñecido)"
 
 #. 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 "Escribindo «%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 "Escribindo «%s» a «%s»"
@@ -7731,7 +7769,7 @@ msgstr "Desexa sobrescribilo?"
 msgid "File exists \"{0}\"."
 msgstr "O ficheiro xa existe «{0}»."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:164
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:166
 msgid "_Overwrite"
 msgstr "S_obrescribir"
 
@@ -7764,31 +7802,31 @@ msgid "Reply-To"
 msgstr "Responder a"
 
 #: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1063
-#: ../mail/em-format-html.c:2593 ../mail/em-format-html.c:2661
-#: ../mail/em-format-html.c:2684 ../modules/mail/em-mailer-prefs.c:75
+#: ../mail/em-format-html.c:2627 ../mail/em-format-html.c:2695
+#: ../mail/em-format-html.c:2718 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "Cc"
 
 #: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1064
-#: ../mail/em-format-html.c:2594 ../mail/em-format-html.c:2665
-#: ../mail/em-format-html.c:2687 ../modules/mail/em-mailer-prefs.c:76
+#: ../mail/em-format-html.c:2628 ../mail/em-format-html.c:2699
+#: ../mail/em-format-html.c:2721 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "Cco"
 
 #: ../em-format/em-format-quote.c:464 ../em-format/em-format.c:1065
 #: ../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:77
-#: ../smime/lib/e-cert.c:1151
+#: ../smime/lib/e-cert.c:1147
 msgid "Subject"
 msgstr "Titular"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:475 ../mail/em-format-html.c:2786
+#: ../em-format/em-format-quote.c:475 ../mail/em-format-html.c:2820
 #: ../modules/mail/em-mailer-prefs.c:1028
 msgid "Mailer"
 msgstr "Aplicativo de correo"
 
-#: ../em-format/em-format-quote.c:565 ../mail/em-composer-utils.c:1203
+#: ../em-format/em-format-quote.c:565 ../mail/em-composer-utils.c:1207
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensaxe reencamiñada --------"
 
@@ -8035,11 +8073,11 @@ msgid "A_dd Condition"
 msgstr "Enga_dir unha condición"
 
 #: ../filter/e-filter-rule.c:1135 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:321
+#: ../mail/em-utils.c:323
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:322
+#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:324
 msgid "Outgoing"
 msgstr "Saínte"
 
@@ -8071,7 +8109,7 @@ msgstr "Falta a data."
 msgid "Missing file name."
 msgstr "Falta o nome do ficheiro."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:90
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:91
 msgid "Missing name."
 msgstr "Falta o nome."
 
@@ -8183,24 +8221,24 @@ msgid "Ask for each message"
 msgstr "Preguntar para cada mensaxe"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1833 ../widgets/misc/e-account-tree-view.c:131
+#: ../mail/em-account-editor.c:1832 ../widgets/misc/e-account-tree-view.c:265
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Ningún"
 
-#: ../mail/em-account-editor.c:2237
+#: ../mail/em-account-editor.c:2233
 msgid "Fil_e:"
 msgstr "Fich_eiro:"
 
-#: ../mail/em-account-editor.c:2237 ../mail/mail-config.ui.h:157
+#: ../mail/em-account-editor.c:2233 ../mail/mail-config.ui.h:158
 msgid "_Path:"
 msgstr "_Ruta:"
 
-#: ../mail/em-account-editor.c:2286
+#: ../mail/em-account-editor.c:2287
 msgid "Mail Configuration"
 msgstr "Configuración do correo"
 
-#: ../mail/em-account-editor.c:2287
+#: ../mail/em-account-editor.c:2288
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -8210,7 +8248,7 @@ msgstr ""
 "\n"
 "Prema en «Continuar» para comezar."
 
-#: ../mail/em-account-editor.c:2290
+#: ../mail/em-account-editor.c:2291
 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 "
@@ -8220,19 +8258,19 @@ msgstr ""
 "necesitan encherse, a non ser que desexe incluír esta información no correo "
 "que envíe."
 
-#: ../mail/em-account-editor.c:2292 ../mail/em-account-editor.c:2484
+#: ../mail/em-account-editor.c:2293 ../mail/em-account-editor.c:2485
 msgid "Receiving Email"
 msgstr "Recepción de correo"
 
-#: ../mail/em-account-editor.c:2293
+#: ../mail/em-account-editor.c:2294
 msgid "Please configure the following account settings."
 msgstr "Configurar os seguintes axustes da conta."
 
-#: ../mail/em-account-editor.c:2295 ../mail/em-account-editor.c:3081
+#: ../mail/em-account-editor.c:2296 ../mail/em-account-editor.c:3082
 msgid "Sending Email"
 msgstr "Envío de correo"
 
-#: ../mail/em-account-editor.c:2296
+#: ../mail/em-account-editor.c:2297
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -8241,11 +8279,11 @@ msgstr ""
 "seguro, pregunte ao administrador do sistema ou provedor de acceso a "
 "Internet."
 
-#: ../mail/em-account-editor.c:2298 ../mail/mail-config.ui.h:1
+#: ../mail/em-account-editor.c:2299 ../mail/mail-config.ui.h:1
 msgid "Account Information"
 msgstr "Información da conta"
 
-#: ../mail/em-account-editor.c:2299
+#: ../mail/em-account-editor.c:2300
 msgid ""
 "Please enter a descriptive name for this account below.\n"
 "This name will be used for display purposes only."
@@ -8253,11 +8291,11 @@ msgstr ""
 "Introduza un nome descritivo para esta conta no espazo inferior.\n"
 "Este nome usarase só para a vista."
 
-#: ../mail/em-account-editor.c:2303
+#: ../mail/em-account-editor.c:2304
 msgid "Done"
 msgstr "Feito"
 
-#: ../mail/em-account-editor.c:2304
+#: ../mail/em-account-editor.c:2305
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8272,50 +8310,50 @@ msgstr ""
 "\n"
 "Prema en «Aplicar» para gardar os axustes."
 
-#: ../mail/em-account-editor.c:2843
+#: ../mail/em-account-editor.c:2844
 msgid "Check for _new messages every"
 msgstr "Comprobar automaticamente se hai mensaxes _novas cada"
 
-#: ../mail/em-account-editor.c:2851
+#: ../mail/em-account-editor.c:2852
 msgid "minu_tes"
 msgstr "minu_tos"
 
-#: ../mail/em-account-editor.c:3520 ../mail/mail-config.ui.h:101
+#: ../mail/em-account-editor.c:3521 ../mail/mail-config.ui.h:102
 msgid "Security"
 msgstr "Seguranza"
 
 #. 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:3575 ../mail/em-account-editor.c:3658
+#: ../mail/em-account-editor.c:3576 ../mail/em-account-editor.c:3659
 msgid "Receiving Options"
 msgstr "Opcións de recepción"
 
-#: ../mail/em-account-editor.c:3576 ../mail/em-account-editor.c:3659
+#: ../mail/em-account-editor.c:3577 ../mail/em-account-editor.c:3660
 msgid "Checking for New Messages"
 msgstr "Comprobando se hai mensaxes novas"
 
 #: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1416 ../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/em-format-html-display.c:1418 ../mail/mail-config.ui.h:14
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:174
+#: ../widgets/misc/e-attachment-paned.c:179
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Anexo"
 msgstr[1] "Anexos"
 
 #: ../mail/e-mail-attachment-bar.c:608
-#: ../widgets/misc/e-attachment-paned.c:623
+#: ../widgets/misc/e-attachment-paned.c:700
 msgid "Icon View"
 msgstr "Vista de iconas"
 
 #: ../mail/e-mail-attachment-bar.c:610
-#: ../widgets/misc/e-attachment-paned.c:625
+#: ../widgets/misc/e-attachment-paned.c:702
 msgid "List View"
 msgstr "Vista de lista"
 
-#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1427
-#: ../shell/e-shell-window-actions.c:1434
-#: ../shell/e-shell-window-actions.c:1441
+#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1436
+#: ../shell/e-shell-window-actions.c:1443
+#: ../shell/e-shell-window-actions.c:1450
 msgid "Close this window"
 msgstr "Pechar esta xanela"
 
@@ -8347,52 +8385,52 @@ msgstr "Enviar unha mensaxe de resposta a este enderezo"
 msgid "Create Search _Folder"
 msgstr "Crear un carta_fol de busca"
 
-#: ../mail/e-mail-folder-utils.c:111
+#: ../mail/e-mail-folder-utils.c:109
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Gardando a mensaxe no cartafol «%s»"
 
-#: ../mail/e-mail-folder-utils.c:274
+#: ../mail/e-mail-folder-utils.c:270
 msgid "Forwarded messages"
 msgstr "Mensaxes reencamiñadas"
 
-#: ../mail/e-mail-folder-utils.c:391
+#: ../mail/e-mail-folder-utils.c:385
 msgid "Scanning messages for duplicates"
 msgstr "Buscando mensaxes duplicadas"
 
-#: ../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"
 msgstr[0] "Descargando %d mensaxe"
 msgstr[1] "Descargando %d mensaxes"
 
-#: ../mail/e-mail-folder-utils.c:834
+#: ../mail/e-mail-folder-utils.c:824
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Eliminando o cartafol «%s»"
 
-#: ../mail/e-mail-folder-utils.c:968
+#: ../mail/e-mail-folder-utils.c:956
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Eliminouse o ficheiro «%s»."
 
-#: ../mail/e-mail-folder-utils.c:972
+#: ../mail/e-mail-folder-utils.c:960
 msgid "File has been removed."
 msgstr "Quitouse o ficheiro."
 
-#: ../mail/e-mail-folder-utils.c:1031
+#: ../mail/e-mail-folder-utils.c:1019
 msgid "Removing attachments"
 msgstr "Eliminando os anexos"
 
-#: ../mail/e-mail-folder-utils.c:1195
+#: ../mail/e-mail-folder-utils.c:1181
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Gardando %d mensaxe"
 msgstr[1] "Gardando %d mensaxes"
 
-#: ../mail/e-mail-folder-utils.c:1539 ../mail/em-folder-utils.c:613
+#: ../mail/e-mail-folder-utils.c:1525 ../mail/em-folder-utils.c:628
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "O URI do cartafol «%s» non é válido"
@@ -8432,7 +8470,7 @@ msgid "_Later"
 msgstr "_Máis tarde"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:684
+#: ../modules/mail/e-mail-shell-view-actions.c:677
 msgid "Add Label"
 msgstr "Engadir unha etiqueta"
 
@@ -8453,7 +8491,7 @@ msgid "Color"
 msgstr "Cor"
 
 #: ../mail/e-mail-label-tree-view.c:98
-#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../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
@@ -8461,28 +8499,28 @@ msgid "Name"
 msgstr "Nome"
 
 #: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:312
-#: ../mail/em-folder-tree-model.c:720
+#: ../mail/em-folder-tree-model.c:916
 #: ../modules/mail/e-mail-shell-view-private.c:1066
 #: ../modules/mail/e-mail-shell-view-private.c:1077
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
-#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:713
+#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:909
 #: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Drafts"
 msgstr "Borradores"
 
-#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:724
+#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:920
 #: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Outbox"
 msgstr "Caixa de saída"
 
-#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:728
+#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:924
 #: ../modules/mail/e-mail-shell-view-private.c:1070
 msgid "Sent"
 msgstr "Enviados"
 
-#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:716
+#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:912
 #: ../modules/mail/e-mail-shell-view-private.c:1072
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:1034 ../plugins/templates/templates.c:1312
@@ -8503,11 +8541,11 @@ msgstr "Migración"
 msgid "Migrating '%s':"
 msgstr "Migrando «%s»:"
 
-#: ../mail/e-mail-migrate.c:728
+#: ../mail/e-mail-migrate.c:726
 msgid "Migrating Folders"
 msgstr "Migrando cartafoles"
 
-#: ../mail/e-mail-migrate.c:729
+#: ../mail/e-mail-migrate.c:727
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -8519,7 +8557,7 @@ msgstr ""
 "\n"
 "Sexa paciente mentres o Evolution migra os seus cartafoles…"
 
-#: ../mail/e-mail-migrate.c:1527
+#: ../mail/e-mail-migrate.c:1523
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "Non é posíbel crear os cartafoles de correo local en «%s»: %s"
@@ -8536,617 +8574,617 @@ msgstr "Copiar ao cartafol"
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: ../mail/e-mail-reader.c:814 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:823 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Mover ao cartafol"
 
-#: ../mail/e-mail-reader.c:814 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:823 ../mail/em-folder-utils.c:487
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../mail/e-mail-reader.c:1175 ../mail/e-mail-reader.c:1363
-#: ../mail/e-mail-reader.c:1403
+#: ../mail/e-mail-reader.c:1184 ../mail/e-mail-reader.c:1372
+#: ../mail/e-mail-reader.c:1412
 msgid "_Do not ask me again."
 msgstr "_Non preguntar de novo."
 
-#: ../mail/e-mail-reader.c:1409
+#: ../mail/e-mail-reader.c:1418
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Ignorar sempre «Responder a:» para as listas de correo."
 
-#: ../mail/e-mail-reader.c:1775
+#: ../mail/e-mail-reader.c:1784
 msgid "A_dd Sender to Address Book"
 msgstr "Enga_dir o remitente á axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1777
+#: ../mail/e-mail-reader.c:1786
 msgid "Add sender to address book"
 msgstr "Engadir o remitente á axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1782
+#: ../mail/e-mail-reader.c:1791
 msgid "Check for _Junk"
 msgstr "Comprobar se hai correo li_xo"
 
-#: ../mail/e-mail-reader.c:1784
+#: ../mail/e-mail-reader.c:1793
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrar as mensaxes seleccionadas polo estado de correo lixo"
 
-#: ../mail/e-mail-reader.c:1789
+#: ../mail/e-mail-reader.c:1798
 msgid "_Copy to Folder..."
 msgstr "_Copiar ao cartafol…"
 
-#: ../mail/e-mail-reader.c:1791
+#: ../mail/e-mail-reader.c:1800
 msgid "Copy selected messages to another folder"
 msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:1796
+#: ../mail/e-mail-reader.c:1805
 msgid "_Delete Message"
 msgstr "E_liminar a mensaxe"
 
-#: ../mail/e-mail-reader.c:1798
+#: ../mail/e-mail-reader.c:1807
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar as mensaxes seleccionadas para eliminalas"
 
-#: ../mail/e-mail-reader.c:1803
+#: ../mail/e-mail-reader.c:1812
 msgid "Filter on Mailing _List..."
 msgstr "Filtrar pola _lista de correo…"
 
-#: ../mail/e-mail-reader.c:1805
+#: ../mail/e-mail-reader.c:1814
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Crear unha regra para filtrar as mensaxes a esta lista de correo"
 
-#: ../mail/e-mail-reader.c:1810
+#: ../mail/e-mail-reader.c:1819
 msgid "Filter on _Recipients..."
 msgstr "Filtrar polos _destinatarios…"
 
-#: ../mail/e-mail-reader.c:1812
+#: ../mail/e-mail-reader.c:1821
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Crear unha regra para filtrar as mensaxes a estes destinatarios"
 
-#: ../mail/e-mail-reader.c:1817
+#: ../mail/e-mail-reader.c:1826
 msgid "Filter on Se_nder..."
 msgstr "Filtrar polo re_mitente…"
 
-#: ../mail/e-mail-reader.c:1819
+#: ../mail/e-mail-reader.c:1828
 msgid "Create a rule to filter messages from this sender"
 msgstr "Crear unha regra para filtrar as mensaxes deste remitente"
 
-#: ../mail/e-mail-reader.c:1824
+#: ../mail/e-mail-reader.c:1833
 msgid "Filter on _Subject..."
 msgstr "Filtrar polo a_sunto…"
 
-#: ../mail/e-mail-reader.c:1826
+#: ../mail/e-mail-reader.c:1835
 msgid "Create a rule to filter messages with this subject"
 msgstr "Crear unha regra para filtrar as mensaxes con este asunto"
 
-#: ../mail/e-mail-reader.c:1831
+#: ../mail/e-mail-reader.c:1840
 msgid "A_pply Filters"
 msgstr "_Aplicar os filtros"
 
-#: ../mail/e-mail-reader.c:1833
+#: ../mail/e-mail-reader.c:1842
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplicar as regras de filtrado ás mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:1838
+#: ../mail/e-mail-reader.c:1847
 msgid "_Find in Message..."
 msgstr "_Buscar na mensaxe…"
 
-#: ../mail/e-mail-reader.c:1840
+#: ../mail/e-mail-reader.c:1849
 msgid "Search for text in the body of the displayed message"
 msgstr "Buscar un texto no corpo da mensaxe mostrada"
 
-#: ../mail/e-mail-reader.c:1845
+#: ../mail/e-mail-reader.c:1854
 msgid "_Clear Flag"
 msgstr "E_liminar a marca"
 
-#: ../mail/e-mail-reader.c:1847
+#: ../mail/e-mail-reader.c:1856
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Eliminar as marcas de seguimento das mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:1852
+#: ../mail/e-mail-reader.c:1861
 msgid "_Flag Completed"
 msgstr "_Marcar como completado"
 
-#: ../mail/e-mail-reader.c:1854
+#: ../mail/e-mail-reader.c:1863
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr ""
 "Estabelecer a marca de seguimento como completada nas mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:1859
+#: ../mail/e-mail-reader.c:1868
 msgid "Follow _Up..."
 msgstr "Seguimento…"
 
-#: ../mail/e-mail-reader.c:1861
+#: ../mail/e-mail-reader.c:1870
 msgid "Flag the selected messages for follow-up"
 msgstr "Marcar as mensaxes seleccionadas para o seguimento"
 
-#: ../mail/e-mail-reader.c:1866
+#: ../mail/e-mail-reader.c:1875
 msgid "_Attached"
 msgstr "_Anexada"
 
-#: ../mail/e-mail-reader.c:1868 ../mail/e-mail-reader.c:1875
+#: ../mail/e-mail-reader.c:1877 ../mail/e-mail-reader.c:1884
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Reencamiñar a mensaxe seleccionada como un anexo"
 
-#: ../mail/e-mail-reader.c:1873
+#: ../mail/e-mail-reader.c:1882
 msgid "Forward As _Attached"
 msgstr "Reencamiñar como un _anexo"
 
-#: ../mail/e-mail-reader.c:1880
+#: ../mail/e-mail-reader.c:1889
 msgid "_Inline"
 msgstr "_Inserida"
 
-#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1889
+#: ../mail/e-mail-reader.c:1891 ../mail/e-mail-reader.c:1898
 msgid "Forward the selected message in the body of a new message"
 msgstr "Reencamiñar a mensaxe seleccionada no corpo dunha mensaxe nova"
 
-#: ../mail/e-mail-reader.c:1887
+#: ../mail/e-mail-reader.c:1896
 msgid "Forward As _Inline"
 msgstr "Reencamiñar _inserida"
 
-#: ../mail/e-mail-reader.c:1894
+#: ../mail/e-mail-reader.c:1903
 msgid "_Quoted"
 msgstr "_Citada"
 
-#: ../mail/e-mail-reader.c:1896 ../mail/e-mail-reader.c:1903
+#: ../mail/e-mail-reader.c:1905 ../mail/e-mail-reader.c:1912
 msgid "Forward the selected message quoted like a reply"
 msgstr "Reencamiñar a mensaxe seleccionada citada como unha resposta"
 
-#: ../mail/e-mail-reader.c:1901
+#: ../mail/e-mail-reader.c:1910
 msgid "Forward As _Quoted"
 msgstr "Reencamiñar _citada"
 
-#: ../mail/e-mail-reader.c:1908
+#: ../mail/e-mail-reader.c:1917
 msgid "_Load Images"
 msgstr "_Cargar as imaxes"
 
-#: ../mail/e-mail-reader.c:1910
+#: ../mail/e-mail-reader.c:1919
 msgid "Force images in HTML mail to be loaded"
 msgstr "Forzar a carga de imaxes no correo HTML"
 
-#: ../mail/e-mail-reader.c:1915
+#: ../mail/e-mail-reader.c:1924
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../mail/e-mail-reader.c:1917
+#: ../mail/e-mail-reader.c:1926
 msgid "Mark the selected messages as important"
 msgstr "Marcar as mensaxes seleccionadas como importantes"
 
-#: ../mail/e-mail-reader.c:1922
+#: ../mail/e-mail-reader.c:1931
 msgid "_Junk"
 msgstr "_Correo lixo"
 
-#: ../mail/e-mail-reader.c:1924
+#: ../mail/e-mail-reader.c:1933
 msgid "Mark the selected messages as junk"
 msgstr "Marcar as mensaxes seleccionadas como correo lixo"
 
-#: ../mail/e-mail-reader.c:1929
+#: ../mail/e-mail-reader.c:1938
 msgid "_Not Junk"
 msgstr "_Non é correo lixo"
 
-#: ../mail/e-mail-reader.c:1931
+#: ../mail/e-mail-reader.c:1940
 msgid "Mark the selected messages as not being junk"
 msgstr "Marcar as mensaxes seleccionadas como non lixo"
 
-#: ../mail/e-mail-reader.c:1936
+#: ../mail/e-mail-reader.c:1945
 msgid "_Read"
 msgstr "_Lida"
 
-#: ../mail/e-mail-reader.c:1938
+#: ../mail/e-mail-reader.c:1947
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar as mensaxes seleccionadas como lidas"
 
-#: ../mail/e-mail-reader.c:1943
+#: ../mail/e-mail-reader.c:1952
 msgid "Uni_mportant"
 msgstr "Non i_mportante"
 
-#: ../mail/e-mail-reader.c:1945
+#: ../mail/e-mail-reader.c:1954
 msgid "Mark the selected messages as unimportant"
 msgstr "Marcar as mensaxes seleccionadas como non importantes"
 
-#: ../mail/e-mail-reader.c:1950
+#: ../mail/e-mail-reader.c:1959
 msgid "_Unread"
 msgstr "_Sen ler"
 
-#: ../mail/e-mail-reader.c:1952
+#: ../mail/e-mail-reader.c:1961
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar as mensaxes seleccionadas como non lidas"
 
-#: ../mail/e-mail-reader.c:1957
+#: ../mail/e-mail-reader.c:1966
 msgid "_Edit as New Message..."
 msgstr "_Editar como unha mensaxe nova…"
 
-#: ../mail/e-mail-reader.c:1959
+#: ../mail/e-mail-reader.c:1968
 msgid "Open the selected messages in the composer for editing"
 msgstr "Abrir as mensaxes seleccionadas no editor para editalas"
 
-#: ../mail/e-mail-reader.c:1964
+#: ../mail/e-mail-reader.c:1973
 msgid "Compose _New Message"
 msgstr "Redactar unha mensaxe _nova"
 
-#: ../mail/e-mail-reader.c:1966
+#: ../mail/e-mail-reader.c:1975
 msgid "Open a window for composing a mail message"
 msgstr "Abrir unha xanela para escribir unha mensaxe de correo"
 
-#: ../mail/e-mail-reader.c:1971
+#: ../mail/e-mail-reader.c:1980
 msgid "_Open in New Window"
 msgstr "Abrir nunha xanela n_ova"
 
-#: ../mail/e-mail-reader.c:1973
+#: ../mail/e-mail-reader.c:1982
 msgid "Open the selected messages in a new window"
 msgstr "Abrir as mensaxes seleccionadas nunha xanela nova"
 
-#: ../mail/e-mail-reader.c:1978
+#: ../mail/e-mail-reader.c:1987
 msgid "_Move to Folder..."
 msgstr "_Mover ao cartafol…"
 
-#: ../mail/e-mail-reader.c:1980
+#: ../mail/e-mail-reader.c:1989
 msgid "Move selected messages to another folder"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:1985
+#: ../mail/e-mail-reader.c:1994
 msgid "_Switch to Folder"
 msgstr "_Cambiar ao cartafol"
 
-#: ../mail/e-mail-reader.c:1987
+#: ../mail/e-mail-reader.c:1996
 msgid "Display the parent folder"
 msgstr "Mostrar o cartafol pai"
 
-#: ../mail/e-mail-reader.c:1992
+#: ../mail/e-mail-reader.c:2001
 msgid "Switch to _next tab"
 msgstr "Cambiar á lapela segui_nte"
 
-#: ../mail/e-mail-reader.c:1994
+#: ../mail/e-mail-reader.c:2003
 msgid "Switch to the next tab"
 msgstr "Cambiar á lapela seguinte"
 
-#: ../mail/e-mail-reader.c:1999
+#: ../mail/e-mail-reader.c:2008
 msgid "Switch to _previous tab"
 msgstr "Cambiar á lapela a_nterior"
 
-#: ../mail/e-mail-reader.c:2001
+#: ../mail/e-mail-reader.c:2010
 msgid "Switch to the previous tab"
 msgstr "Cambiar á lapela anterior"
 
-#: ../mail/e-mail-reader.c:2006
+#: ../mail/e-mail-reader.c:2015
 msgid "Cl_ose current tab"
 msgstr "Pe_char a lapela actual"
 
-#: ../mail/e-mail-reader.c:2008
+#: ../mail/e-mail-reader.c:2017
 msgid "Close current tab"
 msgstr "Pechar a lapela actual"
 
-#: ../mail/e-mail-reader.c:2013
+#: ../mail/e-mail-reader.c:2022
 msgid "_Next Message"
 msgstr "Segui_nte mensaxe"
 
-#: ../mail/e-mail-reader.c:2015
+#: ../mail/e-mail-reader.c:2024
 msgid "Display the next message"
 msgstr "Mostrar a seguinte mensaxe"
 
-#: ../mail/e-mail-reader.c:2020
+#: ../mail/e-mail-reader.c:2029
 msgid "Next _Important Message"
 msgstr "Seguinte mensaxe _importante"
 
-#: ../mail/e-mail-reader.c:2022
+#: ../mail/e-mail-reader.c:2031
 msgid "Display the next important message"
 msgstr "Mostrar a seguinte mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2027
+#: ../mail/e-mail-reader.c:2036
 msgid "Next _Thread"
 msgstr "Seguin_te conversa"
 
-#: ../mail/e-mail-reader.c:2029
+#: ../mail/e-mail-reader.c:2038
 msgid "Display the next thread"
 msgstr "Mostrar a seguinte conversa"
 
-#: ../mail/e-mail-reader.c:2034
+#: ../mail/e-mail-reader.c:2043
 msgid "Next _Unread Message"
 msgstr "Seguinte mensaxe _sen ler"
 
-#: ../mail/e-mail-reader.c:2036
+#: ../mail/e-mail-reader.c:2045
 msgid "Display the next unread message"
 msgstr "Mostrar a seguinte mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:2041
+#: ../mail/e-mail-reader.c:2050
 msgid "_Previous Message"
 msgstr "_Mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:2043
+#: ../mail/e-mail-reader.c:2052
 msgid "Display the previous message"
 msgstr "Mostrar a mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:2048
+#: ../mail/e-mail-reader.c:2057
 msgid "Pr_evious Important Message"
 msgstr "Ant_erior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2050
+#: ../mail/e-mail-reader.c:2059
 msgid "Display the previous important message"
 msgstr "Mostrar a anterior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2055
+#: ../mail/e-mail-reader.c:2064
 msgid "Previous T_hread"
 msgstr "_Conversa anterior"
 
-#: ../mail/e-mail-reader.c:2057
+#: ../mail/e-mail-reader.c:2066
 msgid "Display the previous thread"
 msgstr "Mostrar a conversa anterior"
 
-#: ../mail/e-mail-reader.c:2062
+#: ../mail/e-mail-reader.c:2071
 msgid "P_revious Unread Message"
 msgstr "Ante_rior mensaxe sen ler"
 
-#: ../mail/e-mail-reader.c:2064
+#: ../mail/e-mail-reader.c:2073
 msgid "Display the previous unread message"
 msgstr "Mostrar a anterior mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:2071
+#: ../mail/e-mail-reader.c:2080
 msgid "Print this message"
 msgstr "Imprimir esta mensaxe"
 
-#: ../mail/e-mail-reader.c:2078
+#: ../mail/e-mail-reader.c:2087
 msgid "Preview the message to be printed"
 msgstr "Previsualizar a mensaxe que se vai imprimir"
 
-#: ../mail/e-mail-reader.c:2083
+#: ../mail/e-mail-reader.c:2092
 msgid "Re_direct"
 msgstr "Re_direccionar"
 
-#: ../mail/e-mail-reader.c:2085
+#: ../mail/e-mail-reader.c:2094
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redireccionar a alguén a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:2090
+#: ../mail/e-mail-reader.c:2099
 msgid "Remo_ve Attachments"
 msgstr "Eliminar os _anexos"
 
-#: ../mail/e-mail-reader.c:2092
+#: ../mail/e-mail-reader.c:2101
 msgid "Remove attachments"
 msgstr "Eliminar os anexos"
 
-#: ../mail/e-mail-reader.c:2097
+#: ../mail/e-mail-reader.c:2106
 msgid "Remove Du_plicate Messages"
 msgstr "Eliminar as mensaxes du_plicadas"
 
-#: ../mail/e-mail-reader.c:2099
+#: ../mail/e-mail-reader.c:2108
 msgid "Checks selected messages for duplicates"
 msgstr "Comprobar se hai mensaxes seleccionadas que estean duplicadas"
 
-#: ../mail/e-mail-reader.c:2104 ../mail/mail.error.xml.h:109
+#: ../mail/e-mail-reader.c:2113 ../mail/mail.error.xml.h:110
 #: ../modules/calendar/e-cal-shell-view-actions.c:1510
 #: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "Responder a t_odos"
 
-#: ../mail/e-mail-reader.c:2106
+#: ../mail/e-mail-reader.c:2115
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr ""
 "Redactar unha resposta para todos os destinatarios da mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:2111 ../mail/mail.error.xml.h:110
+#: ../mail/e-mail-reader.c:2120 ../mail/mail.error.xml.h:111
 msgid "Reply to _List"
 msgstr "Responder á _lista"
 
-#: ../mail/e-mail-reader.c:2113
+#: ../mail/e-mail-reader.c:2122
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Responder á rolda de correo remitente da mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:2118
+#: ../mail/e-mail-reader.c:2127
 #: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "_Responder ao remitente"
 
-#: ../mail/e-mail-reader.c:2120
+#: ../mail/e-mail-reader.c:2129
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Redactar unha resposta para o remitente da mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:2125
+#: ../mail/e-mail-reader.c:2134
 msgid "_Save as mbox..."
 msgstr "Gardar como mbox…"
 
-#: ../mail/e-mail-reader.c:2127
+#: ../mail/e-mail-reader.c:2136
 msgid "Save selected messages as an mbox file"
 msgstr "Gardar as mensaxes seleccionadas como un ficheiro mbox"
 
-#: ../mail/e-mail-reader.c:2132
+#: ../mail/e-mail-reader.c:2141
 msgid "_Message Source"
 msgstr "Fonte da _mensaxe"
 
-#: ../mail/e-mail-reader.c:2134
+#: ../mail/e-mail-reader.c:2143
 msgid "Show the raw email source of the message"
 msgstr "Mostrar a fonte en bruto da mensaxe"
 
-#: ../mail/e-mail-reader.c:2146
+#: ../mail/e-mail-reader.c:2155
 msgid "_Undelete Message"
 msgstr "_Recuperar a mensaxe"
 
-#: ../mail/e-mail-reader.c:2148
+#: ../mail/e-mail-reader.c:2157
 msgid "Undelete the selected messages"
 msgstr "Recuperar as mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:2153
+#: ../mail/e-mail-reader.c:2162
 msgid "_Normal Size"
 msgstr "Tamaño _normal"
 
-#: ../mail/e-mail-reader.c:2155
+#: ../mail/e-mail-reader.c:2164
 msgid "Reset the text to its original size"
 msgstr "Restabelecer o texto ao seu tamaño orixinal"
 
-#: ../mail/e-mail-reader.c:2160
+#: ../mail/e-mail-reader.c:2169
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
-#: ../mail/e-mail-reader.c:2162
+#: ../mail/e-mail-reader.c:2171
 msgid "Increase the text size"
 msgstr "Aumentar o tamaño do texto"
 
-#: ../mail/e-mail-reader.c:2167
+#: ../mail/e-mail-reader.c:2176
 msgid "Zoom _Out"
 msgstr "_Reducir"
 
-#: ../mail/e-mail-reader.c:2169
+#: ../mail/e-mail-reader.c:2178
 msgid "Decrease the text size"
 msgstr "Diminuír o tamaño do texto"
 
-#: ../mail/e-mail-reader.c:2176
+#: ../mail/e-mail-reader.c:2185
 msgid "Create R_ule"
 msgstr "Crear unha r_egra"
 
-#: ../mail/e-mail-reader.c:2183
+#: ../mail/e-mail-reader.c:2192
 msgid "Ch_aracter Encoding"
 msgstr "Codificación de car_acteres"
 
-#: ../mail/e-mail-reader.c:2190
+#: ../mail/e-mail-reader.c:2199
 msgid "F_orward As"
 msgstr "Reencamiñar c_omo…"
 
-#: ../mail/e-mail-reader.c:2197
+#: ../mail/e-mail-reader.c:2206
 msgid "_Group Reply"
 msgstr "_Responder ao grupo"
 
-#: ../mail/e-mail-reader.c:2204
+#: ../mail/e-mail-reader.c:2213
 msgid "_Go To"
 msgstr "_Ir a"
 
-#: ../mail/e-mail-reader.c:2211
+#: ../mail/e-mail-reader.c:2220
 msgid "Mar_k As"
 msgstr "Mar_car como"
 
-#: ../mail/e-mail-reader.c:2218
+#: ../mail/e-mail-reader.c:2227
 msgid "_Message"
 msgstr "_Mensaxe"
 
-#: ../mail/e-mail-reader.c:2225
+#: ../mail/e-mail-reader.c:2234
 msgid "_Zoom"
 msgstr "A_mpliar"
 
-#: ../mail/e-mail-reader.c:2235
+#: ../mail/e-mail-reader.c:2244
 msgid "Search Folder from Mailing _List..."
 msgstr "Cartafol de busca por _lista de correo…"
 
-#: ../mail/e-mail-reader.c:2237
+#: ../mail/e-mail-reader.c:2246
 msgid "Create a search folder for this mailing list"
 msgstr "Crear un cartafol de busca para esta rolda de correo"
 
-#: ../mail/e-mail-reader.c:2242
+#: ../mail/e-mail-reader.c:2251
 msgid "Search Folder from Recipien_ts..."
 msgstr "Cartafol de busca por des_tinatarios…"
 
-#: ../mail/e-mail-reader.c:2244
+#: ../mail/e-mail-reader.c:2253
 msgid "Create a search folder for these recipients"
 msgstr "Crear un cartafol de busca para estes destinatarios"
 
-#: ../mail/e-mail-reader.c:2249
+#: ../mail/e-mail-reader.c:2258
 msgid "Search Folder from Sen_der..."
 msgstr "Cartafol de busca por _remitente…"
 
-#: ../mail/e-mail-reader.c:2251
+#: ../mail/e-mail-reader.c:2260
 msgid "Create a search folder for this sender"
 msgstr "Crear un cartafol de busca para este remitente"
 
-#: ../mail/e-mail-reader.c:2256
+#: ../mail/e-mail-reader.c:2265
 msgid "Search Folder from S_ubject..."
 msgstr "Cartafol de busca por as_unto…"
 
-#: ../mail/e-mail-reader.c:2258
+#: ../mail/e-mail-reader.c:2267
 msgid "Create a search folder for this subject"
 msgstr "Crear un cartafol de busca para este asunto"
 
-#: ../mail/e-mail-reader.c:2281
+#: ../mail/e-mail-reader.c:2290
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para _seguimento…"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2298
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: ../mail/e-mail-reader.c:2293
+#: ../mail/e-mail-reader.c:2302
 msgid "Mark as _Junk"
 msgstr "Marcar como correo l_ixo"
 
-#: ../mail/e-mail-reader.c:2297
+#: ../mail/e-mail-reader.c:2306
 msgid "Mark as _Not Junk"
 msgstr "Desmarcar como correo lixo"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2310
 msgid "Mar_k as Read"
 msgstr "Marcar como _lida"
 
-#: ../mail/e-mail-reader.c:2305
+#: ../mail/e-mail-reader.c:2314
 msgid "Mark as Uni_mportant"
 msgstr "Marcar como non im_portante"
 
-#: ../mail/e-mail-reader.c:2309
+#: ../mail/e-mail-reader.c:2318
 msgid "Mark as _Unread"
 msgstr "Marcar como _non lida"
 
-#: ../mail/e-mail-reader.c:2353
+#: ../mail/e-mail-reader.c:2362
 msgid "_Caret Mode"
 msgstr "Activar o _cursor"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2364
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Mostrar un cursor intermitente no corpo das mensaxes mostradas"
 
-#: ../mail/e-mail-reader.c:2361
+#: ../mail/e-mail-reader.c:2370
 msgid "All Message _Headers"
 msgstr "Todas as ca_beceiras da mensaxe"
 
-#: ../mail/e-mail-reader.c:2363
+#: ../mail/e-mail-reader.c:2372
 msgid "Show messages with all email headers"
 msgstr "Mostrar as mensaxes con todas as cabeceiras de correo electrónico"
 
-#: ../mail/e-mail-reader.c:2659
+#: ../mail/e-mail-reader.c:2668
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Recuperando a mensaxe «%s»"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. * other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3246 ../mail/mail-config.ui.h:32
+#: ../mail/e-mail-reader.c:3255 ../mail/mail-config.ui.h:32
 #: ../plugins/google-account-setup/google-source.c:316
-#: ../plugins/google-account-setup/google-source.c:565
-#: ../plugins/google-account-setup/google-source.c:704
-#: ../widgets/misc/e-account-tree-view.c:253
+#: ../plugins/google-account-setup/google-source.c:558
+#: ../plugins/google-account-setup/google-source.c:695
+#: ../widgets/misc/e-account-tree-view.c:414
 msgid "Default"
 msgstr "predeterminado"
 
-#: ../mail/e-mail-reader.c:3415
+#: ../mail/e-mail-reader.c:3424
 #: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "_Reencamiñar"
 
-#: ../mail/e-mail-reader.c:3416
+#: ../mail/e-mail-reader.c:3425
 msgid "Forward the selected message to someone"
 msgstr "Reencamiñar a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:3435
+#: ../mail/e-mail-reader.c:3444
 msgid "Group Reply"
 msgstr "Responder ao grupo"
 
-#: ../mail/e-mail-reader.c:3436
+#: ../mail/e-mail-reader.c:3445
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Responder á lista de correo ou a todos os destinatarios"
 
-#: ../mail/e-mail-reader.c:3489 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3498 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../mail/e-mail-reader.c:3522
+#: ../mail/e-mail-reader.c:3531
 #: ../modules/calendar/e-cal-shell-view-actions.c:1356
 #: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../mail/e-mail-reader.c:3526
+#: ../mail/e-mail-reader.c:3535
 #: ../modules/calendar/e-cal-shell-view-actions.c:1349
 #: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:3535 ../mail/mail-dialogs.ui.h:17
+#: ../mail/e-mail-reader.c:3544 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "Responder"
 
-#: ../mail/e-mail-reader.c:4205
+#: ../mail/e-mail-reader.c:4214
 #, c-format
 msgid "Folder '%s'"
 msgstr "Cartafol «%s»"
@@ -9157,7 +9195,7 @@ msgstr "Non avisarme de novo."
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:670
+#: ../mail/e-mail-reader-utils.c:667
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -9172,7 +9210,7 @@ msgstr[1] ""
 "O cartafol «%s» contén %u mensaxes duplicadas. Ten certeza de que quere "
 "eliminalas?"
 
-#: ../mail/e-mail-reader-utils.c:1047
+#: ../mail/e-mail-reader-utils.c:1044
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Gardar mensaxe"
@@ -9183,59 +9221,59 @@ msgstr[1] "Gardar mensaxes"
 #. * 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:1068
+#: ../mail/e-mail-reader-utils.c:1065
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Mensaxe"
 msgstr[1] "Mensaxes"
 
-#: ../mail/e-mail-session.c:870
+#: ../mail/e-mail-session.c:798
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Introducir a frase de paso para %s"
 
-#: ../mail/e-mail-session.c:874
+#: ../mail/e-mail-session.c:802
 msgid "Enter Passphrase"
 msgstr "Introducir a frase de paso"
 
-#: ../mail/e-mail-session.c:878
+#: ../mail/e-mail-session.c:806
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introducir o contrasinal para %s"
 
-#: ../mail/e-mail-session.c:882
+#: ../mail/e-mail-session.c:810
 msgid "Enter Password"
 msgstr "Introducir o contrasinal"
 
-#: ../mail/e-mail-session.c:933
+#: ../mail/e-mail-session.c:861
 #, c-format
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operación."
 
-#: ../mail/e-mail-session.c:1046
+#: ../mail/e-mail-session.c:974
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr ""
 "Non se proporcionou ningún enderezo de destino, o reencamiñamento cancelouse."
 
-#: ../mail/e-mail-session.c:1055
+#: ../mail/e-mail-session.c:983
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "Non se atopou ningunha conta que usar, o reencamiñamento cancelouse."
 
-#: ../mail/e-mail-session-utils.c:419
+#: ../mail/e-mail-session-utils.c:415
 #, c-format
 msgid "Cannot get transport for account '%s'"
 msgstr "Non é posíbel obter o servizo de transporte para a conta «%s»"
 
-#: ../mail/e-mail-session-utils.c:508 ../mail/mail-ops.c:634
+#: ../mail/e-mail-session-utils.c:500 ../mail/mail-ops.c:638
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Produciuse un fallo ao aplicar os filtros ao correo saínte: %s"
 
-#: ../mail/e-mail-session-utils.c:532 ../mail/e-mail-session-utils.c:566
-#: ../mail/mail-ops.c:653 ../mail/mail-ops.c:687
+#: ../mail/e-mail-session-utils.c:524 ../mail/e-mail-session-utils.c:558
+#: ../mail/mail-ops.c:657 ../mail/mail-ops.c:691
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -9244,32 +9282,32 @@ msgstr ""
 "Produciuse un fallo ao anexar a %s: %s\n"
 "No seu lugar anexaranse ao cartafol local «Enviados»."
 
-#: ../mail/e-mail-session-utils.c:586 ../mail/mail-ops.c:707
+#: ../mail/e-mail-session-utils.c:578 ../mail/mail-ops.c:711
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Produciuse un fallo ao anexar ao cartafol local «Enviados»: %s"
 
-#: ../mail/e-mail-session-utils.c:797 ../mail/mail-ops.c:810
-#: ../mail/mail-ops.c:906
+#: ../mail/e-mail-session-utils.c:788 ../mail/mail-ops.c:832
+#: ../mail/mail-ops.c:928
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
-#: ../mail/e-mail-session-utils.c:873
+#: ../mail/e-mail-session-utils.c:862
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "Eliminando a subscrición do cartafol «%s»"
 
-#: ../mail/e-mail-store-utils.c:168
+#: ../mail/e-mail-store-utils.c:166
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Desconectando de «%s»"
 
-#: ../mail/e-mail-store-utils.c:259
+#: ../mail/e-mail-store-utils.c:255
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Conectando novamente con %s"
 
-#: ../mail/e-mail-store-utils.c:334
+#: ../mail/e-mail-store-utils.c:328
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparando a conta «%s» para o modo sen conexión"
@@ -9282,7 +9320,7 @@ msgstr "Marcar para facer seguimento"
 #. * 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:1197
+#: ../mail/em-composer-utils.c:1201
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -9290,31 +9328,31 @@ msgstr ""
 "O ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} ás ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribiu:"
 
-#: ../mail/em-composer-utils.c:1208
+#: ../mail/em-composer-utils.c:1212
 msgid "-----Original Message-----"
 msgstr "-----Mensaxe orixinal-----"
 
 #. 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:1992
+#: ../mail/em-composer-utils.c:2001
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "A mensaxe a %s sobre «%s» o %s leuse."
 
-#: ../mail/em-composer-utils.c:2052
+#: ../mail/em-composer-utils.c:2061
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "Notificación de recepción para: «%s»"
 
-#: ../mail/em-composer-utils.c:2592
+#: ../mail/em-composer-utils.c:2600
 msgid "an unknown sender"
 msgstr "un remitente descoñecido"
 
-#: ../mail/em-composer-utils.c:2998
+#: ../mail/em-composer-utils.c:3006
 msgid "Posting destination"
 msgstr "Destino da publicación"
 
-#: ../mail/em-composer-utils.c:2999
+#: ../mail/em-composer-utils.c:3007
 msgid "Choose folders to post the message to."
 msgstr "Escolla os cartafoles nos que publicar a mensaxe."
 
@@ -9611,58 +9649,62 @@ msgstr "C_rear"
 msgid "Folder _name:"
 msgstr "_Nome do cartafol:"
 
-#: ../mail/em-folder-tree.c:647
+#: ../mail/em-folder-tree.c:648
 msgid "Folder names cannot contain '/'"
 msgstr "Os nomes dos cartafoles non poden conter o carácter «/»"
 
-#: ../mail/em-folder-tree.c:768
+#: ../mail/em-folder-tree.c:773
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1590
+#: ../mail/em-folder-tree.c:1595
 msgid "Mail Folder Tree"
 msgstr "Árbore de cartafoles de correo"
 
-#: ../mail/em-folder-tree.c:2069 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2091 ../mail/em-folder-utils.c:115
 #, c-format
 msgid "Moving folder %s"
 msgstr "Movendo o cartafol %s"
 
-#: ../mail/em-folder-tree.c:2072 ../mail/em-folder-utils.c:117
+#: ../mail/em-folder-tree.c:2094 ../mail/em-folder-utils.c:117
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando o cartafol %s"
 
-#: ../mail/em-folder-tree.c:2079 ../mail/message-list.c:2303
+#: ../mail/em-folder-tree.c:2101 ../mail/message-list.c:2303
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo as mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:2083 ../mail/message-list.c:2305
+#: ../mail/em-folder-tree.c:2105 ../mail/message-list.c:2305
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando as mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:2102
+#: ../mail/em-folder-tree.c:2124
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Non é posíbel soltar as mensaxe(s) no almacenamento do nivel superior"
 
-#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:157
-#: ../mail/em-folder-tree-model.c:163 ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
-#: ../mail/mail-vfolder.c:1125 ../mail/mail-vfolder.c:1239
+#: ../mail/em-folder-tree-model.c:168 ../mail/mail-vfolder.c:1125
+#: ../mail/mail-vfolder.c:1239 ../widgets/misc/e-account-tree-view.c:100
+#: ../widgets/misc/e-account-tree-view.c:301
+#: ../widgets/misc/e-account-tree-view.c:924
+#: ../widgets/misc/e-account-tree-view.c:983
+#: ../widgets/misc/e-account-tree-view.c:1055
+#: ../widgets/misc/e-account-tree-view.c:1132
+#: ../widgets/misc/e-account-tree-view.c:1387
 msgid "Search Folders"
 msgstr "Cartafoles de busca"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:179 ../mail/em-folder-tree-model.c:181
+#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
 msgid "UNMATCHED"
 msgstr "SEN COINCIDENCIAS"
 
-#: ../mail/em-folder-tree-model.c:790 ../mail/em-folder-tree-model.c:1075
+#: ../mail/em-folder-tree-model.c:986 ../mail/em-folder-tree-model.c:1278
 msgid "Loading..."
 msgstr "Cargando…"
 
@@ -9674,109 +9716,109 @@ msgstr "Mover o cartafol a"
 msgid "Copy Folder To"
 msgstr "Copiar o cartafol a"
 
-#: ../mail/em-folder-utils.c:590
+#: ../mail/em-folder-utils.c:605
 msgid "Create Folder"
 msgstr "Crear un cartafol"
 
-#: ../mail/em-folder-utils.c:591
+#: ../mail/em-folder-utils.c:606
 msgid "Specify where to create the folder:"
 msgstr "Indicar onde crear o cartafol:"
 
-#: ../mail/em-format-html.c:166
+#: ../mail/em-format-html.c:167
 msgid "Formatting message"
 msgstr "Formatando a mensaxe"
 
-#: ../mail/em-format-html.c:378
+#: ../mail/em-format-html.c:379
 msgid "Formatting Message..."
 msgstr "Formatando a mensaxe…"
 
-#: ../mail/em-format-html.c:1562 ../mail/em-format-html.c:1572
+#: ../mail/em-format-html.c:1596 ../mail/em-format-html.c:1606
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "Obtendo «%s»"
 
-#: ../mail/em-format-html.c:1723 ../mail/em-format-html-display.c:89
+#: ../mail/em-format-html.c:1757 ../mail/em-format-html-display.c:89
 msgid "Unsigned"
 msgstr "Sen asinar"
 
-#: ../mail/em-format-html.c:1724 ../mail/em-format-html-display.c:90
+#: ../mail/em-format-html.c:1758 ../mail/em-format-html-display.c:90
 msgid "Valid signature"
 msgstr "A sinatura é correcta"
 
-#: ../mail/em-format-html.c:1725 ../mail/em-format-html-display.c:91
+#: ../mail/em-format-html.c:1759 ../mail/em-format-html-display.c:91
 msgid "Invalid signature"
 msgstr "A sinatura é incorrecta"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format-html-display.c:92
+#: ../mail/em-format-html.c:1760 ../mail/em-format-html-display.c:92
 msgid "Valid signature, but cannot verify sender"
 msgstr "A sinatura é correcta, pero non é posíbel comprobar o remitente"
 
-#: ../mail/em-format-html.c:1727 ../mail/em-format-html-display.c:93
+#: ../mail/em-format-html.c:1761 ../mail/em-format-html-display.c:93
 msgid "Signature exists, but need public key"
 msgstr "A sinatura existe, pero precisa unha chave pública"
 
-#: ../mail/em-format-html.c:1733 ../mail/em-format-html-display.c:100
+#: ../mail/em-format-html.c:1767 ../mail/em-format-html-display.c:100
 msgid "Unencrypted"
 msgstr "Sen cifrar"
 
-#: ../mail/em-format-html.c:1734 ../mail/em-format-html-display.c:101
+#: ../mail/em-format-html.c:1768 ../mail/em-format-html-display.c:101
 msgid "Encrypted, weak"
 msgstr "Cifrada, débil"
 
-#: ../mail/em-format-html.c:1735 ../mail/em-format-html-display.c:102
+#: ../mail/em-format-html.c:1769 ../mail/em-format-html-display.c:102
 msgid "Encrypted"
 msgstr "Cifrada"
 
-#: ../mail/em-format-html.c:1736 ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html.c:1770 ../mail/em-format-html-display.c:103
 msgid "Encrypted, strong"
 msgstr "Cifrada, forte"
 
-#: ../mail/em-format-html.c:2136
+#: ../mail/em-format-html.c:2170
 msgid "Unknown external-body part."
 msgstr "Parte do corpo externo descoñecida."
 
-#: ../mail/em-format-html.c:2146
+#: ../mail/em-format-html.c:2180
 msgid "Malformed external-body part."
 msgstr "Parte do corpo externo formada incorrectamente."
 
-#: ../mail/em-format-html.c:2177
+#: ../mail/em-format-html.c:2211
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro ao sitio FTP (%s)"
 
-#: ../mail/em-format-html.c:2188
+#: ../mail/em-format-html.c:2222
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Punteiro ao ficheiro local (%s) correcto no sitio «%s»"
 
-#: ../mail/em-format-html.c:2190
+#: ../mail/em-format-html.c:2224
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro ao ficheiro local (%s)"
 
-#: ../mail/em-format-html.c:2211
+#: ../mail/em-format-html.c:2245
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro aos datos remotos (%s)"
 
-#: ../mail/em-format-html.c:2226
+#: ../mail/em-format-html.c:2260
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro aos datos externos descoñecidos (tipo «%s»)"
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user@example.com"
-#: ../mail/em-format-html.c:2934
-#: ../plugins/mail-notification/mail-notification.c:402
+#: ../mail/em-format-html.c:2968
+#: ../plugins/mail-notification/mail-notification.c:403
 #, c-format
 msgid "From: %s"
 msgstr "De: %s:"
 
-#: ../mail/em-format-html.c:2956
+#: ../mail/em-format-html.c:2990
 msgid "(no subject)"
 msgstr "(Sen asunto)"
 
-#: ../mail/em-format-html.c:3032
+#: ../mail/em-format-html.c:3066
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Esta mensaxe enviouse por %s no nome de %s"
@@ -9864,7 +9906,7 @@ msgstr "_Visualizar o certificado"
 msgid "This certificate is not viewable"
 msgstr "Este certificado non é visíbel"
 
-#: ../mail/em-format-html-display.c:566
+#: ../mail/em-format-html-display.c:568
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -9873,39 +9915,39 @@ msgstr ""
 "procesamento demora demasiado. Pode visualizalo sen formato ou ben con un "
 "editor de texto externo."
 
-#: ../mail/em-format-html-display.c:756
+#: ../mail/em-format-html-display.c:758
 msgid "Save Image"
 msgstr "Gardar imaxe"
 
-#: ../mail/em-format-html-display.c:804
+#: ../mail/em-format-html-display.c:806
 msgid "Save _Image..."
 msgstr "Gardar _imaxe…"
 
-#: ../mail/em-format-html-display.c:806
+#: ../mail/em-format-html-display.c:808
 msgid "Save the image to a file"
 msgstr "Gardar a imaxe a un ficheiro"
 
-#: ../mail/em-format-html-display.c:1034
+#: ../mail/em-format-html-display.c:1036
 msgid "Completed on"
 msgstr "Completado o"
 
-#: ../mail/em-format-html-display.c:1046
+#: ../mail/em-format-html-display.c:1048
 msgid "Overdue:"
 msgstr "Atrasada:"
 
-#: ../mail/em-format-html-display.c:1054
+#: ../mail/em-format-html-display.c:1056
 msgid "by"
 msgstr "por"
 
-#: ../mail/em-format-html-display.c:1335 ../mail/em-format-html-display.c:1386
+#: ../mail/em-format-html-display.c:1337 ../mail/em-format-html-display.c:1388
 msgid "View _Unformatted"
 msgstr "Visualizar sen _formato"
 
-#: ../mail/em-format-html-display.c:1337
+#: ../mail/em-format-html-display.c:1339
 msgid "Hide _Unformatted"
 msgstr "Oc_ultar sen formato"
 
-#: ../mail/em-format-html-display.c:1408
+#: ../mail/em-format-html-display.c:1410
 msgid "O_pen With"
 msgstr "A_brir con"
 
@@ -9920,61 +9962,81 @@ msgstr "Páxina %d de %d"
 msgid "No HTML stream available"
 msgstr "Non hai un fluxo HTML dispoñíbel"
 
-#: ../mail/em-subscription-editor.c:1162
+#: ../mail/em-subscription-editor.c:832
+msgid "_Subscribe"
+msgstr "Su_bscribir"
+
+#: ../mail/em-subscription-editor.c:839
+msgid "Su_bscribe to shown"
+msgstr "Su_bscribirse ás mostradas"
+
+#: ../mail/em-subscription-editor.c:846
+msgid "Subscribe to _all"
+msgstr "Subscribirse a _todas"
+
+#: ../mail/em-subscription-editor.c:933 ../mail/em-subscription-editor.c:1772
+#: ../modules/mail/e-mail-shell-view-actions.c:1210
+msgid "_Unsubscribe"
+msgstr "Cancelar a s_ubscrición"
+
+#: ../mail/em-subscription-editor.c:940
+msgid "Unsu_bscribe from hidden"
+msgstr "Des_ubscribirse das ocultas"
+
+#: ../mail/em-subscription-editor.c:947
+msgid "Unsubscribe from _all"
+msgstr "Desubscribirse de _todas"
+
+#: ../mail/em-subscription-editor.c:1618
 msgid "Folder Subscriptions"
 msgstr "Subscricións de cartafoles"
 
-#: ../mail/em-subscription-editor.c:1201
+#: ../mail/em-subscription-editor.c:1657
 msgid "_Account:"
 msgstr "Cont_a:"
 
-#: ../mail/em-subscription-editor.c:1216
+#: ../mail/em-subscription-editor.c:1672
 msgid "Clear Search"
 msgstr "Limpar a busca"
 
-#: ../mail/em-subscription-editor.c:1234
+#: ../mail/em-subscription-editor.c:1690
 msgid "Sho_w items that contain:"
 msgstr "Most_rar os elementos que conteñan:"
 
-#: ../mail/em-subscription-editor.c:1273
+#: ../mail/em-subscription-editor.c:1735
 msgid "Subscribe to the selected folder"
 msgstr "Subscribir o cartafol seleccionado"
 
-#: ../mail/em-subscription-editor.c:1274
+#: ../mail/em-subscription-editor.c:1736
 msgid "Su_bscribe"
 msgstr "Su_bscribir"
 
-#: ../mail/em-subscription-editor.c:1285
-#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#: ../mail/em-subscription-editor.c:1771
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Unsubscribe from the selected folder"
 msgstr "Cancelar a subscrición ao cartafol seleccionado"
 
-#: ../mail/em-subscription-editor.c:1286
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
-msgid "_Unsubscribe"
-msgstr "Cancelar a s_ubscrición"
-
-#: ../mail/em-subscription-editor.c:1297
+#: ../mail/em-subscription-editor.c:1801
 msgid "Collapse all folders"
 msgstr "Pregar todos os cartafoles"
 
-#: ../mail/em-subscription-editor.c:1298
+#: ../mail/em-subscription-editor.c:1802
 msgid "C_ollapse All"
 msgstr "Pregar t_odo"
 
-#: ../mail/em-subscription-editor.c:1308
+#: ../mail/em-subscription-editor.c:1812
 msgid "Expand all folders"
 msgstr "Despregar todos os cartafoles"
 
-#: ../mail/em-subscription-editor.c:1309
+#: ../mail/em-subscription-editor.c:1813
 msgid "E_xpand All"
 msgstr "Despre_gar todo"
 
-#: ../mail/em-subscription-editor.c:1319
+#: ../mail/em-subscription-editor.c:1823
 msgid "Refresh the folder list"
 msgstr "Actualizar a lista de cartafoles"
 
-#: ../mail/em-subscription-editor.c:1331
+#: ../mail/em-subscription-editor.c:1835
 msgid "Stop the current operation"
 msgstr "Deter a operación actual"
 
@@ -9982,23 +10044,23 @@ msgstr "Deter a operación actual"
 #. * 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:104
 #, 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] "Está seguro de que desexa abrir %d mensaxe á vez?"
 msgstr[1] "Está seguro de que desexa abrir %d mensaxes á vez?"
 
-#: ../mail/em-utils.c:158
+#: ../mail/em-utils.c:160
 #: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "_Non mostrar esta mensaxe outra vez"
 
-#: ../mail/em-utils.c:333
+#: ../mail/em-utils.c:335
 msgid "Message Filters"
 msgstr "Filtros de mensaxe"
 
-#: ../mail/em-utils.c:918
+#: ../mail/em-utils.c:920
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensaxes de %s"
@@ -10007,7 +10069,7 @@ msgstr "Mensaxes de %s"
 msgid "Search _Folders"
 msgstr "Carta_foles de busca"
 
-#: ../mail/em-vfolder-rule.c:618
+#: ../mail/em-vfolder-rule.c:594
 msgid "Add Folder"
 msgstr "Engadir un cartafol"
 
@@ -10118,21 +10180,17 @@ msgid "Composer Window default width"
 msgstr "Largura predeterminada da xanela do editor de mensaxes"
 
 #: ../mail/evolution-mail.schemas.in.h:26
-msgid "Composer load/attach directory"
-msgstr "Cartafol para cargar/anexar do editor de mensaxes"
-
-#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Abreviar a vista de enderezos en A/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr ""
 "Abrevia a vista de enderezos en A/CC/CCO co número indicado en address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -10140,11 +10198,11 @@ msgstr ""
 "Controla a frecuencia coa que se sincronizan os cambios locais co servidor "
 "de correo remoto. O intervalo debe ser de polo menos 30 segundos."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Custom headers to use while checking for junk."
 msgstr "Cabeceiras personalizadas para usar mentres se comproba o correo lixo."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -10152,55 +10210,55 @@ msgstr ""
 "Cabeceiras personalizadas para usar mentres se comproba o correo lixo. A "
 "lista de elementos son cadeas no formato «headername=value»."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default charset in which to compose messages"
 msgstr "Conxunto de caracteres predeterminado para escribir mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default charset in which to compose messages."
 msgstr "Conxunto de caracteres predeterminado para escribir mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default charset in which to display messages"
 msgstr "Conxunto de caracteres predeterminado para mostrar mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default charset in which to display messages."
 msgstr "Conxunto de caracteres predeterminado para mostrar mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default forward style"
 msgstr "Estilo de reencamiñamento predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default height of the Composer Window."
 msgstr "Altura predeterminada da xanela do editor de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default height of the mail browser window."
 msgstr "Altura predeterminada da xanela do buscador de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default maximized state of the mail browser window."
 msgstr "Estado maximizado predeterminado da xanela do buscador de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default reply style"
 msgstr "Estilo de resposta predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Default value for thread expand state"
 msgstr "Valor predeterminado para o estado despregado da conversa"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Default width of the Composer Window."
 msgstr "Largura predeterminada da xanela do editor de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Default width of the mail browser window."
 msgstr "Largura predeterminada da xanela do buscador de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid ""
 "Describes whether message headers in paned view should be collapsed or "
 "expanded by default. \"0\" = expanded \"1\" = collapsed"
@@ -10208,7 +10266,7 @@ msgstr ""
 "Describe se as cabeceiras dos mensaxes na vista con paneis se deben contraer "
 "ou expandir de maneira predeterminada. «0» = expandidas «1» = contraídas"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -10216,13 +10274,13 @@ msgstr ""
 "Determina se hai que buscar enderezos para filtrar correo lixo na axenda de "
 "enderezos local"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Determina se hai que buscar o enderezo de correo do remitente na axenda de "
 "enderezos"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 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 "
@@ -10235,13 +10293,13 @@ msgstr ""
 "enderezos remotas (LDAP, por exemplo) están marcadas para o completado "
 "automático."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Determina se se deben usar as cabeceiras personalizadas para a detección de "
 "correo lixo"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:48
 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 "
@@ -10251,7 +10309,7 @@ msgstr ""
 "correo lixo. Se esta opción está activada e se mencionan as cabeceiras, "
 "mellorarase a velocidade de detección do correo lixo."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -10259,48 +10317,44 @@ msgstr ""
 "Determina se se debe usar o mesmo tipo de letra para as liñas «De» e "
 "«Asunto» da columna «Mensaxes» na vista vertical."
 
-#: ../mail/evolution-mail.schemas.in.h:51
-msgid "Directory for loading/attaching files to composer."
-msgstr "Cartafol para cargar/anexar os ficheiros no editor de mensaxes."
-
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Directory for saving mail component files."
 msgstr "Cartafol onde gardar os ficheiros enviados por correo."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr ""
 "Desactivar ou activar a abreviación dos nomes de cartafol na barra lateral"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Display only message texts not exceeding certain size"
 msgstr "Mostrar só as mensaxes de texto que non excedan de certo tamaño"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Do not add signature delimiter"
 msgstr "Non engadir un delimitador de sinatura"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Mostrar os erros de ortografía mentres se escribe."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Empty Junk folders on exit"
 msgstr "Baleirar os cartafoles do correo lixo ao saír"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Empty Trash folders on exit"
 msgstr "Baleirar os cartafoles de lixo ao saír"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Baleirar todos os cartafoles do correo lixo ao saír do Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Baleirar todos os cartafoles de lixo ao saír do Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -10308,31 +10362,35 @@ msgstr ""
 "Activar as imaxes animadas no correo HTML. Moitos usuarios atopan as imaxes "
 "animadas molestas e prefiren ver unha mensaxe estática."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Activar o modo de cursor para poder ver un cursor ao ler un correo."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:61
+msgid "Enable local folders"
+msgstr "Activar cartafoles locais"
+
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable or disable magic space bar"
 msgstr "Activar ou desactivar a barra de espazo máxica"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Activar ou desactivar a confirmación cando se marcan varias mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable or disable type ahead search feature"
 msgstr "Activar ou desactivar a característica de busca ao teclear"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable search folders"
 msgstr "Activar os cartafoles de busca"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable search folders on startup."
 msgstr "Activar os cartafoles de busca ao iniciar."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -10340,7 +10398,7 @@ msgstr ""
 "Activar a barra de busca lateral para permitir a busca interactiva de nomes "
 "de cartafoles."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -10348,7 +10406,7 @@ msgstr ""
 "Activar esta opción para usar a barra espazadora para desprazarse pola "
 "mensaxe, na lista de mensaxes e nos cartafoles."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
@@ -10356,27 +10414,27 @@ msgstr ""
 "Activar a vista dos textos das mensaxes que non excedan o tamaño definido "
 "pola chave 'message_text_part_limit'."
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "Activar o uso dos axustes de vista da lista de mensaxes similares en todos "
 "os cartafoles"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Activar o uso dos axustes de vista da lista de mensaxes similares en todos "
 "os cartafoles."
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Enable/disable caret mode"
 msgstr "Activar/desactivar o modo de cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:74 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Codificar os nomes de ficheiro á forma de Outlook/GMail\""
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:74
 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, "
@@ -10388,31 +10446,31 @@ msgstr ""
 "ficheiro cos caracteres UTF-8 que usa o Evolution, porque estes non seguen a "
 "RFC 2231 senón que usan un estándar RFC 2047 incorrecto."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "Flush Outbox after filtering"
 msgstr "Limpar a caixa de saída despois do filtrado"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Forward message."
 msgstr "Reencamiñar a mensaxe."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Group Reply replies to list"
 msgstr "A resposta ao grupo responde á lista"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Height of the message-list pane"
 msgstr "Altura do panel da lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Height of the message-list pane."
 msgstr "Altura do panel da lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Oculta a vista previa por cartafol e elimina a selección"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -10420,7 +10478,7 @@ msgstr ""
 "Se un usuario tenta abrir 10 ou máis mensaxes ao mesmo tempo, pedir a "
 "confirmación."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:82
 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 "
@@ -10431,11 +10489,11 @@ msgstr ""
 "mapee a un visualizador de compoñentes Bonobo na base de datos de tipos MIME "
 "do GNOME."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Ignore list Reply-To:"
 msgstr "Ignorar «Responder a:» para as listas:"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
@@ -10443,7 +10501,7 @@ msgstr ""
 "Altura inicial da xanela «Editor de filtros». O valor actualízase a medida "
 "que o usuario redimensiona a xanela verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid ""
 "Initial height of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10451,7 +10509,7 @@ msgstr ""
 "Altura inicial da xanela «Subscricións de cartafoles». O valor actualízase a "
 "medida que o usuario redimensiona a xanela verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10459,7 +10517,7 @@ msgstr ""
 "Altura inicial da xanela «Editor do cartafol de busca». O valor actualízase "
 "a medida que o usuario redimensiona a xanela verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10467,7 +10525,7 @@ msgstr ""
 "Altura inicial da xanela «Enviar e recibir correo electrónico». O valor "
 "actualízase a medida que o usuario redimensiona a xanela verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -10480,7 +10538,7 @@ msgstr ""
 "xanela «Editor de filtros». Esta chave só existe como un detalle de "
 "implementación."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid ""
 "Initial maximize state of the \"Folder Subscriptions\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10493,7 +10551,7 @@ msgstr ""
 "cartafoles» non é maximizábel. Esta chave só existe como un detalle de "
 "implementación."
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10506,7 +10564,7 @@ msgstr ""
 "de busca» non é maximizábel. Esta chave só existe como un detalle de "
 "implementación."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10520,7 +10578,7 @@ msgstr ""
 "xanela «Enviar e recibir correo». Esta chave só existe como un detalle de "
 "implementación."
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
@@ -10528,7 +10586,7 @@ msgstr ""
 "Largura inicial da xanela «Editor de filtros». O valor actualízase a medida "
 "que o usuario redimensiona a xanela horizontalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid ""
 "Initial width of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10536,7 +10594,7 @@ msgstr ""
 "Largura inicial da xanela «Subscricións de cartafoles». O valor actualízase "
 "a medida que o usuario redimensiona a xanela horizontalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10544,7 +10602,7 @@ msgstr ""
 "Largura inicial da xanela «Editor do cartafol de busca». O valor actualízase "
 "a medida que o usuario redimensiona a xanela horizontalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10552,7 +10610,7 @@ msgstr ""
 "Largura inicial da xanela «Enviar e recibir correo». O valor actualízase a "
 "medida que o usuario redimensiona a xanela horizontalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:96
 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 "
@@ -10564,7 +10622,7 @@ msgstr ""
 "á lista de correo mediante a cal recibiu a copia da mensaxe que está "
 "respondendo."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:97
 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 "
@@ -10574,7 +10632,7 @@ msgstr ""
 "cartafol de busca bórranse as mensaxes permanentemente, non só dos "
 "resultados da busca."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:98
 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."
@@ -10582,7 +10640,7 @@ msgstr ""
 "Activa/desactiva as preguntas que avisan de que está enviando unha resposta "
 "privada a un correo que chegou a través dunha lista de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
@@ -10590,7 +10648,7 @@ msgstr ""
 "Activa/desactiva as mensaxes que avisan de que está enviando unha resposta a "
 "moitas persoas."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:100
 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 "
@@ -10601,7 +10659,7 @@ msgstr ""
 "a lista estabelece unha cabeceira «Responder a:» que redirecciona a súa "
 "resposta de novo á lista."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -10609,42 +10667,42 @@ msgstr ""
 "Activa/desactiva as preguntas que avisan de que está tentando enviar unha "
 "mensaxe a destinatarios non insertados como enderezos de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Last time Empty Junk was run"
 msgstr "A última vez que se baleirou o correo lixo"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Last time Empty Trash was run"
 msgstr "A última vez que se baleirou o lixo"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Layout style"
 msgstr "Estilo da disposición"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:105
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
 msgid "Level beyond which the message should be logged."
 msgstr "Nivel a partir do que se debería rexistrar a mensaxe."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas coas cores asociadas"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr ""
 "Lista dos tipos MIME para os que comprobar os visualizadores de compoñentes "
 "do Bonobo"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of accepted licenses"
 msgstr "Lista de licenzas aceptadas"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "List of accounts"
 msgstr "Lista de contas"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -10653,17 +10711,17 @@ msgstr ""
 "contén cadeas que nomean subcartafoles relativos a /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeceiras personalizadas e o seu estado de activación."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 "Lista dos códigos de idioma dos dicionarios usados para a comprobación "
 "ortográfica."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:113
 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."
@@ -10672,15 +10730,15 @@ msgstr ""
 "lista contén cadeas que conteñen nome:cor, onde a cor usa a codificación "
 "hexadecimal HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista de nomes de protocolos coa licenza aceptada."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Load images for HTML messages over HTTP"
 msgstr "Cargar as imaxes das mensaxes HTML sobre HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:116
 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 "
@@ -10690,87 +10748,87 @@ msgstr ""
 "«0» - Non cargar nunca as imaxes de fóra da rede. «1» - Cargar as imaxes nas "
 "mensaxes dos contactos. «2» - Cargar sempre as imaxes de fóra da rede."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Log filter actions"
 msgstr "Rexistrar as accións de filtrado"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Log filter actions to the specified log file."
 msgstr "Rexistrar as accións de filtrado no ficheiro indicado."
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Logfile to log filter actions"
 msgstr "Ficheiro de rexistro para as accións de filtrado"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Logfile to log filter actions."
 msgstr "Ficheiro de rexistro para as accións de filtrado."
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Mail browser height"
 msgstr "Altura do buscador de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Mail browser maximized"
 msgstr "Buscador de correo maximizado"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mail browser width"
 msgstr "Largura do buscador de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como visto despois do tempo de espera indicado"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como visto despois do tempo de espera indicado."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar citas textuais na «Vista previa» da mensaxe"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar citas textuais na «Vista previa» da mensaxe"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Message text limit for display"
 msgstr "Límite do texto da mensaxe para a vista"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Estilo de vista da mensaxe («normal», «cabeceiras completas», «fonte»)"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Número mínimo de días antes de baleirar o correo lixo ao saír"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Número mínimo de días antes de baleirar o lixo ao saír"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Tempo mínimo antes de baleirar o correo lixo ao saír, en días."
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Tempo mínimo antes de baleirar o lixo ao saír, en días."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Número de enderezos para mostrar en A/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Original message."
 msgstr "Mensaxe orixinal."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Path where picture gallery should search for its content"
 msgstr "Ruta onde a galería de imaxes debería buscar o seu contido"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid ""
 "Possible values are: never - to never close browser window always - to "
 "always close browser window ask - (or any other value) will ask user"
@@ -10779,119 +10837,119 @@ msgstr ""
 "sempre - pechar sempre a xanela do buscador    preguntar - (ou calquera "
 "valor) preguntar ao usuario"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
 "Preguntar antes de enviar a destinatarios non inseridos como enderezos de "
 "correo."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt on empty subject"
 msgstr "Avisar cando o «Asunto» estea baleiro"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Avisar ao usuario cando tente expurgar un cartafol."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Avisar ao usuario cando tente enviar unha mensaxe sen asunto."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Prompt when deleting messages in search folder"
 msgstr "Avisar cando se eliminen mensaxes nun cartafol de busca"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Avisar cando a lista de correo secuestre as respostas privadas"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt when replying privately to list messages"
 msgstr "Avisar cando se responda de forma privada a correos dunha lista"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Prompt when replying to many recipients"
 msgstr "Avisar ao responder a moitos destinatarios"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Prompt when user expunges"
 msgstr "Avisar cando o usuario expurgue"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user only fills Bcc"
 msgstr "Avisar cando o usuario encha só o campo Cco"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Avisar cando o usuario tente abrir dez ou máis mensaxes ao mesmo tempo"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
 "Avisar ao enviar mensaxes en HTML a destinatarios que non desexen recibilas."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Avisar cando o usuario tente enviar unha mensaxe sen cubrir os campos «Para» "
 "ou «CC»."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Avisar cando o usuario tente enviar un HTML non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Prompt while marking multiple messages"
 msgstr "Avisar cando se marquen varias mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Put personalized signatures at the top of replies"
 msgstr "Poñer sinaturas personalizadas no inicio das respostas"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Put the cursor at the bottom of replies"
 msgstr "Poñer o cursor ao fondo da resposta"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Recoñecer as emoticonas no texto e substituílas con imaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Recognize links in text and replace them."
 msgstr "Recoñecer as ligazóns no texto e substituílas."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Run junk test on incoming mail."
 msgstr "Realizar a proba do correo lixo no correo entrante."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Save directory"
 msgstr "Cartafol onde gardar"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Search for the sender photo in local address books"
 msgstr "Buscar a fotografía do remitente nas axendas locais de enderezos"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Send HTML mail by default"
 msgstr "Enviar o correo en HTML de forma predeterminada"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Send HTML mail by default."
 msgstr "Enviar o correo en HTML de forma predeterminada."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Sender email-address column in the message list"
 msgstr "Columna cos enderezos dos remitentes na lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Server synchronization interval"
 msgstr "Intervalo de sincronización do servidor"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -10899,64 +10957,64 @@ msgstr ""
 "Estabelecer como verdadeiro no caso de que se queira engadir o delimitador "
 "de sinatura antes da sinatura cando escriba un correo electrónico."
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Mostrar o campo «Cco» ao enviar unha mensaxe de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Mostrar o campo «Cc» ao enviar unha mensaxe de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Mostrar o campo «De» ao enviar unha mensaxe a un grupo de discusión"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr ""
 "Mostrar o campo «Respostar a» ao enviar unha mensaxe a un grupo de discusión"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Mostrar o campo «Respostar a» ao enviar unha mensaxe de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show Animations"
 msgstr "Mostrar as animacións"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show all message headers"
 msgstr "Mostrar todas as cabeceiras das mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show all the headers when viewing a messages."
 msgstr "Mostrar todas as cabeceiras ao visualizar as mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show animated images as animations."
 msgstr "Mostrar as imaxes animadas como animacións."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Mostrar as mensaxes eliminadas (riscadas) na lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar as mensaxes eliminadas na lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Show image animations"
 msgstr "Mostrar as imaxes animadas"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Show original \"Date\" header value."
 msgstr "Mostrar o valor orixinal da cabeceira «Data»."
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Show photo of the sender"
 msgstr "Mostrar a fotografía do remitente"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -10964,7 +11022,7 @@ msgstr ""
 "Mostrar o campo «Cco» ao enviar unha mensaxe de correo. Isto pódese "
 "configurar no menú «Vista» cando se selecciona unha conta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -10972,7 +11030,7 @@ msgstr ""
 "Mostrar o campo «Cc» ao enviar unha mensaxe de correo. Isto pódese "
 "configurar no menú «Vista» cando se selecciona unha conta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -10980,7 +11038,7 @@ msgstr ""
 "Mostrar o campo «De» ao enviar unha mensaxe a un grupo de discusión. Isto "
 "pódese configurar no menú «Vista» cando se selecciona unha conta de novas."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -10989,7 +11047,7 @@ msgstr ""
 "discusión. Isto pódese configurar no menú «Vista» cando se selecciona unha "
 "conta de novas."
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -10997,14 +11055,14 @@ msgstr ""
 "Mostrar o campo «Responder a» ao enviar unha mensaxe de correo. Isto pódese "
 "configurar no menú «Vista» cando se selecciona unha conta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr ""
 "Mostrar o enderezo do remitente nunha columna separada na lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:185
 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 "
@@ -11014,12 +11072,12 @@ msgstr ""
 "distinto). Doutro xeito mostrar o valor da cabeceira «Data» no formato "
 "preferido polo usuario e o fuso de hora local."
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Mostrar a fotografía do remitente no panel de lectura da mensaxe."
 
 #
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:187
 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. "
@@ -11038,6 +11096,10 @@ msgstr ""
 "mesmo. Funciona comparando a cabeceira «Responder a:» cunha cabeceira "
 "«Responder á lista:», se existe."
 
+#: ../mail/evolution-mail.schemas.in.h:188
+msgid "Sort accounts alphabetically in a folder tree"
+msgstr "Ordenar contas alfabeticamente nun árbore de cartafoles"
+
 #: ../mail/evolution-mail.schemas.in.h:189
 msgid "Spell check inline"
 msgstr "Comprobación ortográfica en liña"
@@ -11055,28 +11117,40 @@ msgid "State of message headers in paned view"
 msgstr "Estado das cabeceiras da mensaxe na vista con paneis"
 
 #: ../mail/evolution-mail.schemas.in.h:193
+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 ""
+"Indica como ordenar contas nunha árbore de cartafoles usado nunha vista de "
+"Correo. Cando está estabelecido a certo as contas ordénanse alfabeticamente, "
+"coa excepción de Neste equipo y Cartafoles de busca, pola contra os "
+"cartafoles ordénanse pola orde dada polo usuario."
+
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "Terminal font"
 msgstr "Tipo de letra do terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid "The default plugin for Junk hook"
 msgstr "O engadido predeterminado para o tratamento do correo lixo"
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "A última vez que se baleirou o correo lixo, en días desde o 1 de xaneiro de "
 "1970 (Epoch)."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "A última vez que se baleirou o lixo, en días desde o 1 de xaneiro de 1970 "
 "(Epoch)."
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:198
 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 "
@@ -11088,11 +11162,11 @@ msgstr ""
 "previa embaixo da lista de mensaxes. «1» (vista vertical) mostra o panel de "
 "vista previa ao lado da lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "The terminal font for mail display."
 msgstr "O tipo de letra do terminal para mostrar o correo."
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows."
@@ -11100,7 +11174,7 @@ msgstr ""
 "O texto inserido ao reencamiñar unha mensaxe, informando que a continuación "
 "vai a mensaxe reencamiñada."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows."
@@ -11108,7 +11182,7 @@ msgstr ""
 "O texto inserido ao responder unha mensaxe, informando que a continuación "
 "vai a mensaxe orixinal."
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author."
@@ -11116,11 +11190,11 @@ msgstr ""
 "O texto inserido cando se responde unha mensaxe, atribuíndolle a mensaxe ao "
 "autor orixinal."
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "The variable width font for mail display."
 msgstr "O tipo de letra de largura variábel para mostrar o correo."
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -11128,7 +11202,7 @@ msgstr ""
 "Isto pode ter tres valores posíbeis: «0» para erros; «1» para avisos; «2» "
 "para mensaxes de depuración."
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:205
 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 "
@@ -11138,7 +11212,7 @@ msgstr ""
 "Evolution, indicado en KB. O tamaño predeterminado é 4096 (4MB). Este valor "
 "úsase só cando a chave 'force_message_limit' está activada."
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:206
 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 "
@@ -11148,7 +11222,7 @@ msgstr ""
 "engadidos activados. Se o engadido predeterminado listado está desactivado "
 "non se usarán os outros engadidos dispoñíbeis."
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:207
 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."
@@ -11156,7 +11230,7 @@ msgstr ""
 "Esta chave só se le unha vez e restabelécese como «falso» despois de a ler. "
 "Isto deselecciona o correo da lista e elimina a vista previa de ese cartafol."
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:208
 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;"
@@ -11168,7 +11242,7 @@ msgstr ""
 "estrutura XML é &lt;header enabled&gt; - defínao como activado para mostrar "
 "a cabeceira na vista do correo."
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:209
 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 "
@@ -11179,11 +11253,11 @@ msgstr ""
 "para excluír os correos enviados por contactos coñecidos desde o filtro de "
 "correo lixo."
 
-#: ../mail/evolution-mail.schemas.in.h:209
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid "This option would help in improving the speed of fetching."
 msgstr "Esta opción podería axudar a mellorar a velocidade de recepción."
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -11191,7 +11265,7 @@ msgstr ""
 "Isto define o número de enderezos que se mostra na vista da lista de "
 "mensaxes predeterminada, para os restantes mostrarase «…»."
 
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Requires a restart to apply."
@@ -11199,7 +11273,7 @@ msgstr ""
 "Esta opción indica se as conversas deben estar despregadas ou pregadas por "
 "omisión. É necesario reiniciar o Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:213
 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 "
@@ -11209,7 +11283,7 @@ msgstr ""
 "mensaxe de cada conversa en vez de pola data das mensaxes. É necesario "
 "reiniciar o Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:214
 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 "
@@ -11219,37 +11293,37 @@ msgstr ""
 "de imaxes do sistema, xeralmente localizado en ~/Imaxes. Este cartafol "
 "usarase tamén cando a ruta estabelecida non apunta a un cartafol existente."
 
-#: ../mail/evolution-mail.schemas.in.h:214
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Thread the message-list based on Subject"
 msgstr "Lista de mensaxes por conversas baseadas no asunto"
 
-#: ../mail/evolution-mail.schemas.in.h:215
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Timeout for marking message as seen"
 msgstr "Tempo de espera para marcar unha mensaxe como vista"
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "Timeout for marking message as seen."
 msgstr "Tempo de espera para marcar unha mensaxe como vista."
 
-#: ../mail/evolution-mail.schemas.in.h:217
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid "UID string of the default account."
 msgstr "Cadea UID para a conta predeterminada."
 
-#: ../mail/evolution-mail.schemas.in.h:218
+#: ../mail/evolution-mail.schemas.in.h:219
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 "Cor de subliñado para as palabras escritas incorrectamente cando se usa a "
 "comprobación ortográfica en liña."
 
-#: ../mail/evolution-mail.schemas.in.h:219
+#: ../mail/evolution-mail.schemas.in.h:220
 msgid "Use custom fonts"
 msgstr "Usar tipos de letra personalizados"
 
-#: ../mail/evolution-mail.schemas.in.h:220
+#: ../mail/evolution-mail.schemas.in.h:221
 msgid "Use custom fonts for displaying mail."
 msgstr "Usar tipos de letra personalizados para mostrar o correo."
 
-#: ../mail/evolution-mail.schemas.in.h:221
+#: ../mail/evolution-mail.schemas.in.h:222
 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 "
@@ -11259,7 +11333,7 @@ msgstr ""
 "responde a unha mensaxe. Isto determina se o cursor se sitúa no inicio da "
 "mensaxe ou no final."
 
-#: ../mail/evolution-mail.schemas.in.h:222
+#: ../mail/evolution-mail.schemas.in.h:223
 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 "
@@ -11269,17 +11343,17 @@ msgstr ""
 "responden a unha mensaxe. Isto determina se a sinatura se sitúa no inicio da "
 "mensaxe ou no final."
 
-#: ../mail/evolution-mail.schemas.in.h:223
+#: ../mail/evolution-mail.schemas.in.h:224
 msgid "Variable width font"
 msgstr "Tipo de letra de largura variábel"
 
-#: ../mail/evolution-mail.schemas.in.h:224
+#: ../mail/evolution-mail.schemas.in.h:225
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Indica se hai que engadir unha solicitude de confirmación de lectura de "
 "forma predeterminada."
 
-#: ../mail/evolution-mail.schemas.in.h:225
+#: ../mail/evolution-mail.schemas.in.h:226
 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 "
@@ -11290,7 +11364,7 @@ msgstr ""
 "cada X minutos». Esta opción úsase conxuntamente coa opción "
 "'send_recv_on_start'."
 
-#: ../mail/evolution-mail.schemas.in.h:226
+#: ../mail/evolution-mail.schemas.in.h:227
 msgid ""
 "Whether check for new messages when Evolution is started. This includes also "
 "sending messages from Outbox."
@@ -11298,13 +11372,13 @@ msgstr ""
 "Indica se debe buscar novas mensaxes ao iniciar o Evolution. Inclúe o envío "
 "de mensaxes desde a caixa de saída."
 
-#: ../mail/evolution-mail.schemas.in.h:227
+#: ../mail/evolution-mail.schemas.in.h:228
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 "Indica se hai que desactivar a funcionalidade de abreviación dos nomes dos "
 "cartafoles na barra lateral."
 
-#: ../mail/evolution-mail.schemas.in.h:228
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -11312,11 +11386,11 @@ msgstr ""
 "Indica se debe retroceder no agrupamento de conversas polo asunto cando as "
 "mensaxes non conteñen cabeceiras «En resposta a» ou «Referencias»."
 
-#: ../mail/evolution-mail.schemas.in.h:229
+#: ../mail/evolution-mail.schemas.in.h:230
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Indica se ordenar as conversa pola última mensaxe que aparece"
 
-#: ../mail/evolution-mail.schemas.in.h:230
+#: ../mail/evolution-mail.schemas.in.h:231
 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 "
@@ -11327,11 +11401,17 @@ msgstr ""
 "filtrado «Reencamiñar a» e aproximadamente un minuto despois da invocación "
 "da última acción."
 
-#: ../mail/evolution-mail.schemas.in.h:231
+#: ../mail/evolution-mail.schemas.in.h:232
+msgid "Whether to show local folders (On This Computer) in a folder tree."
+msgstr ""
+"Indica se se deben mostrar os cartafoles locais (Neste equipo) nun árbore de "
+"cartafoles."
+
+#: ../mail/evolution-mail.schemas.in.h:233
 msgid "Width of the message-list pane"
 msgstr "Largura do panel da lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:232
+#: ../mail/evolution-mail.schemas.in.h:234
 msgid "Width of the message-list pane."
 msgstr "Largura do panel da lista de mensaxes."
 
@@ -11360,13 +11440,13 @@ msgstr "Cartafol de _destino:"
 
 #: ../mail/importers/evolution-mbox-importer.c:145
 #: ../plugins/dbx-import/dbx-importer.c:260
-#: ../plugins/pst-import/pst-importer.c:460
+#: ../plugins/pst-import/pst-importer.c:546
 msgid "Select folder"
 msgstr "Seleccionar un cartafol"
 
 #: ../mail/importers/evolution-mbox-importer.c:146
 #: ../plugins/dbx-import/dbx-importer.c:261
-#: ../plugins/pst-import/pst-importer.c:461
+#: ../plugins/pst-import/pst-importer.c:547
 msgid "Select folder to import into"
 msgstr "Seleccionar un cartafol ao que importar"
 
@@ -11381,7 +11461,7 @@ msgid "From"
 msgstr "De"
 
 #: ../mail/importers/evolution-mbox-importer.c:482
-#: ../shell/e-shell-utils.c:221
+#: ../shell/e-shell-utils.c:187
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Caixa de correo Berkeley (mbox)"
 
@@ -11396,7 +11476,7 @@ msgstr "Importando a caixa de correo"
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
 #: ../plugins/dbx-import/dbx-importer.c:610
-#: ../plugins/pst-import/pst-importer.c:648
+#: ../plugins/pst-import/pst-importer.c:751
 #, c-format
 msgid "Importing '%s'"
 msgstr "Importando «%s»"
@@ -11411,7 +11491,7 @@ msgid "Importing Pine data"
 msgstr "Importando datos do Pine"
 
 #: ../mail/importers/pine-importer.c:463
-#: ../modules/addressbook/addressbook-config.c:1081
+#: ../modules/addressbook/addressbook-config.c:1078
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
@@ -11521,7 +11601,7 @@ msgid "Apply the same _view settings to all folders"
 msgstr "Aplicar as mesmas opcións de _vista para todos os cartafoles"
 
 #: ../mail/mail-config.ui.h:15
-#: ../modules/addressbook/addressbook-config.c:1088
+#: ../modules/addressbook/addressbook-config.c:1085
 msgid "Authentication"
 msgstr "Autenticación"
 
@@ -11574,7 +11654,7 @@ msgid "Composing Messages"
 msgstr "Escribir unha mensaxe"
 
 #: ../mail/mail-config.ui.h:28
-#: ../modules/plugin-manager/evolution-plugin-manager.c:161
+#: ../modules/plugin-manager/evolution-plugin-manager.c:160
 msgid "Configuration"
 msgstr "Configuración"
 
@@ -11818,141 +11898,145 @@ msgstr "SHA384"
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:94 ../modules/addressbook/ldap-config.ui.h:12
+#: ../mail/mail-config.ui.h:94
+msgid "SOC_KS Proxy:"
+msgstr "Proxy SOC_KS:"
+
+#: ../mail/mail-config.ui.h:95 ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:96
 msgid "SSL is not supported in this build of Evolution"
 msgstr "SSL non é compatíbel con esta versión do Evolution"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:97
 msgid "S_earch for sender photograph only in local address books"
 msgstr "B_uscar a fotografía do remitente só nas axendas de enderezos locais"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:98
 msgid "S_elect..."
 msgstr "S_eleccionar…"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:99
 msgid "S_end message receipts:"
 msgstr "_Enviar as confirmacións de lectura das mensaxes:"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:100
 msgid "S_tandard Font:"
 msgstr "Tipo de letra es_tándar:"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:101
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME seguro (S/MIME)"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML fixed width font"
 msgstr "Seleccionar o tipo de letra de largura fixa para HTML"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML variable width font"
 msgstr "Seleccionar o tipo de letra de largura variábel para HTML"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:105
 msgid "Sender Photograph"
 msgstr "Fotografía do remitente"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:107
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Enviar unha resposta _privada á mensaxes da lista de correo"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:109
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
 "Enviar unha mensaxe con _destinatarios non inseridos como enderezos de correo"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:111
 msgid "Sending a message with an _empty subject line"
 msgstr "Enviar unha m_ensaxe co asunto baleiro"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:113
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Enviar unha mensaxe só con destinatarios _Bcc definidos"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:115
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Enviar unha resposta a un grande _número de destinatarios"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:116
 msgid "Sent _Messages Folder:"
 msgstr "Cartafol das _mensaxes enviadas:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:117
 msgid "Ser_ver requires authentication"
 msgstr "O ser_vidor solicita autenticación"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:118
 msgid "Server Configuration"
 msgstr "Configuración do servidor"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:119
 msgid "Server _Type:"
 msgstr "_Tipo de servidor:"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:120
 msgid "Set custom junk header"
 msgstr "Estabelecer cabeceira de SPAM personalizada"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:121
 msgid "Si_gning algorithm:"
 msgstr "Algoritmo da si_natura:"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:122
 msgid "Sig_natures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:123
 msgid "Sig_ning certificate:"
 msgstr "Certificado de si_natura:"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:124
 msgid "Signat_ure:"
 msgstr "Sinat_ura:"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:125
 msgid "Signatures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:126
 msgid "Signing _algorithm:"
 msgstr "_Algoritmo da sinatura:"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:127
 msgid "Special Folders"
 msgstr "Cartafoles especiais"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:128
 msgid "Spell Checking"
 msgstr "Comprobación ortográfica"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:129
 msgid "Start _typing at the bottom on replying"
 msgstr "Comezar a escribir ao final da respos_ta"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:130
 msgid "Start up"
 msgstr "Iniciar"
 
-#: ../mail/mail-config.ui.h:130 ../modules/addressbook/ldap-config.ui.h:20
+#: ../mail/mail-config.ui.h:131 ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:132
 msgid "T_ype:"
 msgstr "T_ipo:"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:133
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -11960,7 +12044,7 @@ msgstr ""
 "Esta lista de idiomas mostra unicamente os idiomas para os cales hai "
 "instalado un dicionario."
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:134
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -11970,7 +12054,7 @@ msgstr ""
 "sinatura. O nome que indique usarase\n"
 "só a efectos de vista. "
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:137
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -11978,7 +12062,7 @@ msgstr ""
 "Para evitar accidentes co correo e outras incomodidades pedir a confirmación "
 "antes de realizar as seguintes accións marcadas:"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:138
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -11986,138 +12070,138 @@ msgstr ""
 "Indique o nome polo que desexa identificar esta conta.\n"
 "Por exemplo: «Traballo» ou «Persoal»"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:140
 msgid "Us_ername:"
 msgstr "Nom_e do usuario:"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:141
 msgid "Use Authe_ntication"
 msgstr "Usar aute_nticación"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:142
 msgid "User _Name:"
 msgstr "_Nome do usuario:"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:143
 msgid "_Add Signature"
 msgstr "_Engadir unha sinatura"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:144
 msgid "_Always load images from the Internet"
 msgstr "C_argar sempre as imaxes desde Internet"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:145
 msgid "_Authentication Type"
 msgstr "Tipo de _autenticación"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:146
 msgid "_Direct connection to the Internet"
 msgstr "Conexión _directa a Internet"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:147
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 "Non asinar as solicitudes _de reunión (para a compatibilidade co Outlook)"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:148
 msgid "_Forward style:"
 msgstr "Estilo do _reencamiñamento:"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:149
 msgid "_Junk Folder:"
 msgstr "Cartafol do coreo _lixo:"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:150
 msgid "_Keep signature above the original message on replying"
 msgstr "Ao responder _manter a sinatura por riba da mensaxe orixinal"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:151
 msgid "_Languages"
 msgstr "I_diomas"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:152
 msgid "_Load images only in messages from contacts"
 msgstr "Ca_rgar as imaxes só nas mensaxes dos contactos"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:153
 msgid "_Lookup in local address book only"
 msgstr "Buscar só nas axendas de enderezos _locais"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:154
 msgid "_Make this my default account"
 msgstr "Facer desta a _miña conta predeterminada"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:155
 msgid "_Manual proxy configuration:"
 msgstr "Configuración _manual do proxy:"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:157
 msgid "_Never load images from the Internet"
 msgstr "_Non cargar nunca as imaxes desde Internet"
 
-#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:27
+#: ../mail/mail-config.ui.h:159 ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "_Porto:"
 
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:160
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Avisar antes de enviar correo HTML aos contactos que non o desexan"
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:161
 msgid "_Reply style:"
 msgstr "Estilo da _resposta:"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:162
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:163
 msgid "_Secure HTTP Proxy:"
 msgstr "Proxy HTTP _segura:"
 
-#: ../mail/mail-config.ui.h:164 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:165 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "_Servidor:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:167
 msgid "_Show animated images"
 msgstr "Mo_strar as imaxes animadas"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:168
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Mostrar a fotografía do remitente na vista previa das mensaxes"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:169
 msgid "_Trash Folder:"
 msgstr "Cartafo_l do lixo:"
 
-#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:31
+#: ../mail/mail-config.ui.h:170 ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "_Usar unha conexión segura:"
 
-#: ../mail/mail-config.ui.h:170
+#: ../mail/mail-config.ui.h:171
 msgid "_Use system defaults"
 msgstr "_Usar as predefinicións do sistema"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:172
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar os mesmos tipos de letra que outros aplicativos"
 
-#: ../mail/mail-config.ui.h:172 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:174 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:174
+#: ../mail/mail-config.ui.h:175
 msgid "color"
 msgstr "cor"
 
-#: ../mail/mail-config.ui.h:175
+#: ../mail/mail-config.ui.h:176
 msgid "description"
 msgstr "descrición"
 
@@ -12223,73 +12307,73 @@ msgstr "Marque is_to para aceptar o acordo de licenza"
 msgid "Pinging %s"
 msgstr "Facendo ping a %s"
 
-#: ../mail/mail-ops.c:85
+#: ../mail/mail-ops.c:86
 msgid "Filtering Selected Messages"
 msgstr "Filtrando as mensaxes seleccionadas"
 
-#: ../mail/mail-ops.c:205
+#: ../mail/mail-ops.c:206
 msgid "Fetching Mail"
 msgstr "Recibindo o correo"
 
-#: ../mail/mail-ops.c:821
+#: ../mail/mail-ops.c:843
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:891
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Produciuse un fallo ao enviar %d de %d mensaxes"
 
-#: ../mail/mail-ops.c:873 ../mail/mail-send-recv.c:837
+#: ../mail/mail-ops.c:895 ../mail/mail-send-recv.c:840
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:875 ../mail/mail-send-recv.c:839
+#: ../mail/mail-ops.c:897 ../mail/mail-send-recv.c:842
 msgid "Complete."
 msgstr "Completado."
 
-#: ../mail/mail-ops.c:985
+#: ../mail/mail-ops.c:1012
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Movendo as mensaxes a «%s»"
 
-#: ../mail/mail-ops.c:986
+#: ../mail/mail-ops.c:1013
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Copiando as mensaxes a «%s»"
 
-#: ../mail/mail-ops.c:1104
+#: ../mail/mail-ops.c:1131
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Gardando o cartafol «%s»"
 
-#: ../mail/mail-ops.c:1179
+#: ../mail/mail-ops.c:1206
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expurgando e gardando a conta «%s»"
 
-#: ../mail/mail-ops.c:1180
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Gardando a conta «%s»"
 
-#: ../mail/mail-ops.c:1242
+#: ../mail/mail-ops.c:1269
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Actualizando o cartafol «%s»"
 
-#: ../mail/mail-ops.c:1432
+#: ../mail/mail-ops.c:1459
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Expurgando o cartafol «%s»"
 
-#: ../mail/mail-ops.c:1517
+#: ../mail/mail-ops.c:1544
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Baleirando o lixo de «%s»"
 
-#: ../mail/mail-ops.c:1619
+#: ../mail/mail-ops.c:1646
 #, c-format
 msgid "Disconnecting %s"
 msgstr "Desconectando %s"
@@ -12306,7 +12390,7 @@ msgstr "Enviar e recibir o correo"
 msgid "Cancel _All"
 msgstr "Cancel_ar todo"
 
-#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:979
+#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:988
 msgid "Updating..."
 msgstr "Actualizando…"
 
@@ -12314,7 +12398,7 @@ msgstr "Actualizando…"
 msgid "Waiting..."
 msgstr "Agardando…"
 
-#: ../mail/mail-send-recv.c:959
+#: ../mail/mail-send-recv.c:967
 #, c-format
 msgid "Checking for new mail"
 msgstr "Comprobando se hai correo novo"
@@ -12708,10 +12792,14 @@ msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "O cartafol «{0}» non contén ningunha mensaxe duplicada."
 
 #: ../mail/mail.error.xml.h:75
+msgid "Hidden file is attached."
+msgstr "Existe un ficheiro oculto adxunto."
+
+#: ../mail/mail.error.xml.h:76
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Se continúa non poderá recuperar estas mensaxes."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -12719,16 +12807,16 @@ msgstr ""
 "Se elimina o cartafol, todo o seu contido e o dos seus subcartafoles "
 "eliminarase permanentemente."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Se elimina o cartafol, eliminarase permanentemente todo o seu contido."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Se continúa, as contas proxy eliminaranse permanentemente."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -12736,11 +12824,11 @@ msgstr ""
 "Se continúa, a información da conta e toda a\n"
 "información do proxy eliminarase permanentemente."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Se continúa, a información da conta eliminarase permanentemente."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -12748,23 +12836,23 @@ msgstr ""
 "Se sae do aplicativo, estas mensaxes non se enviarán até que o Evolution se "
 "inicie de novo."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Invalid authentication"
 msgstr "A autenticación non é válida"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Mail Deletion Failed"
 msgstr "Produciuse un fallo na eliminación do correo"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid "Mail filters automatically updated."
 msgstr "Filtros de correo actualizados automaticamente."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -12776,7 +12864,7 @@ msgstr ""
 "os destinatarios na súa mensaxe. Para evitar isto debería engadir polo menos "
 "un destinatario «Para:» ou «CC:»."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
 "Folder will delete the actual messages from the folder or folders in which "
@@ -12787,35 +12875,35 @@ msgstr ""
 "fisicamente.\n"
 "Está seguro de que desexa facer isto?"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:90
 msgid "Missing folder."
 msgstr "Falta o cartafol."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:92
 msgid "N_ever"
 msgstr "N_unca"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:93
 msgid "No duplicate messages found."
 msgstr "Non se atoparon mensaxes duplicadas."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:94
 msgid "No sources selected."
 msgstr "Non se seleccionou ningunha fonte."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:95
 msgid "Opening too many messages at once may take a long time."
 msgstr "Abrir demasiadas mensaxes á vez pode levar moito tempo."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:96
 msgid "Please check your account settings and try again."
 msgstr "Comprobe os axustes da conta e ténteo outra vez."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:97
 msgid "Please enable the account or send using another account."
 msgstr "Active a conta ou faga o envío usando outra conta."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -12823,7 +12911,7 @@ msgstr ""
 "Introduza un enderezo de correo correcto no campo «Para:». Pode buscar "
 "enderezos de correo premendo no botón «Para:» ao lado da caixa da entrada."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -12833,67 +12921,67 @@ msgstr ""
 "HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:101
 msgid "Please provide an unique name to identify this signature."
 msgstr "Introduza un nome único para identificar esta sinatura."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:102
 msgid "Please wait."
 msgstr "Agarde."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:103
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Produciuse un problema ao migrar o cartafol de correo antigo «{0}»."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:104
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Estase solicitando do servidor unha lista de mecanismos de autenticación "
 "compatíbeis."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:105
 msgid "Read receipt requested."
 msgstr "Solicitouse unha confirmación de lectura."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:106
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
 "Está seguro de que desexa eliminar o cartafol «{0}» e todos os seus "
 "subcartafoles?"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:107
 msgid "Really delete folder \"{0}\"?"
 msgstr "Desexa confirmar o borrado do cartafol «{0}»?"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:108
 msgid "Remove duplicate messages?"
 msgstr "Desexa eliminar as mensaxes duplicadas?"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:109
 msgid "Reply _Privately"
 msgstr "Responder de forma _privada"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:112
 msgid "Search Folders automatically updated."
 msgstr "Os cartafoles de busca actualizáronse automaticamente."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:113
 msgid "Send private reply?"
 msgstr "Desexa enviar unha resposta privada?"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:114
 msgid "Send reply to all recipients?"
 msgstr "Desexa enviar unha resposta a todos os destinatarios?"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:115
 msgid "Signature Already Exists"
 msgstr "A sinatura xa existe"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:116
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Desxa sincronizar os cartafoles localmente para o uso sen conexión?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -12901,7 +12989,15 @@ msgstr ""
 "O Evolution precisa os cartafoles do sistema para funcionar correctamente e "
 "non é posíbel renomealos, movelos ou eliminalos."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:118
+msgid ""
+"The attachment named {0} is a hidden file and may contain sensitive data. "
+"Please review it before sending."
+msgstr ""
+"O anexo co nome {0} é un ficheiro oculto e pode conter datos sensíbeis. "
+"Revíseo antes de envialo."
+
+#: ../mail/mail.error.xml.h:119
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -12918,7 +13014,7 @@ msgstr ""
 "destinatarios da súa mensaxe. Para evitar isto, debería engadir polo menos "
 "un destinatario a «Para:» ou «Cc:». "
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -12927,7 +13023,7 @@ msgstr ""
 "electrónico correcto:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:124
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -12936,15 +13032,15 @@ msgstr ""
 "electrónico correctos:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:127
 msgid "The script file must exist and be executable."
 msgstr "O ficheiro do script debe existir e ser executábel."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:128
 msgid "These messages are not copies."
 msgstr "Estes mensaxes non son copias."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -12953,7 +13049,7 @@ msgstr ""
 "se é necesario, vaia ao editor de cartafoles de busca para engadilo "
 "explicitamente."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -12961,13 +13057,13 @@ msgstr ""
 "Non é posíbel enviar esta mensaxe porque a conta que escolleu para enviala "
 "non está activada"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Non é posíbel enviar esta mensaxe porque non indicou ningún destinatario"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:133
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -12975,11 +13071,11 @@ msgstr ""
 "Este servidor non é compatíbel con este tipo de autenticación e quizais non "
 "permita ningún tipo de autenticación."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:134
 msgid "This signature has been changed, but has not been saved."
 msgstr "Modificouse esta sinatura pero non se gardou."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:135
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -12987,15 +13083,15 @@ msgstr ""
 "Isto marcará todas as mensaxes como lidas no cartafol seleccionado e nos "
 "seus subcartafoles."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:136
 msgid "This will mark all messages as read in the selected folder."
 msgstr "Isto marcará todas as mensaxes como lidas no cartafol seleccionado."
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:137
 msgid "Unable to connect to the GroupWise server."
 msgstr "Non foi posíbel conectar co servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:138
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13003,27 +13099,27 @@ msgstr ""
 "Non é posíbel abrir o cartafol de borradores desta conta. Desexa usar no seu "
 "lugar o cartafol de borradores do sistema?"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:139
 msgid "Unable to read license file."
 msgstr "Non é posíbel ler o ficheiro da licenza."
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:140
 msgid "Unable to retrieve message."
 msgstr "Non foi posíbel obter a mensaxe."
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:141
 msgid "Use _Default"
 msgstr "Usar o pre_definido"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:142
 msgid "Use default drafts folder?"
 msgstr "Desexa usar o cartafol de borradores predeterminado?"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:143
 msgid "Would you like to close the message window?"
 msgstr "Desexa pechar a xanela da mensaxe?"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:144
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
@@ -13033,7 +13129,7 @@ msgstr ""
 "mediante unha lista de correo, pero a lista está tentando redireccionar a "
 "súa resposta de novo á lista. Está seguro que desexa continuar?"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:145
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -13043,7 +13139,7 @@ msgstr ""
 "correo, pero está respondendo de forma privada ao remitente, non á lista. "
 "Está seguro que desexa continuar?"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:146
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
@@ -13051,31 +13147,31 @@ msgstr ""
 "Está respondendo a un correo electrónico que se enviou a moitos "
 "destinatarios. Está seguro que desexa responder a TODOS eles?"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:147
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Non ten os permisos suficientes para eliminar este correo."
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:148
 msgid "You have not filled in all of the required information."
 msgstr "Non encheu toda a información requirida."
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:149
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Ten mensaxes sen enviar. Desexa saír de todas formas?"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:150
 msgid "You may not create two accounts with the same name."
 msgstr "Non pode crear dúas contas co mesmo nome."
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:151
 msgid "You must name this Search Folder."
 msgstr "Debe dar un nome a este cartafol de busca."
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:152
 msgid "You must specify a folder."
 msgstr "Debe indicar un cartafol."
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:153
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13085,65 +13181,65 @@ msgstr ""
 "Fágao seleccionando os cartafoles individualmente, ou seleccionando todos os "
 "cartafoles locais, todos os cartafoles remotos ou ambos."
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:155
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Produciuse un fallo ao iniciar a sesión no servidor «{0}» como «{0}»."
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:156
 msgid "_Always"
 msgstr "_Sempre"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:157
 msgid "_Append"
 msgstr "_Anexar"
 
-#: ../mail/mail.error.xml.h:156
-#: ../plugins/publish-calendar/publish-calendar.c:619
+#: ../mail/mail.error.xml.h:158
+#: ../plugins/publish-calendar/publish-calendar.c:611
 msgid "_Disable"
 msgstr "_Desactivar"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:159
 msgid "_Discard changes"
 msgstr "_Rexeitar as modificacións"
 
-#: ../mail/mail.error.xml.h:158
-#: ../modules/mail/e-mail-shell-view-actions.c:1122
+#: ../mail/mail.error.xml.h:160
+#: ../modules/mail/e-mail-shell-view-actions.c:1112
 msgid "_Empty Trash"
 msgstr "_Baleirar o lixo"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:161
 msgid "_Exit Evolution"
 msgstr "_Saír do Evolution"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:162
 msgid "_Expunge"
 msgstr "_Compactar"
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:163
 msgid "_Migrate Now"
 msgstr "_Migrar agora"
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:164
 msgid "_No"
 msgstr "_Non"
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:165
 msgid "_Open Messages"
 msgstr "_Abrir as mensaxes"
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:168
 msgid "_Send Receipt"
 msgstr "_Enviar a confirmación"
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:169
 msgid "_Synchronize"
 msgstr "_Sincronizar"
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:170
 msgid "_Yes"
 msgstr "_Si"
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:171
 msgid "{0}"
 msgstr "{0}"
 
@@ -13280,27 +13376,27 @@ msgid "Subject - Trimmed"
 msgstr "Asunto - Recortado"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1562
+#: ../modules/mail/e-mail-shell-view-actions.c:1552
 msgid "Body contains"
 msgstr "O corpo contén"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1569
+#: ../modules/mail/e-mail-shell-view-actions.c:1559
 msgid "Message contains"
 msgstr "A mensaxe contén"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1576
+#: ../modules/mail/e-mail-shell-view-actions.c:1566
 msgid "Recipients contain"
 msgstr "Os destinatarios conteñen"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1583
+#: ../modules/mail/e-mail-shell-view-actions.c:1573
 msgid "Sender contains"
 msgstr "O remitente contén"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1590
+#: ../modules/mail/e-mail-shell-view-actions.c:1580
 msgid "Subject contains"
 msgstr "O asunto contén"
 
@@ -13308,7 +13404,7 @@ msgstr "O asunto contén"
 msgid "Subject or Addresses contains"
 msgstr "O asunto ou os enderezos conteñen"
 
-#: ../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."
@@ -13316,7 +13412,7 @@ msgstr ""
 "Seleccionar esta opción significa que o Evolution só conectará co servidor "
 "LDAP se o servidor LDAP é compatíbel con SSL."
 
-#: ../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."
@@ -13324,7 +13420,7 @@ msgstr ""
 "Seleccionar esta opción significa que o Evolution só conectará co servidor "
 "LDAP se o servidor LDAP é compatíbel co TLS."
 
-#: ../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 "
@@ -13334,16 +13430,16 @@ msgstr ""
 "TLS. Isto significa que a conexión será insegura e que vostede será "
 "vulnerábel aos fallos de seguranza."
 
-#: ../modules/addressbook/addressbook-config.c:641
+#: ../modules/addressbook/addressbook-config.c:638
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "U_sar no calendario de aniversarios"
 
-#: ../modules/addressbook/addressbook-config.c:683
+#: ../modules/addressbook/addressbook-config.c:680
 msgid "Copy _book content locally for offline operation"
 msgstr ""
 "Copiar o contido da a_xenda de enderezos localmente para operar sen conexión"
 
-#: ../modules/addressbook/addressbook-config.c:798
+#: ../modules/addressbook/addressbook-config.c:795
 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 "
@@ -13353,7 +13449,7 @@ msgstr ""
 "Proporcionouse unha lista de portos estándar. Pregunte ao administrador do "
 "sistema que porto debería indicar."
 
-#: ../modules/addressbook/addressbook-config.c:879
+#: ../modules/addressbook/addressbook-config.c:876
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -13362,7 +13458,7 @@ msgstr ""
 "Este é o método que o Evolution usará para autenticalo a vostede. Definir "
 "isto como «Enderezo de correo» require o acceso anónimo ao servidor LDAP."
 
-#: ../modules/addressbook/addressbook-config.c:962
+#: ../modules/addressbook/addressbook-config.c:959
 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 "
@@ -13374,29 +13470,29 @@ msgstr ""
 "todas as entradas por embaixo da súa base de busca. Un ámbito «un» só "
 "incluirá as entradas un nivel por embaixo da súa base."
 
-#: ../modules/addressbook/addressbook-config.c:1086
+#: ../modules/addressbook/addressbook-config.c:1083
 msgid "Server Information"
 msgstr "Información do servidor"
 
-#: ../modules/addressbook/addressbook-config.c:1091
+#: ../modules/addressbook/addressbook-config.c:1088
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Información"
 
-#: ../modules/addressbook/addressbook-config.c:1092
+#: ../modules/addressbook/addressbook-config.c:1089
 #: ../modules/mail/e-mail-shell-view.c:58
 msgid "Searching"
 msgstr "Buscando"
 
-#: ../modules/addressbook/addressbook-config.c:1094
+#: ../modules/addressbook/addressbook-config.c:1091
 msgid "Downloading"
 msgstr "Descargando"
 
-#: ../modules/addressbook/addressbook-config.c:1309
+#: ../modules/addressbook/addressbook-config.c:1306
 msgid "Address Book Properties"
 msgstr "Propiedades da axenda de enderezos"
 
-#: ../modules/addressbook/addressbook-config.c:1311
+#: ../modules/addressbook/addressbook-config.c:1308
 msgid "New Address Book"
 msgstr "Nova axenda de enderezos"
 
@@ -13425,34 +13521,38 @@ msgid "EFolderList XML for the list of completion URIs."
 msgstr "EFolderList XML para a lista de completado dos URIs."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "Enable address formatting"
+msgstr "Activar formatado de enderezos"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
 msgid "Position of the contact preview pane when oriented horizontally."
 msgstr ""
 "Posición do panel de vista previa de contactos cando se dispoña "
 "horizontalmente."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
 msgid "Position of the contact preview pane when oriented vertically."
 msgstr ""
 "Posición do panel de vista previa de contactos cando se dispoña "
 "verticalmente."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid "Primary address book"
 msgstr "Axenda de enderezos primaria"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
 msgid "Show autocompleted name with an address"
 msgstr "Mostrar o nome completado automaticamente co enderezo"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
 msgid "Show maps"
 msgstr "Mostrar mapas"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid "Show preview pane"
 msgstr "Mostrar o panel de vista previa"
 
-#: ../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."
@@ -13460,7 +13560,7 @@ msgstr ""
 "O UID da axenda de enderezos seleccionada (ou a primaria) na barra lateral "
 "da vista de «Contactos»."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. \"0\" (Classic View) places the preview pane below the "
@@ -13472,7 +13572,7 @@ msgstr ""
 "previa embaixo da lista de contactos. «1» (vista vertical) mostra o panel de "
 "vista previa ao lado da lista de contactos."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -13480,17 +13580,25 @@ msgstr ""
 "O número de caracteres que deben teclearse antes de que o Evolution tente "
 "completar automaticamente."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 "O URI para o cartafol usado por última vez no diálogo de selección de nomes"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid "URI for the folder last used in the select names dialog."
 msgstr ""
 "O URI para o cartafol usado por última vez no diálogo de selección de nomes."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+msgid ""
+"Whether addresses should be formatted according to standard in their "
+"destination country."
+msgstr ""
+"Indica se se deben formatar os enderezos segundo o estándar do país de "
+"destino."
+
+#: ../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."
@@ -13498,11 +13606,11 @@ msgstr ""
 "Indica se forzar a vista do enderezo de correo co nome do contacto "
 "completado automaticamente na entrada."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:21
 msgid "Whether to show maps in preview pane."
 msgstr "Indica se se mostran os mapas no panel de vista previa."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:22
 msgid "Whether to show the preview pane."
 msgstr "Indica se mostrar o panel de vista previa."
 
@@ -13513,10 +13621,18 @@ msgid "_Table column:"
 msgstr "Columna da _táboa:"
 
 #: ../modules/addressbook/autocompletion-config.c:197
+msgid "Address formatting"
+msgstr "Formatado de enderezos"
+
+#: ../modules/addressbook/autocompletion-config.c:200
+msgid "_Format address according to standard of its destination country"
+msgstr "_Formatar enderezos segundo o estándar do país de destino"
+
+#: ../modules/addressbook/autocompletion-config.c:209
 msgid "Autocompletion"
 msgstr "Completado automático"
 
-#: ../modules/addressbook/autocompletion-config.c:200
+#: ../modules/addressbook/autocompletion-config.c:212
 msgid "Always _show address of the autocompleted contact"
 msgstr "Mo_strar sempre o enderezo do contacto completado automaticamente"
 
@@ -13561,7 +13677,7 @@ msgstr "Crear unha axenda de enderezos nova"
 #: ../modules/addressbook/e-book-shell-view.c:405
 #: ../modules/calendar/e-cal-shell-backend.c:115
 #: ../modules/calendar/e-cal-shell-migrate.c:63
-#: ../modules/online-accounts/e-online-accounts-google.c:366
+#: ../modules/online-accounts/e-online-accounts-google.c:369
 msgid "Contacts"
 msgstr "Contactos"
 
@@ -13624,7 +13740,7 @@ msgstr ""
 #: ../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:1199
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
 msgid "_Rename..."
 msgstr "_Renomear…"
 
@@ -13705,7 +13821,7 @@ msgstr "_Accións"
 #: ../modules/addressbook/e-book-shell-view-actions.c:940
 #: ../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:1357
+#: ../modules/mail/e-mail-shell-view-actions.c:1347
 msgid "_Preview"
 msgstr "Vista _previa"
 
@@ -13743,7 +13859,7 @@ msgstr "Mostrar mapas na xanela de vista previa de contactos"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1018
 #: ../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:1472
+#: ../modules/mail/e-mail-shell-view-actions.c:1462
 msgid "_Classic View"
 msgstr "Vista _clásica"
 
@@ -13754,7 +13870,7 @@ msgstr "Mostrar a vista previa do contacto embaixo da lista de contactos"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1025
 #: ../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:1479
+#: ../modules/mail/e-mail-shell-view-actions.c:1469
 msgid "_Vertical View"
 msgstr "Vista _vertical"
 
@@ -13770,18 +13886,18 @@ msgid "Any Category"
 msgstr "Calquera categoría"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1042
-#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../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 "Sen coincidencias"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1052
-#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../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:1555
-#: ../shell/e-shell-content.c:666
+#: ../modules/mail/e-mail-shell-view-actions.c:1545
+#: ../shell/e-shell-content.c:664
 msgid "Advanced Search"
 msgstr "Busca avanzada"
 
@@ -15185,27 +15301,31 @@ msgstr "Citas activas"
 msgid "Next 7 Days' Appointments"
 msgstr "Citas dos próximos sete días"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1734
+#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+msgid "Occurs Less Than 5 Times"
+msgstr "Acontece menos de 5 veces"
+
+#: ../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 "A descrición contén"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1741
+#: ../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 "O resumo contén"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1753
+#: ../modules/calendar/e-cal-shell-view-actions.c:1760
 msgid "Print this calendar"
 msgstr "Imprimir este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1760
+#: ../modules/calendar/e-cal-shell-view-actions.c:1767
 msgid "Preview the calendar to be printed"
 msgstr "Previsualizar o calendario que se vai imprimir"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1782
+#: ../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
@@ -15213,7 +15333,7 @@ msgstr "Previsualizar o calendario que se vai imprimir"
 msgid "_Save as iCalendar..."
 msgstr "Gardar como iCalendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1859
+#: ../modules/calendar/e-cal-shell-view-actions.c:1866
 msgid "Go To"
 msgstr "Ir a"
 
@@ -15610,11 +15730,11 @@ msgid_plural "%d tasks"
 msgstr[0] "%d tarefa"
 msgstr[1] "%d tarefas"
 
-#: ../modules/mail/em-account-prefs.c:219
+#: ../modules/mail/em-account-prefs.c:258
 msgid "Evolution Account Assistant"
 msgstr "Asistente de contas do Evolution"
 
-#: ../modules/mail/em-account-prefs.c:268
+#: ../modules/mail/em-account-prefs.c:307
 msgid "Account Editor"
 msgstr "Editor de contas"
 
@@ -15643,316 +15763,316 @@ msgstr "Carta_fol de correo"
 msgid "Create a new mail folder"
 msgstr "Crear un novo cartafol de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:412
+#: ../modules/mail/e-mail-shell-backend.c:409
 msgid "Mail Accounts"
 msgstr "Contas de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:420
+#: ../modules/mail/e-mail-shell-backend.c:417
 msgid "Mail Preferences"
 msgstr "Preferencias de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:428
+#: ../modules/mail/e-mail-shell-backend.c:425
 msgid "Composer Preferences"
 msgstr "Preferencias do editor"
 
-#: ../modules/mail/e-mail-shell-backend.c:436
+#: ../modules/mail/e-mail-shell-backend.c:433
 msgid "Network Preferences"
 msgstr "Preferencias de rede"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1115
+#: ../modules/mail/e-mail-shell-view-actions.c:1105
 #: ../modules/mail/e-mail-shell-view.c:960
 msgid "_Disable Account"
 msgstr "_Desactivar a conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1117
+#: ../modules/mail/e-mail-shell-view-actions.c:1107
 msgid "Disable this account"
 msgstr "Desactivar esta conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1124
+#: ../modules/mail/e-mail-shell-view-actions.c:1114
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr ""
 "Eliminar permanentemente todas as mensaxes eliminadas de todos os cartafoles"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1129
+#: ../modules/mail/e-mail-shell-view-actions.c:1119
 msgid "_Download Messages for Offline Usage"
 msgstr "_Descargar as mensaxes para o uso sen conexión"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1131
+#: ../modules/mail/e-mail-shell-view-actions.c:1121
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Descargar as mensaxes das contas e cartafoles marcados para uso sen conexión"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1136
+#: ../modules/mail/e-mail-shell-view-actions.c:1126
 msgid "Fl_ush Outbox"
 msgstr "Lim_par a caixa de saída"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1143
+#: ../modules/mail/e-mail-shell-view-actions.c:1133
 msgid "_Copy Folder To..."
 msgstr "_Copiar o cartafol a…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1145
+#: ../modules/mail/e-mail-shell-view-actions.c:1135
 msgid "Copy the selected folder into another folder"
 msgstr "Copiar o cartafol seleccionado noutro cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1152
+#: ../modules/mail/e-mail-shell-view-actions.c:1142
 msgid "Permanently remove this folder"
 msgstr "Eliminar permanentemente este cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1157
+#: ../modules/mail/e-mail-shell-view-actions.c:1147
 msgid "E_xpunge"
 msgstr "Com_pactar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1149
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Eliminar permanentemente as mensaxes eliminadas deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1154
 msgid "Mar_k All Messages as Read"
 msgstr "Ma_rcar todas as mensaxes como lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1156
 msgid "Mark all messages in the folder as read"
 msgstr "Marcar todas as mensaxes do cartafol como lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1171
+#: ../modules/mail/e-mail-shell-view-actions.c:1161
 msgid "_Move Folder To..."
 msgstr "_Mover o cartafol a…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1173
+#: ../modules/mail/e-mail-shell-view-actions.c:1163
 msgid "Move the selected folder into another folder"
 msgstr "Mover o cartafol seleccionado a outro cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1178
+#: ../modules/mail/e-mail-shell-view-actions.c:1168
 msgid "_New..."
 msgstr "_Novo…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view-actions.c:1170
 msgid "Create a new folder for storing mail"
 msgstr "Crear un cartafol novo para gardar o correo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1177
 msgid "Change the properties of this folder"
 msgstr "Modificar as propiedades deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1184
 msgid "Refresh the folder"
 msgstr "Actualizar o cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../modules/mail/e-mail-shell-view-actions.c:1191
 msgid "Change the name of this folder"
 msgstr "Modificar o nome deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1206
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
 msgid "Select Message _Thread"
 msgstr "Seleccionar a _conversa desta mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1208
+#: ../modules/mail/e-mail-shell-view-actions.c:1198
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 "Seleccionar todas as mensaxes da mesma conversa que a mensaxe seleccionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
 msgid "Select Message S_ubthread"
 msgstr "Seleccionar a conversa sec_undaria desta mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
 msgid "Select all replies to the currently selected message"
 msgstr "Seleccionar todas as respostas á mensaxe seleccionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1227
+#: ../modules/mail/e-mail-shell-view-actions.c:1217
 msgid "Empty _Trash"
 msgstr "Baleirar o _lixo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr ""
 "Eliminar permanentemente todas as mensaxes eliminadas de todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
 msgid "_New Label"
 msgstr "Etiqueta _nova"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1243
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "N_one"
 msgstr "Nin_gún"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1257
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "_Manage Subscriptions"
 msgstr "Xestionar as _subscricións"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
-#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#: ../modules/mail/e-mail-shell-view-actions.c:1249
+#: ../modules/mail/e-mail-shell-view-actions.c:1326
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 "Subscribir ou eliminar as subscricións a cartafoles en servidores remotos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1264
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "Send / _Receive"
 msgstr "Enviar / _Recibir"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1256
 msgid "Send queued items and retrieve new items"
 msgstr "Enviar os elementos da cola e obter os elementos novos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "R_eceive All"
 msgstr "R_ecibir todos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
+#: ../modules/mail/e-mail-shell-view-actions.c:1263
 msgid "Receive new items from all accounts"
 msgstr "Recibir os elementos novos de todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
 msgid "_Send All"
 msgstr "_Enviar todos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1270
 msgid "Send queued items in all accounts"
 msgstr "Enviar os elementos da cola de todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
 #: ../widgets/misc/e-activity-proxy.c:310
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1308
+#: ../modules/mail/e-mail-shell-view-actions.c:1298
 msgid "Cancel the current mail operation"
 msgstr "Cancelar a operación de correo actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1313
+#: ../modules/mail/e-mail-shell-view-actions.c:1303
 msgid "Collapse All _Threads"
 msgstr "Pregar todos as _conversas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1315
+#: ../modules/mail/e-mail-shell-view-actions.c:1305
 msgid "Collapse all message threads"
 msgstr "Pregar todos as conversas da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/mail/e-mail-shell-view-actions.c:1310
 msgid "E_xpand All Threads"
 msgstr "D_espregar todas as conversas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1322
+#: ../modules/mail/e-mail-shell-view-actions.c:1312
 msgid "Expand all message threads"
 msgstr "Despregar todas as conversas da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1327
+#: ../modules/mail/e-mail-shell-view-actions.c:1317
 msgid "_Message Filters"
 msgstr "Filtros de _mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
+#: ../modules/mail/e-mail-shell-view-actions.c:1319
 msgid "Create or edit rules for filtering new mail"
 msgstr "Crear ou editar regras para o filtrado do correo novo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
 msgid "_Subscriptions..."
 msgstr "_Subscricións…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1343
+#: ../modules/mail/e-mail-shell-view-actions.c:1333
 msgid "F_older"
 msgstr "Cartaf_ol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1350
+#: ../modules/mail/e-mail-shell-view-actions.c:1340
 msgid "_Label"
 msgstr "_Etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1367
+#: ../modules/mail/e-mail-shell-view-actions.c:1357
 msgid "C_reate Search Folder From Search..."
 msgstr "C_rear un cartafol de busca a partir da busca…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1374
+#: ../modules/mail/e-mail-shell-view-actions.c:1364
 msgid "Search F_olders"
 msgstr "Cartaf_oles de busca"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1376
+#: ../modules/mail/e-mail-shell-view-actions.c:1366
 msgid "Create or edit search folder definitions"
 msgstr "Crear ou editar as definicións dos cartafoles de busca"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1407
+#: ../modules/mail/e-mail-shell-view-actions.c:1397
 msgid "_New Folder..."
 msgstr "Cartafol _novo…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1435
+#: ../modules/mail/e-mail-shell-view-actions.c:1425
 msgid "Show Message _Preview"
 msgstr "Mostrar a vista _previa da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1437
+#: ../modules/mail/e-mail-shell-view-actions.c:1427
 msgid "Show message preview pane"
 msgstr "Mostrar o panel de vista previa das mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1443
+#: ../modules/mail/e-mail-shell-view-actions.c:1433
 msgid "Show _Deleted Messages"
 msgstr "Mostrar as mensaxes _eliminadas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1445
+#: ../modules/mail/e-mail-shell-view-actions.c:1435
 msgid "Show deleted messages with a line through them"
 msgstr "Mostrar as mensaxes eliminadas riscándoas."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1451
+#: ../modules/mail/e-mail-shell-view-actions.c:1441
 msgid "_Group By Threads"
 msgstr "A_grupar por conversas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1453
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
 msgid "Threaded message list"
 msgstr "Lista de mensaxes por conversas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1474
+#: ../modules/mail/e-mail-shell-view-actions.c:1464
 msgid "Show message preview below the message list"
 msgstr "Mostrar a vista previa da mensaxe embaixo da lista de mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1481
+#: ../modules/mail/e-mail-shell-view-actions.c:1471
 msgid "Show message preview alongside the message list"
 msgstr "Mostrar a vista previa da mensaxe a carón da lista de mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1489
+#: ../modules/mail/e-mail-shell-view-actions.c:1479
 msgid "All Messages"
 msgstr "Todas as mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1496
+#: ../modules/mail/e-mail-shell-view-actions.c:1486
 msgid "Important Messages"
 msgstr "Mensaxes importantes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1503
+#: ../modules/mail/e-mail-shell-view-actions.c:1493
 msgid "Last 5 Days' Messages"
 msgstr "Mensaxes dos últimos 5 días"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1510
+#: ../modules/mail/e-mail-shell-view-actions.c:1500
 msgid "Messages Not Junk"
 msgstr "Mensaxes que non son lixo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1517
+#: ../modules/mail/e-mail-shell-view-actions.c:1507
 msgid "Messages with Attachments"
 msgstr "Mensaxes con anexos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1524
+#: ../modules/mail/e-mail-shell-view-actions.c:1514
 msgid "No Label"
 msgstr "Sen etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1531
+#: ../modules/mail/e-mail-shell-view-actions.c:1521
 msgid "Read Messages"
 msgstr "Mensaxes lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1538
+#: ../modules/mail/e-mail-shell-view-actions.c:1528
 msgid "Recent Messages"
 msgstr "Mensaxes recentes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1545
+#: ../modules/mail/e-mail-shell-view-actions.c:1535
 msgid "Unread Messages"
 msgstr "Mensaxes sen ler"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1597
+#: ../modules/mail/e-mail-shell-view-actions.c:1587
 msgid "Subject or Addresses contain"
 msgstr "O asunto ou os enderezos conteñen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1607
+#: ../modules/mail/e-mail-shell-view-actions.c:1597
 msgid "All Accounts"
 msgstr "Todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1614
+#: ../modules/mail/e-mail-shell-view-actions.c:1604
 msgid "Current Account"
 msgstr "Conta actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
+#: ../modules/mail/e-mail-shell-view-actions.c:1611
 msgid "Current Folder"
 msgstr "Cartafol actual"
 
@@ -16029,18 +16149,18 @@ msgstr[1] "%d en total"
 msgid "Trash"
 msgstr "Lixo"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1542
+#: ../modules/mail/e-mail-shell-view-private.c:1544
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ../modules/mail/em-composer-prefs.c:495
-#: ../modules/plugin-manager/evolution-plugin-manager.c:361
-#: ../plugins/publish-calendar/publish-calendar.c:857
-#: ../widgets/misc/e-account-tree-view.c:224
+#: ../modules/mail/em-composer-prefs.c:498
+#: ../modules/plugin-manager/evolution-plugin-manager.c:360
+#: ../plugins/publish-calendar/publish-calendar.c:849
+#: ../widgets/misc/e-account-tree-view.c:385
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../modules/mail/em-composer-prefs.c:499
+#: ../modules/mail/em-composer-prefs.c:502
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
@@ -16133,33 +16253,33 @@ msgstr ""
 "Esta opción conectara co servidor a través do servizo de Contas en liña de "
 "GNOME"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:70
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
 msgid "Author(s)"
 msgstr "Autoría"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:256
+#: ../modules/plugin-manager/evolution-plugin-manager.c:255
 msgid "Plugin Manager"
 msgstr "Xestor de engadidos"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:271
+#: ../modules/plugin-manager/evolution-plugin-manager.c:270
 msgid "Note: Some changes will not take effect until restart"
 msgstr ""
 "Nota: algunhas modificacións non serán efectivas até que reinicie o programa"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:300
+#: ../modules/plugin-manager/evolution-plugin-manager.c:299
 msgid "Overview"
 msgstr "Visión xeral"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:369
-#: ../modules/plugin-manager/evolution-plugin-manager.c:452
+#: ../modules/plugin-manager/evolution-plugin-manager.c:368
+#: ../modules/plugin-manager/evolution-plugin-manager.c:451
 msgid "Plugin"
 msgstr "Engadido"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:490
+#: ../modules/plugin-manager/evolution-plugin-manager.c:489
 msgid "_Plugins"
 msgstr "_Engadidos"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:491
+#: ../modules/plugin-manager/evolution-plugin-manager.c:490
 msgid "Enable and disable plugins"
 msgstr "Activar e desactivar os engadidos"
 
@@ -16344,25 +16464,25 @@ msgstr "Son inserido"
 msgid "Play audio attachments directly in mail messages."
 msgstr "Reproducir os anexos de son directamente nas mensaxes de correo."
 
-#: ../plugins/backup-restore/backup-restore.c:192
+#: ../plugins/backup-restore/backup-restore.c:223
 msgid "Select name of the Evolution backup file"
 msgstr "Seleccionar o nome do ficheiro de copia de seguranza do Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:225
+#: ../plugins/backup-restore/backup-restore.c:256
 msgid "_Restart Evolution after backup"
 msgstr "_Reiniciar o Evolution despois de facer unha copia de seguranza"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:283
 msgid "Select name of the Evolution backup file to restore"
 msgstr ""
 "Seleccionar o nome do ficheiro da copia de seguranza do Evolution para "
 "restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:264
+#: ../plugins/backup-restore/backup-restore.c:296
 msgid "_Restart Evolution after restore"
 msgstr "_Reiniciar o Evolution despois de restabelecer"
 
-#: ../plugins/backup-restore/backup-restore.c:337
+#: ../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 "
@@ -16372,35 +16492,35 @@ msgstr ""
 "restaurar todos os correos, calendarios, tarefas, notas e contactos. Tamén "
 "restabelecerá todas as configuracións persoais, filtros de correo, etc."
 
-#: ../plugins/backup-restore/backup-restore.c:344
+#: ../plugins/backup-restore/backup-restore.c:393
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restaurar Evolution desde a copia de seguranza"
 
-#: ../plugins/backup-restore/backup-restore.c:351
+#: ../plugins/backup-restore/backup-restore.c:403
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Seleccionar o arquivo do Evolution para restabelecer:"
 
-#: ../plugins/backup-restore/backup-restore.c:354
+#: ../plugins/backup-restore/backup-restore.c:407
 msgid "Choose a file to restore"
 msgstr "Escoller un ficheiro para restabelecer"
 
-#: ../plugins/backup-restore/backup-restore.c:362
+#: ../plugins/backup-restore/backup-restore.c:421
 msgid "Restore from backup"
 msgstr "Restabelecer desde unha copia de seguranza"
 
-#: ../plugins/backup-restore/backup-restore.c:402
+#: ../plugins/backup-restore/backup-restore.c:468
 msgid "_Back up Evolution Data..."
 msgstr "Fa_cer unha copia de seguranza dos datos do Evolution…"
 
-#: ../plugins/backup-restore/backup-restore.c:404
+#: ../plugins/backup-restore/backup-restore.c:470
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Facer unha copia de seguranza dos datos e os axustes do Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:409
+#: ../plugins/backup-restore/backup-restore.c:475
 msgid "R_estore Evolution Data..."
 msgstr "R_estabelecer os datos do Evolution…"
 
-#: ../plugins/backup-restore/backup-restore.c:411
+#: ../plugins/backup-restore/backup-restore.c:477
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Restabelecer os datos e os axustes do Evolution desde un ficheiro"
 
@@ -16425,86 +16545,85 @@ msgid "With Graphical User Interface"
 msgstr "Con interface gráfica de usuario"
 
 #. FIXME Will the versioned setting always work?
-#: ../plugins/backup-restore/backup.c:299
-#: ../plugins/backup-restore/backup.c:418
+#: ../plugins/backup-restore/backup.c:300
+#: ../plugins/backup-restore/backup.c:424
 msgid "Shutting down Evolution"
 msgstr "Pechando o Evolution"
 
-#: ../plugins/backup-restore/backup.c:308
+#: ../plugins/backup-restore/backup.c:309
 msgid "Backing Evolution accounts and settings"
 msgstr "Facendo unha copia de seguranza das contas e axustes do Evolution"
 
-#: ../plugins/backup-restore/backup.c:318
+#: ../plugins/backup-restore/backup.c:321
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Facendo unha copia de seguranza dos datos do Evolution (correos, contactos, "
 "calendarios, tarefas e notas)"
 
-#: ../plugins/backup-restore/backup.c:331
+#: ../plugins/backup-restore/backup.c:337
 msgid "Back up complete"
 msgstr "Copia de seguranza completada"
 
-#: ../plugins/backup-restore/backup.c:338
-#: ../plugins/backup-restore/backup.c:527
+#: ../plugins/backup-restore/backup.c:344
+#: ../plugins/backup-restore/backup.c:560
 msgid "Restarting Evolution"
 msgstr "Reiniciando o Evolution"
 
-#: ../plugins/backup-restore/backup.c:424
+#: ../plugins/backup-restore/backup.c:430
 msgid "Back up current Evolution data"
 msgstr "Facer unha copia de seguranza dos datos actuais do Evolution"
 
-#: ../plugins/backup-restore/backup.c:432
+#: ../plugins/backup-restore/backup.c:438
 msgid "Extracting files from back up"
 msgstr "Extraendo os ficheiros desde a copia de seguranza"
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:505
 msgid "Loading Evolution settings"
 msgstr "Cargando os axustes do Evolution"
 
-#: ../plugins/backup-restore/backup.c:508
+#: ../plugins/backup-restore/backup.c:541
 msgid "Removing temporary back up files"
 msgstr "Eliminando os ficheiros temporais da copia de seguranza"
 
-#: ../plugins/backup-restore/backup.c:520
+#: ../plugins/backup-restore/backup.c:553
 msgid "Ensuring local sources"
 msgstr "Asegurando as fontes locais"
 
-#: ../plugins/backup-restore/backup.c:707
+#: ../plugins/backup-restore/backup.c:748
+msgid "Evolution Back Up"
+msgstr "Respaldo de Evolution"
+
+#: ../plugins/backup-restore/backup.c:749
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Facendo a copia de seguranza no cartafol %s"
 
-#: ../plugins/backup-restore/backup.c:712
+#: ../plugins/backup-restore/backup.c:754
+msgid "Evolution Restore"
+msgstr "Restabelecemento do Evolution"
+
+#: ../plugins/backup-restore/backup.c:755
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restabelecendo desde o cartafol %s"
 
-#. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:736
-msgid "Evolution Back up"
-msgstr "Copia de seguranza do Evolution"
-
-#: ../plugins/backup-restore/backup.c:736
-msgid "Evolution Restore"
-msgstr "Restabelecemento do Evolution"
-
-#: ../plugins/backup-restore/backup.c:774
+#: ../plugins/backup-restore/backup.c:824
 msgid "Backing up Evolution Data"
 msgstr "Facendo unha copia de seguranza dos datos do Evolution"
 
-#: ../plugins/backup-restore/backup.c:775
+#: ../plugins/backup-restore/backup.c:825
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Agarde mentres o Evolution fai unha copia de seguranza dos datos."
 
-#: ../plugins/backup-restore/backup.c:777
+#: ../plugins/backup-restore/backup.c:827
 msgid "Restoring Evolution Data"
 msgstr "Restabelecendo os datos do Evolution"
 
-#: ../plugins/backup-restore/backup.c:778
+#: ../plugins/backup-restore/backup.c:828
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Agarde mentres o Evolution restabelece os datos."
 
-#: ../plugins/backup-restore/backup.c:796
+#: ../plugins/backup-restore/backup.c:846
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Isto podería levar algún tempo dependendo da cantidade de datos da súa conta."
@@ -16526,10 +16645,10 @@ msgstr "Está seguro de que desexa pechar o Evolution?"
 
 #: ../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 ""
-"Está seguro de restabelecer o Evolution desde a copia de seguranza "
-"seleccionada?"
+"Ten certeza de que quere restaurar Evolution desde o ficheiro de respaldo "
+"seleccionado?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid "Close and Back up Evolution"
@@ -16544,13 +16663,12 @@ msgid "Insufficient Permissions"
 msgstr "Permisos insuficientes"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-msgid "Invalid Evolution back up file"
-msgstr "O ficheiro de copia de seguranza do Evolution non é válido"
+msgid "Invalid Evolution backup file"
+msgstr "Ficheiro de respaldo de Evolution non válido"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid "Please select a valid back up file to restore."
-msgstr ""
-"Seleccione un ficheiro de copia de seguranza correcto para restabelecer."
+msgid "Please select a valid backup file to restore."
+msgstr "Seleccione un ficheiro de respaldo válido que restaurar."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid "The selected folder is not writable."
@@ -16568,13 +16686,13 @@ 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 ""
-"Para restabelecer os datos e axustes, primeiro debe pechar o Evolution. "
-"Asegúrese de gardar todos os datos antes de continuar. Isto eliminará todos "
-"os datos e axustes actuais do Evolution e restabeleceraos desde a copia de "
-"seguranza."
+"Para restaurar os datos e a súa configuración, primeiro debe pechar "
+"Evolution. Asegúrese de gardar todos os datos antes de continuar. Isto "
+"eliminará todos os datos e axustes actuais do Evolution e restauraráos desde "
+"o seu respaldo."
 
 #: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
@@ -16745,7 +16863,7 @@ msgstr "Usar conexión _segura"
 
 #: ../plugins/caldav/caldav-source.c:249
 #: ../plugins/google-account-setup/google-contacts-source.c:337
-#: ../plugins/google-account-setup/google-source.c:669
+#: ../plugins/google-account-setup/google-source.c:660
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:269
 msgid "User_name:"
 msgstr "_Nome do usuario:"
@@ -16759,7 +16877,7 @@ msgstr "Busca un cal_endario no servidor"
 #: ../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:675
+#: ../plugins/google-account-setup/google-source.c:666
 msgid "Re_fresh:"
 msgstr "Actuali_zar:"
 
@@ -16902,23 +17020,23 @@ msgstr "Importar o DBX do Outlook"
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr "Cartafol persoal do Outlook Express 5/6 (.dbx)"
 
-#: ../plugins/default-source/default-source.c:168
+#: ../plugins/default-source/default-source.c:169
 msgid "Mark as _default address book"
 msgstr "Marcar como axenda de enderezos pre_definida"
 
-#: ../plugins/default-source/default-source.c:182
+#: ../plugins/default-source/default-source.c:183
 msgid "A_utocomplete with this address book"
 msgstr "Completar a_utomaticamente con esta axenda de enderezos"
 
-#: ../plugins/default-source/default-source.c:191
+#: ../plugins/default-source/default-source.c:192
 msgid "Mark as _default calendar"
 msgstr "Marcar como calendario pre_definido"
 
-#: ../plugins/default-source/default-source.c:192
+#: ../plugins/default-source/default-source.c:193
 msgid "Mark as _default task list"
 msgstr "Marcar como lista de tarefas pre_definida"
 
-#: ../plugins/default-source/default-source.c:193
+#: ../plugins/default-source/default-source.c:194
 msgid "Mark as _default memo list"
 msgstr "Marcar como a lista de notas pre_definida"
 
@@ -17169,14 +17287,14 @@ msgstr ""
 msgid "Server"
 msgstr "Servidor"
 
-#: ../plugins/google-account-setup/google-source.c:459
+#: ../plugins/google-account-setup/google-source.c:457
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "Introduza o contrasinal para que o usuario %s acceda á lista de calendarios "
 "subscritos."
 
-#: ../plugins/google-account-setup/google-source.c:576
+#: ../plugins/google-account-setup/google-source.c:569
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17185,17 +17303,17 @@ msgstr ""
 "Non é posíbel ler os datos desde o servidor do Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:576
-#: ../plugins/mail-to-task/mail-to-task.c:813
-#: ../plugins/mail-to-task/mail-to-task.c:1077
+#: ../plugins/google-account-setup/google-source.c:569
+#: ../plugins/mail-to-task/mail-to-task.c:820
+#: ../plugins/mail-to-task/mail-to-task.c:1084
 msgid "Unknown error."
 msgstr "Erro descoñecido."
 
-#: ../plugins/google-account-setup/google-source.c:679
+#: ../plugins/google-account-setup/google-source.c:670
 msgid "Cal_endar:"
 msgstr "Cal_endario:"
 
-#: ../plugins/google-account-setup/google-source.c:714
+#: ../plugins/google-account-setup/google-source.c:705
 msgid "Retrieve _List"
 msgstr "Obter a _lista"
 
@@ -17446,44 +17564,44 @@ msgstr ""
 "Para procesar todos estes elementos, debería gardarse o ficheiro e "
 "importarse o calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2672
+#: ../plugins/itip-formatter/itip-formatter.c:2665
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ningún"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2688
+#: ../plugins/itip-formatter/itip-formatter.c:2681
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2806
+#: ../plugins/itip-formatter/itip-formatter.c:2799
 msgid "This meeting recurs"
 msgstr "Esta cita repítese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2809
+#: ../plugins/itip-formatter/itip-formatter.c:2802
 msgid "This task recurs"
 msgstr "Esta tarefa repítese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2812
+#: ../plugins/itip-formatter/itip-formatter.c:2805
 msgid "This memo recurs"
 msgstr "Esta nota repítese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3036
+#: ../plugins/itip-formatter/itip-formatter.c:3029
 msgid "Meeting Invitations"
 msgstr "Convites a reunións"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:3061
+#: ../plugins/itip-formatter/itip-formatter.c:3054
 msgid "_Delete message after acting"
 msgstr "E_liminar a mensaxe despois da acción"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3071
-#: ../plugins/itip-formatter/itip-formatter.c:3104
+#: ../plugins/itip-formatter/itip-formatter.c:3064
+#: ../plugins/itip-formatter/itip-formatter.c:3097
 msgid "Conflict Search"
 msgstr "Busca de conflitos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:3086
+#: ../plugins/itip-formatter/itip-formatter.c:3079
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccionar os calendarios nos que buscar conflitos entre reunións"
 
@@ -17707,8 +17825,8 @@ msgstr "%s cancelou a seguinte reunión a través de %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
-msgid "%s has canceled the following meeting."
-msgstr "%s cancelou a seguinte reunión."
+msgid "%s has canceled the following meeting:"
+msgstr "%s cancelou a seguinte reunión:"
 
 #: ../plugins/itip-formatter/itip-view.c:418
 #, c-format
@@ -17717,8 +17835,8 @@ msgstr "%s propuxo as seguintes modificacións para a reunión a través de %s."
 
 #: ../plugins/itip-formatter/itip-view.c:420
 #, c-format
-msgid "%s has proposed the following meeting changes."
-msgstr "%s propuxo as seguintes modificacións para a reunión."
+msgid "%s has proposed the following meeting changes:"
+msgstr "%s propuxo os seguintes cambios para a reunión:"
 
 #: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
@@ -17727,8 +17845,8 @@ msgstr "%s rexeitou as seguintes modificacións para a reunión a través de %s:
 
 #: ../plugins/itip-formatter/itip-view.c:426
 #, c-format
-msgid "%s has declined the following meeting changes."
-msgstr "%s rexeitou as seguintes modificacións para a reunión."
+msgid "%s has declined the following meeting changes:"
+msgstr "%s rexeitou os seguintes cambios para a reunión:"
 
 #: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
@@ -18053,7 +18171,7 @@ msgid "Whether to notify new messages in Inbox folder only."
 msgstr ""
 "Indica se avisar das mensaxes novas só no cartafol da caixa de entrada."
 
-#: ../plugins/mail-notification/mail-notification.c:391
+#: ../plugins/mail-notification/mail-notification.c:392
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18070,56 +18188,56 @@ msgstr[1] ""
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:416
+#: ../plugins/mail-notification/mail-notification.c:417
 #, c-format
 msgid "Subject: %s"
 msgstr "Asunto: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:427
+#: ../plugins/mail-notification/mail-notification.c:428
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Recibiu %d mensaxe nova."
 msgstr[1] "Recibiu %d mensaxes novas."
 
-#: ../plugins/mail-notification/mail-notification.c:436
-#: ../plugins/mail-notification/mail-notification.c:444
-#: ../plugins/mail-notification/mail-notification.c:447
+#: ../plugins/mail-notification/mail-notification.c:437
+#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:448
 msgid "New email"
 msgstr "Novo correo"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:468
+#: ../plugins/mail-notification/mail-notification.c:469
 #, c-format
 msgid "Show %s"
 msgstr "Mostrar %s"
 
-#: ../plugins/mail-notification/mail-notification.c:673
+#: ../plugins/mail-notification/mail-notification.c:674
 msgid "_Play sound when a new message arrives"
 msgstr "Re_producir un son cando chegue correo novo"
 
-#: ../plugins/mail-notification/mail-notification.c:703
+#: ../plugins/mail-notification/mail-notification.c:704
 msgid "_Beep"
 msgstr "_Ton de aviso"
 
-#: ../plugins/mail-notification/mail-notification.c:716
+#: ../plugins/mail-notification/mail-notification.c:717
 msgid "Use sound _theme"
 msgstr "Usar un _tema sonoro"
 
-#: ../plugins/mail-notification/mail-notification.c:735
+#: ../plugins/mail-notification/mail-notification.c:736
 msgid "Play _file:"
 msgstr "Reproducir o _ficheiro:"
 
-#: ../plugins/mail-notification/mail-notification.c:744
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Select sound file"
 msgstr "Seleccionar un ficheiro de son"
 
-#: ../plugins/mail-notification/mail-notification.c:801
+#: ../plugins/mail-notification/mail-notification.c:802
 msgid "Notify new messages for _Inbox only"
 msgstr "Notificar as mensaxes novas só na caixa de _entrada"
 
-#: ../plugins/mail-notification/mail-notification.c:811
+#: ../plugins/mail-notification/mail-notification.c:812
 msgid "Show _notification when a new message arrives"
 msgstr "Mostrar _notificacións cando chegue correo novo"
 
@@ -18132,12 +18250,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Notificar a chegada de mensaxes novas."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:238
+#: ../plugins/mail-to-task/mail-to-task.c:239
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Creado desde un correo electrónico por %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:603
+#: ../plugins/mail-to-task/mail-to-task.c:610
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18146,7 +18264,7 @@ msgstr ""
 "O calendario seleccionado xa contén unha actividade «%s». Desexa editar a "
 "actividade antiga?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:606
+#: ../plugins/mail-to-task/mail-to-task.c:613
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18155,7 +18273,7 @@ msgstr ""
 "A lista de tarefas seleccionadas xa contén unha tarefa «%s». Desexa editar a "
 "tarefa antiga?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:609
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18164,7 +18282,7 @@ msgstr ""
 "A lista de notas seleccionada xa contén unha nota «%s» . Desexa editar a "
 "nota antiga?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:626
+#: ../plugins/mail-to-task/mail-to-task.c:633
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -18173,7 +18291,7 @@ msgstr ""
 "Seleccionou %d correos para convertelos en actividades. Desexa engadilos "
 "todos?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:629
+#: ../plugins/mail-to-task/mail-to-task.c:636
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -18181,7 +18299,7 @@ msgid ""
 msgstr ""
 "Seleccionou %d correos para convertelos en tarefas. Desexa engadilos todos?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:632
+#: ../plugins/mail-to-task/mail-to-task.c:639
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -18189,29 +18307,29 @@ msgid ""
 msgstr ""
 "Seleccionou %d correos para convertelos en notas. Desexa engadilos todos?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:651
+#: ../plugins/mail-to-task/mail-to-task.c:658
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Desexa continuar convertendo os correos restantes?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:726
+#: ../plugins/mail-to-task/mail-to-task.c:733
 msgid "[No Summary]"
 msgstr "[Sen resumo]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:745
 msgid "Invalid object returned from a server"
 msgstr "O obxecto devolto por un servidor non é válido"
 
-#: ../plugins/mail-to-task/mail-to-task.c:788
+#: ../plugins/mail-to-task/mail-to-task.c:795
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Produciuse un erro no proceso: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:813
+#: ../plugins/mail-to-task/mail-to-task.c:820
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Non é posíbel abrir o calendario. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:820
+#: ../plugins/mail-to-task/mail-to-task.c:827
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18219,7 +18337,7 @@ msgstr ""
 "A fonte seleccionada é só de lectura polo que non é posíbel crear "
 "actividades nela. Seleccione outra fonte."
 
-#: ../plugins/mail-to-task/mail-to-task.c:823
+#: ../plugins/mail-to-task/mail-to-task.c:830
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18227,7 +18345,7 @@ msgstr ""
 "A fonte seleccionada é só de lectura polo que non é posíbel crear tarefas "
 "nela. Seleccione outra fonte."
 
-#: ../plugins/mail-to-task/mail-to-task.c:826
+#: ../plugins/mail-to-task/mail-to-task.c:833
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18235,44 +18353,44 @@ msgstr ""
 "A fonte seleccionada é só de lectura polo que non é posíbel crear notas "
 "nela. Seleccione outra fonte."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1077
+#: ../plugins/mail-to-task/mail-to-task.c:1084
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Non é posíbel obter a lista fonte. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1138
+#: ../plugins/mail-to-task/mail-to-task.c:1147
 msgid "No writable calendar is available."
 msgstr "Non hai ningún calendario escribíbel dispoñíbel."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1230
+#: ../plugins/mail-to-task/mail-to-task.c:1239
 msgid "Create an _Event"
 msgstr "Cr_ear unha actividade"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1232
+#: ../plugins/mail-to-task/mail-to-task.c:1241
 msgid "Create a new event from the selected message"
 msgstr "Crear unha actividade nova a partir da mensaxe seleccionada"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1237
+#: ../plugins/mail-to-task/mail-to-task.c:1246
 msgid "Create a Mem_o"
 msgstr "Crear unha n_ota"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1239
+#: ../plugins/mail-to-task/mail-to-task.c:1248
 msgid "Create a new memo from the selected message"
 msgstr "Crear unha nota nova a partir da mensaxe seleccionada"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1244
+#: ../plugins/mail-to-task/mail-to-task.c:1253
 msgid "Create a _Task"
 msgstr "Crear unha _tarefa"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1246
+#: ../plugins/mail-to-task/mail-to-task.c:1255
 msgid "Create a new task from the selected message"
 msgstr "Crear unha tarefa nova a partir da mensaxe seleccionada"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1254
+#: ../plugins/mail-to-task/mail-to-task.c:1263
 msgid "Create a _Meeting"
 msgstr "Crear unha _reunión"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1256
+#: ../plugins/mail-to-task/mail-to-task.c:1265
 msgid "Create a new meeting from the selected message"
 msgstr "Crear unha reunión nova a partir da mensaxe seleccionada"
 
@@ -18445,7 +18563,7 @@ msgstr "No cartafol actual e nos _subcartafoles"
 msgid "In Current _Folder Only"
 msgstr "Só no carta_fol actual"
 
-#: ../plugins/mark-all-read/mark-all-read.c:575
+#: ../plugins/mark-all-read/mark-all-read.c:569
 msgid "Mark Me_ssages as Read"
 msgstr "Marcar as men_saxes como lidas"
 
@@ -18522,31 +18640,31 @@ msgstr "Importación do PST do Outlook"
 msgid "Outlook personal folders (.pst)"
 msgstr "Cartafoles persoais do Outlook (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:450
+#: ../plugins/pst-import/pst-importer.c:536
 msgid "_Mail"
 msgstr "_Correo"
 
-#: ../plugins/pst-import/pst-importer.c:469
+#: ../plugins/pst-import/pst-importer.c:555
 msgid "Destination folder:"
 msgstr "Cartafol de destino:"
 
-#: ../plugins/pst-import/pst-importer.c:475
+#: ../plugins/pst-import/pst-importer.c:562
 msgid "_Address Book"
 msgstr "_Axenda de enderezos"
 
-#: ../plugins/pst-import/pst-importer.c:476
+#: ../plugins/pst-import/pst-importer.c:567
 msgid "A_ppointments"
 msgstr "Ci_tas"
 
-#: ../plugins/pst-import/pst-importer.c:477 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:572 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tarefas"
 
-#: ../plugins/pst-import/pst-importer.c:478
+#: ../plugins/pst-import/pst-importer.c:577
 msgid "_Journal entries"
 msgstr "Entradas do _xornal"
 
-#: ../plugins/pst-import/pst-importer.c:585
+#: ../plugins/pst-import/pst-importer.c:688
 msgid "Importing Outlook data"
 msgstr "Importación de datos do Outlook"
 
@@ -18566,7 +18684,7 @@ msgid "Publish calendars to the web."
 msgstr "Publicar calendarios na web."
 
 #: ../plugins/publish-calendar/publish-calendar.c:216
-#: ../plugins/publish-calendar/publish-calendar.c:471
+#: ../plugins/publish-calendar/publish-calendar.c:463
 #, c-format
 msgid "Could not open %s:"
 msgstr "Non foi posíbel abrir %s:"
@@ -18586,28 +18704,28 @@ msgstr "Produciuse un erro ao publicar en %s:"
 msgid "Publishing to %s finished successfully"
 msgstr "Rematouse con éxito a publicación en %s"
 
-#: ../plugins/publish-calendar/publish-calendar.c:288
+#: ../plugins/publish-calendar/publish-calendar.c:284
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Produciuse un fallo ao montar %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:619
+#: ../plugins/publish-calendar/publish-calendar.c:611
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "E_nable"
 msgstr "A_ctivar"
 
-#: ../plugins/publish-calendar/publish-calendar.c:767
+#: ../plugins/publish-calendar/publish-calendar.c:759
 msgid "Are you sure you want to remove this location?"
 msgstr "Está seguro de que desexa eliminar esta localización?"
 
 #. 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:1099
+#: ../plugins/publish-calendar/publish-calendar.c:1091
 msgid "Could not create publish thread."
 msgstr "Non foi posíbel crear a conversa para publicar."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1107
+#: ../plugins/publish-calendar/publish-calendar.c:1099
 msgid "_Publish Calendar Information"
 msgstr "_Publicar a información do calendario"
 
@@ -18644,8 +18762,8 @@ msgid "Publishing _Frequency:"
 msgstr "_Frecuencia da publicación:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:15
-msgid "Secure FTP (SSH)"
-msgstr "FTP seguro (SSH)"
+msgid "Secure FTP (SFTP)"
+msgstr "FTP seguro (SFTP)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "Secure WebDAV (HTTPS)"
@@ -18793,7 +18911,7 @@ msgstr "_Encapsular valores con:"
 msgid "Comma separated values (.csv)"
 msgstr "Valores separados por comas (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:173 ../shell/e-shell-utils.c:225
+#: ../plugins/save-calendar/ical-format.c:173 ../shell/e-shell-utils.c:191
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -18884,29 +19002,29 @@ msgstr "vCards inseridas"
 msgid "Show vCards directly in mail messages."
 msgstr "Mostrar as vCards directamente nas mensaxes de correo."
 
-#: ../plugins/vcard-inline/vcard-inline.c:207
-#: ../plugins/vcard-inline/vcard-inline.c:292
+#: ../plugins/vcard-inline/vcard-inline.c:208
+#: ../plugins/vcard-inline/vcard-inline.c:293
 msgid "Show Full vCard"
 msgstr "Mostrar vCard completa"
 
-#: ../plugins/vcard-inline/vcard-inline.c:210
+#: ../plugins/vcard-inline/vcard-inline.c:211
 msgid "Show Compact vCard"
 msgstr "Mostrar vCard compacta"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../plugins/vcard-inline/vcard-inline.c:271
+#: ../plugins/vcard-inline/vcard-inline.c:272
 msgid "There is one other contact."
 msgstr "Hai outro contacto máis."
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../plugins/vcard-inline/vcard-inline.c:280
+#: ../plugins/vcard-inline/vcard-inline.c:281
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Hai %d contacto máis."
 msgstr[1] "Hai %d contactos máis."
 
-#: ../plugins/vcard-inline/vcard-inline.c:301
+#: ../plugins/vcard-inline/vcard-inline.c:302
 msgid "Save in Address Book"
 msgstr "Gardar na axenda de enderezos"
 
@@ -19017,14 +19135,6 @@ msgid "Initial attachment view"
 msgstr "Visión inicial do anexo"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:20
-msgid "Initial file chooser folder"
-msgstr "Cartafol inicial do seleccionador de ficheiros"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:21
-msgid "Initial folder for GtkFileChooser dialogs."
-msgstr "Cartafol inicial para os diálogos GtkFileChooser."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
@@ -19032,46 +19142,46 @@ msgstr ""
 "Vista inicial dos trebellos da barra de anexos. «0» é a vista de iconas, «1» "
 "é a vista en lista."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Last upgraded configuration version"
 msgstr "Última versión da configuración anovada"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Lista das rutas aos cartafoles que se sincronizarán co disco para o uso sen "
 "conexión"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Non-proxy hosts"
 msgstr "Servidores que non usan proxy"
 
-#: ../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 "Contrasinal requirido como autenticación ao usar o proxy HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Proxy configuration mode"
 msgstr "Modo de configuración do proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "SOCKS proxy host name"
 msgstr "Nome do servidor do proxy SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "SOCKS proxy port"
 msgstr "Porto do proxy SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Secure HTTP proxy host name"
 msgstr "Nome do servidor do proxy HTTP seguro"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Secure HTTP proxy port"
 msgstr "Porto do proxy HTTP seguro"
 
-#: ../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 "
@@ -19083,23 +19193,23 @@ msgstr ""
 "configuración manual do proxy» e «usar a configuración do proxy fornecida no "
 "url autoconfigurado» respectivamente."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Sidebar is visible"
 msgstr "A barra lateral está visíbel"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Skip development warning dialog"
 msgstr "Saltar o diálogo de aviso de desenvolvemento"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:314
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:310
 msgid "Start in offline mode"
 msgstr "Iniciar en modo sen conexión"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "Statusbar is visible"
 msgstr "A barra de estado é visíbel"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19107,27 +19217,27 @@ msgstr ""
 "A versión de configuración do Evolution, co nivel de configuración maior/"
 "menor (por exemplo «2.6.0»)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The default X coordinate for the main window."
 msgstr "A coordenada X predeterminada da xanela principal."
 
-#: ../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 "A coordenada Y predeterminada da xanela principal."
 
-#: ../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 "Altura predeterminada da xanela principal, en píxeles."
 
-#: ../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 "Largura predeterminada da xanela principal, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default width for the sidebar, in pixels."
 msgstr "Largura predeterminada da barra lateral, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../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\")."
@@ -19135,19 +19245,19 @@ msgstr ""
 "A última versión anovada da configuración do Evolution, con nivel de "
 "configuración maior/menor (por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The machine name to proxy HTTP through."
 msgstr "Nome da máquina a través da que usar o proxy HTTP."
 
-#: ../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 "Nome da máquina a través da que usar o proxy HTTP seguro."
 
-#: ../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 "Nome da máquina a través da que usar o proxy socks."
 
-#: ../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."
@@ -19155,7 +19265,7 @@ msgstr ""
 "Porto da máquina definido en «/apps/evolution/shell/network_config/"
 "http_host»  a través do que usar o proxy ."
 
-#: ../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."
@@ -19163,7 +19273,7 @@ msgstr ""
 "Porto da máquina definido en «/apps/evolution/shell/network_config/"
 "secure_host» a través do que usar o proxy ."
 
-#: ../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."
@@ -19171,7 +19281,7 @@ msgstr ""
 "Porto da máquina definido en «/apps/evolution/shell/network_config/"
 "socks_host» a través do que usar o proxy ."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../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 "
@@ -19181,7 +19291,7 @@ msgstr ""
 "de ferramentas». Se se selecciona «barra de ferramentas», o estilo dos "
 "botóns determinarao a configuración da barra de ferramentas do GNOME."
 
-#: ../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 "
@@ -19194,68 +19304,68 @@ msgstr ""
 "inicial como *.foo.com), enderezos IP de servidores (tanto IPv4 como IPv6) e "
 "enderezos de rede cunha máscara (do tipo 192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Toolbar is visible"
 msgstr "A barra de ferramentas está visíbel"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "URL that provides proxy configuration values."
 msgstr "O URL que proporciona os valores de configuración de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Use HTTP proxy"
 msgstr "Usar proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Username to pass as authentication when doing HTTP proxying."
 msgstr "Nome do usuario para pasar como autenticación ao usar un proxy HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Indica se o Evolution se iniciará en modo sen conexión en vez de en modo "
 "conectado."
 
-#: ../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 "Indica se a xanela debería ou non estar maximizada."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the sidebar should be visible."
 msgstr "Indica se a barra lateral está visíbel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether the status bar should be visible."
 msgstr "Indica se a barra de estado está visíbel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:60
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the toolbar should be visible."
 msgstr "Indica se a barra de ferramentas está visíbel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:61
+#: ../shell/apps_evolution_shell.schemas.in.h:59
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Indica se se salta o diálogo de aviso nas versións de desenvolvemento do "
 "Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:62
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "Whether the window buttons should be visible."
 msgstr "Indica se os botóns da xanela están visíbeis."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:63
+#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid "Window button style"
 msgstr "Estilo dos botóns de xanela"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:64
+#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Window buttons are visible"
 msgstr "Os botóns da xanela están visíbeis"
 
-#: ../shell/e-shell-content.c:729 ../shell/e-shell-content.c:730
+#: ../shell/e-shell-content.c:727 ../shell/e-shell-content.c:728
 msgid "Searches"
 msgstr "Buscas"
 
-#: ../shell/e-shell-content.c:773
+#: ../shell/e-shell-content.c:771
 msgid "Save Search"
 msgstr "Gardar a busca"
 
@@ -19263,27 +19373,27 @@ msgstr "Gardar a busca"
 #. * 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:937
 msgid "Sho_w:"
 msgstr "Mos_trar:"
 
 #. 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:970
 msgid "Sear_ch:"
 msgstr "Bus_car:"
 
 #. 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:1033
 msgid "i_n"
 msgstr "e_n"
 
-#: ../shell/e-shell-utils.c:223
+#: ../shell/e-shell-utils.c:189
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:246
+#: ../shell/e-shell-utils.c:212
 msgid "All Files (*)"
 msgstr "Todos os ficheiros (*)"
 
@@ -19308,268 +19418,273 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Sitio web do Evolution"
 
-#: ../shell/e-shell-window-actions.c:902
+#: ../shell/e-shell-window-actions.c:911
 msgid "Categories Editor"
 msgstr "Editor de categorías"
 
-#: ../shell/e-shell-window-actions.c:1237
+#: ../shell/e-shell-window-actions.c:1246
 msgid "Bug Buddy is not installed."
 msgstr "O Bug buddy non está instalado."
 
-#: ../shell/e-shell-window-actions.c:1239
+#: ../shell/e-shell-window-actions.c:1248
 msgid "Bug Buddy could not be run."
 msgstr "Non foi posíbel executar o Bug Buddy."
 
-#: ../shell/e-shell-window-actions.c:1420
+#: ../shell/e-shell-window-actions.c:1429
 msgid "Show information about Evolution"
 msgstr "Mostrar información sobre o Evolution"
 
-#: ../shell/e-shell-window-actions.c:1425
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1434
+#: ../shell/e-shell-window-actions.c:1448
 msgid "_Close Window"
 msgstr "Pe_char a xanela"
 
-#: ../shell/e-shell-window-actions.c:1446
+#: ../shell/e-shell-window-actions.c:1455
 msgid "_Contents"
 msgstr "_Contidos"
 
-#: ../shell/e-shell-window-actions.c:1448
+#: ../shell/e-shell-window-actions.c:1457
 msgid "Open the Evolution User Guide"
 msgstr "Abrir a guía de usuario do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1474
+#: ../shell/e-shell-window-actions.c:1483
 msgid "_Forget Passwords"
 msgstr "_Esquecer os contrasinais"
 
-#: ../shell/e-shell-window-actions.c:1476
+#: ../shell/e-shell-window-actions.c:1485
 msgid "Forget all remembered passwords"
 msgstr "Esquecer todos os contrasinais gardados"
 
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1490
 msgid "I_mport..."
 msgstr "I_mportar…"
 
-#: ../shell/e-shell-window-actions.c:1483
+#: ../shell/e-shell-window-actions.c:1492
 msgid "Import data from other programs"
 msgstr "Importar os datos doutros programas"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1497
 msgid "New _Window"
 msgstr "_Xanela nova"
 
-#: ../shell/e-shell-window-actions.c:1490
+#: ../shell/e-shell-window-actions.c:1499
 msgid "Create a new window displaying this view"
 msgstr "Crear unha xanela nova mostrando esta vista"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1511
 msgid "Available Cate_gories"
 msgstr "Cate_gorias dispoñíbeis"
 
-#: ../shell/e-shell-window-actions.c:1504
+#: ../shell/e-shell-window-actions.c:1513
 msgid "Manage available categories"
 msgstr "Xestionar as categorías dispoñíbeis"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1525
 msgid "_Quick Reference"
 msgstr "_Referencia rápida"
 
-#: ../shell/e-shell-window-actions.c:1518
+#: ../shell/e-shell-window-actions.c:1527
 msgid "Show Evolution's shortcut keys"
 msgstr "Mostrar as teclas dos atallos do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1525
+#: ../shell/e-shell-window-actions.c:1534
 msgid "Exit the program"
 msgstr "Saír do programa"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1539
 msgid "_Advanced Search..."
 msgstr "Busca _avanzada…"
 
-#: ../shell/e-shell-window-actions.c:1532
+#: ../shell/e-shell-window-actions.c:1541
 msgid "Construct a more advanced search"
 msgstr "Construír unha busca máis avanzada"
 
-#: ../shell/e-shell-window-actions.c:1539
+#: ../shell/e-shell-window-actions.c:1548
 msgid "Clear the current search parameters"
 msgstr "Limpar os parámetros da busca actual"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1553
 msgid "_Edit Saved Searches..."
 msgstr "_Editar as buscas gardadas…"
 
-#: ../shell/e-shell-window-actions.c:1546
+#: ../shell/e-shell-window-actions.c:1555
 msgid "Manage your saved searches"
 msgstr "Xestionar as buscas gardadas"
 
-#: ../shell/e-shell-window-actions.c:1553
+#: ../shell/e-shell-window-actions.c:1562
 msgid "Click here to change the search type"
 msgstr "Prema aquí para cambiar o tipo de busca"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1567
 msgid "_Find Now"
 msgstr "_Buscar agora"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1560
+#: ../shell/e-shell-window-actions.c:1569
 msgid "Execute the current search parameters"
 msgstr "Executar os parámetros de busca actuais"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1574
 msgid "_Save Search..."
 msgstr "_Gardar a busca…"
 
-#: ../shell/e-shell-window-actions.c:1567
+#: ../shell/e-shell-window-actions.c:1576
 msgid "Save the current search parameters"
 msgstr "Gardar os parámetros de busca actuais"
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Submit _Bug Report..."
 msgstr "Enviar un _informe de erro…"
 
-#: ../shell/e-shell-window-actions.c:1581
+#: ../shell/e-shell-window-actions.c:1590
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de erro usando o Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1595
 msgid "_Work Offline"
 msgstr "_Traballar sen conexión"
 
-#: ../shell/e-shell-window-actions.c:1588
+#: ../shell/e-shell-window-actions.c:1597
 msgid "Put Evolution into offline mode"
 msgstr "Poñer o Evolution en modo sen conexión"
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1602
 msgid "_Work Online"
 msgstr "_Traballar conectado"
 
-#: ../shell/e-shell-window-actions.c:1595
+#: ../shell/e-shell-window-actions.c:1604
 msgid "Put Evolution into online mode"
 msgstr "Poñer o Evolution en modo conectado"
 
-#: ../shell/e-shell-window-actions.c:1623
+#: ../shell/e-shell-window-actions.c:1632
 msgid "Lay_out"
 msgstr "Disp_osición"
 
-#: ../shell/e-shell-window-actions.c:1630
+#: ../shell/e-shell-window-actions.c:1639
 msgid "_New"
 msgstr "_Novo"
 
-#: ../shell/e-shell-window-actions.c:1637
+#: ../shell/e-shell-window-actions.c:1646
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../shell/e-shell-window-actions.c:1644
+#: ../shell/e-shell-window-actions.c:1653
 msgid "_Switcher Appearance"
 msgstr "Aparencia do _selector"
 
-#: ../shell/e-shell-window-actions.c:1658
+#: ../shell/e-shell-window-actions.c:1667
 msgid "_Window"
 msgstr "_Xanela"
 
-#: ../shell/e-shell-window-actions.c:1687
+#: ../shell/e-shell-window-actions.c:1696
 msgid "Show Side _Bar"
 msgstr "Mostrar a _barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1689
+#: ../shell/e-shell-window-actions.c:1698
 msgid "Show the side bar"
 msgstr "Mostrar a _barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1695
+#: ../shell/e-shell-window-actions.c:1704
 msgid "Show _Buttons"
 msgstr "Mostrar os botóns"
 
-#: ../shell/e-shell-window-actions.c:1697
+#: ../shell/e-shell-window-actions.c:1706
 msgid "Show the switcher buttons"
 msgstr "Mostrar os botóns do selector"
 
-#: ../shell/e-shell-window-actions.c:1703
+#: ../shell/e-shell-window-actions.c:1712
 msgid "Show _Status Bar"
 msgstr "Mostrar a _barra de estado"
 
-#: ../shell/e-shell-window-actions.c:1705
+#: ../shell/e-shell-window-actions.c:1714
 msgid "Show the status bar"
 msgstr "Mostrar a barra de estado"
 
-#: ../shell/e-shell-window-actions.c:1711
+#: ../shell/e-shell-window-actions.c:1720
 msgid "Show _Tool Bar"
 msgstr "Mostrar a barra de ferramen_tas"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1722
 msgid "Show the tool bar"
 msgstr "Mostrar a barra de ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1735
+#: ../shell/e-shell-window-actions.c:1744
 msgid "_Icons Only"
 msgstr "Só _iconas"
 
-#: ../shell/e-shell-window-actions.c:1737
+#: ../shell/e-shell-window-actions.c:1746
 msgid "Display window buttons with icons only"
 msgstr "Mostrar os botóns da xanela só con iconas"
 
-#: ../shell/e-shell-window-actions.c:1742
+#: ../shell/e-shell-window-actions.c:1751
 msgid "_Text Only"
 msgstr "Só _texto"
 
-#: ../shell/e-shell-window-actions.c:1744
+#: ../shell/e-shell-window-actions.c:1753
 msgid "Display window buttons with text only"
 msgstr "Mostrar os botóns da xanela só con texto"
 
-#: ../shell/e-shell-window-actions.c:1749
+#: ../shell/e-shell-window-actions.c:1758
 msgid "Icons _and Text"
 msgstr "Icon_as e texto"
 
-#: ../shell/e-shell-window-actions.c:1751
+#: ../shell/e-shell-window-actions.c:1760
 msgid "Display window buttons with icons and text"
 msgstr "Mostrar os botóns da xanela con iconas e texto"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1765
 msgid "Tool_bar Style"
 msgstr "Estilo da _barra de ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1758
+#: ../shell/e-shell-window-actions.c:1767
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Mostrar os botóns da xanela usando a configuración da barra de ferramentas "
 "do escritorio"
 
-#: ../shell/e-shell-window-actions.c:1766
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Define Views..."
 msgstr "Definir as vistas…"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1777
 msgid "Create or edit views"
 msgstr "Crear ou editar vistas"
 
-#: ../shell/e-shell-window-actions.c:1773
+#: ../shell/e-shell-window-actions.c:1782
 msgid "Save Custom View..."
 msgstr "Gardar a vista personalizada…"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1784
 msgid "Save current custom view"
 msgstr "Gardar a vista personalizada actual"
 
-#: ../shell/e-shell-window-actions.c:1782
+#: ../shell/e-shell-window-actions.c:1791
 msgid "C_urrent View"
 msgstr "Vista act_ual"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1801
 msgid "Custom View"
 msgstr "Vista personalizada"
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1803
 msgid "Current view is a customized view"
 msgstr "A vista actual é unha vista personalizada"
 
-#: ../shell/e-shell-window-actions.c:1804
+#: ../shell/e-shell-window-actions.c:1813
 msgid "Change the page settings for your current printer"
 msgstr "Cambiar os axustes da páxina para a impresora actual"
 
-#: ../shell/e-shell-window-actions.c:2194
+#: ../shell/e-shell-window-actions.c:2203
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
-#: ../shell/e-shell-window-actions.c:2414
+#: ../shell/e-shell-window-actions.c:2323
+#, c-format
+msgid "Select view: %s"
+msgstr "Seleccionar vista: %s"
+
+#: ../shell/e-shell-window-actions.c:2423
 msgid "Execute these search parameters"
 msgstr "Executar estes parámetros de busca"
 
@@ -19579,24 +19694,24 @@ msgstr "Executar estes parámetros de busca"
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:442
+#: ../shell/e-shell-window.c:445
 msgid "New"
 msgstr "Novo"
 
-#: ../shell/e-shell.c:361
+#: ../shell/e-shell.c:313
 msgid "Preparing to go offline..."
 msgstr "Preparando a desconexión…"
 
-#: ../shell/e-shell.c:414
+#: ../shell/e-shell.c:366
 msgid "Preparing to go online..."
 msgstr "Preparando a conexión…"
 
-#: ../shell/e-shell.c:476
+#: ../shell/e-shell.c:434
 msgid "Preparing to quit..."
 msgstr "Preparando a saída…"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:195
+#: ../shell/main.c:193
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19633,7 +19748,7 @@ msgstr ""
 "Esperamos que lles sexa de proveito o resultado do noso duro traballo, e\n"
 "agardamos con ansias as súas colaboracións!\n"
 
-#: ../shell/main.c:219
+#: ../shell/main.c:217
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19641,13 +19756,13 @@ msgstr ""
 "Grazas\n"
 "O equipo do Evolution\n"
 
-#: ../shell/main.c:226
+#: ../shell/main.c:224
 msgid "Do not tell me again"
 msgstr "Non preguntarme de novo"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:308
+#: ../shell/main.c:304
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -19655,52 +19770,52 @@ msgstr ""
 "Iniciar o Evolution mostrando o compoñente indicado. As opción dispoñíbeis "
 "son 'mail', 'calendar', 'contacts', 'tasks' e 'memos'"
 
-#: ../shell/main.c:312
+#: ../shell/main.c:308
 msgid "Apply the given geometry to the main window"
 msgstr "Aplicar a xeometría indicada á xanela principal"
 
-#: ../shell/main.c:316
+#: ../shell/main.c:312
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:314
 msgid "Ignore network availability"
 msgstr "Ignorar a dispoñibilidade da rede"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:316
 msgid "Start in \"express\" mode"
 msgstr "Iniciar en modo «express»"
 
-#: ../shell/main.c:323
+#: ../shell/main.c:319
 msgid "Forcibly shut down Evolution"
 msgstr "Forzar o peche do Evolution"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:322
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar a saída da depuración de todos os compoñentes a un ficheiro."
 
-#: ../shell/main.c:328
+#: ../shell/main.c:324
 msgid "Disable loading of any plugins."
 msgstr "Desactivar a carga de todos os engadidos."
 
-#: ../shell/main.c:330
+#: ../shell/main.c:326
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar o panel de vista previa de correo, contactos e tarefas."
 
-#: ../shell/main.c:334
+#: ../shell/main.c:330
 msgid "Import URIs or file names given as rest of arguments."
 msgstr ""
 "Importar os URIs ou nomes de ficheiros fornecidos como resto dos argumentos."
 
-#: ../shell/main.c:336
+#: ../shell/main.c:332
 msgid "Request a running Evolution process to quit"
 msgstr "Solicitar a saída dun proceso de execución do Evolution"
 
-#: ../shell/main.c:512 ../shell/main.c:520
+#: ../shell/main.c:508 ../shell/main.c:516
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Cliente de correo e XIP Evolution"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:579
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19709,7 +19824,7 @@ msgstr ""
 "%s: --online e --offline non poden usarse á vez.\n"
 "  Use «%s --help» para máis información.\n"
 
-#: ../shell/main.c:589
+#: ../shell/main.c:585
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -19900,7 +20015,7 @@ msgstr "Expedido á unidade organizativa (OU)"
 
 #: ../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:569
+#: ../smime/lib/e-cert.c:565
 msgid "Serial Number"
 msgstr "Número de serie"
 
@@ -19966,7 +20081,7 @@ msgstr "Todos os ficheiros"
 msgid "Failed to import certificate"
 msgstr "Produciuse un fallo ao importar o certificado"
 
-#: ../smime/gui/certificate-manager.c:991
+#: ../smime/gui/certificate-manager.c:992
 msgid "All PKCS12 files"
 msgstr "Todos os ficheiros PKCS12"
 
@@ -19974,7 +20089,7 @@ msgstr "Todos os ficheiros PKCS12"
 msgid "All email certificate files"
 msgstr "Todos os ficheiros de certificados de correo"
 
-#: ../smime/gui/certificate-manager.c:1027
+#: ../smime/gui/certificate-manager.c:1026
 msgid "All CA certificate files"
 msgstr "Todos os ficheiros de certificados dunha EA"
 
@@ -19993,7 +20108,7 @@ msgstr "Introduza o contrasinal para «%s»"
 msgid "Enter new password for certificate database"
 msgstr "Introduza o contrasinal novo para a base de datos de certificados"
 
-#: ../smime/gui/component.c:78
+#: ../smime/gui/component.c:79
 msgid "Enter new password"
 msgstr "Introduza un contrasinal novo"
 
@@ -20040,7 +20155,7 @@ msgstr ""
 "Antes de confiar nesta EA para calquera propósito, debería examinar o seu "
 "certificado e as súas directrices e procedementos (se están dispoñíbeis)."
 
-#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1097
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1093
 msgid "Certificate"
 msgstr "Certificado"
 
@@ -20116,11 +20231,11 @@ msgstr "Organización (O)"
 msgid "Organizational Unit (OU)"
 msgstr "Unidade organizativa (UO)"
 
-#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:829
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:825
 msgid "SSL Client Certificate"
 msgstr "Certificado de cliente SSL"
 
-#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:833
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:829
 msgid "SSL Server Certificate"
 msgstr "Certificado de servidor SSL"
 
@@ -20133,16 +20248,16 @@ msgid "Trust the authenticity of this certificate"
 msgstr "Confiar na autenticidade deste certificado"
 
 #: ../smime/gui/smime-ui.ui.h:35
-msgid "Trust this CA to identify email users."
-msgstr "Confiar nesta EA para identificar usuarios de correo."
+msgid "Trust this CA to identify _email users."
+msgstr "Confiar nesta AC para identificar a usuarios de _correo-e."
 
 #: ../smime/gui/smime-ui.ui.h:36
-msgid "Trust this CA to identify software developers."
-msgstr "Confiar nesta EA para identificar desenvolvedores de software."
+msgid "Trust this CA to identify _software developers."
+msgstr "Confiar nesta AC para identificar a desenvolvedores de _software."
 
 #: ../smime/gui/smime-ui.ui.h:37
-msgid "Trust this CA to identify websites."
-msgstr "Confiar nesta EA para identificar sitios web."
+msgid "Trust this CA to identify _websites."
+msgstr "Confiar nesta AC para identificar sitios _web."
 
 #: ../smime/gui/smime-ui.ui.h:38
 msgid "Validity"
@@ -20176,157 +20291,157 @@ msgstr "_Copia de seguranza"
 msgid "_Edit CA Trust"
 msgstr "_Editar a confianza na EA"
 
-#: ../smime/lib/e-cert-db.c:912
+#: ../smime/lib/e-cert-db.c:910
 msgid "Certificate already exists"
 msgstr "O certificado xa existe"
 
-#: ../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 "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:417
+#: ../smime/lib/e-cert.c:413
 msgid "Sign"
 msgstr "Sinatura"
 
-#: ../smime/lib/e-cert.c:418
+#: ../smime/lib/e-cert.c:414
 msgid "Encrypt"
 msgstr "Cifrado"
 
-#: ../smime/lib/e-cert.c:530
+#: ../smime/lib/e-cert.c:526
 msgid "Version"
 msgstr "Versión"
 
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:541
 msgid "Version 1"
 msgstr "Versión 1"
 
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:544
 msgid "Version 2"
 msgstr "Versión 2"
 
-#: ../smime/lib/e-cert.c:551
+#: ../smime/lib/e-cert.c:547
 msgid "Version 3"
 msgstr "Versión 3"
 
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:630
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:633
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:643
+#: ../smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-256 With RSA Encryption"
 msgstr "PKCS #1 SHA-256 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:646
+#: ../smime/lib/e-cert.c:642
 msgid "PKCS #1 SHA-384 With RSA Encryption"
 msgstr "PKCS #1 SHA-384 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:649
+#: ../smime/lib/e-cert.c:645
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "PKCS #1 SHA-512 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:672
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 cifrado RSA"
 
-#: ../smime/lib/e-cert.c:679
+#: ../smime/lib/e-cert.c:675
 msgid "Certificate Key Usage"
 msgstr "Uso da chave de certificado"
 
-#: ../smime/lib/e-cert.c:682
+#: ../smime/lib/e-cert.c:678
 msgid "Netscape Certificate Type"
 msgstr "Tipo de certificado Netscape"
 
-#: ../smime/lib/e-cert.c:685
+#: ../smime/lib/e-cert.c:681
 msgid "Certificate Authority Key Identifier"
 msgstr "Identificador da chave da entidade de acreditación"
 
-#: ../smime/lib/e-cert.c:697
+#: ../smime/lib/e-cert.c:693
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identificador do obxecto (%s)"
 
-#: ../smime/lib/e-cert.c:749
+#: ../smime/lib/e-cert.c:745
 msgid "Algorithm Identifier"
 msgstr "Identificador do algoritmo"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-cert.c:753
 msgid "Algorithm Parameters"
 msgstr "Parámetros do algoritmo"
 
-#: ../smime/lib/e-cert.c:779
+#: ../smime/lib/e-cert.c:775
 msgid "Subject Public Key Info"
 msgstr "Información da chave pública do titular"
 
-#: ../smime/lib/e-cert.c:784
+#: ../smime/lib/e-cert.c:780
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritmo da chave pública do titular"
 
-#: ../smime/lib/e-cert.c:799
+#: ../smime/lib/e-cert.c:795
 msgid "Subject's Public Key"
 msgstr "Chave pública do titular"
 
-#: ../smime/lib/e-cert.c:820 ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:816 ../smime/lib/e-cert.c:866
 msgid "Error: Unable to process extension"
 msgstr "Erro: non é posíbel procesar a extensión"
 
-#: ../smime/lib/e-cert.c:841 ../smime/lib/e-cert.c:853
+#: ../smime/lib/e-cert.c:837 ../smime/lib/e-cert.c:849
 msgid "Object Signer"
 msgstr "Asinante do obxecto"
 
-#: ../smime/lib/e-cert.c:845
+#: ../smime/lib/e-cert.c:841
 msgid "SSL Certificate Authority"
 msgstr "Entidade de acreditación SSL"
 
-#: ../smime/lib/e-cert.c:849
+#: ../smime/lib/e-cert.c:845
 msgid "Email Certificate Authority"
 msgstr "Entidade de acreditación de correo"
 
-#: ../smime/lib/e-cert.c:878
+#: ../smime/lib/e-cert.c:874
 msgid "Signing"
 msgstr "Sinatura"
 
-#: ../smime/lib/e-cert.c:882
+#: ../smime/lib/e-cert.c:878
 msgid "Non-repudiation"
 msgstr "Non rexeitar"
 
-#: ../smime/lib/e-cert.c:886
+#: ../smime/lib/e-cert.c:882
 msgid "Key Encipherment"
 msgstr "Cifrado da chave"
 
-#: ../smime/lib/e-cert.c:890
+#: ../smime/lib/e-cert.c:886
 msgid "Data Encipherment"
 msgstr "Cifrado de datos"
 
-#: ../smime/lib/e-cert.c:894
+#: ../smime/lib/e-cert.c:890
 msgid "Key Agreement"
 msgstr "Acordo de chave"
 
-#: ../smime/lib/e-cert.c:898
+#: ../smime/lib/e-cert.c:894
 msgid "Certificate Signer"
 msgstr "Asinante do certificado"
 
-#: ../smime/lib/e-cert.c:902
+#: ../smime/lib/e-cert.c:898
 msgid "CRL Signer"
 msgstr "Asinante da LRC"
 
-#: ../smime/lib/e-cert.c:951
+#: ../smime/lib/e-cert.c:947
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../smime/lib/e-cert.c:953 ../smime/lib/e-cert.c:956
+#: ../smime/lib/e-cert.c:949 ../smime/lib/e-cert.c:952
 msgid "Not Critical"
 msgstr "Non crítico"
 
-#: ../smime/lib/e-cert.c:977
+#: ../smime/lib/e-cert.c:973
 msgid "Extensions"
 msgstr "Extensións"
 
@@ -20338,40 +20453,40 @@ msgstr "Extensións"
 #. * change this string, unless changing the order of
 #. * name and value.  As a result example:
 #. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-cert.c:1055
+#: ../smime/lib/e-cert.c:1051
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1111 ../smime/lib/e-cert.c:1234
+#: ../smime/lib/e-cert.c:1107 ../smime/lib/e-cert.c:1230
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritmo de sinatura do certificado"
 
-#: ../smime/lib/e-cert.c:1120
+#: ../smime/lib/e-cert.c:1116
 msgid "Issuer"
 msgstr "Emisor"
 
-#: ../smime/lib/e-cert.c:1175
+#: ../smime/lib/e-cert.c:1171
 msgid "Issuer Unique ID"
 msgstr "ID único do emisor"
 
-#: ../smime/lib/e-cert.c:1194
+#: ../smime/lib/e-cert.c:1190
 msgid "Subject Unique ID"
 msgstr "ID único do titular"
 
-#: ../smime/lib/e-cert.c:1240
+#: ../smime/lib/e-cert.c:1236
 msgid "Certificate Signature Value"
 msgstr "Valor da sinatura do certificado"
 
-#: ../smime/lib/e-pkcs12.c:256
+#: ../smime/lib/e-pkcs12.c:255
 msgid "PKCS12 File Password"
 msgstr "Contrasinal para o ficheiro PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:257
+#: ../smime/lib/e-pkcs12.c:256
 msgid "Enter password for PKCS12 file:"
 msgstr "Introduza un contrasinal para o ficheiro PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:362
 msgid "Imported Certificate"
 msgstr "Certificado importado"
 
@@ -20530,15 +20645,19 @@ msgstr "Tipo de vista"
 msgid "Type of view:"
 msgstr "Tipo de vista:"
 
-#: ../widgets/misc/e-account-manager.c:353
+#: ../widgets/misc/e-account-manager.c:383
+msgid "Use default Evolution _sort order for accounts"
+msgstr "Usar _orde predeterminado de Evolution para as contas"
+
+#: ../widgets/misc/e-account-manager.c:438
 msgid "De_fault"
 msgstr "Prede_finido"
 
-#: ../widgets/misc/e-account-tree-view.c:243
+#: ../widgets/misc/e-account-tree-view.c:404
 msgid "Account Name"
 msgstr "Nome da conta"
 
-#: ../widgets/misc/e-account-tree-view.c:274
+#: ../widgets/misc/e-account-tree-view.c:435
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -20555,7 +20674,7 @@ msgid "MIME Type:"
 msgstr "Tipo MIME:"
 
 #: ../widgets/misc/e-attachment-dialog.c:373
-#: ../widgets/misc/e-attachment-store.c:559
+#: ../widgets/misc/e-attachment-store.c:440
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suxerir automaticamente a vista do anexo"
 
@@ -20591,32 +20710,32 @@ msgstr "Cargando"
 msgid "Saving"
 msgstr "Gardando"
 
-#: ../widgets/misc/e-attachment-paned.c:97
+#: ../widgets/misc/e-attachment-paned.c:102
 msgid "Hide Attachment _Bar"
 msgstr "Ocultar a _barra de anexos"
 
-#: ../widgets/misc/e-attachment-paned.c:99
-#: ../widgets/misc/e-attachment-paned.c:639
+#: ../widgets/misc/e-attachment-paned.c:104
+#: ../widgets/misc/e-attachment-paned.c:716
 msgid "Show Attachment _Bar"
 msgstr "Mostrar a _barra de anexos"
 
-#: ../widgets/misc/e-attachment-store.c:547
+#: ../widgets/misc/e-attachment-store.c:428
 msgid "Add Attachment"
 msgstr "Engadir un anexo"
 
-#: ../widgets/misc/e-attachment-store.c:550
+#: ../widgets/misc/e-attachment-store.c:431
 msgid "A_ttach"
 msgstr "A_nexar"
 
-#: ../widgets/misc/e-attachment-store.c:613
+#: ../widgets/misc/e-attachment-store.c:494
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Gardar o anexo"
 msgstr[1] "Gardar os anexos"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:642
-#: ../widgets/misc/e-attachment.c:1810 ../widgets/misc/e-attachment.c:2352
+#: ../widgets/misc/e-attachment-store.c:523
+#: ../widgets/misc/e-attachment.c:1809 ../widgets/misc/e-attachment.c:2347
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
@@ -20667,44 +20786,44 @@ msgstr "Abrir este anexo en %s"
 msgid "Attached message"
 msgstr "Mensaxe anexada"
 
-#: ../widgets/misc/e-attachment.c:1853 ../widgets/misc/e-attachment.c:2654
+#: ../widgets/misc/e-attachment.c:1852 ../widgets/misc/e-attachment.c:2649
 msgid "A load operation is already in progress"
 msgstr "Xa se está en proceso unha operación de carga"
 
-#: ../widgets/misc/e-attachment.c:1861 ../widgets/misc/e-attachment.c:2662
+#: ../widgets/misc/e-attachment.c:1860 ../widgets/misc/e-attachment.c:2657
 msgid "A save operation is already in progress"
 msgstr "Xa se está en proceso unha operación de gardado"
 
-#: ../widgets/misc/e-attachment.c:1953
+#: ../widgets/misc/e-attachment.c:1952
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Non foi posíbel cargar «%s»"
 
-#: ../widgets/misc/e-attachment.c:1956
+#: ../widgets/misc/e-attachment.c:1955
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Non foi posíbel cargar o anexo"
 
-#: ../widgets/misc/e-attachment.c:2232
+#: ../widgets/misc/e-attachment.c:2228
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Non foi posíbel abrir «%s»"
 
-#: ../widgets/misc/e-attachment.c:2235
+#: ../widgets/misc/e-attachment.c:2231
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Non foi posíbel abrir o anexo"
 
-#: ../widgets/misc/e-attachment.c:2670
+#: ../widgets/misc/e-attachment.c:2665
 msgid "Attachment contents not loaded"
 msgstr "Non se cargaron os contidos do anexo"
 
-#: ../widgets/misc/e-attachment.c:2746
+#: ../widgets/misc/e-attachment.c:2741
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Non foi posíbel gardar «%s»"
 
-#: ../widgets/misc/e-attachment.c:2749
+#: ../widgets/misc/e-attachment.c:2744
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Non foi posíbel gardar o anexo"
@@ -20715,7 +20834,7 @@ msgid "Ctrl-click to open a link"
 msgstr "Ctrl+clic para abrir unha ligazón"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1250
 msgid "%B %Y"
 msgstr "%B de %Y"
 
@@ -21280,7 +21399,7 @@ msgid "A_vailable Fields:"
 msgstr "Campos _dispoñíbeis:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1717
+#: ../widgets/table/e-table-header-item.c:1721
 msgid "Ascending"
 msgstr "Ascendente"
 
@@ -21293,7 +21412,7 @@ msgid "Clear _All"
 msgstr "Limp_ar todo"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1717
+#: ../widgets/table/e-table-header-item.c:1721
 msgid "Descending"
 msgstr "Descendente"
 
@@ -21396,60 +21515,60 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d elemento)"
 msgstr[1] "%s (%d elementos)"
 
-#: ../widgets/table/e-table-header-item.c:1557
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "Customize Current View"
 msgstr "Personalizar a vista actual"
 
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Sort _Ascending"
 msgstr "Orde _ascendente"
 
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1586
 msgid "Sort _Descending"
 msgstr "Orde _descendente"
 
-#: ../widgets/table/e-table-header-item.c:1585
+#: ../widgets/table/e-table-header-item.c:1589
 msgid "_Unsort"
 msgstr "Sen ord_enar"
 
-#: ../widgets/table/e-table-header-item.c:1588
+#: ../widgets/table/e-table-header-item.c:1592
 msgid "Group By This _Field"
 msgstr "Agrupar por este ca_mpo"
 
-#: ../widgets/table/e-table-header-item.c:1591
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "Group By _Box"
 msgstr "Agrupar por cai_xa"
 
-#: ../widgets/table/e-table-header-item.c:1595
+#: ../widgets/table/e-table-header-item.c:1599
 msgid "Remove This _Column"
 msgstr "Eliminar esta _columna"
 
-#: ../widgets/table/e-table-header-item.c:1598
+#: ../widgets/table/e-table-header-item.c:1602
 msgid "Add a C_olumn..."
 msgstr "Engadir unha c_olumna…"
 
-#: ../widgets/table/e-table-header-item.c:1602
+#: ../widgets/table/e-table-header-item.c:1606
 msgid "A_lignment"
 msgstr "A_liñamento"
 
-#: ../widgets/table/e-table-header-item.c:1605
+#: ../widgets/table/e-table-header-item.c:1609
 msgid "B_est Fit"
 msgstr "Axuste ópt_imo"
 
-#: ../widgets/table/e-table-header-item.c:1608
+#: ../widgets/table/e-table-header-item.c:1612
 msgid "Format Column_s..."
 msgstr "Formatar as columna_s…"
 
-#: ../widgets/table/e-table-header-item.c:1612
+#: ../widgets/table/e-table-header-item.c:1616
 msgid "Custo_mize Current View..."
 msgstr "Perso_nalizar a vista actual…"
 
-#: ../widgets/table/e-table-header-item.c:1674
+#: ../widgets/table/e-table-header-item.c:1678
 msgid "_Sort By"
 msgstr "O_rdenar por"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1692
+#: ../widgets/table/e-table-header-item.c:1696
 msgid "_Custom"
 msgstr "_Personalizar"
 
@@ -21485,14 +21604,26 @@ msgstr "premer"
 msgid "sort"
 msgstr "ordenar"
 
-#: ../widgets/text/e-text.c:2327
+#: ../widgets/text/e-text.c:2328
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: ../widgets/text/e-text.c:2339
+#: ../widgets/text/e-text.c:2340
 msgid "Input Methods"
 msgstr "Métodos de entrada"
 
+#~ msgid "Composer load/attach directory"
+#~ msgstr "Cartafol para cargar/anexar do editor de mensaxes"
+
+#~ msgid "Directory for loading/attaching files to composer."
+#~ msgstr "Cartafol para cargar/anexar os ficheiros no editor de mensaxes."
+
+#~ msgid "Initial file chooser folder"
+#~ msgstr "Cartafol inicial do seleccionador de ficheiros"
+
+#~ msgid "Initial folder for GtkFileChooser dialogs."
+#~ msgstr "Cartafol inicial para os diálogos GtkFileChooser."
+
 #~ msgid "Compose New Message"
 #~ msgstr "Redactar unha nova mensaxe"
 
@@ -21597,9 +21728,6 @@ msgstr "Métodos de entrada"
 #~ msgid "Subscribe to my _notifications"
 #~ msgstr "Subscribir ás miñas _notificacións"
 
-#~ msgid "Subscribe to my _alarms"
-#~ msgstr "Subscribir ás miñas _alarmas"
-
 #~ msgid "Reminder Notes"
 #~ msgstr "Notas de aviso"
 
diff --git a/po/hu.po b/po/hu.po
index b427fdb66b..5b2d7d6ad6 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -15,16 +15,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-12 11:31+0200\n"
-"PO-Revision-Date: 2011-09-12 11:30+0200\n"
+"POT-Creation-Date: 2011-10-17 00:35+0200\n"
+"PO-Revision-Date: 2011-10-15 02:02+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
-"Language-Team: Magyar <gnome-hu-list at gnome dot org>\n"
+"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
@@ -2576,7 +2576,7 @@ msgstr "Értekezlet – %s"
 #: ../calendar/gui/dialogs/comp-editor.c:756
 #, c-format
 msgid "Assigned Task - %s"
-msgstr "Hozzárendelt feladat – %s"
+msgstr "Kiosztott feladat – %s"
 
 #: ../calendar/gui/dialogs/comp-editor.c:758
 #, c-format
@@ -15331,11 +15331,11 @@ msgstr "_Feladat"
 #: ../modules/calendar/e-task-shell-backend.c:304
 msgctxt "New"
 msgid "Assigne_d Task"
-msgstr "Hozzáren_delt feladat"
+msgstr "Ki_osztott feladat"
 
 #: ../modules/calendar/e-task-shell-backend.c:306
 msgid "Create a new assigned task"
-msgstr "Új hozzárendelt feladat létrehozása"
+msgstr "Új kiosztott feladat létrehozása"
 
 #: ../modules/calendar/e-task-shell-backend.c:314
 msgctxt "New"