diff --git a/help/ca/ca.po b/help/ca/ca.po
index ebff62df..67ac4927 100644
--- a/help/ca/ca.po
+++ b/help/ca/ca.po
@@ -155,7 +155,7 @@ msgid ""
 "<gui>Drafts</gui> folder. If de-selected, you will not be able to save draft"
 " messages when closing the composer."
 msgstr ""
-"La casella de verificació <gui>Desa els missatges enviats al servidor "
+"La casella de selecció <gui>Desa els missatges enviats al servidor "
 "</gui> controla si l'editor desarà còpies dels missatges de correu "
 "electrònic escrits a la carpeta <gui>Esborranys</gui>. Si es desactiva, no "
 "podreu desar els esborranys dels missatges quan es tanqui l'editor."
@@ -168,7 +168,7 @@ msgid ""
 " If de-selected, you will no be able to see any email messages you have "
 "sent, unless your server automatically saves them for you."
 msgstr ""
-" La casella de verificació <gui>Desa els missatges enviats al servidor "
+" La casella de selecció <gui>Desa els missatges enviats al servidor "
 "</gui> controla si Geary desarà les còpies de correu electrònic "
 "enviades a la carpeta <gui>Enviats</gui>. Si es desactiva, no podreu veure "
 "cap dels missatges de correu electrònic que hàgiu enviat, tret que el "
@@ -377,7 +377,7 @@ msgid ""
 "reporting</link>—report new bugs or request new features"
 msgstr ""
 "<link href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug\">Informa d'un "
-"error</link>—informa de nous errors o sol·licita noves funcionalitats."
+"error</link>—informa de nous errors o sol·licita noves funcionalitats"
 
 #. (itstool) path: item/p
 #: C/contributing.page:19
@@ -512,7 +512,7 @@ msgstr ""
 #. (itstool) path: section/title
 #: C/label.page:25
 msgid "Move a conversation to a folder or label"
-msgstr "Moure una conversa a una carpeta o etiqueta."
+msgstr "Moure una conversa a una carpeta o etiqueta"
 
 #. (itstool) path: section/p
 #: C/label.page:26
@@ -530,7 +530,7 @@ msgid ""
 " from the resulting drop-down menu."
 msgstr ""
 "Feu clic al botó <gui>Moure</gui> a la barra d'eines i seleccioneu una "
-"carpeta o etiqueta del menú desplegable. "
+"carpeta o etiqueta del menú desplegable."
 
 #. (itstool) path: item/p
 #: C/label.page:31
@@ -619,7 +619,7 @@ msgid ""
 "for your email accounts. Geary uses the term <em>label</em> for any folder "
 "that you have created to organize your email messages."
 msgstr ""
-"La <em>llista de carpetes </em>mostra totes les <em>carpetes</em> i "
+"La <em>llista de carpetes</em> mostra totes les <em>carpetes</em> i "
 "<em>etiquetes</em> dels vostres comptes de correu electrònic. Geary utilitza"
 " el terme <em>etiqueta</em> per qualsevol carpeta que hàgiu creat per "
 "organitzar els vostres missatges de correu."
@@ -682,7 +682,7 @@ msgid ""
 "first conversation in a range, then hold down <key>Shift</key> and click the"
 " last conversation."
 msgstr ""
-"Alguns comandaments de Geary poden actuar sobre un grup de converses. Per "
+"Algunes ordres de Geary poden actuar sobre un grup de converses. Per "
 "seleccionar diverses converses, mantingueu premuda la tecla <key>Ctrl</key> "
 "i feu clic a cada conversa de la llista de converses que vulgueu "
 "seleccionar. Alternativament, podeu fer clic al primer element de la "
@@ -1021,7 +1021,7 @@ msgstr "<input>assumpte:<var>text</var></input>"
 #. (itstool) path: td/p
 #: C/search.page:60
 msgid "Finds messages whose subject contains <var>text</var>."
-msgstr "Troba missatges que a assumpte continguin<var>text</var>."
+msgstr "Troba missatges que a assumpte continguin <var>text</var>."
 
 #. (itstool) path: td/p
 #: C/search.page:63
@@ -1214,7 +1214,7 @@ msgid ""
 "<keyseq><key>Ctrl</key><key>Enter</key></keyseq> to send the message."
 msgstr ""
 "Per iniciar una nova conversa per correu electrònic, feu clic al botó <gui "
-"style=\"button\">Editar</gui>a la barra d'eines. Escriviu l'adreça de la "
+"style=\"button\">Edita</gui>a la barra d'eines. Escriviu l'adreça de la "
 "gent que ha de rebre el correu al camp text <gui style=\"input\">Per "
 "a</gui>, i l'assumpte  al camp <gui style=\"input\">Assumpte</gui>. A "
 "continuació, podeu escriure el vostre missatge a l'àrea de text que hi ha a "
@@ -1332,7 +1332,7 @@ msgid ""
 "<gui style=\"button\">Un-indent</gui> formatting toolbar buttons."
 msgstr ""
 "Es poden inserir o eliminar llistes numerades o amb pics fent clic als "
-"botons <gui style=\"button\">Llista numerada</gui> i<gui "
+"botons <gui style=\"button\">Llista numerada</gui> i <gui "
 "style=\"button\">Llista amb pics</gui>a la barra d'eines de format. Es pot "
 "ajustar el nivell de sagnat d'elements de la llista mitjançant els botons de"
 " la barra de format<gui style=\"button\">Augmentar el sagnat</gui> i<gui "
@@ -1365,7 +1365,7 @@ msgid ""
 "dropping it either on the text fields at the top of the window or on the "
 "toolbar at the bottom."
 msgstr ""
-"A un correu electrònic s'hi poden adjuntar documents, musica, vídeos, i "
+"A un correu electrònic s'hi poden adjuntar documents, música, vídeos, i "
 "altres tipus de fitxers fent clic al botó <gui style=\"button\">Adjunta "
 "fitxer</gui> a la part superior de la finestra d'edició i seleccionat el "
 "fitxer a adjuntar, o arrossegant un fitxer des de l'aplicació "
@@ -1427,7 +1427,7 @@ msgstr ""
 "idioma de la llista per activar-lo o desactivar-lo, i feu clic al botó <gui "
 "style=\"button\">-</gui> per eliminar-lo de la llista. Si no apareix un "
 "idioma a la llista, busqueu-lo escrivint-ne el nom al quadre de cerca, "
-"aleshores feu clic al botó <gui style=\"button\">+</gui>per afegir-lo."
+"aleshores feu clic al botó <gui style=\"button\">+</gui> per afegir-lo."
 
 #. (itstool) path: section/title
 #: C/write.page:117
@@ -1472,7 +1472,7 @@ msgid ""
 msgstr ""
 "Si deseu o rebutgeu un correu electrònic, podeu tornar-lo a obrir fent clic "
 "a <gui style=\"button\">Desfés</gui> a la notificació emergent que apareix o"
-" teclejant<keyseq><key>Ctrl</key><key>Z</key></keyseq>. La capacitat de "
+" teclejant <keyseq><key>Ctrl</key><key>Z</key></keyseq>. La capacitat de "
 "restaurar un missatge desat o descartat es manté activa 30 minuts. Després, "
 "haureu de tornar a obrir el missatge accedint a la "
 "carpeta<gui>Esborranys</gui>, si existeix."
diff --git a/po/ca.po b/po/ca.po
index 1d3378fa..b3ca74f8 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,14 +7,14 @@
 # Alfredo Hernández <aldomann.designs@gmail.com>, 2012
 # martin.steghoefer <martin@steghoefer.de>, 2013
 # Gerard Bertran <bertran.gerardo@gmail.com>, 2017
-# Jordi Mas i Hernàndez <jmas@softcatala.org>, 2017
+# Jordi Mas i Hernàndez <jmas@softcatala.org>, 2017, 2020
 # Jordi Serratosa <jordis@softcatala.cat>, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n"
-"POT-Creation-Date: 2019-04-18 07:39+0000\n"
-"PO-Revision-Date: 2019-04-20 19:22+0200\n"
+"POT-Creation-Date: 2020-03-14 23:28+0000\n"
+"PO-Revision-Date: 2020-03-16 12:19+0100\n"
 "Last-Translator: Carles Ferrando Garcia <carles.ferrando@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/geary/language/"
 "ca/)\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.2.4\n"
 
 #: desktop/geary-attach.contract.desktop.in:3
 msgid "Send by email"
@@ -34,36 +34,38 @@ msgid "Send files using Geary"
 msgstr "Enviar fitxers a través de Geary"
 
 #. Translators: The application name
-#: desktop/geary-autostart.desktop.in:3
-#: desktop/org.gnome.Geary.appdata.xml.in:11
-#: desktop/org.gnome.Geary.desktop.in:3
+#: desktop/geary-autostart.desktop.in.in:3
+#: desktop/org.gnome.Geary.appdata.xml.in.in:12
+#: desktop/org.gnome.Geary.desktop.in.in:3
 #: src/client/accounts/accounts-editor-servers-pane.vala:555
+#: src/client/application/application-main-window.vala:555
 msgid "Geary"
 msgstr "Geary"
 
-#: desktop/geary-autostart.desktop.in:4 desktop/org.gnome.Geary.desktop.in:4
+#: desktop/geary-autostart.desktop.in.in:4
+#: desktop/org.gnome.Geary.desktop.in.in:4
 msgid "Email"
 msgstr "Correu electrònic"
 
 #. Translators: The application's summary / tagline
-#: desktop/geary-autostart.desktop.in:5
-#: desktop/org.gnome.Geary.appdata.xml.in:15
-#: desktop/org.gnome.Geary.desktop.in:5
-#: src/client/application/geary-application.vala:23
+#: desktop/geary-autostart.desktop.in.in:5
+#: desktop/org.gnome.Geary.appdata.xml.in.in:16
+#: desktop/org.gnome.Geary.desktop.in.in:5
+#: src/client/application/application-client.vala:32
 msgid "Send and receive email"
 msgstr "Envieu i rebeu correus electrònics"
 
 #. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
-#: desktop/geary-autostart.desktop.in:7
+#: desktop/geary-autostart.desktop.in.in:7
 msgid "Email;E-mail;Mail;"
 msgstr "Email;Correu electrònic;Correu;"
 
 #. Translators: The development team's name
-#: desktop/org.gnome.Geary.appdata.xml.in:13
+#: desktop/org.gnome.Geary.appdata.xml.in.in:14
 msgid "Geary Development Team"
 msgstr "Equip de desenvolupament del Geary"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:17
+#: desktop/org.gnome.Geary.appdata.xml.in.in:18
 msgid ""
 "Geary is an email application built around conversations, for the GNOME 3 "
 "desktop. It allows you to read, find and send email with a straightforward, "
@@ -73,70 +75,73 @@ msgstr ""
 "a l'escriptori GNOME 3. Permet llegir, trobar i enviar correu electrònic amb "
 "una interfície senzilla i moderna."
 
-#: desktop/org.gnome.Geary.appdata.xml.in:22
+#: desktop/org.gnome.Geary.appdata.xml.in.in:23
 msgid ""
 "Conversations allow you to read a complete discussion without having to find "
 "and click from message to message."
 msgstr ""
-"Les converses li permeten llegir una discussió completa sense haver de "
-"buscar i fer clic de missatge en missatge."
+"Les converses li permeten llegir una discussió completa sense haver de buscar "
+"i fer clic de missatge en missatge."
 
-#: desktop/org.gnome.Geary.appdata.xml.in:26
+#: desktop/org.gnome.Geary.appdata.xml.in.in:27
 msgid "Geary’s features include:"
 msgstr "Les característiques de Geary inclouen:"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:28
+#: desktop/org.gnome.Geary.appdata.xml.in.in:29
 msgid "Quick email account setup"
 msgstr "Configuració de comptes de correu electrònic"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:29
+#: desktop/org.gnome.Geary.appdata.xml.in.in:30
 msgid "Shows related messages together in conversations"
 msgstr "Mostra missatges relacionats junts en converses"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:30
+#: desktop/org.gnome.Geary.appdata.xml.in.in:31
 msgid "Fast, full text and keyword search"
 msgstr "Ràpid, text complet i recerca per paraula clau"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:31
+#: desktop/org.gnome.Geary.appdata.xml.in.in:32
 msgid "Full-featured HTML and plain text message composer"
 msgstr "HTML amb totes les funcions i redacció de missatge de text"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:32
+#: desktop/org.gnome.Geary.appdata.xml.in.in:33
 msgid "Desktop notification of new mail"
 msgstr "Notificació a l'escriptori quan arribi correu nou"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:33
+#: desktop/org.gnome.Geary.appdata.xml.in.in:34
 msgid "Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers"
 msgstr ""
 "Compatible amb GMail, Yahoo! Mail, Outlook.com i d'altres servidors IMAP"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in:47
+#: desktop/org.gnome.Geary.appdata.xml.in.in:48
 msgid "Geary displaying a conversation"
 msgstr "Geary mostrant una conversa"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in:58
+#: desktop/org.gnome.Geary.appdata.xml.in.in:59
 msgid "Geary showing the rich text composer"
 msgstr "Geary mostrant l'editor de text enriquit"
 
 #. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
-#: desktop/org.gnome.Geary.desktop.in:7
+#: desktop/org.gnome.Geary.desktop.in.in:7
 msgid "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 msgstr "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 
-#: desktop/org.gnome.Geary.desktop.in:21
+#: desktop/org.gnome.Geary.desktop.in.in:22
 msgid "Compose Message"
 msgstr "Redacta un missatge"
 
+#: desktop/org.gnome.Geary.desktop.in.in:26
+msgid "New Window"
+msgstr "Finestra nova"
+
 #: desktop/org.gnome.Geary.gschema.xml:8
 msgid "Maximize window"
 msgstr "Maximitza la finestra"
 
 #: desktop/org.gnome.Geary.gschema.xml:9
 msgid "True if the application window is maximized, false otherwise."
-msgstr ""
-"Cert si la finestra d'aplicació està maximitzada, fals en cas contrari."
+msgstr "Cert si la finestra d'aplicació està maximitzada, fals en cas contrari."
 
 #: desktop/org.gnome.Geary.gschema.xml:14
 msgid "Width of window"
@@ -167,8 +172,7 @@ msgid "Position of folder list pane when horizontal"
 msgstr "Posició del plafó de la llista de carpetes quan és horitzontal"
 
 #: desktop/org.gnome.Geary.gschema.xml:33
-msgid ""
-"Position of the folder list Paned grabber in the horizontal orientation."
+msgid "Position of the folder list Paned grabber in the horizontal orientation."
 msgstr ""
 "Posició del capturador de la llista de carpetes en orientació horitzontal."
 
@@ -178,8 +182,7 @@ msgstr "Posició del plafó de la llista de carpetes quan és vertical"
 
 #: desktop/org.gnome.Geary.gschema.xml:39
 msgid "Position of the folder list Paned grabber in the vertical orientation."
-msgstr ""
-"Posició del capturador de la llista de carpetes en orientació vertical."
+msgstr "Posició del capturador de la llista de carpetes en orientació vertical."
 
 #: desktop/org.gnome.Geary.gschema.xml:44
 msgid "Orientation of the folder list pane"
@@ -187,49 +190,67 @@ msgstr "Orientació del plafó de la llista de carpetes"
 
 #: desktop/org.gnome.Geary.gschema.xml:45
 msgid "True if the folder list Paned is in the horizontal orientation."
-msgstr ""
-"Cert si l'orientació del plafó de la llista de carpetes és horitzontal."
+msgstr "Cert si l'orientació del plafó de la llista de carpetes és horitzontal."
 
 #: desktop/org.gnome.Geary.gschema.xml:50
+msgid "Show/hide formatting toolbar"
+msgstr "Mostra o amaga la barra de format"
+
+#: desktop/org.gnome.Geary.gschema.xml:51
+msgid "True if the formatting toolbar in the composer is shown."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:56
 msgid "Position of message list pane"
 msgstr "Posició del plafó de la llista de missatges"
 
-#: desktop/org.gnome.Geary.gschema.xml:51
+#: desktop/org.gnome.Geary.gschema.xml:57
 msgid "Position of the message list Paned grabber."
 msgstr "Posició del capturador de la llista de missatges."
 
-#: desktop/org.gnome.Geary.gschema.xml:56
+#: desktop/org.gnome.Geary.gschema.xml:62
 msgid "Autoselect next message"
 msgstr "Autoselecciona el missatge següent"
 
-#: desktop/org.gnome.Geary.gschema.xml:57
+#: desktop/org.gnome.Geary.gschema.xml:63
 msgid "True if we should autoselect the next available conversation."
 msgstr ""
-"Cert si hem de seleccionar de forma automàtica la següent conversa "
-"disponible."
+"Cert si hem de seleccionar de forma automàtica la següent conversa disponible."
 
-#: desktop/org.gnome.Geary.gschema.xml:62
+#: desktop/org.gnome.Geary.gschema.xml:68
 msgid "Display message previews"
 msgstr "Mostra la vista prèvia del missatge"
 
-#: desktop/org.gnome.Geary.gschema.xml:63
+#: desktop/org.gnome.Geary.gschema.xml:69
 msgid "True if we should display a short preview of each message."
 msgstr "Cert si s'ha de mostrar una vista prèvia curta de cada missatge."
 
-#: desktop/org.gnome.Geary.gschema.xml:68
+#: desktop/org.gnome.Geary.gschema.xml:74
+msgid "Use single key shortcuts"
+msgstr "Usa només les dreceres d'una tecla"
+
+#: desktop/org.gnome.Geary.gschema.xml:75
+msgid ""
+"Enables shortcuts for email actions that do not require pressing <Ctrl> to "
+"emulate those used by Gmail."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:82
 msgid "Languages that shall be used in the spell checker"
 msgstr "Idiomes que s'usaran en el corrector ortogràfic"
 
-#: desktop/org.gnome.Geary.gschema.xml:69
-msgid "List of the languages to use in the spell checker."
-msgstr "Llista d'idiomes a usar amb el corrector ortogràfic."
+#: desktop/org.gnome.Geary.gschema.xml:83
+msgid ""
+"A list of POSIX locales, with the empty list disabling spell checking and the "
+"null list using desktop languages by default."
+msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:74
+#: desktop/org.gnome.Geary.gschema.xml:90
 msgid "Languages that are displayed in the spell checker popover"
 msgstr ""
 "Idiomes que es mostraran a la finestra emergent del corrector ortogràfic"
 
-#: desktop/org.gnome.Geary.gschema.xml:75
+#: desktop/org.gnome.Geary.gschema.xml:91
 msgid ""
 "List of languages that are always displayed in the popover of the spell "
 "checker."
@@ -237,105 +258,109 @@ msgstr ""
 "Llista d’idiomes que sempre es mostren a la finestra emergent del corrector "
 "ortogràfic."
 
-#: desktop/org.gnome.Geary.gschema.xml:80
-msgid "Enable notification sounds"
-msgstr "Habilita les notificacions amb so"
-
-#: desktop/org.gnome.Geary.gschema.xml:81
-msgid "True to play sounds for notifications and sending."
-msgstr "Cert per executar i enviar sons per a notificacions."
-
-#: desktop/org.gnome.Geary.gschema.xml:86
-msgid "Show notifications for new mail"
-msgstr "Mostra les notificacions quan arribi correu nou"
-
-#: desktop/org.gnome.Geary.gschema.xml:87
-msgid "True to show notification bubbles."
-msgstr "Cert per mostrar globus amb notificacions."
-
-#: desktop/org.gnome.Geary.gschema.xml:92
+#: desktop/org.gnome.Geary.gschema.xml:96
 msgid "Notify of new mail at startup"
 msgstr "Notifica'm el correu nou a l'inici"
 
-#: desktop/org.gnome.Geary.gschema.xml:93
+#: desktop/org.gnome.Geary.gschema.xml:97
 msgid "True to notify of new mail at startup."
 msgstr "Cert per notificar l'arribada d'un correu nou a l'inici."
 
-#: desktop/org.gnome.Geary.gschema.xml:98
+#: desktop/org.gnome.Geary.gschema.xml:102
 msgid "Ask when opening an attachment"
 msgstr "Pregunteu quan obriu un fitxer adjunt"
 
-#: desktop/org.gnome.Geary.gschema.xml:99
+#: desktop/org.gnome.Geary.gschema.xml:103
 msgid "True to ask when opening an attachment."
 msgstr "Cert per preguntar quan s'obri un fitxer adjunt."
 
-#: desktop/org.gnome.Geary.gschema.xml:104
+#: desktop/org.gnome.Geary.gschema.xml:108
 msgid "Whether to compose emails in HTML"
 msgstr "Si es vol redactar missatges de correu electrònic en HTML"
 
-#: desktop/org.gnome.Geary.gschema.xml:105
+#: desktop/org.gnome.Geary.gschema.xml:109
 msgid "True to compose emails in HTML; false for plain text."
 msgstr ""
 "Cert si voleu redactar correus electrònics en HTML; fals si useu text pla."
 
-#: desktop/org.gnome.Geary.gschema.xml:110
+#: desktop/org.gnome.Geary.gschema.xml:114
 msgid "Advisory strategy for full-text searching"
 msgstr "Estratègia d'assessorament per a la cerca de text complet"
 
-#: desktop/org.gnome.Geary.gschema.xml:111
+#: desktop/org.gnome.Geary.gschema.xml:115
 msgid ""
 "Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
-msgstr ""
-"Són valors acceptables «exacte», «conservador», «agressiu», i «neutre»."
+msgstr "Són valors acceptables «exacte», «conservador», «agressiu», i «neutre»."
 
-#: desktop/org.gnome.Geary.gschema.xml:116
+#: desktop/org.gnome.Geary.gschema.xml:120
 msgid "Zoom of conversation viewer"
 msgstr "Amplia/redueix el visor de la conversa"
 
-#: desktop/org.gnome.Geary.gschema.xml:117
+#: desktop/org.gnome.Geary.gschema.xml:121
 msgid "The zoom to apply on the conservation view."
-msgstr "L'amplificació/reducció per aplicar al visualitzador de la conversa."
+msgstr "L'amplificació/reducció per a aplicar a la visualitació de la conversa."
 
-#: desktop/org.gnome.Geary.gschema.xml:122
+#: desktop/org.gnome.Geary.gschema.xml:126
 msgid "Size of detached composer window"
 msgstr "Mida de la finestra separada de l'editor"
 
-#: desktop/org.gnome.Geary.gschema.xml:123
+#: desktop/org.gnome.Geary.gschema.xml:127
 msgid "The last recorded size of the detached composer window."
 msgstr "El darrer registre de la mida de la finestra separada de l'editor."
 
-#: desktop/org.gnome.Geary.gschema.xml:128
+#: desktop/org.gnome.Geary.gschema.xml:132
+#, fuzzy
+#| msgid "Error sending email"
+msgid "Undo sending email delay"
+msgstr "Error en l'enviament de correu electrònic"
+
+#: desktop/org.gnome.Geary.gschema.xml:133
+msgid ""
+"The number of seconds to wait before sending an email. Set to zero or less to "
+"disable."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:139
+msgid "Brief notification display time"
+msgstr "Temps per a mostrar una notificació breu"
+
+#: desktop/org.gnome.Geary.gschema.xml:140
+msgid ""
+"The length of time in seconds for which brief notifications should be "
+"displayed."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:146
 msgid "Whether we migrated the old settings"
 msgstr "Si hem de migrar els paràmetres antics"
 
-#: desktop/org.gnome.Geary.gschema.xml:129
-msgid ""
-"False to check for the old “org.yorba.geary”-schema and copy its values."
+#: desktop/org.gnome.Geary.gschema.xml:147
+msgid "False to check for the old “org.yorba.geary”-schema and copy its values."
 msgstr ""
-"Fals per comprovar l'antic «org.yorba.geary» -schema i copiar els seus "
+"Fals per a comprovar l'antic «org.yorba.geary» -schema i copiar els seus "
 "valors."
 
 #. Translators: In-app notification label, when
 #. the app had a problem pinning an otherwise
 #. untrusted TLS certificate
-#: src/client/accounts/accounts-editor.vala:203
+#: src/client/accounts/accounts-editor.vala:210
 msgid "Failed to store certificate"
 msgstr "Ha fallat l'emmagatzematge del certificat"
 
 #. Translators: Label for adding an email account
 #. account for a generic IMAP service provider.
-#: src/client/accounts/accounts-editor-add-pane.vala:109
+#: src/client/accounts/accounts-editor-add-pane.vala:108
 msgid "All others"
 msgstr "Tots els altres"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:196
+#: src/client/accounts/accounts-editor-add-pane.vala:195
 #: src/client/accounts/accounts-editor-servers-pane.vala:316
 msgid "Check your receiving login and password"
 msgstr "Comproveu la recepció de l'usuari i la contrasenya"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:211
+#: src/client/accounts/accounts-editor-add-pane.vala:210
 #: src/client/accounts/accounts-editor-servers-pane.vala:329
 msgid "Check your receiving server details"
 msgstr "Comproveu la recepció dels detalls del servidor"
@@ -345,51 +370,51 @@ msgstr "Comproveu la recepció dels detalls del servidor"
 #. succeeded, so the user probably needs to
 #. specify custom creds here
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:233
+#: src/client/accounts/accounts-editor-add-pane.vala:232
 #: src/client/accounts/accounts-editor-servers-pane.vala:350
 msgid "Check your sending login and password"
 msgstr "Comproveu l'usuari i contrasenya enviats"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:247
+#: src/client/accounts/accounts-editor-add-pane.vala:246
 #: src/client/accounts/accounts-editor-servers-pane.vala:363
 msgid "Check your sending server details"
 msgstr "Comproveu els detalls del servidor enviats"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:262
+#: src/client/accounts/accounts-editor-add-pane.vala:261
 msgid "Check your email address and password"
 msgstr "Comproveu la vostra adreça de correu i la contrasenya"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:273
+#: src/client/accounts/accounts-editor-add-pane.vala:272
 msgid "Could not connect, check your network"
 msgstr "No s'ha pogut fer la connexió, comproveu la vostra xarxa"
 
 #. Translators: In-app notification label for a
 #. generic error creating an account
-#: src/client/accounts/accounts-editor-add-pane.vala:286
+#: src/client/accounts/accounts-editor-add-pane.vala:285
 msgid "An unexpected problem occurred"
 msgstr "Ha succeït un problema inesperat"
 
 #. Translators: In-app notification label, the
 #. string substitution is a more detailed reason.
-#: src/client/accounts/accounts-editor-add-pane.vala:304
+#: src/client/accounts/accounts-editor-add-pane.vala:303
 #, c-format
 msgid "Account not created: %s"
 msgstr "Compte no creat: %s"
 
 #. Translators: Label for the person's actual name when adding
 #. an account
-#: src/client/accounts/accounts-editor-add-pane.vala:551
+#: src/client/accounts/accounts-editor-add-pane.vala:558
 msgid "Your name"
 msgstr "El vostre nom"
 
 #. Translators: Label used for the address part of an
 #. email address when editing a user's sender address
 #. preferences for an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:568
-#: src/client/accounts/accounts-editor-edit-pane.vala:501
+#: src/client/accounts/accounts-editor-add-pane.vala:575
+#: src/client/accounts/accounts-editor-edit-pane.vala:513
 msgid "Email address"
 msgstr "Adreça de correu electrònic"
 
@@ -398,8 +423,8 @@ msgstr "Adreça de correu electrònic"
 #. Translators: This is used as a placeholder for the
 #. address part of an email address when editing a user's
 #. sender address preferences for an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:571
-#: src/client/accounts/accounts-editor-edit-pane.vala:469
+#: src/client/accounts/accounts-editor-add-pane.vala:579
+#: src/client/accounts/accounts-editor-edit-pane.vala:479
 msgid "person@example.com"
 msgstr "correu_personal@exemple.com"
 
@@ -407,15 +432,15 @@ msgstr "correu_personal@exemple.com"
 #. when adding an account
 #. Translators: Label for the user's login name for an
 #. IMAP, SMTP, etc service
-#: src/client/accounts/accounts-editor-add-pane.vala:585
-#: src/client/accounts/accounts-editor-servers-pane.vala:880
+#: src/client/accounts/accounts-editor-add-pane.vala:593
+#: src/client/accounts/accounts-editor-servers-pane.vala:884
 msgid "Login name"
 msgstr "Nom d'usuari"
 
 #. Translators: Label for the user's password for an IMAP,
 #. SMTP, etc service
-#: src/client/accounts/accounts-editor-add-pane.vala:599
-#: src/client/accounts/accounts-editor-servers-pane.vala:999
+#: src/client/accounts/accounts-editor-add-pane.vala:607
+#: src/client/accounts/accounts-editor-servers-pane.vala:1006
 #: ui/password-dialog.glade:108
 msgid "Password"
 msgstr "Contrasenya"
@@ -424,14 +449,14 @@ msgstr "Contrasenya"
 #. adding an account.
 #. Translators: This label describes the host name or IP
 #. address and port used by an account's IMAP service.
-#: src/client/accounts/accounts-editor-add-pane.vala:621
-#: src/client/accounts/accounts-editor-servers-pane.vala:727
+#: src/client/accounts/accounts-editor-add-pane.vala:629
+#: src/client/accounts/accounts-editor-servers-pane.vala:728
 msgid "IMAP server"
 msgstr "Servidor IMAP"
 
 #. Translators: Placeholder for the IMAP server hostname
 #. when adding an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:624
+#: src/client/accounts/accounts-editor-add-pane.vala:632
 msgid "imap.example.com"
 msgstr "imap.exemple.com"
 
@@ -439,20 +464,20 @@ msgstr "imap.exemple.com"
 #. adding an account.
 #. Translators: This label describes the host name or IP
 #. address and port used by an account's SMTP service.
-#: src/client/accounts/accounts-editor-add-pane.vala:630
-#: src/client/accounts/accounts-editor-servers-pane.vala:733
+#: src/client/accounts/accounts-editor-add-pane.vala:638
+#: src/client/accounts/accounts-editor-servers-pane.vala:734
 msgid "SMTP server"
 msgstr "Servidor SMTP"
 
 #. Translators: Placeholder for the SMTP server hostname
 #. when adding an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:633
+#: src/client/accounts/accounts-editor-add-pane.vala:641
 msgid "smtp.example.com"
 msgstr "smtp.exemple.com"
 
 #. Translators: Label in the account editor for the user's
 #. custom name for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:278
+#: src/client/accounts/accounts-editor-edit-pane.vala:277
 #: ui/accounts_editor_remove_pane.ui:123
 msgid "Account name"
 msgstr "Nom del compte"
@@ -461,46 +486,46 @@ msgstr "Nom del compte"
 #. the name of an account. The string
 #. substitution is the old name of the
 #. account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:312
+#: src/client/accounts/accounts-editor-edit-pane.vala:318
 #, c-format
 msgid "Change account name back to “%s”"
 msgstr "Torna a canviar el nom del compte a «%s»"
 
 #. Translators: Tooltip for adding a new email sender/from
 #. address's address to an account
-#: src/client/accounts/accounts-editor-edit-pane.vala:336
+#: src/client/accounts/accounts-editor-edit-pane.vala:342
 msgid "Add a new sender email address"
 msgstr "Afegeix una adreça nova de correu electrònic del remitent"
 
 #. Translators: Label used to indicate the user has
 #. provided no display name for one of their sender
 #. email addresses in their account settings.
-#: src/client/accounts/accounts-editor-edit-pane.vala:417
+#: src/client/accounts/accounts-editor-edit-pane.vala:423
 msgid "Name not set"
 msgstr "Nom no configurat"
 
 #. Translators: This is used as a placeholder for the
 #. display name for an email address when editing a user's
 #. sender address preferences for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:456
+#: src/client/accounts/accounts-editor-edit-pane.vala:464
 msgid "Sender Name"
 msgstr "Nom del remitent"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:479
+#: src/client/accounts/accounts-editor-edit-pane.vala:491
 msgid "Remove"
 msgstr "Suprimeix"
 
 #. Translators: Label used for the display name part of an
 #. email address when editing a user's sender address
 #. preferences for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:494
+#: src/client/accounts/accounts-editor-edit-pane.vala:506
 msgid "Sender name"
 msgstr "Nom del remitent"
 
 #. Translators: Label used as the undo tooltip after adding an
 #. new sender email address to an account. The string
 #. substitution is the email address added.
-#: src/client/accounts/accounts-editor-edit-pane.vala:561
+#: src/client/accounts/accounts-editor-edit-pane.vala:573
 #, c-format
 msgid "Remove “%s”"
 msgstr "Suprimeix «%s»"
@@ -508,7 +533,7 @@ msgstr "Suprimeix «%s»"
 #. Translators: Label used as the undo tooltip after editing a
 #. sender address for an account. The string substitution is
 #. the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:601
+#: src/client/accounts/accounts-editor-edit-pane.vala:613
 #, c-format
 msgid "Undo changes to “%s”"
 msgstr "Desfés els canvis a «%s»"
@@ -516,7 +541,7 @@ msgstr "Desfés els canvis a «%s»"
 #. Translators: Label used as the undo tooltip after removing
 #. a sender address from an account. The string substitution
 #. is the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:688
+#: src/client/accounts/accounts-editor-edit-pane.vala:700
 #, c-format
 msgid "Add “%s” back"
 msgstr "Afegiu de nou «%s»"
@@ -524,14 +549,14 @@ msgstr "Afegiu de nou «%s»"
 #. Translators: Label used as the undo tooltip after removing
 #. a sender address from an account. The string substitution
 #. is the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:730
+#: src/client/accounts/accounts-editor-edit-pane.vala:742
 msgid "Undo signature changes"
 msgstr "Desfés els canvis de signatura"
 
 #. Translators: This label describes the account
 #. preference for the length of time (weeks, months or
 #. years) that past email should be downloaded.
-#: src/client/accounts/accounts-editor-edit-pane.vala:778
+#: src/client/accounts/accounts-editor-edit-pane.vala:790
 msgid "Download mail"
 msgstr "Baixa els missatges"
 
@@ -540,98 +565,100 @@ msgstr "Baixa els missatges"
 #. should be downloaded for an account. The
 #. string substitution is the duration,
 #. e.g. "1 month back".
-#: src/client/accounts/accounts-editor-edit-pane.vala:810
+#: src/client/accounts/accounts-editor-edit-pane.vala:822
 #, c-format
 msgid "Change download period back to: %s"
 msgstr "Canvia el període del correu rebut a baixar de nou: %s"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:831
+#: src/client/accounts/accounts-editor-edit-pane.vala:843
 msgid "Everything"
 msgstr "Tot"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:835
+#: src/client/accounts/accounts-editor-edit-pane.vala:847
 msgid "2 weeks back"
 msgstr "Fa 2 setmanes"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:839
+#: src/client/accounts/accounts-editor-edit-pane.vala:851
 msgid "1 month back"
 msgstr "Fa 1 mes"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:843
+#: src/client/accounts/accounts-editor-edit-pane.vala:855
 msgid "3 months back"
 msgstr "Fa 3 mesos"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:847
+#: src/client/accounts/accounts-editor-edit-pane.vala:859
 msgid "6 months back"
 msgstr "Fa 6 mesos"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:851
+#: src/client/accounts/accounts-editor-edit-pane.vala:863
 msgid "1 year back"
 msgstr "Fa 1 any"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:855
+#: src/client/accounts/accounts-editor-edit-pane.vala:867
 msgid "2 years back"
 msgstr "Fa 2 anys"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:859
+#: src/client/accounts/accounts-editor-edit-pane.vala:871
 msgid "4 years back"
 msgstr "Fa 4 anys"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:865
+#: src/client/accounts/accounts-editor-edit-pane.vala:877
 #, c-format
 msgid "%d day back"
 msgid_plural "%d days back"
 msgstr[0] "%d dia enrere"
 msgstr[1] "%d dies enrere"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:243
+#: src/client/accounts/accounts-editor-list-pane.vala:255
+#: src/client/application/application-main-window.vala:2053
 msgid "Undo"
 msgstr "Desfés"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:251
+#: src/client/accounts/accounts-editor-list-pane.vala:264
+#: src/client/application/application-main-window.vala:2036
 msgid "Redo"
 msgstr "Refés"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:345
-#: src/client/accounts/accounts-editor-list-pane.vala:433
-#: src/client/accounts/accounts-editor-row.vala:278
+#: src/client/accounts/accounts-editor-list-pane.vala:358
+#: src/client/accounts/accounts-editor-list-pane.vala:446
+#: src/client/accounts/accounts-editor-row.vala:279
 msgid "Gmail"
 msgstr "Gmail"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:349
-#: src/client/accounts/accounts-editor-list-pane.vala:437
-#: src/client/accounts/accounts-editor-row.vala:282
+#: src/client/accounts/accounts-editor-list-pane.vala:362
+#: src/client/accounts/accounts-editor-list-pane.vala:450
+#: src/client/accounts/accounts-editor-row.vala:283
 msgid "Outlook.com"
 msgstr "Outlook.com"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:353
-#: src/client/accounts/accounts-editor-list-pane.vala:441
-#: src/client/accounts/accounts-editor-row.vala:286
+#: src/client/accounts/accounts-editor-list-pane.vala:366
+#: src/client/accounts/accounts-editor-list-pane.vala:454
+#: src/client/accounts/accounts-editor-row.vala:287
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #. Translators: Tooltip for accounts that have been
 #. loaded but disabled by the user.
-#: src/client/accounts/accounts-editor-list-pane.vala:371
+#: src/client/accounts/accounts-editor-list-pane.vala:384
 msgid "This account has been disabled"
 msgstr "Aquest compte ha estat inhabilitat"
 
 #. Translators: Tooltip for accounts that have been
 #. loaded but because of some error are not able to be
 #. used.
-#: src/client/accounts/accounts-editor-list-pane.vala:380
+#: src/client/accounts/accounts-editor-list-pane.vala:393
 msgid "This account has encountered a problem and is unavailable"
 msgstr "Aquest compte té un problema i no està disponible"
 
 #. Translators: Label for adding a generic email account
-#: src/client/accounts/accounts-editor-list-pane.vala:430
+#: src/client/accounts/accounts-editor-list-pane.vala:443
 msgid "Other email providers"
 msgstr "Altres proveïdors de correu"
 
 #. Translators: Notification shown after removing an
 #. account. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:547
+#: src/client/accounts/accounts-editor-list-pane.vala:560
 #, c-format
 msgid "Account “%s” removed"
 msgstr "El compte «%s» ha estat eliminat"
@@ -639,44 +666,44 @@ msgstr "El compte «%s» ha estat eliminat"
 #. Translators: Notification shown after removing an account
 #. is undone. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:554
+#: src/client/accounts/accounts-editor-list-pane.vala:567
 #, c-format
 msgid "Account “%s” restored"
 msgstr "El compte «%s» ha estat restaurat"
 
 #. Translators: Tooltip for dragging list items
-#: src/client/accounts/accounts-editor-row.vala:49
+#: src/client/accounts/accounts-editor-row.vala:50
 msgid "Drag to move this item"
-msgstr "Arrossega per moure aquest element"
+msgstr "Arrossega per a moure aquest element"
 
 #. Translators: Label describes the service provider
 #. hosting the email account, e.g. Gmail, Yahoo, or some
 #. other generic IMAP service.
-#: src/client/accounts/accounts-editor-row.vala:294
+#: src/client/accounts/accounts-editor-row.vala:295
 msgid "Service provider"
 msgstr "Proveïdor de servei"
 
 #. Translators: This label describes what form of transport
 #. security (TLS, StartTLS, etc) used by an account's IMAP or SMTP
 #. service.
-#: src/client/accounts/accounts-editor-row.vala:467
+#: src/client/accounts/accounts-editor-row.vala:468
 msgid "Connection security"
 msgstr "Seguretat de la connexió"
 
 #. Translators: Label used when no auth scheme is used
 #. by an account's IMAP or SMTP service.
-#: src/client/accounts/accounts-editor-row.vala:478
-#: src/client/accounts/accounts-editor-servers-pane.vala:752
-#: src/client/accounts/accounts-editor-servers-pane.vala:964
+#: src/client/accounts/accounts-editor-row.vala:479
+#: src/client/accounts/accounts-editor-servers-pane.vala:755
+#: src/client/accounts/accounts-editor-servers-pane.vala:970
 #: src/engine/api/geary-special-folder-type.vala:58
 msgid "None"
 msgstr "Cap"
 
-#: src/client/accounts/accounts-editor-row.vala:485
+#: src/client/accounts/accounts-editor-row.vala:486
 msgid "StartTLS"
 msgstr "StartTLS"
 
-#: src/client/accounts/accounts-editor-row.vala:492
+#: src/client/accounts/accounts-editor-row.vala:493
 msgid "TLS"
 msgstr "TLS"
 
@@ -684,28 +711,29 @@ msgstr "TLS"
 #. credentials (none, use IMAP, custom) when adding a new
 #. account
 #. Button label for retrying when a login error has occurred
-#: src/client/accounts/accounts-editor-row.vala:533 ui/main-window.ui:455
+#: src/client/accounts/accounts-editor-row.vala:534
+#: ui/application-main-window.ui:346
 msgid "Login"
 msgstr "Nom d'usuari"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (none) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:540
+#: src/client/accounts/accounts-editor-row.vala:541
 msgid "No login needed"
 msgstr "No s’ha d'iniciar sessió"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (use IMAP) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:548
+#: src/client/accounts/accounts-editor-row.vala:549
 msgid "Use same login as receiving"
 msgstr "Usa el mateix nom d'usuari que en la recepció"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (custom) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:556
+#: src/client/accounts/accounts-editor-row.vala:557
 msgid "Use a different login"
 msgstr "Useu un nom d'usuari diferent"
 
@@ -730,8 +758,8 @@ msgstr "Comptes en línia GNOME"
 #. Translators: This label describes an account
 #. preference.
 #: src/client/accounts/accounts-editor-servers-pane.vala:611
-msgid "Save drafts on server"
-msgstr "Desa els esborranys al servidor"
+msgid "Save draft email on server"
+msgstr "Desa l'esborrany del missatge al servidor"
 
 #. Translators: This label describes an account
 #. preference.
@@ -744,28 +772,189 @@ msgstr "Desa els missatges enviats al servidor"
 #. Translators: Label used when an account's IMAP or
 #. SMTP service uses OAuth2. The string replacement is
 #. the service's login name.
-#: src/client/accounts/accounts-editor-servers-pane.vala:950
+#: src/client/accounts/accounts-editor-servers-pane.vala:956
 #, c-format
 msgid "%s using OAuth2"
 msgstr "%s està emprant OAuth2"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:960
+#: src/client/accounts/accounts-editor-servers-pane.vala:966
 msgid "Use receiving server login"
 msgstr "Utilitza el nom d'usuari del servidor de recepció"
 
-#: src/client/application/geary-application.vala:24
+#. Translators: File name used in save chooser when saving
+#. attachments that do not otherwise have a name.
+#: src/client/application/application-attachment-manager.vala:21
+msgid "Untitled"
+msgstr "Sense títol"
+
+#. / Translators: Dialog primary label when prompting to
+#. / overwrite a file. The string substitution is the file'sx
+#. / name.
+#: src/client/application/application-attachment-manager.vala:222
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Ja existeix un fitxer anomenat «%s». Voleu reemplaçar-lo?"
+
+#. / Translators: Dialog secondary label when prompting to
+#. / overwrite a file. The string substitution is the parent
+#. / folder's name.
+#: src/client/application/application-attachment-manager.vala:229
+#, c-format
+msgid ""
+"The file already exists in “%s”.  Replacing it will overwrite its contents."
+msgstr ""
+"El fitxer ja existeix a «%s». Reemplaçant-lo sobreescriureu el seu contingut."
+
+#: src/client/application/application-attachment-manager.vala:236
+msgid "_Replace"
+msgstr "_Reemplaça"
+
+#: src/client/application/application-client.vala:33
 msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
-#: src/client/application/geary-application.vala:25
+#: src/client/application/application-client.vala:34
 msgid "Copyright 2016-2019 Geary Development Team."
 msgstr "Copyright 2016-2019 equip de desenvolupament del Geary."
 
-#: src/client/application/geary-application.vala:27
+#: src/client/application/application-client.vala:36
 msgid "Visit the Geary web site"
 msgstr "Visiteu el lloc web de Geary"
 
-#: src/client/application/geary-application.vala:454
+#. / Command line option
+#: src/client/application/application-client.vala:94
+msgid "Print debug logging"
+msgstr "Imprimeix el registre de depuració"
+
+#. / Command line option
+#: src/client/application/application-client.vala:97
+msgid "Start with the main window hidden (deprecated)"
+msgstr "Comença amb la finestra principal oculta (obsolet)"
+
+#. / Command line option
+#: src/client/application/application-client.vala:100
+msgid "Enable WebKitGTK Inspector in web views"
+msgstr "Habilita l'inspector WebKitGTK a les vistes web"
+
+#. / Command line option
+#: src/client/application/application-client.vala:103
+msgid "Log conversation monitoring"
+msgstr "Registra el seguiment de les converses"
+
+#. / Command line option
+#: src/client/application/application-client.vala:106
+msgid "Log IMAP network deserialization"
+msgstr "Registra la deserialització de xarxa IMAP"
+
+#. / Command line option. "Normalization" can also be called
+#. / "synchronization".
+#: src/client/application/application-client.vala:110
+msgid "Log folder normalization"
+msgstr "Registra la normalització de carpetes"
+
+#. / Command line option
+#: src/client/application/application-client.vala:113
+msgid "Log network activity"
+msgstr "Registra l'activitat de xarxa"
+
+#. / Command line option
+#: src/client/application/application-client.vala:116
+msgid "Log periodic activity"
+msgstr "Registra l'activitat periòdica"
+
+#. / Command line option. The IMAP replay queue is how changes
+#. / on the server are replicated on the client.  It could
+#. / also be called the IMAP events queue.
+#: src/client/application/application-client.vala:121
+msgid "Log IMAP replay queue"
+msgstr "Registra la cua de reproducció IMAP"
+
+#. / Command line option. Serialization is how commands and
+#. / responses are converted into a stream of bytes for
+#. / network transmission
+#: src/client/application/application-client.vala:126
+msgid "Log IMAP network serialization"
+msgstr "Registra la serialització de xarxa d'IMAP"
+
+#. / Command line option
+#: src/client/application/application-client.vala:129
+msgid "Log database queries (generates lots of messages)"
+msgstr "Registra les consultes a la base de dades (genera molts missatges)"
+
+#. / Command line option
+#: src/client/application/application-client.vala:132
+msgid "Perform a graceful quit"
+msgstr "Realitza la sortida amb èxit"
+
+#: src/client/application/application-client.vala:134
+msgid "Open a new window"
+msgstr "Obre una finestra nova"
+
+#. / Command line option
+#: src/client/application/application-client.vala:137
+#, fuzzy
+#| msgid "Revoke all server certificates with TLS warnings"
+msgid "Revoke all pinned TLS server certificates"
+msgstr "Revoca tots els certificats del servidor amb advertències TLS"
+
+#. / Command line option
+#: src/client/application/application-client.vala:140
+msgid "Display program version"
+msgstr "Mostra la versió del programa"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:264
+msgid "Geary version"
+msgstr "Versió del Geary"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:266
+msgid "Geary revision"
+msgstr "Revisió del Geary"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:268
+msgid "GTK version"
+msgstr "Versió de GTK"
+
+#. / Applciation runtime information label
+#: src/client/application/application-client.vala:275
+msgid "GLib version"
+msgstr "Versió de GLib"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:282
+msgid "WebKitGTK version"
+msgstr "Versió de WebKitGTK"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:289
+msgid "Desktop environment"
+msgstr "Entorn d'escriptori"
+
+#. Translators: This is the file type displayed for
+#. attachments with unknown file types.
+#: src/client/application/application-client.vala:291
+#: src/client/components/components-attachment-pane.vala:91
+msgid "Unknown"
+msgstr "Desconegut"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:321
+msgid "Distribution name"
+msgstr "Nom de la distribució"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:326
+msgid "Distribution release"
+msgstr "Versió de la distribució "
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:334
+msgid "Installation prefix"
+msgstr "Prefix d'instal·lació"
+
+#: src/client/application/application-client.vala:587
 #, c-format
 msgid "About %s"
 msgstr "Quant al %s"
@@ -773,115 +962,135 @@ msgstr "Quant al %s"
 #. Translators: add your name and email address to receive
 #. credit in the About dialog For example: Yamada Taro
 #. <yamada.taro@example.com>
-#: src/client/application/geary-application.vala:458
+#: src/client/application/application-client.vala:591
 msgid "translator-credits"
 msgstr ""
 "Martin Steghöfer <martin@steghoefer.de>, 2013\n"
 "Gerard Bertran <bertran.gerardo@gmail.com>, 2017\n"
-"Jordi Mas i Hernàndez <jmas@softcatala.org>, 2017\n"
+"Jordi Mas i Hernàndez <jmas@softcatala.org>, 2017, 2020\n"
 "Carles Ferrando Garcia <carles.ferrando@gmail.com>, 2019"
 
-#: src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Comença Geary amb la finestra principal oculta"
+#. / Warning printed to the console when a deprecated
+#. / command line option is used.
+#: src/client/application/application-client.vala:937
+msgid "The `--hidden` option is deprecated and will be removed in the future."
+msgstr ""
 
-#: src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Sortida de la informació de depuració"
-
-#: src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Registra el seguiment de les converses"
-
-#: src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Registra la deserialització de xarxa"
-
-#: src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Registra l'activitat de xarxa"
-
-#. / The IMAP replay queue is how changes on the server are replicated on the client.
-#. / It could also be called the IMAP events queue.
-#: src/client/application/geary-args.vala:17
-msgid "Log IMAP replay queue"
-msgstr "Registra la cua de reproducció IMAP"
-
-#. / Serialization is how commands and responses are converted into a stream of bytes for
-#. / network transmission
-#: src/client/application/geary-args.vala:20
-msgid "Log network serialization"
-msgstr "Registra la serialització de xarxa"
-
-#: src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Registra l'activitat periòdica"
-
-#: src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Registra les consultes a la base de dades (genera molts missatges)"
-
-#. / "Normalization" can also be called "synchronization"
-#: src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Registra la normalització de carpetes"
-
-#: src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Permet la inspecció del WebView"
-
-#: src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Revoca tots els certificats del servidor amb advertències TLS"
-
-#: src/client/application/geary-args.vala:27
-msgid "Perform a graceful quit"
-msgstr "Realitza la sortida amb èxit"
-
-#: src/client/application/geary-args.vala:28
-msgid "Display program version"
-msgstr "Mostra la versió del programa"
-
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: src/client/application/geary-args.vala:53
+#. / Command line warning, string substitution
+#. / is the given argument
+#: src/client/application/application-client.vala:970
 #, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Utilitza %s per obrir una nova finestra de l'editor"
+msgid "Unrecognised program argument: “%s”"
+msgstr "Paràmetre no reconegut: «%s»"
 
-#: src/client/application/geary-args.vala:56
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Envieu comentaris, suggeriments i errors a:"
-
-#. i18n: Command line arguments are invalid
-#: src/client/application/geary-args.vala:63
+#. / Notification title.
+#: src/client/application/application-controller.vala:458
 #, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "No s'han pogut interpretar les opcions de la línia d'ordres: %s\n"
+msgid "A problem occurred sending email for %s"
+msgstr "S'ha produït un error en enviar el correu per a %s"
 
-#: src/client/application/geary-args.vala:74
+#. / Notification body
+#: src/client/application/application-controller.vala:462
+msgid "Email will not be sent until re-connected"
+msgstr "No s'enviarà el correu electrònic fins que us torneu a connectar"
+
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:568
+msgid "Conversation marked"
+msgid_plural "Conversations marked"
+msgstr[0] "S'ha marcat la conversa"
+msgstr[1] "S'han marcat les converses"
+
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:574
+msgid "Conversation un-marked"
+msgid_plural "Conversations un-marked"
+msgstr[0] "S'ha desmarcat la conversa"
+msgstr[1] "S'han desmarcat les converses"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:600
+#: src/client/application/application-controller.vala:684
 #, c-format
-msgid "Unrecognized command line option “%s”\n"
-msgstr "Opció de la línia d'ordres no reconeguda «%s»\n"
+msgid "Conversation moved to %s"
+msgid_plural "Conversations moved to %s"
+msgstr[0] "S'ha mogut la conversa a %s"
+msgstr[1] "S'han mogut les converses a %s"
 
-#. Translators: File name used in save chooser when saving
-#. attachments that do not otherwise have a name.
-#: src/client/application/geary-controller.vala:58
-msgid "Untitled"
-msgstr "Sense títol"
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the source folder.
+#. / Translators: Label for in-app notification. String
+#. / substitution is the name of the destination folder.
+#: src/client/application/application-controller.vala:608
+#: src/client/application/application-controller.vala:630
+#, c-format
+msgid "Conversation restored to %s"
+msgid_plural "Conversations restored to %s"
+msgstr[0] "S'ha restaurat la conversa a %s"
+msgstr[1] "S'han restaurat les converses a %s"
 
-#: src/client/application/geary-controller.vala:959
-msgid "Labels"
-msgstr "Etiquetes"
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:651
+msgid "Conversation archived"
+msgid_plural "Conversations archived"
+msgstr[0] "S'ha arxivat la conversa"
+msgstr[1] "S'han arxivat les converses"
 
-#. give the user two options: reset the Account local store, or exit Geary.  A third
-#. could be done to leave the Account in an unopened state, but we don't currently
-#. have provisions for that.
-#: src/client/application/geary-controller.vala:972
+#. / Translators: Label for in-app notification. String
+#. / substitution is the name of the destination folder.
+#: src/client/application/application-controller.vala:707
+#, c-format
+msgid "Message restored to %s"
+msgid_plural "Messages restored to %s"
+msgstr[0] "S'ha restaurat el missatge a %s"
+msgstr[1] "S'han restaurat els missatges a %s"
+
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:728
+msgid "Message archived"
+msgid_plural "Messages archived"
+msgstr[0] "S'ha arxivat el missatge"
+msgstr[1] "S'han arxivat el missatges"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:763
+#, c-format
+msgid "Message moved to %s"
+msgid_plural "Messages moved to %s"
+msgstr[0] "S'ha mogut el missatge a %s"
+msgstr[1] "S'han mogut els missatges a %s"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:791
+#, c-format
+msgid "Conversation labelled as %s"
+msgid_plural "Conversations labelled as %s"
+msgstr[0] "S'ha etiquetat la conversa com a %s"
+msgstr[1] "S'han etiquetat les converses com a %s"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:799
+#, c-format
+msgid "Conversation un-labelled as %s"
+msgid_plural "Conversations un-labelled as %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/client/application/application-controller.vala:1223
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "No es pot obrir la base de dades per a %s"
 
-#: src/client/application/geary-controller.vala:973
+#: src/client/application/application-controller.vala:1224
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -906,20 +1115,20 @@ msgstr ""
 "La reconstrucció de la base de dades va destruir tot el correu local i els "
 "seus annexos. <b>El correu al servidor no es veurà afectat.</b>"
 
-#: src/client/application/geary-controller.vala:975
+#: src/client/application/application-controller.vala:1226
 msgid "_Rebuild"
 msgstr "_Reconstrueix"
 
-#: src/client/application/geary-controller.vala:975
+#: src/client/application/application-controller.vala:1226
 msgid "E_xit"
 msgstr "_Surt"
 
-#: src/client/application/geary-controller.vala:984
+#: src/client/application/application-controller.vala:1236
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "No es pot reconstruir la base de dades de «%s»"
 
-#: src/client/application/geary-controller.vala:985
+#: src/client/application/application-controller.vala:1237
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -930,15 +1139,112 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/client/application/geary-controller.vala:1840
-msgid "Undo move (Ctrl+Z)"
-msgstr "Desfés el moviment (Ctrl+Z)"
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:1561
+#, c-format
+msgid "Email sent to %s"
+msgstr "Correu enviat a %s"
 
-#: src/client/application/geary-controller.vala:1850
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:2656
+#, c-format
+msgid "Email to %s queued for delivery"
+msgstr "Correu a %s s'ha posat a la cua d'enviament"
+
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:2720
+#, c-format
+msgid "Email to %s saved"
+msgstr "Corre a %s desat"
+
+#. / Translators: A label for an in-app notification.
+#: src/client/application/application-controller.vala:2735
+#: src/client/application/application-controller.vala:2793
+msgid "Composer could not be restored"
+msgstr ""
+
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:2778
+#, c-format
+msgid "Email to %s discarded"
+msgstr "S'ha descartat el correu a %s"
+
+#. / Translators: Main window title, first string
+#. / substitution being the currently selected folder name,
+#. / the second being the selected account name.
+#: src/client/application/application-main-window.vala:560
+#, c-format
+msgid "%s — %s"
+msgstr "%s — %s"
+
+#: src/client/application/application-main-window.vala:967
+msgid "Labels"
+msgstr "Etiquetes"
+
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/application/application-main-window.vala:1306
+msgid "Do you want to permanently delete this conversation?"
+msgid_plural "Do you want to permanently delete these conversations?"
+msgstr[0] "Voleu suprimir aquesta conversa permanentment?"
+msgstr[1] "Voleu suprimir aquestes converses permanentment?"
+
+#: src/client/application/application-main-window.vala:1311
+#: src/client/application/application-main-window.vala:1326
+msgid "Delete"
+msgstr "Suprimeix"
+
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/application/application-main-window.vala:1321
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] "Voleu suprimir aquest missatge permanentment?"
+msgstr[1] "Voleu suprimir aquests missatges permanentment?"
+
+#: src/client/application/application-main-window.vala:1334
+#, c-format
+msgid "Empty all email from your %s folder?"
+msgstr "Buida tot el correu electrònic de la carpeta %s?"
+
+#: src/client/application/application-main-window.vala:1337
+msgid "This removes the email from Geary and your email server."
+msgstr ""
+"Això elimina el correu electrònic del Geary i el seu servidor de correu "
+"electrònic."
+
+#: src/client/application/application-main-window.vala:1338
+msgid "This cannot be undone."
+msgstr "Això no es pot desfer."
+
+#: src/client/application/application-main-window.vala:1339
+#, c-format
+msgid "Empty %s"
+msgstr "Buit %s"
+
+#: src/client/application/application-main-window.vala:1669
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#. Translators: The first argument will be a
+#. description of the document type, the second will
+#. be a human-friendly size string. For example:
+#. Document (100.9MB)
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: src/client/components/components-attachment-pane.vala:107
+#: src/client/composer/composer-widget.vala:1834
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: src/client/components/components-attachment-pane.vala:379
 msgid "Are you sure you want to open these attachments?"
 msgstr "Esteu segur que voleu obrir aquests fitxers adjunts?"
 
-#: src/client/application/geary-controller.vala:1851
+#: src/client/components/components-attachment-pane.vala:380
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -946,375 +1252,231 @@ msgstr ""
 "Els fitxers adjunts podrien danyar el vostre sistema. Obriu només fitxers de "
 "fonts fiables."
 
-#: src/client/application/geary-controller.vala:1852
+#: src/client/components/components-attachment-pane.vala:381
 msgid "Don’t _ask me again"
 msgstr "No m'ho tornis a pregunt_ar"
 
-#. Translators: Dialog primary label when prompting to
-#. overwrite a file. The string substitution is the file'sx
-#. name.
-#: src/client/application/geary-controller.vala:1981
-#, c-format
-msgid "A file named “%s” already exists.  Do you want to replace it?"
-msgstr "Ja existeix un fitxer anomenat «%s». Voleu reemplaçar-lo?"
+#: src/client/components/components-inspector.vala:72
+msgid "Inspector"
+msgstr "Inspector"
 
-#. Translators: Dialog secondary label when prompting to
-#. overwrite a file. The string substitution is the parent
-#. folder's name.
-#: src/client/application/geary-controller.vala:1988
-#, c-format
+#. / Translators: Title for Inspector logs pane
+#. / Translators: Title for problem report dialog logs pane
+#: src/client/components/components-inspector.vala:87
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:102
+msgid "Logs"
+msgstr "Registres"
+
+#. / Translators: Title for Inspector system system information pane
+#. / Translators: Title for problem report system information
+#. / pane
+#: src/client/components/components-inspector.vala:91
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:105
+msgid "System"
+msgstr "Sistema"
+
+#. Button label for saving problem report information
+#: src/client/components/components-inspector.vala:208
+#: src/client/components/components-inspector.vala:211
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:221
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:224
+#: ui/problem-details-dialog.ui:42
+msgid "Save As"
+msgstr "Desa i anomena..."
+
+#: src/client/components/components-inspector.vala:212
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:225
+#: ui/accounts_editor_servers_pane.ui:17
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:43
+msgid "_Automatically select next message"
+msgstr "Selecciona el missatge següent _automàticament"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:53
+msgid "_Display conversation preview"
+msgstr "_Mostra la vista prèvia de la conversa"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:63
+msgid "Use _three pane view"
+msgstr "Utilitza vista de _tres panells"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:73
+msgid "Use _single key email shortcuts"
+msgstr "_Usa només les dreceres d'una tecla"
+
+#: src/client/components/components-preferences-window.vala:75
 msgid ""
-"The file already exists in “%s”.  Replacing it will overwrite its contents."
+"Enable keyboard shortcuts for email actions that do not require pressing "
+"<Ctrl>"
 msgstr ""
-"El fitxer ja existeix a «%s». Reemplaçant-lo sobreescriureu el seu contingut."
 
-#: src/client/application/geary-controller.vala:1992
-msgid "_Replace"
-msgstr "_Reemplaça"
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:86
+msgid "_Watch for new mail when closed"
+msgstr "_Vigila si arriba correu nou quan s'ha tancat"
 
-#: src/client/application/geary-controller.vala:2268
-msgid "Close the draft message?"
-msgid_plural "Close all draft messages?"
-msgstr[0] "Tanca el missatge obert d'esborrany?"
-msgstr[1] "Tanca els missatges oberts d'esborranys?"
+#. / Translators: Preferences tooltip
+#: src/client/components/components-preferences-window.vala:90
+msgid "Geary will keep running after all windows are closed"
+msgstr "Geary continuarà funcionant després de tancar totes les finestres"
 
-#: src/client/application/geary-controller.vala:2394
+#. / Translators: Search entry placeholder text
+#: src/client/components/components-search-bar.vala:12
+#: src/client/folder-list/folder-list-search-branch.vala:53
+#: src/engine/api/geary-special-folder-type.vala:51
+msgid "Search"
+msgstr "Cerca"
+
+#. / Translators: Search entry tooltip
+#: src/client/components/components-search-bar.vala:32
+msgid "Search all mail in account for keywords"
+msgstr "Cerca les paraules clau en tots els missatges en el compte"
+
+#. / Translators: Search entry placeholder, string
+#. / replacement is the name of an account
+#: src/client/components/components-search-bar.vala:81
+#: src/client/folder-list/folder-list-search-branch.vala:54
 #, c-format
-msgid "Empty all email from your %s folder?"
-msgstr "Buida tot el correu electrònic de la carpeta %s?"
-
-#: src/client/application/geary-controller.vala:2395
-msgid "This removes the email from Geary and your email server."
-msgstr ""
-"Això elimina el correu electrònic del Geary i el seu servidor de correu "
-"electrònic."
-
-#: src/client/application/geary-controller.vala:2396
-msgid "This cannot be undone."
-msgstr "Això no es pot desfer."
-
-#: src/client/application/geary-controller.vala:2397
-#, c-format
-msgid "Empty %s"
-msgstr "Buit %s"
-
-#: src/client/application/geary-controller.vala:2414
-#, c-format
-msgid "Error emptying %s"
-msgstr "Error de buidatge %s"
-
-#: src/client/application/geary-controller.vala:2446
-msgid "Do you want to permanently delete this message?"
-msgid_plural "Do you want to permanently delete these messages?"
-msgstr[0] "Voleu descartar el missatge permanentment?"
-msgstr[1] "Voleu descartar els missatges permanentment?"
-
-#: src/client/application/geary-controller.vala:2448
-msgid "Delete"
-msgstr "_Suprimeix"
-
-#: src/client/application/geary-controller.vala:2462
-msgid "Undo trash (Ctrl+Z)"
-msgstr "Desfés la paperera (Ctrl+Z)"
-
-#: src/client/application/geary-controller.vala:2512
-msgid "Undo archive (Ctrl+Z)"
-msgstr "Desfés el fitxer (Ctrl+Z)"
-
-#: src/client/application/geary-controller.vala:2557
-msgid "Undo (Ctrl+Z)"
-msgstr "Desfés (Ctrl+Z)"
-
-#. Translators: The label for an in-app notification. The
-#. string substitution is a list of recipients of the email.
-#: src/client/application/geary-controller.vala:2638
-#, c-format
-msgid "Successfully sent mail to %s."
-msgstr "S'ha enviat el missatge amb èxit a %s."
-
-#: src/client/application/geary-controller.vala:2720
-msgid "Failed to open default text editor."
-msgstr "No s'ha pogut obrir l'editor de text predeterminat."
+msgid "Search %s account"
+msgstr "Compte de cerca %s"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. email address to be entered, but one is not provided.
-#: src/client/components/components-validator.vala:378
+#: src/client/components/components-validator.vala:390
 msgid "An email address is required"
 msgstr "Cal una adreça de correu electrònic"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. email address to be entered, but the address is invalid.
-#: src/client/components/components-validator.vala:382
+#: src/client/components/components-validator.vala:394
 msgid "Not a valid email address"
 msgstr "Adreça de correu electrònic no vàlida"
 
 #. Translators: Tooltip used when an entry requires a valid,
 #. resolvable server name to be entered, but one is not
 #. provided.
-#: src/client/components/components-validator.vala:428
+#: src/client/components/components-validator.vala:440
 msgid "A server name is required"
 msgstr "Cal un nom de servidor"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. server name to be entered, but it was unable to be
 #. looked-up in the DNS.
-#: src/client/components/components-validator.vala:433
+#: src/client/components/components-validator.vala:445
 msgid "Could not look up server name"
 msgstr "No s’ha pogut cercar el nom del servidor"
 
-#: src/client/components/main-toolbar.vala:151
+#: src/client/components/main-toolbar.vala:116
 msgid "Mark conversation"
 msgid_plural "Mark conversations"
 msgstr[0] "Marca la conversa"
 msgstr[1] "Marca les converses"
 
-#: src/client/components/main-toolbar.vala:156
+#: src/client/components/main-toolbar.vala:121
 msgid "Add label to conversation"
 msgid_plural "Add label to conversations"
 msgstr[0] "Afegeix etiqueta a la conversa"
 msgstr[1] "Afegeix etiqueta a les converses"
 
-#: src/client/components/main-toolbar.vala:161
+#: src/client/components/main-toolbar.vala:126
 msgid "Move conversation"
 msgid_plural "Move conversations"
 msgstr[0] "Mou la conversa"
 msgstr[1] "Mou les converses"
 
-#: src/client/components/main-toolbar.vala:166
-msgid "Archive conversation (A)"
-msgid_plural "Archive conversations (A)"
-msgstr[0] "Arxiva la conversa (A)"
-msgstr[1] "Arxiva les converses (A)"
+#: src/client/components/main-toolbar.vala:131
+msgid "Archive conversation"
+msgid_plural "Archive conversations"
+msgstr[0] "Arxiva la conversa"
+msgstr[1] "Arxiva les converses"
 
-#: src/client/components/main-toolbar.vala:175
-msgid "Move conversation to Trash (Delete, Backspace)"
-msgid_plural "Move conversations to Trash (Delete, Backspace)"
-msgstr[0] "Mou la conversa a la paperera (Esborrar, Retrocés)"
-msgstr[1] "Mou les converses a la paperera (Esborrar, Retrocés)"
+#: src/client/components/main-toolbar.vala:142
+msgid "Move conversation to Trash"
+msgid_plural "Move conversations to Trash"
+msgstr[0] "Mou la conversa a la paperera"
+msgstr[1] "Mou les converses a la paperera"
 
-#: src/client/components/main-toolbar.vala:183
-msgid "Delete conversation (Shift+Delete)"
-msgid_plural "Delete conversations (Shift+Delete)"
-msgstr[0] "Suprimeix la conversa (Maj + Supr)"
-msgstr[1] "Suprimeix les converses (Maj + Supr)"
+#: src/client/components/main-toolbar.vala:152
+msgid "Delete conversation"
+msgid_plural "Delete conversations"
+msgstr[0] "Suprimeix la conversa"
+msgstr[1] "Suprimeix les converses"
 
-#: src/client/components/main-window.vala:503
+#. Translators: Info bar title for a generic account
+#. problem.
+#: src/client/components/main-window-info-bar.vala:44
+msgid "Account problem"
+msgstr "Problema al compte"
+
+#. Translators: Info bar sub-title for a generic account
+#. problem. String substitution is the account name.
+#: src/client/components/main-window-info-bar.vala:48
 #, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+msgid "Geary has encountered a problem with %s."
+msgstr "El Geary ha tingut un problema amb %s."
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:47
+#. Translators: Info bar sub-title for a generic
+#. account problem. String substitution is the
+#. account name.
+#: src/client/components/main-window-info-bar.vala:61
 #, c-format
-msgid "Problem connecting to incoming server for %s"
-msgstr "Ha fallat la connexió al servidor d'entrada %s"
-
-#. Translators: String substitution is the server name
-#: src/client/components/main-window-info-bar.vala:49
-#: src/client/components/main-window-info-bar.vala:58
-#, c-format
-msgid ""
-"Could not connect to %s, check your Internet access and the server name and "
-"try again"
-msgstr ""
-"N0 s'ha pogut connectar amb %s, comproveu el accés a internet i el nom del "
-"servidor i torneu a provar-ho"
+msgid "Geary encountered a problem checking mail for %s."
+msgstr "Geary ha trobat un problema en comprovar el correu per a %s."
 
 #. Translators: Tooltip label for Retry button
-#. Button tooltip for retrying an account problem
-#: src/client/components/main-window-info-bar.vala:51
-#: src/client/components/main-window-info-bar.vala:60
-#: src/client/components/main-window-info-bar.vala:69
-#: src/client/components/main-window-info-bar.vala:78
-#: src/client/components/main-window-info-bar.vala:87
-#: src/client/components/main-window-info-bar.vala:96
-#: src/client/components/main-window-info-bar.vala:136 ui/main-window.ui:265
+#: src/client/components/main-window-info-bar.vala:65
 msgid "Try reconnecting"
 msgstr "Intenta connectar de nou"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:56
+#. Translators: Info bar title for an outgoing
+#. account problem. String substitution is the
+#. account name
+#: src/client/components/main-window-info-bar.vala:73
 #, c-format
-msgid "Problem connecting to outgoing server for %s"
-msgstr "Ha fallat la connexió al servidor de sortida per %s"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:65
-#: src/client/components/main-window-info-bar.vala:83
-#, c-format
-msgid "Problem communicating with incoming server for %s"
-msgstr "Ha fallat la connexió al servidor d'entrada per %s"
-
-#. Translators: String substitution is the server name
-#: src/client/components/main-window-info-bar.vala:67
-#: src/client/components/main-window-info-bar.vala:76
-#, c-format
-msgid "Network error talking to %s, check your Internet access and try again"
-msgstr ""
-"Error de xarxa parlant amb %s, comproveu el accés a Internet i torneu-ho a "
-"provar"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:74
-#: src/client/components/main-window-info-bar.vala:91
-msgid "Problem communicating with outgoing mail server"
-msgstr "Ha fallat la connexió amb el servidor de correu de sortida"
-
-#. Translators: String substitution is the server name
-#: src/client/components/main-window-info-bar.vala:85
-#, c-format
-msgid ""
-"Geary did not understand a message from %s or vice versa, please file a bug "
-"report"
-msgstr ""
-"Geary no entén un missatge de %s o viceversa, envieu un informe d'error"
-
-#. Translators: First string substitution is the server
-#. name, second is the account name
-#: src/client/components/main-window-info-bar.vala:94
-#, c-format
-msgid ""
-"Could not communicate with %s for %s, check the server name and try again in "
-"a moment"
-msgstr ""
-"Ha fallat la connexió amb %s de %s, comproveu el nom del servidor i torneu a "
-"provar en un moment"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:101
-#, c-format
-msgid "Incoming mail server password required for %s"
-msgstr "Cal una contrasenya per al servidor d'entrada per a %s"
-
-#: src/client/components/main-window-info-bar.vala:102
-msgid "Messages cannot be received without the correct password."
-msgstr "Els missatges no es poden rebre sense la contrasenya correcta."
+msgid "Geary encountered a problem sending email for %s."
+msgstr "Geary ha trobat un problema en enviar el correu per a %s."
 
 #. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:104
-msgid "Retry receiving email, you will be prompted for a password"
-msgstr "Torneu a baixar el correu, se us preguntarà per la vostra contrasenya"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:109
-#, c-format
-msgid "Outgoing mail server password required for %s"
-msgstr "Cal una contrasenya per al servidor de sortida per a %s"
-
-#: src/client/components/main-window-info-bar.vala:110
-msgid "Messages cannot be sent without the correct password."
-msgstr "Els missatges no es poden enviar sense la contrasenya correcta."
-
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:112
-msgid "Retry sending queued messages, you will be prompted for a password"
-msgstr ""
-"Torneu a enviar la cua del missatges, se us preguntarà per la vostra "
-"contrasenya"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:117
-#, c-format
-msgid "Incoming mail server security is not trusted for %s"
-msgstr "La seguretat del servidor d'entrada no és de confiança per a %s"
-
-#: src/client/components/main-window-info-bar.vala:118
-msgid "Messages will not be received until checked."
-msgstr "Els missatges no es poden rebre fins que els comproveu."
-
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:120
-#: src/client/components/main-window-info-bar.vala:128
-msgid "Check security details"
-msgstr "Comprova els detalls de seguretat"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:125
-#, c-format
-msgid "Outgoing mail server security is not trusted for %s"
-msgstr "La seguretat del servidor de sortida no és de confiança per a %s"
-
-#: src/client/components/main-window-info-bar.vala:126
-msgid "Messages cannot be sent until checked."
-msgstr "Els missatges no es poden enviar fins que els comproveu."
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:133
-#, c-format
-msgid "A problem occurred checking mail for %s"
-msgstr "Ha succeït un problema en comprovar el correu per a %s"
-
-#: src/client/components/main-window-info-bar.vala:134
-#: src/client/components/main-window-info-bar.vala:142
-msgid "Something went wrong, please file a bug report if the problem persists"
-msgstr "Quelcom ha anat malament, envieu un informe si el problema persisteix"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:141
-#, c-format
-msgid "A problem occurred sending mail for %s"
-msgstr "Ha succeït un problema en enviar el correu per a %s"
-
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:144
+#: src/client/components/main-window-info-bar.vala:77
 msgid "Retry sending queued messages"
 msgstr "Intenteu enviar de nou els missatges de la cua"
 
-#: src/client/components/main-window-info-bar.vala:155
-msgid "A database problem has occurred"
-msgstr "Ha succuït un problema amb la base de dades"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:157
-#, c-format
-msgid "Messages for %s must be downloaded again."
-msgstr "Els missatges per %s es baixaran de nou."
-
-#: src/client/components/main-window-info-bar.vala:170
+#. Translators: Info bar title for a generic application
+#. problem.
+#: src/client/components/main-window-info-bar.vala:84
 msgid "Geary has encountered a problem"
 msgstr "El Geary ha tingut un problema"
 
-#: src/client/components/main-window-info-bar.vala:171
-msgid ""
-"Please check the technical details and report the problem if it persists."
-msgstr ""
-"Comproveu els detalls tècnics i informeu del problema si aquest persisteix."
+#. Translators: Info bar sub-title for a generic
+#. application problem.
+#: src/client/components/main-window-info-bar.vala:88
+msgid "Please report the details if it persists."
+msgstr "Informeu dels detalls si aquest persisteix."
 
-#: src/client/components/main-window-info-bar.vala:179
+#. Translators: Button label for viewing technical details
+#. for a problem report.
+#: src/client/components/main-window-info-bar.vala:99
 msgid "_Details"
 msgstr "_Detalls"
 
-#. Button tooltip for displaying technical details about an account problem
-#: src/client/components/main-window-info-bar.vala:180 ui/main-window.ui:250
+#. Translators: Tooltip for viewing technical details for
+#. a problem report.
+#: src/client/components/main-window-info-bar.vala:102
 msgid "View technical details about the error"
 msgstr "Mostra els detalls tècnics sobre l'error"
 
-#: src/client/components/main-window-info-bar.vala:184
+#. Translators: Button label for retrying a server
+#. connection
+#: src/client/components/main-window-info-bar.vala:108
 msgid "_Retry"
 msgstr "_Intenta de nou"
 
-#: src/client/components/search-bar.vala:8
-#: src/client/folder-list/folder-list-search-branch.vala:38
-#: src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Cerca"
-
-#. Search entry.
-#: src/client/components/search-bar.vala:23
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Cerca tots els missatges en el compte de paraules clau (Ctrl+S)"
-
-#: src/client/components/search-bar.vala:101
-#, c-format
-msgid "Indexing %s account"
-msgstr "Compte d'indexació %s"
-
-#: src/client/components/search-bar.vala:112
-#: src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "Compte de cerca %s"
-
 #. / Displayed in the space-limited status bar while a message is in the process of being sent.
 #: src/client/components/status-bar.vala:26
 msgid "Sending…"
@@ -1355,15 +1517,15 @@ msgstr "Tanc_a"
 msgid "_Discard"
 msgstr "_Descarta"
 
-#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:56
+#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:52
 msgid "_Help"
 msgstr "A_juda"
 
-#: src/client/components/stock.vala:26 ui/conversation-email-menus.ui:77
+#: src/client/components/stock.vala:26 ui/components-attachment-pane-menus.ui:7
 msgid "_Open"
 msgstr "_Obre"
 
-#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:46
+#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:42
 msgid "_Preferences"
 msgstr "_Preferències"
 
@@ -1380,7 +1542,7 @@ msgstr "_Surt"
 msgid "_Remove"
 msgstr "_Elimina"
 
-#: src/client/components/stock.vala:31 ui/conversation-email-menus.ui:83
+#: src/client/components/stock.vala:31 ui/components-attachment-pane-menus.ui:11
 msgid "_Save"
 msgstr "De_sa"
 
@@ -1388,40 +1550,46 @@ msgstr "De_sa"
 msgid "_Keep"
 msgstr "_Mantén"
 
-#: src/client/composer/composer-link-popover.vala:149
+#: src/client/composer/composer-link-popover.vala:139
 msgid "Link URL is not correctly formatted, e.g. http://example.com"
 msgstr ""
 "L'URL de l'enllaç no té el format correcte, per exemple, http://exemple.com"
 
-#: src/client/composer/composer-link-popover.vala:156
+#: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid link URL"
 msgstr "Enllaç URL no vàlid"
 
-#: src/client/composer/composer-link-popover.vala:156
+#: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid email address"
 msgstr "Adreça de correu electrònic no vàlida"
 
-#: src/client/composer/composer-widget.vala:158
+#. / Translators: Title for an empty composer window
+#: src/client/composer/composer-widget.vala:30
+msgid "New Message"
+msgstr "Missatge nou"
+
+#: src/client/composer/composer-widget.vala:217
 msgid "Saved"
 msgstr "Desat"
 
-#: src/client/composer/composer-widget.vala:159
+#: src/client/composer/composer-widget.vala:218
 msgid "Saving"
 msgstr "S'està desant"
 
-#: src/client/composer/composer-widget.vala:160
+#: src/client/composer/composer-widget.vala:219
 msgid "Error saving"
 msgstr "S'ha produït un error en desar"
 
-#: src/client/composer/composer-widget.vala:161
+#: src/client/composer/composer-widget.vala:220
 msgid "Press Backspace to delete quote"
 msgstr "Premi la tecla Retrocés per a esborrar la cita"
 
 #. Translators: This is list of keywords, separated by pipe ("|")
 #. characters, that suggest an attachment; since this is full-word
-#. checking, include all variants of each word.  No spaces are
-#. allowed.
-#: src/client/composer/composer-widget.vala:170
+#. checking, include all variants of each word. No spaces are
+#. allowed. The words will be converted to lower case based on
+#. locale and English versions included automatically.
+#: src/client/composer/composer-widget.vala:236
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1432,100 +1600,90 @@ msgstr ""
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. Keep, Discard or Cancel.
-#: src/client/composer/composer-widget.vala:1130
+#: src/client/composer/composer-widget.vala:843
 msgid "Do you want to keep or discard this draft message?"
 msgstr "Vols mantenir o descartar aquest esborrany de missatge?"
 
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. only Discard or Cancel.
-#: src/client/composer/composer-widget.vala:1158
+#: src/client/composer/composer-widget.vala:869
 msgid "Do you want to discard this draft message?"
 msgstr "Vols descartar aquest esborrany de missatge?"
 
-#: src/client/composer/composer-widget.vala:1275
+#: src/client/composer/composer-widget.vala:1503
 msgid "Send message with an empty subject and body?"
 msgstr "Vols enviar un missatge amb un assumpte buit i el cos?"
 
-#: src/client/composer/composer-widget.vala:1277
+#: src/client/composer/composer-widget.vala:1505
 msgid "Send message with an empty subject?"
 msgstr "Vols enviar un missatge amb un assumpte buit?"
 
-#: src/client/composer/composer-widget.vala:1279
+#: src/client/composer/composer-widget.vala:1507
 msgid "Send message with an empty body?"
 msgstr "Vols enviar un missatge amb un cos buit?"
 
-#: src/client/composer/composer-widget.vala:1283
+#: src/client/composer/composer-widget.vala:1516
 msgid "Send message without an attachment?"
 msgstr "Vols enviar un missatge sense un fitxer adjunt?"
 
-#: src/client/composer/composer-widget.vala:1588
+#: src/client/composer/composer-widget.vala:1820
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "«%s» ja està seleccionat com a fitxer adjunt per a l'enviament."
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#. Translators: The first argument will be a
-#. description of the document type, the second will
-#. be a human-friendly size string. For example:
-#. Document (100.9MB)
-#: src/client/composer/composer-widget.vala:1596
-#: src/client/conversation-viewer/conversation-email.vala:173
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#: src/client/composer/composer-widget.vala:1633
-#, c-format
-msgid "“%s” could not be found."
-msgstr "No es pot conèixer «%s»."
-
-#: src/client/composer/composer-widget.vala:1639
-#, c-format
-msgid "“%s” is a folder."
-msgstr "«%s» és una carpeta."
-
-#: src/client/composer/composer-widget.vala:1645
+#: src/client/composer/composer-widget.vala:1856
+#: src/client/composer/composer-widget.vala:1906
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "«%s» és un fitxer buit."
 
-#: src/client/composer/composer-widget.vala:1658
+#: src/client/composer/composer-widget.vala:1894
+#, c-format
+msgid "“%s” could not be found."
+msgstr "No es pot conèixer «%s»."
+
+#: src/client/composer/composer-widget.vala:1900
+#, c-format
+msgid "“%s” is a folder."
+msgstr "«%s» és una carpeta."
+
+#: src/client/composer/composer-widget.vala:1919
 #, c-format
 msgid "“%s” could not be opened for reading."
-msgstr "No s'ha pogut obrir «%s» per llegir."
+msgstr "No s'ha pogut obrir «%s» per a llegir."
 
-#: src/client/composer/composer-widget.vala:1666
+#: src/client/composer/composer-widget.vala:1927
 msgid "Cannot add attachment"
 msgstr "No s'ha pogut afegir el fitxer adjunt"
 
 #. Translators: Human-readable version of the RFC 822 To header
-#: src/client/composer/composer-widget.vala:1716
-#: src/client/conversation-viewer/conversation-email.vala:982
-#: src/engine/rfc822/rfc822-utils.vala:298 ui/conversation-message.ui:312
+#: src/client/composer/composer-widget.vala:1984
+#: src/client/conversation-viewer/conversation-email.vala:559
+#: src/client/util/util-email.vala:235 ui/conversation-message.ui:312
 msgid "To:"
 msgstr "Per a:"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:1722
-#: src/client/conversation-viewer/conversation-email.vala:987
-#: src/engine/rfc822/rfc822-utils.vala:303 ui/conversation-message.ui:357
+#: src/client/composer/composer-widget.vala:1990
+#: src/client/conversation-viewer/conversation-email.vala:564
+#: src/client/util/util-email.vala:240 ui/conversation-message.ui:357
 msgid "Cc:"
 msgstr "Cc:"
 
 #. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:1728
-#: src/client/conversation-viewer/conversation-email.vala:992
+#: src/client/composer/composer-widget.vala:1996
+#: src/client/conversation-viewer/conversation-email.vala:569
 #: ui/conversation-message.ui:402
 msgid "Bcc:"
 msgstr "CCO:"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:1734
+#: src/client/composer/composer-widget.vala:2002
 msgid "Reply-To: "
 msgstr "Respon a:"
 
-#: src/client/composer/composer-widget.vala:1874
+#: src/client/composer/composer-widget.vala:2254
 msgid "Select Color"
 msgstr "Selecciona el color"
 
@@ -1534,152 +1692,162 @@ msgstr "Selecciona el color"
 #. printf argument will be the alternate email address,
 #. and the second will be the account's primary email
 #. address.
-#: src/client/composer/composer-widget.vala:2064
+#: src/client/composer/composer-widget.vala:2440
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s via %2$s"
 
 #. Composer label (with mnemonic underscore) for the account selector
 #. when choosing what address to send a message from.
-#: src/client/composer/composer-widget.vala:2125
+#: src/client/composer/composer-widget.vala:2496
 msgid "_From:"
 msgstr "_De:"
 
 #. Translators: This is the name of the file chooser filter
 #. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2357
+#: src/client/composer/composer-widget.vala:2801
 msgid "Images"
 msgstr "Imatges"
 
-#: src/client/composer/composer-window.vala:14
-msgid "New Message"
-msgstr "Missatge nou"
-
-#: src/client/composer/spell-check-popover.vala:117
+#: src/client/composer/spell-check-popover.vala:125
 msgid "Remove this language from the preferred list"
 msgstr "Elimina aquest idioma de la llista preferida"
 
-#: src/client/composer/spell-check-popover.vala:121
+#: src/client/composer/spell-check-popover.vala:129
 msgid "Add this language to the preferred list"
 msgstr "Afegeix aquest idioma a la llista preferida"
 
-#: src/client/composer/spell-check-popover.vala:217
+#: src/client/composer/spell-check-popover.vala:225
 msgid "Search for more languages"
 msgstr "Cerca més idiomes"
 
-#: src/client/conversation-list/conversation-list-view.vala:283
-msgid "Delete conversation"
-msgstr "Suprimeix la conversa"
+#. / Translators: Context menu item
+#: src/client/conversation-list/conversation-list-view.vala:335
+msgid "Move conversation to _Trash"
+msgid_plural "Move conversations to _Trash"
+msgstr[0] "_Mou la conversa a la paperera"
+msgstr[1] "_Mou les converses a la paperera"
 
-#: src/client/conversation-list/conversation-list-view.vala:286
+#. / Translators: Context menu item
+#: src/client/conversation-list/conversation-list-view.vala:347
+msgid "_Delete conversation"
+msgid_plural "_Delete conversations"
+msgstr[0] "_Suprimeix la conversa"
+msgstr[1] "_Suprimeix les converses"
+
+#: src/client/conversation-list/conversation-list-view.vala:360
 #: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "Ma_rca com a llegit"
 
-#: src/client/conversation-list/conversation-list-view.vala:289
+#: src/client/conversation-list/conversation-list-view.vala:368
 #: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "Marca com a no _llegit"
 
-#: src/client/conversation-list/conversation-list-view.vala:292
+#: src/client/conversation-list/conversation-list-view.vala:376
 #: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "_No destaquis"
 
-#: src/client/conversation-list/conversation-list-view.vala:294
+#: src/client/conversation-list/conversation-list-view.vala:383
 #: ui/main-toolbar-menus.ui:13
 msgid "_Star"
 msgstr "_Destaca"
 
 #. Translators: Menu item to reply to a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:297
+#: src/client/conversation-list/conversation-list-view.vala:392
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "_Respon"
 
-#: src/client/conversation-list/conversation-list-view.vala:298
+#: src/client/conversation-list/conversation-list-view.vala:398
 msgid "R_eply All"
 msgstr "R_espon tot"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:299
+#: src/client/conversation-list/conversation-list-view.vala:404
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "_Reenvia"
 
-#: src/client/conversation-list/formatted-conversation-data.vala:11
+#: src/client/conversation-list/formatted-conversation-data.vala:18
 msgid "Me"
 msgstr "En a mi"
 
-#. Translators: This is the file type displayed for
-#. attachments with unknown file types.
-#: src/client/conversation-viewer/conversation-email.vala:159
-msgid "Unknown"
-msgstr "Desconegut"
-
 #. Translators: Human-readable version of the RFC 822 From header
-#: src/client/conversation-viewer/conversation-email.vala:977
-#: src/engine/rfc822/rfc822-utils.vala:289
+#: src/client/conversation-viewer/conversation-email.vala:554
+#: src/client/util/util-email.vala:226
 msgid "From:"
 msgstr "De:"
 
 #. Translators: Human-readable version of the RFC 822 Date header
-#: src/client/conversation-viewer/conversation-email.vala:997
-#: src/engine/rfc822/rfc822-utils.vala:294
+#: src/client/conversation-viewer/conversation-email.vala:574
+#: src/client/util/util-email.vala:231
 msgid "Date:"
 msgstr "Data:"
 
 #. Translators: Human-readable version of the RFC 822 Subject header
-#: src/client/conversation-viewer/conversation-email.vala:1002
-#: src/engine/rfc822/rfc822-utils.vala:292
+#: src/client/conversation-viewer/conversation-email.vala:584
+#: src/client/util/util-email.vala:229
 msgid "Subject:"
 msgstr "Assumpte:"
 
-#: src/client/conversation-viewer/conversation-message.vala:65
+#: src/client/conversation-viewer/conversation-message.vala:128
 msgid "This email address may have been forged"
 msgstr "Aquesta adreça de correu electrònic pot haver estat falsificada"
 
-#. Compact headers
+#: src/client/conversation-viewer/conversation-message.vala:231
+msgid "<a href=''>Show less</a>"
+msgstr "<a href=''>Mostra menys</a>"
+
+#: src/client/conversation-viewer/conversation-message.vala:252
+#, c-format
+msgid "<a href=''>%d more…</a>"
+msgstr "<a href=''>%d més…</a>"
+
+#. Compact headers. These are partially done here and partially
+#. in load_contacts.
 #. Translators: This is displayed in place of the from address
 #. when the message has no from address.
-#: src/client/conversation-viewer/conversation-message.vala:394
+#: src/client/conversation-viewer/conversation-message.vala:521
 msgid "No sender"
 msgstr "Sense remitent"
 
 #. Translators: This separates multiple 'from'
 #. addresses in the compact header for a message.
-#: src/client/conversation-viewer/conversation-message.vala:766
+#: src/client/conversation-viewer/conversation-message.vala:913
 msgid ", "
 msgstr ", "
 
 #. Translators: This string is used as the HTML IMG ALT
 #. attribute value when displaying an inline image in an email
 #. that did not specify a file name. E.g. <IMG ALT="Image" ...
-#: src/client/conversation-viewer/conversation-message.vala:869
+#: src/client/conversation-viewer/conversation-message.vala:1033
 msgid "Image"
 msgstr "Imatge"
 
 #. Translators: Title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:81
+#: src/client/conversation-viewer/conversation-viewer.vala:83
 msgid "No conversations selected"
 msgstr "No hi ha converses seleccionades"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:85
+#: src/client/conversation-viewer/conversation-viewer.vala:87
 msgid "Selecting a conversation from the list will display it here"
 msgstr "Selecciona una conversa de la llista que es mostrarà aquí"
 
 #. Translators: Title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:94
+#: src/client/conversation-viewer/conversation-viewer.vala:96
 msgid "Multiple conversations selected"
 msgstr "Diverses converses seleccionades"
 
 #. Translators: Sub-title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:98
+#: src/client/conversation-viewer/conversation-viewer.vala:100
 msgid "Choosing an action will apply to all selected conversations"
 msgstr "L'elecció d'una acció s'aplicarà a totes les converses seleccionades"
 
@@ -1687,20 +1855,20 @@ msgstr "L'elecció d'una acció s'aplicarà a totes les converses seleccionades"
 #. conversations have exist in a folder.
 #. Translators: Title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:107
-#: src/client/conversation-viewer/conversation-viewer.vala:120
+#: src/client/conversation-viewer/conversation-viewer.vala:109
+#: src/client/conversation-viewer/conversation-viewer.vala:122
 msgid "No conversations found"
 msgstr "No s'han trobat converses"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have exist in a folder.
-#: src/client/conversation-viewer/conversation-viewer.vala:111
+#: src/client/conversation-viewer/conversation-viewer.vala:113
 msgid "This folder does not contain any conversations"
 msgstr "Aquesta carpeta no conté converses"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:124
+#: src/client/conversation-viewer/conversation-viewer.vala:126
 msgid "Your search returned no results, try refining your search terms"
 msgstr ""
 "La seva cerca no ha obtingut cap resultat, intenteu millorar els termes de "
@@ -1722,8 +1890,7 @@ msgstr "No es confia de la connexió: %s"
 #: src/client/dialogs/certificate-warning-dialog.vala:38
 #, c-format
 msgid "The identity of the %s mail server at %s:%u could not be verified."
-msgstr ""
-"La identitat del servidor de correu %s en %s:%u no ha estat verificada."
+msgstr "La identitat del servidor de correu %s en %s:%u no ha estat verificada."
 
 #: src/client/dialogs/certificate-warning-dialog.vala:48
 msgid ""
@@ -1751,8 +1918,8 @@ msgid ""
 "Selecting “Don’t Trust This Server” will cause Geary to stop accessing this "
 "account."
 msgstr ""
-"Seleccionant «No confiï en aquest servidor» farà que el Geary aturi l'accés "
-"a aquest compte."
+"Seleccionant «No confiï en aquest servidor» farà que el Geary aturi l'accés a "
+"aquest compte."
 
 #: src/client/dialogs/certificate-warning-dialog.vala:69
 msgid ""
@@ -1791,6 +1958,14 @@ msgstr "El certificat del servidor es considera insegur"
 msgid "An error has occurred processing the server’s certificate"
 msgstr "Hi ha hagut un error processant el certificat del servidor"
 
+#. / Translators: Title for problem report dialog error
+#. / information pane
+#. Dialog title for displaying technical details of a problem. Same as the button that invokes it.
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:100
+#: ui/problem-details-dialog.ui:12
+msgid "Details"
+msgstr "Detalls"
+
 #. We can't keep these in the glade file, because Gnome doesn't want markup in translatable
 #. strings, and Glade doesn't support the "larger" size attribute. See this bug report for
 #. details: https://bugzilla.gnome.org/show_bug.cgi?id=679006
@@ -1826,33 +2001,33 @@ msgstr "%s, %s"
 msgid "Inboxes"
 msgstr "Safates d'entrada"
 
-#: src/client/folder-list/folder-list-search-branch.vala:44
+#: src/client/folder-list/folder-list-search-branch.vala:59
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] "%d resultat"
 msgstr[1] "%d resultats"
 
-#: src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s — New Messages"
-msgstr "%s — Missatges Nous"
-
-#: src/client/notification/libnotify.vala:75
+#. / Notification body text for new email when no other
+#. / new messages are already awaiting.
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:68
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d missatge nou"
 msgstr[1] "%d missatges nous"
 
-#: src/client/notification/libnotify.vala:78
+#. / Notification body text for new email when
+#. / other new messages have already been notified
+#. / about
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:83
 #, c-format
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, %d  missatge nou total"
 msgstr[1] "%s, %d missatges nous totals"
 
-#: src/client/notification/libnotify.vala:112
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:118
 #, c-format
 msgid ""
 "%s\n"
@@ -1867,113 +2042,146 @@ msgstr[1] ""
 "%s\n"
 "(%d uns altres nous missatges de %s)"
 
-#: src/client/notification/libnotify.vala:155
-msgid "Open"
-msgstr "Obre"
+#: src/client/plugin/messaging-menu/messaging-menu.vala:90
+#, c-format
+msgid "%s — New Messages"
+msgstr "%s — Missatges Nous"
 
 #. / Datetime format for 12-hour time, i.e. 8:31 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:68
+#: src/client/util/util-date.vala:69
 msgid "%l:%M %P"
 msgstr "%l:%M %P"
 
 #. / Datetime format for 24-hour time, i.e. 16:35
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:71
+#: src/client/util/util-date.vala:72
 msgid "%H:%M"
 msgstr "%-H:%M"
 
 #. / Datetime format for the locale default, i.e. 8:31 am or 16:35,
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:74
-msgctxt "Default clock format"
-msgid "%l:%M %P"
-msgstr "%l:%M %P"
-
 #. / Date format for dates within the current year, i.e. Nov 8
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:78
+#: src/client/util/util-date.vala:79
 msgid "%b %-e"
 msgstr "%-e %b"
 
-#. / Date format for dates within a different year, i.e. 02/04/10
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:83
-#, no-c-format
-msgid "%x"
-msgstr "%x"
-
 #. / Verbose datetime format for 12-hour time, i.e. November 8, 2010 8:42 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:88
+#: src/client/util/util-date.vala:84
 msgid "%B %-e, %Y %-l:%M %P"
 msgstr "%-e %B del %Y a les %-l:%M %P"
 
 #. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:91
+#: src/client/util/util-date.vala:87
 msgid "%B %-e, %Y %-H:%M"
 msgstr "%-e %B del %Y a les %-H:%M"
 
 #. / Verbose datetime format for the locale default (full month, day and time)
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:94
+#: src/client/util/util-date.vala:90
 msgctxt "Default full date"
 msgid "%B %-e, %Y %-l:%M %P"
 msgstr "%-e %B del %Y a les %-l:%M %P"
 
-#: src/client/util/util-date.vala:164
+#: src/client/util/util-date.vala:159
 msgid "Now"
 msgstr "Ara"
 
-#: src/client/util/util-date.vala:167
+#: src/client/util/util-date.vala:162
 #, c-format
 msgid "%dm ago"
 msgid_plural "%dm ago"
 msgstr[0] "fa %dm"
 msgstr[1] "fa %dm"
 
-#: src/client/util/util-date.vala:171
+#: src/client/util/util-date.vala:166
 #, c-format
 msgid "%dh ago"
 msgid_plural "%dh ago"
 msgstr[0] "fa %dh"
 msgstr[1] "fa %dh"
 
-#: src/client/util/util-date.vala:178
+#: src/client/util/util-date.vala:173
 msgid "Yesterday"
 msgstr "Ahir"
 
 #. / Date format that shows the weekday (Monday, Tuesday, ...)
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:183
+#: src/client/util/util-date.vala:178
 #, c-format
 msgid "%A"
 msgstr "%A"
 
-#: src/client/util/util-email.vala:38 src/engine/rfc822/rfc822-message.vala:862
+#. / 12 hours format for datetime that a message being replied to was received
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:216
+msgid "%a, %b %-e, %Y at %l:%M %P"
+msgstr "%a, %-e %b %Y a les %-l:%M %p"
+
+#. / 24 hours format for the datetime that a message being replied to was received
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:220
+msgid "%a, %b %-e, %Y at %H:%M"
+msgstr "%a, %-e %b %Y a les %-l:%M %p"
+
+#. / Format for the datetime that a message being replied to was received
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:224
+msgid "%a, %b %-e, %Y at %X"
+msgstr "%a, %-e %b %Y a les %-l:%M %p"
+
+#: src/client/util/util-email.vala:38 src/engine/rfc822/rfc822-message.vala:1000
 msgid "(no subject)"
 msgstr "(sense assumpte)"
 
-#. Translators: This is shown for displaying a list of
-#. email recipients that happens to be empty,
-#. i.e. contains no email addresses.
-#: src/client/util/util-email.vala:116
+#. / Translators: This is shown for displaying a list of email
+#. / recipients that happens to be empty, i.e. contains no
+#. / email addresses.
+#: src/client/util/util-email.vala:134
 msgid "(No recipients)"
 msgstr "(No hi ha destinataris)"
 
-#. Translators: This is used for displaying a short list of
-#. email recipients lists with two or more addresses. The
-#. first (string) substitution is address of the first, the
-#. second substitution is the number of n - 1 remaining
-#. recipients.
-#: src/client/util/util-email.vala:130
+#. / Translators: This is used for displaying a short
+#. / list of email recipients lists with two or more
+#. / addresses. The first (string) substitution is
+#. / address of the first, the second substitution is
+#. / the number of n - 1 remaining recipients.
+#: src/client/util/util-email.vala:146
 #, c-format
 msgid "%s and %d other"
 msgid_plural "%s and %d others"
 msgstr[0] "%s i %d altre"
 msgstr[1] "%s i %d altres"
 
+#. / The quoted header for a message being replied to.
+#. / %1$s will be substituted for the date, and %2$s will be substituted for
+#. / the original sender.
+#: src/client/util/util-email.vala:179
+#, c-format
+msgid "On %1$s, %2$s wrote:"
+msgstr "En %1$s, %2$s ha escrit:"
+
+#. / The quoted header for a message being replied to (in case the date is not known).
+#. / %s will be replaced by the original sender.
+#: src/client/util/util-email.vala:186
+#, c-format
+msgid "%s wrote:"
+msgstr "%s ha escrit:"
+
+#. / The quoted header for a message being replied to (in case the sender is not known).
+#. / %s will be replaced by the original date
+#: src/client/util/util-email.vala:192
+#, c-format
+msgid "On %s:"
+msgstr "En %s:"
+
+#: src/client/util/util-email.vala:221
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Missatge reenviat ----------"
+
 #: src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "bytes"
@@ -2051,7 +2259,7 @@ msgstr "Arxiva"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:125
+#: src/engine/imap-db/imap-db-search-query.vala:130
 msgctxt "Search operator"
 msgid "attachment"
 msgstr "fitxer adjunt"
@@ -2064,7 +2272,7 @@ msgstr "fitxer adjunt"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:134
+#: src/engine/imap-db/imap-db-search-query.vala:139
 msgctxt "Search operator"
 msgid "bcc"
 msgstr "CCO"
@@ -2076,7 +2284,7 @@ msgstr "CCO"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:142
+#: src/engine/imap-db/imap-db-search-query.vala:147
 msgctxt "Search operator"
 msgid "body"
 msgstr "Cos"
@@ -2089,7 +2297,7 @@ msgstr "Cos"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:151
+#: src/engine/imap-db/imap-db-search-query.vala:156
 msgctxt "Search operator"
 msgid "cc"
 msgstr "Cc"
@@ -2102,7 +2310,7 @@ msgstr "Cc"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:160
+#: src/engine/imap-db/imap-db-search-query.vala:165
 msgctxt "Search operator"
 msgid "from"
 msgstr "de"
@@ -2114,7 +2322,7 @@ msgstr "de"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:168
+#: src/engine/imap-db/imap-db-search-query.vala:173
 msgctxt "Search operator"
 msgid "is"
 msgstr "és"
@@ -2126,7 +2334,7 @@ msgstr "és"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary
 #. User Guide.
-#: src/engine/imap-db/imap-db-account.vala:176
+#: src/engine/imap-db/imap-db-search-query.vala:181
 msgctxt "Search operator"
 msgid "subject"
 msgstr "assumpte"
@@ -2139,7 +2347,7 @@ msgstr "assumpte"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:185
+#: src/engine/imap-db/imap-db-search-query.vala:190
 msgctxt "Search operator"
 msgid "to"
 msgstr "per"
@@ -2152,7 +2360,7 @@ msgstr "per"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:206
+#: src/engine/imap-db/imap-db-search-query.vala:211
 msgctxt "Search operator value - mail addressed to the user"
 msgid "me"
 msgstr "jo"
@@ -2164,7 +2372,7 @@ msgstr "jo"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:218
+#: src/engine/imap-db/imap-db-search-query.vala:223
 msgctxt "Search operator value - mail sent by the user"
 msgid "me"
 msgstr "jo"
@@ -2176,7 +2384,7 @@ msgstr "jo"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:230
+#: src/engine/imap-db/imap-db-search-query.vala:235
 msgctxt "'is:' search operator value"
 msgid "read"
 msgstr "llegir"
@@ -2189,7 +2397,7 @@ msgstr "llegir"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:241
+#: src/engine/imap-db/imap-db-search-query.vala:246
 msgctxt "'is:' search operator value"
 msgid "starred"
 msgstr "destacat"
@@ -2201,7 +2409,7 @@ msgstr "destacat"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:251
+#: src/engine/imap-db/imap-db-search-query.vala:256
 msgctxt "'is:' search operator value"
 msgid "unread"
 msgstr "no llegit"
@@ -2210,7 +2418,7 @@ msgstr "no llegit"
 #. Draft mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:937
+#: src/engine/imap-engine/imap-engine-generic-account.vala:882
 msgid "Drafts | Draft"
 msgstr "Esborranys | Esborrany"
 
@@ -2218,7 +2426,7 @@ msgstr "Esborranys | Esborrany"
 #. Sent mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:946
+#: src/engine/imap-engine/imap-engine-generic-account.vala:891
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr ""
 "Enviat | Correu enviat | El correu electrònic enviat | Enviat per correu "
@@ -2226,7 +2434,7 @@ msgstr ""
 
 #. The localised name(s) of the Sent folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:951
+#: src/engine/imap-engine/imap-engine-generic-account.vala:896
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Elements enviats"
@@ -2235,10 +2443,10 @@ msgstr "Elements enviats"
 #. Spam mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:961
+#: src/engine/imap-engine/imap-engine-generic-account.vala:906
 msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email | "
+"Bulk E-Mail"
 msgstr ""
 "Brossa | Spam | Correu brossa | Correu electrònic brossa | Correu-electrònic "
 "brossa | Correu massiu | Correu electrònic massiu | Correu-electrònic massiu"
@@ -2247,13 +2455,13 @@ msgstr ""
 #. Trash mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:971
+#: src/engine/imap-engine/imap-engine-generic-account.vala:916
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "Paperera | Escombraries | Cubell d'escombraries"
 
 #. The localised name(s) of the Trash folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:976
+#: src/engine/imap-engine/imap-engine-generic-account.vala:921
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Elements suprimits"
@@ -2262,43 +2470,21 @@ msgstr "Elements suprimits"
 #. Archive mailbox. Separate names using a vertical bar
 #. and put the most common localized name to the front for
 #. the default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:986
+#: src/engine/imap-engine/imap-engine-generic-account.vala:931
 msgid "Archive | Archives"
 msgstr "Arxiu | Arxius"
 
-#. / Format for the datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/engine/rfc822/rfc822-utils.vala:236
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %-e %b %Y a les %-l:%M %p"
-
-#. / The quoted header for a message being replied to.
-#. / %1$s will be substituted for the date, and %2$s will be substituted for
-#. / the original sender.
-#: src/engine/rfc822/rfc822-utils.vala:242
+#: src/engine/rfc822/rfc822-message.vala:458
 #, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "En %1$s, %2$s ha escrit:"
+msgid "Could not determine mime type for “%s”."
+msgstr "No s'ha pogut determinar el tipus mime per a «%s»."
 
-#. / The quoted header for a message being replied to (in case the date is not known).
-#. / %s will be replaced by the original sender.
-#: src/engine/rfc822/rfc822-utils.vala:249
+#: src/engine/rfc822/rfc822-message.vala:469
 #, c-format
-msgid "%s wrote:"
-msgstr "%s ha escrit:"
+msgid "Could not determine content type for mime type “%s” on “%s”."
+msgstr ""
 
-#. / The quoted header for a message being replied to (in case the sender is not known).
-#. / %s will be replaced by the original date
-#: src/engine/rfc822/rfc822-utils.vala:255
-#, c-format
-msgid "On %s:"
-msgstr "En %s:"
-
-#: src/engine/rfc822/rfc822-utils.vala:284
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Missatge reenviat ----------"
-
-#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:127
+#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:126
 msgid "Add an account"
 msgstr "Afegeix un compte"
 
@@ -2352,11 +2538,11 @@ msgstr "Elimina el compte del Geary"
 msgid "Accounts"
 msgstr "Comptes"
 
-#: ui/accounts_editor_list_pane.ui:63
+#: ui/accounts_editor_list_pane.ui:62
 msgid "To get started, select an email provider below."
-msgstr "Per començar selecciona un proveïdor de correu a sota."
+msgstr "Per a començar selecciona un proveïdor de correu a sota."
 
-#: ui/accounts_editor_list_pane.ui:76
+#: ui/accounts_editor_list_pane.ui:75
 msgid "Welcome to Geary"
 msgstr "Us donem la benvinguda al Geary"
 
@@ -2368,8 +2554,8 @@ msgstr "Confirmeu la supressió: %s"
 
 #: ui/accounts_editor_remove_pane.ui:91
 msgid ""
-"Removing an account will remove it from Geary and delete locally cached "
-"email data from your computer, but not from your service provider."
+"Removing an account will remove it from Geary and delete locally cached email "
+"data from your computer, but not from your service provider."
 msgstr ""
 "L'eliminació d’un compte l'eliminarà del Geary i esborrarà les dades del "
 "correu a la memòria cau local de l'ordinador, però no del proveïdor de "
@@ -2379,14 +2565,83 @@ msgstr ""
 msgid "Remove account"
 msgstr "Elimina compte"
 
-#: ui/accounts_editor_servers_pane.ui:17
-msgid "Cancel"
-msgstr "Cancel·la"
-
 #: ui/accounts_editor_servers_pane.ui:47
 msgid "Apply"
 msgstr "Aplica"
 
+#. Infobar title when one or more accounts are offline
+#: ui/application-main-window.ui:185
+msgid "Working offline"
+msgstr "Treballa fora de línia"
+
+#. Label and tooltip for offline infobar
+#: ui/application-main-window.ui:199
+msgid ""
+"Your computer does not appear to be connected to the Internet.\n"
+"You will not be able to send or receive email until it is re-connected."
+msgstr ""
+"Sembla que el vostre ordinador no està connectat a Internet.\n"
+"No podreu enviar ni rebre correus electrònics fins que us torneu a connectar."
+
+#. Label and tooltip for offline infobar
+#: ui/application-main-window.ui:202
+msgid "You will not be able to send or receive email until re-connected."
+msgstr ""
+"No podreu enviar ni rebre correus electrònics fins que us torneu a connectar."
+
+#. Button label for retrying TLS cert validation
+#: ui/application-main-window.ui:249
+msgid "Check"
+msgstr "Comprovació"
+
+#. Button tooltip for retrying TLS cert validation
+#: ui/application-main-window.ui:253
+msgid "Check the security details for the connection"
+msgstr "Comprova els detalls de seguretat per a la connexió"
+
+#. Infobar title when one or more accounts have a TLS cert validation error
+#: ui/application-main-window.ui:282
+msgid "Security problem"
+msgstr "Problema de seguretat"
+
+#. Label and tooltip for TLS cert validation error infobar
+#: ui/application-main-window.ui:296
+msgid ""
+"An account has reported an untrusted server.\n"
+"Please check the server configuration and try again."
+msgstr ""
+"Un compte ha informat d’un servidor no fiable. \n"
+"Comproveu la configuració del servidor i torneu-ho a provar."
+
+#. Label and tooltip for TLS cert validation error infobar
+#: ui/application-main-window.ui:299
+msgid "An account has reported an untrusted server."
+msgstr "Un compte ha informat d’un servidor no fiable."
+
+#. Button tooltip for retrying when a login error has occurred
+#: ui/application-main-window.ui:350
+msgid "Retry login, you will be prompted for your password"
+msgstr "Torneu a iniciar la sessió, se us preguntarà per la vostra contrasenya"
+
+#. Infobar title when one or more accounts have a login error
+#: ui/application-main-window.ui:379
+msgid "Login problem"
+msgstr "Problema amb l'inici de sessió"
+
+#. Label and tooltip for authentication problem infobar
+#: ui/application-main-window.ui:393
+msgid ""
+"An account has reported an incorrect login or password.\n"
+"Please check your login name and try again."
+msgstr ""
+"Un compte ha informat d’un nom d'usuari o contrasenya incorrecte.\n"
+"Comproveu el vostre nom d’usuari i torneu-ho a provar."
+
+#. Label and tooltip for authentication problem infobar
+#: ui/application-main-window.ui:396
+msgid "An account has reported an incorrect login or password."
+msgstr "Un compte ha informat d’un nom d'usuari o contrasenya incorrecte."
+
 #: ui/certificate_warning_dialog.glade:7
 msgid "Untrusted Connection"
 msgstr "Connexió no fiable"
@@ -2403,216 +2658,347 @@ msgstr "Confia en aques_t servidor"
 msgid "_Don’t Trust This Server"
 msgstr "No confiï aquest servi_dor"
 
-#: ui/composer-headerbar.ui:17 ui/composer-headerbar.ui:174
-msgid "Detach (Ctrl+D)"
-msgstr "Separa (Ctrl+D)"
+#: ui/composer-headerbar.ui:23 ui/composer-headerbar.ui:107
+msgid "Detach the composer from the window"
+msgstr "Separa l'editor de la finestra"
 
-#: ui/composer-headerbar.ui:57 ui/composer-headerbar.ui:83
-msgid "Attach File (Ctrl+T)"
-msgstr "Adjunta fitxer (Ctrl+T)"
-
-#: ui/composer-headerbar.ui:107
-msgid "Include Original Attachments"
-msgstr "Inclou fitxers adjunts originals"
-
-#: ui/composer-headerbar.ui:202
+#: ui/composer-headerbar.ui:135
 msgid "_Send"
 msgstr "_Envia"
 
-#: ui/composer-headerbar.ui:207
-msgid "Send (Ctrl+Enter)"
-msgstr "Envia (Ctrl+Enter)"
-
-#: ui/composer-headerbar.ui:230
+#: ui/composer-headerbar.ui:162
 msgid "Discard and Close"
 msgstr "Descarta i tanca"
 
-#: ui/composer-headerbar.ui:254
+#: ui/composer-headerbar.ui:186
 msgid "Save and Close"
 msgstr "Desa i tanca"
 
 #. Note that this button and the Update button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:41
+#: ui/composer-link-popover.ui:42
 msgid "Insert the new link with this URL"
 msgstr "Insereix el nou enllaç amb aquest URL"
 
-#: ui/composer-link-popover.ui:52
+#: ui/composer-link-popover.ui:43
+msgid "Add"
+msgstr "Afegeix"
+
+#: ui/composer-link-popover.ui:47
 msgid "Link URL"
 msgstr "Enllaç URL"
 
 #. Note that this button and the Insert button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:66
+#: ui/composer-link-popover.ui:61
 msgid "Update this link’s URL"
 msgstr "Actualitza l'URL d'aquest enllaç"
 
-#: ui/composer-link-popover.ui:86
+#: ui/composer-link-popover.ui:62
+msgid "Update"
+msgstr "Actualitza"
+
+#: ui/composer-link-popover.ui:75
 msgid "Delete this link"
 msgstr "Suprimeix aquest enllaç"
 
-#: ui/composer-link-popover.ui:106
-msgid "Open this link"
-msgstr "Obre aquest enllaç"
-
-#: ui/composer-menus.ui:7
-msgid "S_ans Serif"
-msgstr "S_ans Serif"
-
-#: ui/composer-menus.ui:12
-msgid "S_erif"
-msgstr "S_erif"
-
-#: ui/composer-menus.ui:17
-msgid "_Fixed Width"
-msgstr "Ample _fix"
-
-#: ui/composer-menus.ui:24
-msgid "_Small"
-msgstr "_Petit"
-
-#: ui/composer-menus.ui:29
-msgid "_Medium"
-msgstr "_Mitjà"
-
-#: ui/composer-menus.ui:34
-msgid "Lar_ge"
-msgstr "_Gran"
-
-#: ui/composer-menus.ui:41
-msgid "C_olor"
-msgstr "C_olor"
-
-#: ui/composer-menus.ui:47 ui/composer-menus.ui:62
-msgid "_Rich Text"
-msgstr "Text en_riquit"
-
-#: ui/composer-menus.ui:53 ui/composer-menus.ui:68
-msgid "Show Extended Fields"
-msgstr "Mostra camps estesos"
-
-#: ui/composer-menus.ui:78
+#: ui/composer-menus.ui:8
 msgid "_Undo"
 msgstr "_Desfés"
 
-#: ui/composer-menus.ui:82
+#: ui/composer-menus.ui:12
 msgid "_Redo"
 msgstr "_Refés"
 
-#: ui/composer-menus.ui:88 ui/composer-menus.ui:106
+#: ui/composer-menus.ui:18 ui/composer-menus.ui:36
 msgid "Cu_t"
 msgstr "_Retalla"
 
-#: ui/composer-menus.ui:92 ui/composer-menus.ui:110
+#: ui/composer-menus.ui:22 ui/composer-menus.ui:40
 #: ui/conversation-message-menus.ui:37
 msgid "_Copy"
 msgstr "_Copia"
 
-#: ui/composer-menus.ui:96 ui/composer-menus.ui:114
+#: ui/composer-menus.ui:26 ui/composer-menus.ui:44
 msgid "_Paste"
 msgstr "_Enganxa"
 
-#: ui/composer-menus.ui:100
+#: ui/composer-menus.ui:30
 msgctxt "Clipboard paste as plain text"
 msgid "Paste _Without Formatting"
 msgstr "_Enganxa sense format"
 
-#: ui/composer-menus.ui:120
+#: ui/composer-menus.ui:50
 msgid "Select _All"
 msgstr "Seleccion_a-ho tot"
 
-#: ui/composer-menus.ui:127 ui/conversation-message-menus.ui:49
+#: ui/composer-menus.ui:57 ui/conversation-message-menus.ui:43
 msgid "_Inspect…"
 msgstr "_Inspecciona…"
 
-#. Address(es) e-mail is to be sent to
-#: ui/composer-widget.ui:56
-msgid "_To"
-msgstr "_Per a"
-
-#: ui/composer-widget.ui:75
-msgid "_Cc"
-msgstr "_Cc"
-
-#: ui/composer-widget.ui:130
-msgid "_Subject"
-msgstr "A_ssumpte"
-
-#: ui/composer-widget.ui:149
-msgid "_Bcc"
-msgstr "_Bcc"
-
-#: ui/composer-widget.ui:179
-msgid "_Reply-To"
-msgstr "_Respon a"
-
 #. Geary account mail will be sent from
-#: ui/composer-widget.ui:208
+#: ui/composer-widget.ui:60
 msgid "From"
 msgstr "De"
 
-#: ui/composer-widget.ui:293
+#. Address(es) e-mail is to be sent to
+#: ui/composer-widget.ui:130
+msgid "_To"
+msgstr "_Per a"
+
+#: ui/composer-widget.ui:158
+msgid "Show Cc, Bcc, and Reply-To fields"
+msgstr "Mostra els camps Cc, Bcc, and Reply-To"
+
+#: ui/composer-widget.ui:219
+msgid "_Cc"
+msgstr "_Cc"
+
+#: ui/composer-widget.ui:267
+msgid "_Bcc"
+msgstr "_Bcc"
+
+#: ui/composer-widget.ui:315
+msgid "_Reply-To"
+msgstr "_Respon a"
+
+#: ui/composer-widget.ui:372
+msgid "_Subject"
+msgstr "A_ssumpte"
+
+#: ui/composer-widget.ui:445
 msgid "Drop files here"
 msgstr "Deixeu anar els fitxers aquí"
 
-#: ui/composer-widget.ui:309
+#: ui/composer-widget.ui:461
 msgid "To add them as attachments"
-msgstr "Per afegir-los com a fitxers adjunts"
+msgstr "Per a afegir-los com a fitxers adjunts"
 
-#: ui/composer-widget.ui:353
-msgid "Undo last edit (Ctrl+Z)"
-msgstr "Desfés l'última edició (Ctrl+Z)"
+#: ui/composer-widget.ui:602
+msgid "Bold text"
+msgstr "Text en negreta"
 
-#: ui/composer-widget.ui:377
-msgid "Redo last edit  (Ctrl+Shift+Z)"
-msgstr "Refés l'última edició  (Ctrl+Maj+Z)"
+#: ui/composer-widget.ui:626
+msgid "Italic text"
+msgstr "Text en cursiva"
 
-#: ui/composer-widget.ui:415
-msgid "Bold (Ctrl+B)"
-msgstr "Negreta (Ctrl+B)"
+#: ui/composer-widget.ui:650
+msgid "Underline text"
+msgstr "Text subratllat"
 
-#: ui/composer-widget.ui:439
-msgid "Italic (Ctrl+I)"
-msgstr "Cursiva (Ctrl+I)"
-
-#: ui/composer-widget.ui:463
-msgid "Underline (Ctrl+U)"
-msgstr "Subratllat (Ctrl+U)"
-
-#: ui/composer-widget.ui:487
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Barrat (Ctrl+K)"
-
-#: ui/composer-widget.ui:525
-msgid "Insert unordered list"
-msgstr "Insereix la llista desordenada"
-
-#: ui/composer-widget.ui:549
-msgid "Insert ordered list"
-msgstr "Insereix la llista ordenada"
-
-#: ui/composer-widget.ui:587
-msgid "Quote text  (Ctrl+])"
-msgstr "Cita de text (Ctrl+])"
-
-#: ui/composer-widget.ui:611
-msgid "Unquote text  (Ctrl+[)"
-msgstr "Fi de la cita de text (Ctrl+[)"
-
-#: ui/composer-widget.ui:649
-msgid "Insert or update selection link (Ctrl+L)"
-msgstr "Insereix o actualitza l'enllaç de la selecció (Ctrl+L)"
-
-#: ui/composer-widget.ui:673
-msgid "Insert an image (Ctrl+G)"
-msgstr "Insereix una imatge (Ctrl+G)"
+#: ui/composer-widget.ui:674
+msgid "Strikethrough text"
+msgstr "Text ratllat"
 
 #: ui/composer-widget.ui:707
-msgid "Remove selection formatting (Ctrl+Space)"
-msgstr "Suprimeix la selecció del format (Ctrl+Espai)"
+msgid "Insert bulleted list"
+msgstr "Insereix la llista de pics"
 
 #: ui/composer-widget.ui:731
+msgid "Insert numbered list"
+msgstr "Insereix la llista numerada"
+
+#: ui/composer-widget.ui:764
+msgid "Indent or quote text"
+msgstr "Sagna o cita el text"
+
+#: ui/composer-widget.ui:788
+msgid "Un-indent or unquote text"
+msgstr "Desfés el sagnat o no citis el text"
+
+#: ui/composer-widget.ui:817
+msgid "Remove text formatting"
+msgstr "Suprimeix la formatació"
+
+#: ui/composer-widget.ui:836
+msgid "Change font type"
+msgstr "Canvia el tipus de lletra"
+
+#: ui/composer-widget.ui:851
+msgid "Sans Serif"
+msgstr "Sans Serif"
+
+#: ui/composer-widget.ui:862
+msgid "Serif"
+msgstr "Serif"
+
+#: ui/composer-widget.ui:873
+msgid "Fixed Width"
+msgstr "Ample fix"
+
+#: ui/composer-widget.ui:899
+msgid "Change font color"
+msgstr "Canvia el color del tipus de lletra"
+
+#: ui/composer-widget.ui:914
+msgid "Change font size"
+msgstr "Canvia la mida del tipus de lletra"
+
+#: ui/composer-widget.ui:949
+msgid "Insert or update text link"
+msgstr "Insereix o actualitza l'enllaç del text"
+
+#: ui/composer-widget.ui:973
+msgid "Insert an image"
+msgstr "Insereix una imatge"
+
+#: ui/composer-widget.ui:1015
+msgid "Undo last edit"
+msgstr "Desfés l'última edició"
+
+#: ui/composer-widget.ui:1039
+msgid "Redo last edit"
+msgstr "Refés l'última edició"
+
+#: ui/composer-widget.ui:1068 ui/composer-widget.ui:1093
+msgid "Attach a file"
+msgstr "Adjunta un fitxer"
+
+#: ui/composer-widget.ui:1117
+msgid "Add original attachments"
+msgstr "Inclou les adjuncions originals"
+
+#: ui/composer-widget.ui:1162
+msgid "More options"
+msgstr "Més opcions"
+
+#: ui/composer-widget.ui:1182
+msgid "Show formatting toolbar"
+msgstr "Mostra la barra de format"
+
+#: ui/composer-widget.ui:1200
 msgid "Select spell checking languages"
 msgstr "Seleccioneu els idiomes de la correcció ortogràfica"
 
+#: ui/composer-widget.ui:1263
+msgid "S_ans Serif"
+msgstr "S_ans Serif"
+
+#: ui/composer-widget.ui:1268
+msgid "S_erif"
+msgstr "S_erif"
+
+#: ui/composer-widget.ui:1273
+msgid "_Fixed Width"
+msgstr "Ample _fix"
+
+#: ui/composer-widget.ui:1283
+msgid "_Small"
+msgstr "_Petit"
+
+#: ui/composer-widget.ui:1288
+msgid "_Medium"
+msgstr "_Mitjà"
+
+#: ui/composer-widget.ui:1293
+msgid "Lar_ge"
+msgstr "_Gran"
+
+#: ui/composer-widget.ui:1303
+msgid "_Rich Text"
+msgstr "Text en_riquit"
+
+#: ui/composer-widget.ui:1308
+msgid "_Plain Text"
+msgstr "_Text pla"
+
+#: ui/components-attachment-pane.ui:29 ui/components-attachment-pane.ui:47
+msgid "Select all attachments"
+msgstr "Selecciona tots els fitxers adjunts"
+
+#: ui/components-attachment-pane.ui:66
+msgid "Save selected attachments"
+msgstr "Desa els fitxers adjunts seleccionats"
+
+#: ui/components-attachment-pane.ui:85
+msgid "Open selected attachments"
+msgstr "Obre els fitxers adjunts seleccionats"
+
+#: ui/components-attachment-pane-menus.ui:17
+msgid "Save _All"
+msgstr "De_sa-ho tot"
+
+#: ui/components-inspector-error-view.ui:33
+msgid ""
+"If the problem is serious or persists, please save and send these details to "
+"the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\">mailing list</a> or "
+"attach to a <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug\">new "
+"bug report</a>."
+msgstr ""
+"Si el problema és greu o persisteix, copieu i envieu aquestes dades a la  <a "
+"href=\"https://wiki.gnome.org/Apps/Geary/Contact\">llista de correu </a> o "
+"envieu un <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug\"> "
+"informe d’error nou</a>."
+
+#: ui/components-inspector-error-view.ui:49
+msgid "Details:"
+msgstr "Detalls:"
+
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:20
+msgid "Toggle appending new log entries"
+msgstr "Commuta afegir noves entrades de registre"
+
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:37 ui/problem-details-dialog.ui:19
+msgid "Search for matching log entries"
+msgstr "Cerca per a entrades de registre coincidents"
+
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:63 ui/problem-details-dialog.ui:46
+msgid "Save logs entries and details"
+msgstr "Desa les entrades de registre i els detalls"
+
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:84 ui/problem-details-dialog.ui:62
+msgid "Copy to clipboard"
+msgstr "Copia al porta-retalls"
+
+#: ui/conversation-contact-popover.ui:146
+msgid "New Conversation…"
+msgstr "Mou la conversa…"
+
+#: ui/conversation-contact-popover.ui:159
+msgid "Copy Email Address"
+msgstr "Copia l'adreça de correu"
+
+#: ui/conversation-contact-popover.ui:182
+msgid "Save in Contacts…"
+msgstr "Desa als contactes…"
+
+#: ui/conversation-contact-popover.ui:195
+msgid "Show Conversations"
+msgstr "Mostra les converses"
+
+#: ui/conversation-contact-popover.ui:208
+msgid "Open in Contacts"
+msgstr "Obre als contactes"
+
+#: ui/conversation-contact-popover.ui:221
+msgid "Always Load Remote Images"
+msgstr "Carrega sempre les imatges remotes"
+
+#. Title label on contact popover
+#: ui/conversation-contact-popover.ui:264
+msgid "Deceptive email address"
+msgstr "Adreça de correu electrònic enganyosa"
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:294
+msgid "This email address is:"
+msgstr "Aquesta adreça de correu electrònic és:"
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:319
+msgid "But was forged as:"
+msgstr "Però ha estat falsificada com a:"
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:344
+msgid "The sender may not be trustworthy"
+msgstr "El remitent pot ser no és de confiança"
+
 #: ui/conversation-email.ui:27
 msgid "Save all attachments"
 msgstr "Desa tots els fitxers adjunts"
@@ -2627,39 +3013,23 @@ msgstr "Marca aquest missatge com a destacat"
 msgid "Mark this message as not starred"
 msgstr "Marca aquest missatge com a no destacat"
 
-#: ui/conversation-email.ui:95
-msgid "Display the message menu"
-msgstr "Mostra el missatge del menú"
-
-#: ui/conversation-email.ui:161
-msgid "Open selected attachments"
-msgstr "Obre els fitxers adjunts seleccionats"
-
-#: ui/conversation-email.ui:178
-msgid "Save selected attachments"
-msgstr "Desa els fitxers adjunts seleccionats"
-
-#: ui/conversation-email.ui:195
-msgid "Select all attachments"
-msgstr "Selecciona tots els fitxers adjunts"
-
-#: ui/conversation-email.ui:240
+#: ui/conversation-email.ui:124
 msgid "Edit Draft"
 msgstr "Edita l'Esborrany"
 
-#: ui/conversation-email.ui:267
+#: ui/conversation-email.ui:151
 msgid "Draft message"
 msgstr "Missatge de l'esborrany"
 
-#: ui/conversation-email.ui:283
+#: ui/conversation-email.ui:167
 msgid "This message has not yet been sent."
 msgstr "Aquest missatge no s'ha enviat."
 
-#: ui/conversation-email.ui:329
+#: ui/conversation-email.ui:213
 msgid "Message not saved"
 msgstr "Missatge no desat"
 
-#: ui/conversation-email.ui:345
+#: ui/conversation-email.ui:229
 msgid "This message was sent, but has not been saved to your account."
 msgstr "Aquest missatge s'ha enviat, però no s'ha desat en el seu compte."
 
@@ -2685,24 +3055,44 @@ msgid "Mark Unread From _Here"
 msgstr "Marca com a no llegit des _d'aquí"
 
 #. Translators: Menu item to move a single, specific message
-#. to the trash
+#. to the trash folder
 #: ui/conversation-email-menus.ui:50
-msgid "_Trash"
-msgstr "_Paperera"
+msgid "Move message to _Trash"
+msgstr "_Mou el missatge a la paperera"
 
 #. Translators: Menu item to delete a single, specific message
 #: ui/conversation-email-menus.ui:57
-msgid "_Delete…"
-msgstr "_Suprimeix…"
+msgid "_Delete message…"
+msgstr "_Suprimeix el missatge…"
 
 #. Translators: Menu item to view the source for a message
 #: ui/conversation-email-menus.ui:69
 msgid "_View Source"
 msgstr "_Visualitza la font"
 
-#: ui/conversation-email-menus.ui:87
-msgid "_Save All"
-msgstr "De_sa-ho tot"
+#: ui/conversation-message-link-popover.ui:54
+msgid "But actually goes to:"
+msgstr "Però en realitat va a:"
+
+#: ui/conversation-message-link-popover.ui:84
+msgid "The link appears to go to:"
+msgstr "L'enllaç sembla anar a:"
+
+#: ui/conversation-message-link-popover.ui:96
+msgid "Deceptive link found"
+msgstr "L'enllaç trobat és enganyós"
+
+#: ui/conversation-message-link-popover.ui:111
+msgid "The email sender may be leading you to the wrong web site."
+msgstr ""
+"El remitent de correu electrònic pot ser que et condueixi a un lloc web "
+"maliciós."
+
+#: ui/conversation-message-link-popover.ui:124
+msgid "If unsure, contact the sender and ask before continuing."
+msgstr ""
+"Si no esteu segur, poseu-vos en contacte amb el remitent i preguntar abans de "
+"continuar."
 
 #: ui/conversation-message-menus.ui:7
 msgid "_Open Link"
@@ -2713,8 +3103,8 @@ msgid "Copy Link _Address"
 msgstr "Copi_a l'enllaç de l'adreça electrònica"
 
 #: ui/conversation-message-menus.ui:17
-msgid "Send New _Message…"
-msgstr "_Envia el correu nou…"
+msgid "_New Conversation…"
+msgstr "Conversa _nova…"
 
 #: ui/conversation-message-menus.ui:21
 msgid "Copy Email _Address"
@@ -2728,10 +3118,6 @@ msgstr "Desa la _imatge com…"
 msgid "_Select All"
 msgstr "_Selecciona-ho tot"
 
-#: ui/conversation-message-menus.ui:43
-msgid "Search for messages from"
-msgstr "Cerca els missatges de"
-
 #: ui/conversation-message.ui:63
 msgid "From <email>"
 msgstr "De <email>"
@@ -2772,39 +3158,15 @@ msgstr "Les imatges remotes no es mostren"
 msgid "Only show remote images from senders you trust."
 msgstr "Només es mostren les imatges remotes de remitents de confiança."
 
-#: ui/conversation-message.ui:692
-msgid "But actually goes to:"
-msgstr "Però en realitat va a:"
-
-#: ui/conversation-message.ui:723
-msgid "The link appears to go to:"
-msgstr "L'enllaç sembla anar a:"
-
-#: ui/conversation-message.ui:735
-msgid "Deceptive link found"
-msgstr "L'enllaç trobat és enganyós"
-
-#: ui/conversation-message.ui:750
-msgid "The email sender may be leading you to the wrong web site."
-msgstr ""
-"El remitent de correu electrònic pot ser que et condueixi a un lloc web "
-"maliciós."
-
-#: ui/conversation-message.ui:763
-msgid "If unsure, contact the sender and ask before continuing."
-msgstr ""
-"Si no esteu segur, poseu-vos en contacte amb el remitent i preguntar abans "
-"de continuar."
-
 #: ui/conversation-viewer.ui:60
 msgid "Find in conversation"
 msgstr "Troba en la conversa"
 
-#: ui/conversation-viewer.ui:74
+#: ui/conversation-viewer.ui:75
 msgid "Find the previous occurrence of the search string."
 msgstr "Troba l'aparició anterior de la cadena de cerca."
 
-#: ui/conversation-viewer.ui:95
+#: ui/conversation-viewer.ui:96
 msgid "Find the next occurrence of the search string."
 msgstr "Troba la següent aparició de la cadena de cerca."
 
@@ -2832,397 +3194,342 @@ msgstr "etiqueta"
 msgid "Conversation Shortcuts"
 msgstr "Dreceres de conversa"
 
-#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:254
-msgctxt "shortcut window"
-msgid "General"
-msgstr "General"
-
-#: ui/gtk/help-overlay.ui:17
-msgctxt "shortcut window"
-msgid "Move focus to the next/previous pane"
-msgstr "Moure l'enfocament al panell següent/anterior"
-
-#: ui/gtk/help-overlay.ui:24
-msgctxt "shortcut window"
-msgid "Move focus to conversation list"
-msgstr "Mou el focus a la llista de conversa"
-
-#: ui/gtk/help-overlay.ui:31
-msgctxt "shortcut window"
-msgid "Detach composer window"
-msgstr "Separa finestra de l'editor"
-
-#: ui/gtk/help-overlay.ui:38
-msgctxt "shortcut window"
-msgid "Close composer window"
-msgstr "Tanca finestra de l'editor"
-
-#: ui/gtk/help-overlay.ui:45
-msgctxt "shortcut window"
-msgid "Show keyboard shortcuts"
-msgstr "Mostra dreceres de teclat"
-
-#: ui/gtk/help-overlay.ui:52
-msgctxt "shortcut window"
-msgid "Show help"
-msgstr "Mostra ajuda"
-
-#: ui/gtk/help-overlay.ui:59
-msgctxt "shortcut window"
-msgid "Quit the application"
-msgstr "Surt de l'aplicació"
-
-#: ui/gtk/help-overlay.ui:68
-msgctxt "shortcut window"
-msgid "Search"
-msgstr "Cerca"
-
-#: ui/gtk/help-overlay.ui:72
-msgctxt "shortcut window"
-msgid "Jump to search box"
-msgstr "Salta a la caixa de cerca"
-
-#: ui/gtk/help-overlay.ui:79
-msgctxt "shortcut window"
-msgid "Find in current conversation"
-msgstr "Troba en la conversa actual"
-
-#: ui/gtk/help-overlay.ui:86
-msgctxt "shortcut window"
-msgid "Find next/previous in current conversation"
-msgstr "Troba el següent/anterior a la conversa actual"
-
-#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:274
+#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:355
 msgctxt "shortcut window"
 msgid "Actions"
 msgstr "Accions"
 
-#: ui/gtk/help-overlay.ui:99
+#: ui/gtk/help-overlay.ui:17
 msgctxt "shortcut window"
-msgid "Compose a new message"
-msgstr "Redacta un missatge nou"
+msgid "New conversation"
+msgstr "Conversació nova"
 
-#: ui/gtk/help-overlay.ui:106
+#: ui/gtk/help-overlay.ui:24
 msgctxt "shortcut window"
-msgid "Reply to sender "
-msgstr "Respon al remitent "
+msgid "Reply to sender"
+msgstr "Respon al remitent"
 
-#: ui/gtk/help-overlay.ui:113
+#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:269
 msgctxt "shortcut window"
 msgid "Reply to all"
 msgstr "Respon a tots"
 
-#: ui/gtk/help-overlay.ui:120
+#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:276
 msgctxt "shortcut window"
 msgid "Forward"
 msgstr "Reenvia"
 
-#: ui/gtk/help-overlay.ui:127
+#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:283
 msgctxt "shortcut window"
-msgid "Archive"
-msgstr "Arxiva"
+msgid "Un-mark/mark read"
+msgstr "Desmarca o marca com a llegit"
 
-#: ui/gtk/help-overlay.ui:134
+#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:290
 msgctxt "shortcut window"
-msgid "Move to trash"
-msgstr "Mou a la paperera"
+msgid "Mark/un-mark starred"
+msgstr "Desmarca o marca com a destacat"
+
+#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:297
+msgctxt "shortcut window"
+msgid "Archive conversations"
+msgstr "Arxiva les converses"
+
+#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:304
+msgctxt "shortcut window"
+msgid "Move conversations"
+msgstr "Mou les converses"
+
+#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:311
+msgctxt "shortcut window"
+msgid "Label conversations"
+msgstr "Etiqueta les converses"
+
+#: ui/gtk/help-overlay.ui:80
+msgctxt "shortcut window"
+msgid "Trash conversations"
+msgstr "Envia les converses a la paperera"
+
+#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:318
+msgctxt "shortcut window"
+msgid "Junk conversations"
+msgstr "Marca les converses com a brossa"
+
+#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:325
+msgctxt "shortcut window"
+msgid "Delete conversations"
+msgstr "Suprimeix les converses"
+
+#: ui/gtk/help-overlay.ui:104
+msgctxt "shortcut window"
+msgid "Search"
+msgstr "Cerca"
+
+#: ui/gtk/help-overlay.ui:108
+msgctxt "shortcut window"
+msgid "Search for conversations"
+msgstr "Cerca a les converses"
+
+#: ui/gtk/help-overlay.ui:115
+msgctxt "shortcut window"
+msgid "Find in current conversation"
+msgstr "Troba en la conversa actual"
 
 #: ui/gtk/help-overlay.ui:141
 msgctxt "shortcut window"
-msgid "Toggle spam"
-msgstr "Selecciona el correu brossa"
+msgid "Undo"
+msgstr "Desfés"
 
-#: ui/gtk/help-overlay.ui:148
+#: ui/gtk/help-overlay.ui:145
 msgctxt "shortcut window"
-msgid "Move the conversation"
-msgstr "Mou la conversa"
+msgid "Undo the last action"
+msgstr "Desfés la darrera acció"
 
-#: ui/gtk/help-overlay.ui:155
+#: ui/gtk/help-overlay.ui:152
 msgctxt "shortcut window"
-msgid "Label the conversation"
-msgstr "Etiqueta la conversa"
+msgid "Redo the last action"
+msgstr "Refés l'última acció"
 
-#: ui/gtk/help-overlay.ui:163
-msgctxt "shortcut window"
-msgid "Mark read"
-msgstr "Marca com a llegit"
-
-#: ui/gtk/help-overlay.ui:170
-msgctxt "shortcut window"
-msgid "Mark unread"
-msgstr "Marca com a no llegit"
-
-#: ui/gtk/help-overlay.ui:179
+#: ui/gtk/help-overlay.ui:161
 msgctxt "shortcut window"
 msgid "View"
 msgstr "Visualitza"
 
-#: ui/gtk/help-overlay.ui:183
+#: ui/gtk/help-overlay.ui:165
 msgctxt "shortcut window"
 msgid "Zoom in"
 msgstr "Amplia el zoom"
 
-#: ui/gtk/help-overlay.ui:190
+#: ui/gtk/help-overlay.ui:172
 msgctxt "shortcut window"
 msgid "Zoom out"
 msgstr "Disminueix el zoom"
 
-#: ui/gtk/help-overlay.ui:197
+#: ui/gtk/help-overlay.ui:179
 msgctxt "shortcut window"
 msgid "Reset zoom"
 msgstr "Restableix el zoom"
 
+#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:375
+msgctxt "shortcut window"
+msgid "General"
+msgstr "General"
+
+#: ui/gtk/help-overlay.ui:192
+msgctxt "shortcut window"
+msgid "Show help"
+msgstr "Mostra ajuda"
+
+#: ui/gtk/help-overlay.ui:199
+msgctxt "shortcut window"
+msgid "Show keyboard shortcuts"
+msgstr "Mostra dreceres de teclat"
+
 #: ui/gtk/help-overlay.ui:206
 msgctxt "shortcut window"
-msgid "Additional Shortcuts"
-msgstr "Dreceres addicionals"
+msgid "Open a new window"
+msgstr "Obre una finestra nova"
 
-#: ui/gtk/help-overlay.ui:210
+#: ui/gtk/help-overlay.ui:213
 msgctxt "shortcut window"
-msgid "Star"
-msgstr "Destaca"
+msgid "Close the current window"
+msgstr "Tanca la finestra actual"
 
-#: ui/gtk/help-overlay.ui:217
+#: ui/gtk/help-overlay.ui:220
 msgctxt "shortcut window"
-msgid "Unstar"
-msgstr "No destaquis"
+msgid "Quit the application"
+msgstr "Surt de l'aplicació"
 
-#: ui/gtk/help-overlay.ui:224
+#: ui/gtk/help-overlay.ui:229
 msgctxt "shortcut window"
-msgid "Delete"
-msgstr "Suprimeix"
+msgid "Keyboard navigation"
+msgstr "Navegació per teclat"
 
-#: ui/gtk/help-overlay.ui:231
+#: ui/gtk/help-overlay.ui:233
 msgctxt "shortcut window"
-msgid "Jump to next (older) conversation"
-msgstr "Salta a la següent conversa (més antiga)"
+msgid "Go to next/previous pane"
+msgstr "Vés al panell següent o anterior"
 
-#: ui/gtk/help-overlay.ui:238
+#: ui/gtk/help-overlay.ui:241
 msgctxt "shortcut window"
-msgid "Jump to previous (newer) conversation"
-msgstr "Salta a la conversa anterior (més recent)"
+msgid "Select next/previous conversation"
+msgstr "Selecciona la conversa següent o anterior"
 
-#: ui/gtk/help-overlay.ui:250
-msgid "Composer Shortcuts"
-msgstr "Dreceres d'editor"
+#: ui/gtk/help-overlay.ui:248
+msgctxt "shortcut window"
+msgid "Focus next/previous message"
+msgstr "Moure l'enfocament al missatge següent o anterior"
 
 #: ui/gtk/help-overlay.ui:258
 msgctxt "shortcut window"
-msgid "Quote text"
-msgstr "Cita text"
+msgid "Single-key shortcuts"
+msgstr "Dreceres de teclat d'una tecla"
 
-#: ui/gtk/help-overlay.ui:265
+#: ui/gtk/help-overlay.ui:262
 msgctxt "shortcut window"
-msgid "Unquote text"
-msgstr "No citis text"
+msgid "Reply to sender "
+msgstr "Respon al remitent "
 
-#: ui/gtk/help-overlay.ui:278
+#: ui/gtk/help-overlay.ui:332
+msgctxt "shortcut window"
+msgid "Find in current conversations"
+msgstr "Troba en les converses actuals"
+
+#: ui/gtk/help-overlay.ui:339
+msgctxt "shortcut window"
+msgid "Select next/previous conversations"
+msgstr "Selecciona la la conversa següent o anterior"
+
+#: ui/gtk/help-overlay.ui:351
+msgid "Composer Shortcuts"
+msgstr "Dreceres d'editor"
+
+#: ui/gtk/help-overlay.ui:359
 msgctxt "shortcut window"
 msgid "Send"
 msgstr "Envia"
 
-#: ui/gtk/help-overlay.ui:285
+#: ui/gtk/help-overlay.ui:366
 msgctxt "shortcut window"
 msgid "Add attachment"
 msgstr "Afegeix el fitxer adjunt"
 
-#: ui/gtk/help-overlay.ui:294
+#: ui/gtk/help-overlay.ui:379
 msgctxt "shortcut window"
-msgid "Rich text mode"
-msgstr "Mode de text enriquit"
+msgid "Close composer window"
+msgstr "Tanca finestra de l'editor"
 
-#: ui/gtk/help-overlay.ui:298
+#: ui/gtk/help-overlay.ui:386
+msgctxt "shortcut window"
+msgid "Detach composer window"
+msgstr "Separa finestra de l'editor"
+
+#: ui/gtk/help-overlay.ui:393
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "Edició"
+
+#: ui/gtk/help-overlay.ui:398
+msgctxt "shortcut window"
+msgid "Move selection to the clipboard"
+msgstr "Mou la selecció al porta-retalls"
+
+#: ui/gtk/help-overlay.ui:405
+msgctxt "shortcut window"
+msgid "Copy selection to clipboard"
+msgstr "Copia la selecció al porta-retalls"
+
+#: ui/gtk/help-overlay.ui:412
+msgid "Paste from the clipboard"
+msgstr "Enganxa del porta-retalls"
+
+#: ui/gtk/help-overlay.ui:419
+msgctxt "shortcut window"
+msgid "Quote text"
+msgstr "Cita text"
+
+#: ui/gtk/help-overlay.ui:426
+msgctxt "shortcut window"
+msgid "Unquote text"
+msgstr "No citis text"
+
+#: ui/gtk/help-overlay.ui:435
+msgctxt "shortcut window"
+msgid "Rich text editing"
+msgstr "Edició en text enriquit"
+
+#: ui/gtk/help-overlay.ui:439
+msgctxt "shortcut window"
+msgid "Paste without formatting"
+msgstr "Enganxa sense format"
+
+#: ui/gtk/help-overlay.ui:446
 msgctxt "shortcut window"
 msgid "Bold text"
 msgstr "Text en negreta"
 
-#: ui/gtk/help-overlay.ui:305
+#: ui/gtk/help-overlay.ui:453
 msgctxt "shortcut window"
 msgid "Italicize text"
 msgstr "Text en cursiva"
 
-#: ui/gtk/help-overlay.ui:312
+#: ui/gtk/help-overlay.ui:460
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "Text subratllat"
 
-#: ui/gtk/help-overlay.ui:319
+#: ui/gtk/help-overlay.ui:467
 msgctxt "shortcut window"
 msgid "Strike text"
 msgstr "Text ratllat"
 
-#: ui/gtk/help-overlay.ui:326
-msgctxt "shortcut window"
-msgid "Insert a link"
-msgstr "Insereix un enllaç"
-
-#: ui/gtk/help-overlay.ui:333
+#: ui/gtk/help-overlay.ui:474
 msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "Suprimeix la formatació"
 
-#: ui/main-toolbar.ui:23
+#: ui/gtk/help-overlay.ui:481
+msgctxt "shortcut window"
+msgid "Insert an image"
+msgstr "Insereix una imatge"
+
+#: ui/gtk/help-overlay.ui:488
+msgctxt "shortcut window"
+msgid "Insert a link"
+msgstr "Insereix un enllaç"
+
+#: ui/main-toolbar.ui:24
 msgctxt "tooltip"
 msgid "Compose Message"
 msgstr "Redacta un missatge"
 
-#: ui/main-toolbar.ui:52
+#: ui/main-toolbar.ui:62
 msgid "Toggle search bar"
 msgstr "Selecciona la barra de cerca"
 
-#: ui/main-toolbar.ui:112
+#: ui/main-toolbar.ui:114
 msgid "Reply"
 msgstr "Respon"
 
-#: ui/main-toolbar.ui:135
+#: ui/main-toolbar.ui:137
 msgid "Reply All"
 msgstr "Respon a tots"
 
-#: ui/main-toolbar.ui:158
+#: ui/main-toolbar.ui:160
 msgid "Forward"
 msgstr "Reenvia"
 
-#: ui/main-toolbar.ui:264
+#: ui/main-toolbar.ui:265
 msgid "Toggle find bar"
 msgstr "Selecciona la barra de cerca"
 
-#: ui/main-toolbar.ui:306
+#: ui/main-toolbar.ui:286
 msgid "_Archive"
 msgstr "_Arxiva"
 
 #: ui/main-toolbar-menus.ui:21
-msgid "Mark as S_pam"
-msgstr "Marca com a correu _brossa"
+msgid "Toggle as S_pam"
+msgstr "_Commuta com a correu brossa"
 
-#: ui/main-toolbar-menus.ui:25
-msgid "Mark as not S_pam"
-msgstr "M_arca com a correu no brossa"
-
-#: ui/main-toolbar-menus.ui:32
+#: ui/main-toolbar-menus.ui:28
 msgid "Empty _Spam…"
 msgstr "Buida _correu brossa…"
 
-#: ui/main-toolbar-menus.ui:36
+#: ui/main-toolbar-menus.ui:32
 msgid "Empty _Trash…"
 msgstr "Buida la _paperera…"
 
-#: ui/main-toolbar-menus.ui:42
+#: ui/main-toolbar-menus.ui:38
 msgid "_Accounts"
 msgstr "_Comptes"
 
-#: ui/main-toolbar-menus.ui:50
+#: ui/main-toolbar-menus.ui:46
 msgid "_Keyboard Shortcuts"
 msgstr "Dreceres de _teclat"
 
-#: ui/main-toolbar-menus.ui:61
+#: ui/main-toolbar-menus.ui:57
 msgid "_About Geary"
 msgstr "_Quant a Geary"
 
-#. Infobar title when one or more accounts are offline
-#: ui/main-window.ui:183
-msgid "Working offline"
-msgstr "Treballa fora de línia"
-
-#. Label and tooltip for offline infobar
-#: ui/main-window.ui:197
-msgid ""
-"Your computer does not appear to be connected to the Internet.\n"
-"You will not be able to send or receive email until it is re-connected."
-msgstr ""
-"Sembla que el vostre ordinador no està connectat a Internet.\n"
-"No podreu enviar ni rebre correus electrònics fins que us torneu a connectar."
-
-#. Label and tooltip for offline infobar
-#: ui/main-window.ui:200
-msgid "You will not be able to send or receive email until re-connected."
-msgstr ""
-"No podreu enviar ni rebre correus electrònics fins que us torneu a connectar."
-
-#. Button label for displaying technical details about an account problem
-#. Dialog title for displaying technical details of a problem. Same as the button that invokes it.
-#: ui/main-window.ui:247 ui/problem-details-dialog.ui:13
-msgid "Details"
-msgstr "Detalls"
-
-#. Button label for retrying an account problem
-#: ui/main-window.ui:261
-msgid "Retry"
-msgstr "Intenta de nou"
-
-#. Infobar title when one or more accounts have encounted an error
-#: ui/main-window.ui:294
-msgid "Account problem"
-msgstr "Problema al compte"
-
-#. Label and tooltip for account service problem infobar
-#: ui/main-window.ui:308
-msgid ""
-"Geary encountered a problem connecting to an account.\n"
-"Please check your Internet connection, the server configuration and try "
-"again."
-msgstr ""
-"Geary ha trobat un problema en connectar-se amb un compte.\n"
-"Comproveu la vostra connexió a Internet, la configuració del servidor i "
-"torneu-ho a provar."
-
-#. Label and tooltip for account service problem infobar
-#: ui/main-window.ui:311
-msgid "Geary encountered a problem connecting to an account."
-msgstr "Geary ha trobat un problema en connectar amb el servidor."
-
-#. Button label for retrying TLS cert validation
-#: ui/main-window.ui:358
-msgid "Check"
-msgstr "Comprovació"
-
-#. Button tooltip for retrying TLS cert validation
-#: ui/main-window.ui:362
-msgid "Check the security details for the connection"
-msgstr "Comprova els detalls de seguretat per a la connexió"
-
-#. Infobar title when one or more accounts have a TLS cert validation error
-#: ui/main-window.ui:391
-msgid "Security problem"
-msgstr "Problema de seguretat"
-
-#. Label and tooltip for TLS cert validation error infobar
-#: ui/main-window.ui:405
-msgid ""
-"An account has reported an untrusted server.\n"
-"Please check the server configuration and try again."
-msgstr ""
-"Un compte ha informat d’un servidor no fiable. \n"
-"Comproveu la configuració del servidor i torneu-ho a provar."
-
-#. Label and tooltip for TLS cert validation error infobar
-#: ui/main-window.ui:408
-msgid "An account has reported an untrusted server."
-msgstr "Un compte ha informat d’un servidor no fiable."
-
-#. Button tooltip for retrying when a login error has occurred
-#: ui/main-window.ui:459
-msgid "Retry login, you will be prompted for your password"
-msgstr "Torneu a iniciar la sessió, se us preguntarà per la vostra contrasenya"
-
-#. Infobar title when one or more accounts have a login error
-#: ui/main-window.ui:488
-msgid "Login problem"
-msgstr "Problema amb l'inici de sessió"
-
-#. Label and tooltip for authentication problem infobar
-#: ui/main-window.ui:502
-msgid ""
-"An account has reported an incorrect login or password.\n"
-"Please check your login name and try again."
-msgstr ""
-"Un compte ha informat d’un nom d'usuari o contrasenya incorrecte.\n"
-"Comproveu el vostre nom d’usuari i torneu-ho a provar."
-
-#. Label and tooltip for authentication problem infobar
-#: ui/main-window.ui:505
-msgid "An account has reported an incorrect login or password."
-msgstr "Un compte ha informat d’un nom d'usuari o contrasenya incorrecte."
-
 #: ui/password-dialog.glade:74
 msgid "SMTP Credentials"
 msgstr "Credencials SMTP"
@@ -3239,498 +3546,6 @@ msgstr "_Recorda la contrasenya"
 msgid "_Authenticate"
 msgstr "_Autenticació"
 
-# N.T.: Títol de secció a les preferències
-#: ui/preferences-dialog.ui:38
-msgid "Reading"
-msgstr "Lectura"
-
-#: ui/preferences-dialog.ui:51
-msgid "_Automatically select next message"
-msgstr "Selecciona el missatge següent _automàticament"
-
-#: ui/preferences-dialog.ui:70
-msgid "_Display conversation preview"
-msgstr "_Mostra la vista prèvia de la conversació"
-
-#: ui/preferences-dialog.ui:89
-msgid "Use _three pane view"
-msgstr "Utilitza vista de _tres panells"
-
-#: ui/preferences-dialog.ui:113
-msgid "Notifications"
-msgstr "Notificacions"
-
-#: ui/preferences-dialog.ui:126
-msgid "_Play notification sounds"
-msgstr "_Reprodueix un so per a les notificacions"
-
-#: ui/preferences-dialog.ui:145
-msgid "Show _notifications for new mail"
-msgstr "Mostra les _notificacions quan arribi correu nou"
-
-#: ui/preferences-dialog.ui:164
-msgid "_Watch for new mail when closed"
-msgstr "_Vigila si arriba correu nou quan s'ha tancat"
-
-#: ui/preferences-dialog.ui:168
-msgid "Geary will keep running after all windows are closed"
-msgstr "Geary continuarà funcionant després de tancar totes les finestres"
-
-#: ui/preferences-dialog.ui:195
-msgid "Preferences"
-msgstr "Preferències"
-
-#. Button label for copying technical information to the clipboard
-#: ui/problem-details-dialog.ui:17
-msgid "Copy to Clipboard"
-msgstr "Copia al porta-retalls"
-
-#. Button tooltip for copying technical information to the clipboard
-#: ui/problem-details-dialog.ui:21
-msgid ""
-"Copy technical details to clipboard for pasting into an email or bug report"
-msgstr ""
-"Copia els detalls tècnics al porta-retalls per enganxar-los a un informe de "
-"correu electrònic o d'error"
-
-#: ui/problem-details-dialog.ui:73
-msgid ""
-"If the problem is serious or persists, please copy and send these details to "
-"the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\">mailing list</a> "
-"or file a <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug\">new "
-"bug report</a>."
-msgstr ""
-"Si el problema és greu o persisteix, copia i envia aquestes dades a la  <a "
-"href=\"https://wiki.gnome.org/Apps/Geary/Contact\"> llista de correu </a> o "
-"envia un <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug\"> nou "
-"informe d’error</a>."
-
-#: ui/problem-details-dialog.ui:89
-msgid "Details:"
-msgstr "_Detalls:"
-
 #: ui/upgrade_dialog.glade:60
 msgid "Geary update in progress…"
 msgstr "Actualització del Geary en curs…"
-
-#~ msgid "Geary Email"
-#~ msgstr "Client de correu Geary"
-
-#~ msgid "Mail Client"
-#~ msgstr "Client de correu"
-
-#~ msgid "Geary Mail"
-#~ msgstr "Geary Mail"
-
-#~ msgid "Additional addresses for %s"
-#~ msgstr "Adreces addicionals per a %s"
-
-#~ msgid "First Last"
-#~ msgstr "Primer últim"
-
-#~ msgid "Enter your account information to get started."
-#~ msgstr "Introduïu la informació del vostre compte per començar."
-
-#~ msgid "Edit"
-#~ msgstr "Edita"
-
-#~ msgid "Preview"
-#~ msgstr "Previsualització"
-
-#~ msgid "Remem_ber passwords"
-#~ msgstr "Recorda _contrasenyes"
-
-#~ msgid "Remem_ber password"
-#~ msgstr "Recorda la _contrasenya"
-
-#~ msgid "Unable to validate:\n"
-#~ msgstr "No s'ha pogut validar:\n"
-
-#~ msgid "        • Invalid account nickname.\n"
-#~ msgstr "        • Sobrenom de compte no vàlid .\n"
-
-#~ msgid "        • Email address already added to Geary.\n"
-#~ msgstr "        • L'adreça de correu electrònic ja s'ha afegit a Geary.\n"
-
-#~ msgid "        • IMAP connection error.\n"
-#~ msgstr "        • Error de connexió d'IMAP.\n"
-
-#~ msgid "        • IMAP username or password incorrect.\n"
-#~ msgstr "        • Nom d'usuari o contrasenya d'IMAP incorrecte.\n"
-
-#~ msgid "        • SMTP connection error.\n"
-#~ msgstr "        • Error de connexió SMTP.\n"
-
-#~ msgid "        • SMTP username or password incorrect.\n"
-#~ msgstr "        • Nom d'usuari o contrasenya d'SMTP incorrecte.\n"
-
-#~ msgid "        • Connection error.\n"
-#~ msgstr "        • Error de connexió.\n"
-
-#~ msgid "        • Username or password incorrect.\n"
-#~ msgstr "        • Nom d'usuari o contrasenya incorrecte.\n"
-
-#~ msgid "Delete conversations (Shift+Delete)"
-#~ msgstr "Suprimeix les converses (Maj + Supr)"
-
-#~ msgid "Move conversations to Trash (Delete, Backspace)"
-#~ msgstr "Mou les converses a la paperera (Esborrar, Retrocés)"
-
-#~ msgid "Archive conversations (A)"
-#~ msgstr "Arxiva les converses (A)"
-
-#~ msgid "Mark conversations"
-#~ msgstr "Marca les converses"
-
-#~ msgid "Add label to conversations"
-#~ msgstr "Afegeix etiqueta a les converses"
-
-#~ msgid "Move conversations"
-#~ msgstr "Mou les converses"
-
-#~ msgid "_Mark as…"
-#~ msgstr "_Marca com..."
-
-#~ msgid "Add label"
-#~ msgstr "Afegeix etiqueta"
-
-#~ msgid "_Label"
-#~ msgstr "_Etiqueta"
-
-#~ msgid "_Move"
-#~ msgstr "_Mou"
-
-#~ msgid "Compose new message (Ctrl+N, N)"
-#~ msgstr "Redacta un nou missatge (Ctrl+N, N)"
-
-#~ msgid "Reply (Ctrl+R, R)"
-#~ msgstr "Respon (Ctrl+R, R)"
-
-#~ msgid "Reply all (Ctrl+Shift+R, Shift+R)"
-#~ msgstr "Respon tot (Ctrl+Maj+R, Maj+R)"
-
-#~ msgid "Forward (Ctrl+L, F)"
-#~ msgstr "Reenvia (Ctrl+L, F)"
-
-#~ msgid "Unable to store server trust exception"
-#~ msgstr "No es pot emmagatzemar a excepció de la confiança del servidor"
-
-#~ msgid "Your settings are insecure"
-#~ msgstr "La vostra configuració no és segura"
-
-#~ msgid ""
-#~ "Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means "
-#~ "your username and password could be read by another person on the "
-#~ "network.  Are you sure you want to do this?"
-#~ msgstr ""
-#~ "Els paràmetres IMAP i/o SMTP no especifiquen SSL o TLS. Això vol dir que "
-#~ "el vostre nom d'usuari i la contrasenya podrien ser llegits per una altra "
-#~ "persona de la xarxa. Esteu segur que voleu fer això?"
-
-#~ msgid "Co_ntinue"
-#~ msgstr "Co_ntinua"
-
-#~ msgid ""
-#~ "Geary encountered an error sending an email.  If the problem persists, "
-#~ "please manually delete the email from your Outbox folder."
-#~ msgstr ""
-#~ "Geary ha detectat un error enviant un correu electrònic. Si el problema "
-#~ "persisteix, elimini manualment el correu electrònic de la seva carpeta: "
-#~ "Safata de sortida."
-
-#~ msgid ""
-#~ "Geary encountered an error saving a sent message to Sent Mail.  The "
-#~ "message will stay in your Outbox folder until you delete it."
-#~ msgstr ""
-#~ "Geary ha detectat un error en desar un missatge enviat al correu enviat. "
-#~ "El missatge romandrà a la carpeta: Bústia de sortida fins que s'elimini."
-
-#~ msgid "Unable to open local mailbox for %s"
-#~ msgstr "No es pot obrir la bústia local per a %s"
-
-#~ msgid ""
-#~ "There was an error opening the local mail database for this account. This "
-#~ "is possibly due to a file permissions problem.\n"
-#~ "\n"
-#~ "Please check that you have read/write permissions for all files in this "
-#~ "directory:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Hi ha hagut un error en obrir la base de dades de correu local per a "
-#~ "aquest compte. Això és possiblement a causa d'un problema de permisos de "
-#~ "fitxer.\n"
-#~ "\n"
-#~ "Comproveu que tingui permís de lectura/escriptura per a tots els fitxers "
-#~ "en aquest directori:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "The version number of the local mail database is formatted for a newer "
-#~ "version of Geary. Unfortunately, the database cannot be “rolled back” to "
-#~ "work with this version of Geary.\n"
-#~ "\n"
-#~ "Please install the latest version of Geary and try again."
-#~ msgstr ""
-#~ "El número de versió de la base de dades de correu local està formatada "
-#~ "per a una nova versió del Geary. La base de dades no pot ser «desfeta» "
-#~ "per treballar amb aquesta versió del Geary.\n"
-#~ "\n"
-#~ "Instal·la l'última versió del Geary i torna a provar-ho."
-
-#~ msgid ""
-#~ "There was an error opening the local account. This is probably due to "
-#~ "connectivity issues.\n"
-#~ "\n"
-#~ "Please check your network connection and restart Geary."
-#~ msgstr ""
-#~ "Hi ha hagut un error en obrir el compte local. Això és probablement a "
-#~ "causa de problemes de connectivitat.\n"
-#~ "\n"
-#~ "Comprovi la seva connexió a la xarxa i reinici el Geary."
-
-#~ msgid "To: "
-#~ msgstr "Per a:"
-
-#~ msgid "Cc: "
-#~ msgstr "Cc:"
-
-#~ msgid "Bcc: "
-#~ msgstr "CCO:"
-
-#~ msgid "Geary will exit if you have no other open email accounts."
-#~ msgstr ""
-#~ "Geary es tancarà si no té altres comptes de correu electrònic oberts."
-
-#~ msgid "Other"
-#~ msgstr "Un altre"
-
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
-
-#~ msgid "SMTP"
-#~ msgstr "SMTP"
-
-#~ msgid "From: %s\n"
-#~ msgstr "De: %s\n"
-
-#~ msgid "Subject: %s\n"
-#~ msgstr "Assumpte: %s\n"
-
-#~ msgid "Date: %s\n"
-#~ msgstr "Data: %s\n"
-
-#~ msgid "To: %s\n"
-#~ msgstr "Per a: %s\n"
-
-#~ msgid "Cc: %s\n"
-#~ msgstr "Cc: %s\n"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">No s'ha pogut eliminar el compte</"
-#~ "span> "
-
-#~ msgid ""
-#~ "A composer window associated with this account is currently open. Send or "
-#~ "discard the message and try again."
-#~ msgstr ""
-#~ "Hi ha una finestra de redacció associada a aquest compte que està oberta. "
-#~ "Desa o descarta el missatge i torna-ho a intentar."
-
-#~ msgid "Please wait while Geary validates your account."
-#~ msgstr "Espereu mentre Geary està validant el vostre compte."
-
-#~ msgid "Try Again"
-#~ msgstr "Torna a provar"
-
-#~ msgid ""
-#~ "Some email services require additional addresses be configured on the "
-#~ "server.  Contact your email provider for more information."
-#~ msgstr ""
-#~ "Alguns serveis de correu electrònic requereixen adreces addicionals per "
-#~ "poder configurar el servidor. Poseu-vos en contacte amb el proveïdor de "
-#~ "correu electrònic per obtenir més informació."
-
-#~ msgid "_Update"
-#~ msgstr "Act_ualització"
-
-#~ msgid "A_ccounts"
-#~ msgstr "_Comptes"
-
-#~ msgid "E_mail address"
-#~ msgstr "_Adreça de correu electrònic"
-
-#~ msgid "_Password"
-#~ msgstr "_Contrasenya"
-
-#~ msgid "S_ervice"
-#~ msgstr "S_ervei"
-
-#~ msgid "N_ame"
-#~ msgstr "N_om"
-
-#~ msgid "N_ickname"
-#~ msgstr "_Sobrenom"
-
-#~ msgid "Work, Home, etc."
-#~ msgstr "Treball, Casa, etc."
-
-#~ msgid "Addi_tional email addresses…"
-#~ msgstr "_Adreces de correu electrònic addicionals..."
-
-#~ msgid "IMAP settings"
-#~ msgstr "Configuració de l'IMAP"
-
-#~ msgid "Se_rver"
-#~ msgstr "Se_rvidor"
-
-#~ msgid "P_ort"
-#~ msgstr "P_ort"
-
-#~ msgid "Ser_ver"
-#~ msgstr "Ser_vidor"
-
-#~ msgid "Por_t"
-#~ msgstr "Por_t"
-
-#~ msgid "User_name"
-#~ msgstr "_Nom d'usuari"
-
-#~ msgid "Pass_word"
-#~ msgstr "Contrasen_ya"
-
-#~ msgid "SMTP password"
-#~ msgstr "Contrasenya SMTP"
-
-#~ msgid "_Username"
-#~ msgstr "Nom d'_usuari"
-
-#~ msgid "IMAP password"
-#~ msgstr "Contrasenya IMAP"
-
-#~ msgid "Encr_yption"
-#~ msgstr "Encr_iptació"
-
-#~ msgid "Encrypt_ion"
-#~ msgstr "Encriptac_ió"
-
-#~ msgid "STARTTLS"
-#~ msgstr "STARTTLS"
-
-#~ msgid "No authentication re_quired"
-#~ msgstr "No es re_quereix autenticació"
-
-#~ msgid "Use IMAP cre_dentials"
-#~ msgstr "_Utilitza credencials IMAP"
-
-#~ msgid "Composer"
-#~ msgstr "Editor"
-
-#~ msgid "Si_gn emails (HTML allowed):"
-#~ msgstr "_Signa missatges de correu electrònic (HTML permès):"
-
-#~ msgid "Storage"
-#~ msgstr "Emmagatzematge"
-
-#~ msgid "Empty Spam or Trash folders"
-#~ msgstr "Buida les carpetes de Correu brossa i la Paperera"
-
-#~ msgid "Geary will run in the background and notify of new mail"
-#~ msgstr ""
-#~ "El Geary s'executarà en segon pla i notifica els nous missatges de correu"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove "
-#~ "this account?</span> "
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">N'esteu segur que voleu eliminar "
-#~ "aquest compte?</span> "
-
-#~ msgid ""
-#~ "All email associated with this account will be removed from your "
-#~ "computer. This will not affect email on the server."
-#~ msgstr ""
-#~ "Tots els missatges associats a aquest compte s'eliminaran del vostre "
-#~ "ordinador. Això no afectarà els missatges al servidor."
-
-#~ msgid "Nickname:"
-#~ msgstr "Sobrenom:"
-
-#, fuzzy
-#~ msgid "Copyright 2011-2015 Yorba Foundation"
-#~ msgstr "Copyright 2011-2013 Yorba Foundation"
-
-#~ msgid "_Save As..."
-#~ msgstr "_Desa i anomena..."
-
-#~ msgid "Save A_ttachment..."
-#~ msgid_plural "Save All A_ttachments..."
-#~ msgstr[0] "Desa el fitxer ad_junt..."
-#~ msgstr[1] "Desa tots els fitxers ad_junts..."
-
-#~ msgid "none"
-#~ msgstr "cap"
-
-#~ msgid "_Left"
-#~ msgstr "_Esquerra"
-
-#~ msgid "_Right"
-#~ msgstr "_Dreta"
-
-#~ msgid "_Center"
-#~ msgstr "_Centrat"
-
-#~ msgid "_Justify"
-#~ msgstr "_Justificat"
-
-#~ msgid "Link (Ctrl+L)"
-#~ msgstr "Enllaç (Ctrl+L)"
-
-#~ msgid "Large"
-#~ msgstr "Gran"
-
-#~ msgid "Medium"
-#~ msgstr "Mitjà"
-
-#~ msgid "Small"
-#~ msgstr "Petit"
-
-#~ msgid "Sans Serif"
-#~ msgstr "Sans Serif"
-
-#~ msgid "Serif"
-#~ msgstr "Serif"
-
-#, fuzzy
-#~ msgid "Detach"
-#~ msgstr "_Adjunta"
-
-#~ msgid "_Attach File"
-#~ msgstr "_Adjunta fitxer"
-
-#~ msgid "Archive conversation (Delete, Backspace, A)"
-#~ msgstr "Arxiva la conversa (Suprimir, Retrocés, A)"
-
-#~ msgid "Password:"
-#~ msgstr "Contrasenya:"
-
-#~ msgid "Port:"
-#~ msgstr "Port:"
-
-#~ msgid "Real name:"
-#~ msgstr "Nom real:"
-
-#~ msgid "SSL"
-#~ msgstr "SSL"
-
-#~ msgid "SSL/TLS encryption:"
-#~ msgstr "Xifrat SSL/TLS:"
-
-#~ msgid "Server:"
-#~ msgstr "Servidor:"
-
-#~ msgid "Unable to login to email server"
-#~ msgstr ""
-#~ "No s'ha pogut entrar al teu compte al servidor del correu electrònic"