[geary] Update Catalan translation



commit 69bcdec9b2c8030cdb0e8970eaaa7650a00c732f
Author: Jordi Mas <jmas softcatala org>
Date:   Sun Nov 22 09:41:54 2020 +0100

    Update Catalan translation

 po/ca.po | 979 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 508 insertions(+), 471 deletions(-)
---
diff --git a/po/ca.po b/po/ca.po
index 86249675e..d9be78217 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -13,7 +13,7 @@ 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: 2020-05-26 18:52+0000\n"
+"POT-Creation-Date: 2020-11-10 06:27+0000\n"
 "PO-Revision-Date: 2020-04-25 08:20+0200\n"
 "Last-Translator: Carles Ferrando Garcia <carles ferrando gmail com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/geary/language/ca/)\n"
@@ -34,10 +34,10 @@ msgstr "Enviar fitxers a través de Geary"
 
 #. Translators: The application name
 #: desktop/geary-autostart.desktop.in.in:3
-#: desktop/org.gnome.Geary.appdata.xml.in.in:12
+#: desktop/org.gnome.Geary.appdata.xml.in.in:11
 #: desktop/org.gnome.Geary.desktop.in.in:3
-#: src/client/accounts/accounts-editor-servers-pane.vala:555
-#: src/client/application/application-main-window.vala:590
+#: src/client/accounts/accounts-editor-servers-pane.vala:560
+#: src/client/application/application-main-window.vala:608
 msgid "Geary"
 msgstr "Geary"
 
@@ -48,9 +48,9 @@ msgstr "Correu electrònic"
 
 #. Translators: The application's summary / tagline
 #: desktop/geary-autostart.desktop.in.in:5
-#: desktop/org.gnome.Geary.appdata.xml.in.in:16
+#: desktop/org.gnome.Geary.appdata.xml.in.in:15
 #: desktop/org.gnome.Geary.desktop.in.in:5
-#: src/client/application/application-client.vala:32
+#: src/client/application/application-client.vala:33
 msgid "Send and receive email"
 msgstr "Envieu i rebeu correus electrònics"
 
@@ -61,11 +61,11 @@ msgid "Email;E-mail;Mail;"
 msgstr "Email;Correu electrònic;Correu;"
 
 #. Translators: The development team's name
-#: desktop/org.gnome.Geary.appdata.xml.in.in:14
+#: desktop/org.gnome.Geary.appdata.xml.in.in:13
 msgid "Geary Development Team"
 msgstr "Equip de desenvolupament del Geary"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:18
+#: desktop/org.gnome.Geary.appdata.xml.in.in:17
 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, "
@@ -75,50 +75,50 @@ 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.in:23
+#: desktop/org.gnome.Geary.appdata.xml.in.in:22
 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 conversa completa sense haver de "
-"buscar i fer clic de missatge en missatge."
+"Les converses li permeten llegir una conversa completa sense haver de buscar"
+" i fer clic de missatge en missatge."
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:27
+#: desktop/org.gnome.Geary.appdata.xml.in.in:26
 msgid "Geary’s features include:"
 msgstr "Les característiques de Geary inclouen:"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:29
+#: desktop/org.gnome.Geary.appdata.xml.in.in:28
 msgid "Quick email account setup"
 msgstr "Configuració de comptes de correu electrònic"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:30
+#: desktop/org.gnome.Geary.appdata.xml.in.in:29
 msgid "Shows related messages together in conversations"
 msgstr "Mostra missatges relacionats junts en converses"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:31
+#: desktop/org.gnome.Geary.appdata.xml.in.in:30
 msgid "Fast, full text and keyword search"
 msgstr "Ràpid, text complet i recerca per paraula clau"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:32
+#: desktop/org.gnome.Geary.appdata.xml.in.in:31
 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.in:33
+#: desktop/org.gnome.Geary.appdata.xml.in.in:32
 msgid "Desktop notification of new mail"
 msgstr "Notificació a l'escriptori quan arribi correu nou"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:34
+#: desktop/org.gnome.Geary.appdata.xml.in.in:33
 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.in:48
+#: desktop/org.gnome.Geary.appdata.xml.in.in:47
 msgid "Geary displaying a conversation"
 msgstr "Geary mostrant una conversa"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in.in:59
+#: desktop/org.gnome.Geary.appdata.xml.in.in:58
 msgid "Geary showing the rich text composer"
 msgstr "Geary mostrant l'editor de text enriquit"
 
@@ -377,13 +377,13 @@ msgstr "Tots els altres"
 
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:195
-#: src/client/accounts/accounts-editor-servers-pane.vala:316
+#: src/client/accounts/accounts-editor-servers-pane.vala:321
 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:210
-#: src/client/accounts/accounts-editor-servers-pane.vala:329
+#: src/client/accounts/accounts-editor-servers-pane.vala:334
 msgid "Check your receiving server details"
 msgstr "Comproveu la recepció dels detalls del servidor"
 
@@ -393,13 +393,13 @@ msgstr "Comproveu la recepció dels detalls del servidor"
 #. specify custom creds here
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:232
-#: src/client/accounts/accounts-editor-servers-pane.vala:350
+#: src/client/accounts/accounts-editor-servers-pane.vala:355
 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:246
-#: src/client/accounts/accounts-editor-servers-pane.vala:363
+#: src/client/accounts/accounts-editor-servers-pane.vala:368
 msgid "Check your sending server details"
 msgstr "Comproveu els detalls del servidor enviats"
 
@@ -455,14 +455,14 @@ msgstr "correu_personal exemple com"
 #. Translators: Label for the user's login name for an
 #. IMAP, SMTP, etc service
 #: src/client/accounts/accounts-editor-add-pane.vala:593
-#: src/client/accounts/accounts-editor-servers-pane.vala:884
+#: src/client/accounts/accounts-editor-servers-pane.vala:889
 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:607
-#: src/client/accounts/accounts-editor-servers-pane.vala:1006
+#: src/client/accounts/accounts-editor-servers-pane.vala:1011
 #: ui/password-dialog.glade:108
 msgid "Password"
 msgstr "Contrasenya"
@@ -472,7 +472,7 @@ msgstr "Contrasenya"
 #. 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:629
-#: src/client/accounts/accounts-editor-servers-pane.vala:728
+#: src/client/accounts/accounts-editor-servers-pane.vala:733
 msgid "IMAP server"
 msgstr "Servidor IMAP"
 
@@ -487,7 +487,7 @@ msgstr "imap.exemple.com"
 #. 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:638
-#: src/client/accounts/accounts-editor-servers-pane.vala:734
+#: src/client/accounts/accounts-editor-servers-pane.vala:739
 msgid "SMTP server"
 msgstr "Servidor SMTP"
 
@@ -632,55 +632,54 @@ msgstr[0] "Úĺtim dia"
 msgstr[1] "Últims %d dies"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:255
-#: src/client/application/application-main-window.vala:2027
+#: src/client/application/application-main-window.vala:2066
 msgid "Undo"
 msgstr "Desfés"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:264
-#: src/client/application/application-main-window.vala:2010
+#: src/client/application/application-main-window.vala:2049
 msgid "Redo"
 msgstr "Refés"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:358
-#: src/client/accounts/accounts-editor-list-pane.vala:446
+#: src/client/accounts/accounts-editor-list-pane.vala:454
 #: src/client/accounts/accounts-editor-row.vala:279
 msgid "Gmail"
 msgstr "Gmail"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:362
-#: src/client/accounts/accounts-editor-list-pane.vala:450
+#: src/client/accounts/accounts-editor-list-pane.vala:458
 #: src/client/accounts/accounts-editor-row.vala:283
 msgid "Outlook.com"
 msgstr "Outlook.com"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:366
-#: src/client/accounts/accounts-editor-list-pane.vala:454
+#: src/client/accounts/accounts-editor-list-pane.vala:462
 #: 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:384
+#: src/client/accounts/accounts-editor-list-pane.vala:388
 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:393
+#: src/client/accounts/accounts-editor-list-pane.vala:397
 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:443
+#: src/client/accounts/accounts-editor-list-pane.vala:466
 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:560
+#: src/client/accounts/accounts-editor-list-pane.vala:572
 #, c-format
 msgid "Account “%s” removed"
 msgstr "El compte «%s» ha estat eliminat"
@@ -688,7 +687,7 @@ 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:567
+#: src/client/accounts/accounts-editor-list-pane.vala:579
 #, c-format
 msgid "Account “%s” restored"
 msgstr "El compte «%s» ha estat restaurat"
@@ -701,30 +700,30 @@ 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:295
+#: src/client/accounts/accounts-editor-row.vala:299
 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:469
+#: src/client/accounts/accounts-editor-row.vala:473
 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:480
-#: src/client/accounts/accounts-editor-servers-pane.vala:755
-#: src/client/accounts/accounts-editor-servers-pane.vala:970
+#: src/client/accounts/accounts-editor-row.vala:484
+#: src/client/accounts/accounts-editor-servers-pane.vala:760
+#: src/client/accounts/accounts-editor-servers-pane.vala:975
 msgid "None"
 msgstr "Cap"
 
-#: src/client/accounts/accounts-editor-row.vala:487
+#: src/client/accounts/accounts-editor-row.vala:491
 msgid "StartTLS"
 msgstr "StartTLS"
 
-#: src/client/accounts/accounts-editor-row.vala:494
+#: src/client/accounts/accounts-editor-row.vala:498
 msgid "TLS"
 msgstr "TLS"
 
@@ -732,35 +731,35 @@ msgstr "TLS"
 #. credentials (none, use IMAP, custom) when adding a new
 #. account
 #. Translators: An info bar button label
-#: src/client/accounts/accounts-editor-row.vala:535
-#: src/client/application/application-main-window.vala:544
+#: src/client/accounts/accounts-editor-row.vala:539
+#: src/client/application/application-main-window.vala:554
 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:542
+#: src/client/accounts/accounts-editor-row.vala:546
 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:550
+#: src/client/accounts/accounts-editor-row.vala:554
 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:558
+#: src/client/accounts/accounts-editor-row.vala:562
 msgid "Use a different login"
 msgstr "Useu un nom d'usuari diferent"
 
 #. Translators: In-app notification label, the
 #. string substitution is a more detailed reason.
-#: src/client/accounts/accounts-editor-servers-pane.vala:377
+#: src/client/accounts/accounts-editor-servers-pane.vala:382
 #, c-format
 msgid "Account not updated: %s"
 msgstr "Compte no actualitzat: %s"
@@ -768,23 +767,23 @@ msgstr "Compte no actualitzat: %s"
 #. Translators: This label describes the program that
 #. created the account, e.g. an SSO service like GOA, or
 #. locally by Geary.
-#: src/client/accounts/accounts-editor-servers-pane.vala:540
+#: src/client/accounts/accounts-editor-servers-pane.vala:545
 msgid "Account source"
 msgstr "Origen del compte"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:552
+#: src/client/accounts/accounts-editor-servers-pane.vala:557
 msgid "GNOME Online Accounts"
 msgstr "Comptes en línia GNOME"
 
 #. Translators: This label describes an account
 #. preference.
-#: src/client/accounts/accounts-editor-servers-pane.vala:611
+#: src/client/accounts/accounts-editor-servers-pane.vala:616
 msgid "Save draft email on server"
 msgstr "Desa l'esborrany del missatge al servidor"
 
 #. Translators: This label describes an account
 #. preference.
-#: src/client/accounts/accounts-editor-servers-pane.vala:666
+#: src/client/accounts/accounts-editor-servers-pane.vala:671
 msgid "Save sent email on server"
 msgstr "Desa els missatges enviats al servidor"
 
@@ -793,12 +792,12 @@ 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:956
+#: src/client/accounts/accounts-editor-servers-pane.vala:961
 #, c-format
 msgid "%s using OAuth2"
 msgstr "%s està emprant OAuth2"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:966
+#: src/client/accounts/accounts-editor-servers-pane.vala:971
 msgid "Use receiving server login"
 msgstr "Utilitza el nom d'usuari del servidor de recepció"
 
@@ -831,143 +830,143 @@ msgstr ""
 msgid "_Replace"
 msgstr "_Reemplaça"
 
-#: src/client/application/application-client.vala:33
+#: src/client/application/application-client.vala:34
 msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
-#: src/client/application/application-client.vala:34
+#: src/client/application/application-client.vala:35
 msgid "Copyright 2016-2020 Geary Development Team."
 msgstr "Copyright 2016-2020 equip de desenvolupament del Geary."
 
-#: src/client/application/application-client.vala:36
+#: src/client/application/application-client.vala:37
 msgid "Visit the Geary web site"
 msgstr "Visiteu el lloc web de Geary"
 
 #. / Command line option
-#: src/client/application/application-client.vala:96
+#: src/client/application/application-client.vala:97
 msgid "Print debug logging"
 msgstr "Imprimeix el registre de depuració"
 
 #. / Command line option
-#: src/client/application/application-client.vala:99
+#: src/client/application/application-client.vala:100
 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:102
+#: src/client/application/application-client.vala:103
 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:105
+#: src/client/application/application-client.vala:106
 msgid "Log conversation monitoring"
 msgstr "Registra el seguiment de les converses"
 
 #. / Command line option
-#: src/client/application/application-client.vala:108
+#: src/client/application/application-client.vala:109
 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:112
+#: src/client/application/application-client.vala:113
 msgid "Log folder normalization"
 msgstr "Registra la normalització de carpetes"
 
 #. / Command line option
-#: src/client/application/application-client.vala:115
+#: src/client/application/application-client.vala:116
 msgid "Log IMAP network activity"
 msgstr "Registra l'activitat de xarxa d'IMAP"
 
 #. / 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:120
+#: src/client/application/application-client.vala:121
 msgid "Log IMAP replay queue"
 msgstr "Registra la cua de reproducció IMAP"
 
 #. / Command line option
-#: src/client/application/application-client.vala:123
+#: src/client/application/application-client.vala:124
 msgid "Log SMTP network activity"
 msgstr "Registra l'activitat de xarxa de SMTP"
 
 #. / Command line option
-#: src/client/application/application-client.vala:126
+#: src/client/application/application-client.vala:127
 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:129
+#: src/client/application/application-client.vala:130
 msgid "Perform a graceful quit"
 msgstr "Realitza la sortida amb èxit"
 
-#: src/client/application/application-client.vala:131
+#: src/client/application/application-client.vala:132
 msgid "Open a new window"
 msgstr "Obre una finestra nova"
 
 #. / Command line option
-#: src/client/application/application-client.vala:134
+#: src/client/application/application-client.vala:135
 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:137
+#: src/client/application/application-client.vala:138
 msgid "Display program version"
 msgstr "Mostra la versió del programa"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:261
+#: src/client/application/application-client.vala:262
 msgid "Geary version"
 msgstr "Versió del Geary"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:263
+#: src/client/application/application-client.vala:264
 msgid "Geary revision"
 msgstr "Revisió del Geary"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:265
+#: src/client/application/application-client.vala:266
 msgid "GTK version"
 msgstr "Versió de GTK"
 
 #. / Applciation runtime information label
-#: src/client/application/application-client.vala:272
+#: src/client/application/application-client.vala:273
 msgid "GLib version"
 msgstr "Versió de GLib"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:279
+#: src/client/application/application-client.vala:280
 msgid "WebKitGTK version"
 msgstr "Versió de WebKitGTK"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:286
+#: src/client/application/application-client.vala:287
 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:288
+#: src/client/application/application-client.vala:289
 #: src/client/components/components-attachment-pane.vala:91
 msgid "Unknown"
 msgstr "Desconegut"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:318
+#: src/client/application/application-client.vala:293
 msgid "Distribution name"
 msgstr "Nom de la distribució"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:323
+#: src/client/application/application-client.vala:298
 msgid "Distribution release"
 msgstr "Versió de la distribució"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:331
+#: src/client/application/application-client.vala:303
 msgid "Installation prefix"
 msgstr "Prefix d'instal·lació"
 
-#: src/client/application/application-client.vala:584
+#: src/client/application/application-client.vala:559
 #, c-format
 msgid "About %s"
 msgstr "Quant al %s"
@@ -975,7 +974,7 @@ 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/application-client.vala:588
+#: src/client/application/application-client.vala:563
 msgid "translator-credits"
 msgstr ""
 "Martin Steghöfer <martin steghoefer de>, 2013\n"
@@ -985,37 +984,37 @@ msgstr ""
 
 #. / Warning printed to the console when a deprecated
 #. / command line option is used.
-#: src/client/application/application-client.vala:1049
+#: src/client/application/application-client.vala:1045
 msgid "The `--hidden` option is deprecated and will be removed in the future."
 msgstr "L'opció «--hidden» està en desús i s'eliminarà en el futur."
 
 #. / Command line warning, string substitution
 #. / is the given argument
-#: src/client/application/application-client.vala:1082
+#: src/client/application/application-client.vala:1078
 #, c-format
 msgid "Unrecognised program argument: “%s”"
 msgstr "Argument del programa no reconegut: «%s»"
 
 #. / Notification title.
-#: src/client/application/application-controller.vala:485
+#: src/client/application/application-controller.vala:479
 #, c-format
 msgid "A problem occurred sending email for %s"
 msgstr "S'ha produït un error en enviar el correu per a %s"
 
 #. / Notification body
-#: src/client/application/application-controller.vala:489
+#: src/client/application/application-controller.vala:483
 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:588
+#: src/client/application/application-controller.vala:582
 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:594
+#: src/client/application/application-controller.vala:588
 msgid "Conversation un-marked"
 msgid_plural "Conversations un-marked"
 msgstr[0] "S'ha desmarcat la conversa"
@@ -1024,8 +1023,8 @@ 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:620
-#: src/client/application/application-controller.vala:704
+#: src/client/application/application-controller.vala:614
+#: src/client/application/application-controller.vala:698
 #, c-format
 msgid "Conversation moved to %s"
 msgid_plural "Conversations moved to %s"
@@ -1037,8 +1036,8 @@ msgstr[1] "S'han mogut les converses a %s"
 #. / 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:628
-#: src/client/application/application-controller.vala:650
+#: src/client/application/application-controller.vala:622
+#: src/client/application/application-controller.vala:644
 #, c-format
 msgid "Conversation restored to %s"
 msgid_plural "Conversations restored to %s"
@@ -1046,7 +1045,7 @@ msgstr[0] "S'ha restaurat la conversa a %s"
 msgstr[1] "S'han restaurat les converses a %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:671
+#: src/client/application/application-controller.vala:665
 msgid "Conversation archived"
 msgid_plural "Conversations archived"
 msgstr[0] "S'ha arxivat la conversa"
@@ -1054,7 +1053,7 @@ msgstr[1] "S'han arxivat les converses"
 
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
-#: src/client/application/application-controller.vala:727
+#: src/client/application/application-controller.vala:721
 #, c-format
 msgid "Message restored to %s"
 msgid_plural "Messages restored to %s"
@@ -1062,7 +1061,7 @@ 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:748
+#: src/client/application/application-controller.vala:742
 msgid "Message archived"
 msgid_plural "Messages archived"
 msgstr[0] "S'ha arxivat el missatge"
@@ -1071,7 +1070,7 @@ msgstr[1] "S'han arxivat els missatges"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:783
+#: src/client/application/application-controller.vala:777
 #, c-format
 msgid "Message moved to %s"
 msgid_plural "Messages moved to %s"
@@ -1081,7 +1080,7 @@ 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:811
+#: src/client/application/application-controller.vala:805
 #, c-format
 msgid "Conversation labelled as %s"
 msgid_plural "Conversations labelled as %s"
@@ -1091,19 +1090,19 @@ 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:819
-#, c-format, fuzzy
+#: src/client/application/application-controller.vala:813
+#, c-format
 msgid "Conversation un-labelled as %s"
 msgid_plural "Conversations un-labelled as %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Conversa desetiquetada com a %s"
+msgstr[1] "Converses desetiquetades com a %s"
 
-#: src/client/application/application-controller.vala:1305
+#: src/client/application/application-controller.vala:1320
 #, 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/application-controller.vala:1306
+#: src/client/application/application-controller.vala:1321
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is possibly due to corruption of 
the database file in this directory:\n"
@@ -1122,20 +1121,20 @@ msgstr ""
 "\n"
 "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/application-controller.vala:1308
+#: src/client/application/application-controller.vala:1323
 msgid "_Rebuild"
 msgstr "_Reconstrueix"
 
-#: src/client/application/application-controller.vala:1308
+#: src/client/application/application-controller.vala:1323
 msgid "E_xit"
 msgstr "_Surt"
 
-#: src/client/application/application-controller.vala:1318
+#: src/client/application/application-controller.vala:1333
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "No es pot reconstruir la base de dades de «%s»"
 
-#: src/client/application/application-controller.vala:1319
+#: src/client/application/application-controller.vala:1334
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -1148,90 +1147,90 @@ 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:1449
+#: src/client/application/application-controller.vala:1501
 #, c-format
 msgid "Email sent to %s"
 msgstr "Correu enviat a %s"
 
 #. / 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:2448
+#: src/client/application/application-controller.vala:2491
 #, 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:2512
+#: src/client/application/application-controller.vala:2555
 #, 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:2527
-#: src/client/application/application-controller.vala:2585
+#: src/client/application/application-controller.vala:2570
+#: src/client/application/application-controller.vala:2628
 msgid "Composer could not be restored"
 msgstr "No s'ha pogut restaurar l'editor"
 
 #. / 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:2570
+#: src/client/application/application-controller.vala:2613
 #, c-format
 msgid "Email to %s discarded"
 msgstr "S'ha descartat el correu a %s"
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:530
+#: src/client/application/application-main-window.vala:540
 msgid "Working offline"
 msgstr "Treballa fora de línia"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:532
+#: src/client/application/application-main-window.vala:542
 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."
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:539
+#: src/client/application/application-main-window.vala:549
 msgid "Login problem"
 msgstr "Problema amb l'inici de sessió"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:541
+#: src/client/application/application-main-window.vala:551
 msgid "An account has reported an incorrect login or password."
 msgstr "Un compte ha informat d'un nom d'usuari o contrasenya incorrecte."
 
 #. Translators: An info bar button tool-tip
-#: src/client/application/application-main-window.vala:547
+#: src/client/application/application-main-window.vala:558
 msgid "Retry login, you will be prompted for your password"
 msgstr ""
 "Torneu a iniciar la sessió, se us preguntarà per la vostra contrasenya"
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:554
+#: src/client/application/application-main-window.vala:565
 msgid "Security problem"
 msgstr "Problema de seguretat"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:556
-msgid "An account has reported an untrusted server.."
-msgstr "Un compte ha informat d'un servidor no fiable.."
+#: src/client/application/application-main-window.vala:567
+msgid "An account has reported an untrusted server."
+msgstr "Un compte ha informat d'un servidor no fiable."
 
 #. Translators: An info bar button label
-#: src/client/application/application-main-window.vala:559
+#: src/client/application/application-main-window.vala:570
 msgid "Check"
 msgstr "Comprovació"
 
 #. Translators: An info bar button tool-tip
-#: src/client/application/application-main-window.vala:562
+#: src/client/application/application-main-window.vala:574
 msgid "Check the security details for the connection"
 msgstr "Comprova els detalls de seguretat per a la connexió"
 
 #. / 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:595
+#: src/client/application/application-main-window.vala:617
 #, c-format
 msgid "%s — %s"
 msgstr "%s — %s"
@@ -1239,51 +1238,51 @@ msgstr "%s — %s"
 #. Translators: The name of the folder group containing
 #. folders created by people (as opposed to special-use
 #. folders)
-#: src/client/application/application-main-window.vala:972
+#: src/client/application/application-main-window.vala:996
 #: src/client/folder-list/folder-list-account-branch.vala:43
 msgid "Labels"
 msgstr "Etiquetes"
 
-#: src/client/application/application-main-window.vala:1261
+#: src/client/application/application-main-window.vala:1298
 #, 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:1262
+#: src/client/application/application-main-window.vala:1299
 msgid "This removes the email from Geary and your email server."
 msgstr ""
 "Això elimina el correu electrònic del Geary i del servidor de correu "
 "electrònic."
 
-#: src/client/application/application-main-window.vala:1263
+#: src/client/application/application-main-window.vala:1300
 msgid "This cannot be undone."
 msgstr "Això no es pot desfer."
 
-#: src/client/application/application-main-window.vala:1264
+#: src/client/application/application-main-window.vala:1301
 #, c-format
 msgid "Empty %s"
 msgstr "Buida %s"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1321
+#: src/client/application/application-main-window.vala:1358
 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:1326
-#: src/client/application/application-main-window.vala:1341
+#: src/client/application/application-main-window.vala:1363
+#: src/client/application/application-main-window.vala:1378
 msgid "Delete"
 msgstr "Suprimeix"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1336
+#: src/client/application/application-main-window.vala:1373
 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:1659
+#: src/client/application/application-main-window.vala:1696
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -1295,7 +1294,7 @@ msgstr "%s (%d)"
 #. / 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:1920
+#: src/client/composer/composer-widget.vala:1787
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -1323,7 +1322,7 @@ msgstr "Inspector"
 #. / Translators: Title for Inspector logs pane
 #. / Translators: Title for problem report dialog logs pane
 #: src/client/components/components-inspector.vala:93
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:102
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:101
 msgid "Logs"
 msgstr "Registres"
 
@@ -1331,46 +1330,46 @@ msgstr "Registres"
 #. / Translators: Title for problem report system information
 #. / pane
 #: src/client/components/components-inspector.vala:97
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:105
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:104
 msgid "System"
 msgstr "Sistema"
 
 #. Button label for saving problem report information
 #: src/client/components/components-inspector.vala:226
 #: src/client/components/components-inspector.vala:229
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:221
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:224
-#: ui/problem-details-dialog.ui:42
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:220
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:223
+#: ui/problem-details-dialog.ui:47
 msgid "Save As"
 msgstr "Anomena i desa"
 
 #: src/client/components/components-inspector.vala:230
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:225
-#: ui/accounts_editor_servers_pane.ui:17
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:224
+#: ui/accounts_editor_servers_pane.ui:17 ui/composer-headerbar.ui:61
 msgid "Cancel"
 msgstr "Cancel·la"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:52
+#: src/client/components/components-preferences-window.vala:124
 msgid "_Automatically select next message"
 msgstr "Selecciona el missatge següent _automàticament"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:62
+#: src/client/components/components-preferences-window.vala:134
 msgid "_Display conversation preview"
 msgstr "_Mostra la vista prèvia de la conversa"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:72
+#: src/client/components/components-preferences-window.vala:144
 msgid "Use _three pane view"
 msgstr "Utilitza vista de _tres panells"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:82
+#: src/client/components/components-preferences-window.vala:154
 msgid "Use _single key email shortcuts"
 msgstr "_Usa només les dreceres d'una tecla"
 
-#: src/client/components/components-preferences-window.vala:84
+#: src/client/components/components-preferences-window.vala:156
 msgid ""
 "Enable keyboard shortcuts for email actions that do not require pressing "
 "<Ctrl>"
@@ -1379,22 +1378,22 @@ msgstr ""
 "no requereixen prémer <Ctrl>"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:95
+#: src/client/components/components-preferences-window.vala:167
 msgid "_Watch for new mail when closed"
 msgstr "_Vigila si arriba correu nou quan s'ha tancat"
 
 #. / Translators: Preferences tooltip
-#: src/client/components/components-preferences-window.vala:99
+#: src/client/components/components-preferences-window.vala:171
 msgid "Geary will keep running after all windows are closed"
 msgstr "Geary continuarà funcionant després de tancar totes les finestres"
 
 #. / Translators: Preferences page title
-#: src/client/components/components-preferences-window.vala:117
+#: src/client/components/components-preferences-window.vala:189
 msgid "Preferences"
 msgstr "Preferències"
 
 #. / Translators: Preferences page title
-#: src/client/components/components-preferences-window.vala:180
+#: src/client/components/components-preferences-window.vala:250
 msgid "Plugins"
 msgstr "Connectors"
 
@@ -1489,27 +1488,27 @@ 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:390
+#: src/client/components/components-validator.vala:394
 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:394
+#: src/client/components/components-validator.vala:398
 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:440
+#: src/client/components/components-validator.vala:444
 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:445
+#: src/client/components/components-validator.vala:449
 msgid "Could not look up server name"
 msgstr "No s'ha pogut cercar el nom del servidor"
 
@@ -1572,7 +1571,9 @@ msgstr "Error en desar l'enviament de correu electrònic"
 msgid "_OK"
 msgstr "_D'acord"
 
-#: src/client/components/stock.vala:19 ui/password-dialog.glade:196
+#: src/client/components/stock.vala:19
+#: src/client/plugin/mail-merge/mail-merge.vala:392
+#: ui/password-dialog.glade:196
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
@@ -1597,6 +1598,7 @@ msgid "_Help"
 msgstr "A_juda"
 
 #: src/client/components/stock.vala:26
+#: src/client/plugin/mail-merge/mail-merge.vala:391
 #: ui/components-attachment-pane-menus.ui:7
 msgid "_Open"
 msgstr "_Obre"
@@ -1627,6 +1629,10 @@ msgstr "De_sa"
 msgid "_Keep"
 msgstr "_Mantén"
 
+#: src/client/composer/composer-editor.vala:675
+msgid "Select Color"
+msgstr "Selecciona el color"
+
 #: src/client/composer/composer-link-popover.vala:139
 msgid "Link URL is not correctly formatted, e.g. http://example.com";
 msgstr ""
@@ -1641,23 +1647,23 @@ msgid "Invalid email address"
 msgstr "Adreça de correu electrònic no vàlida"
 
 #. / Translators: Title for an empty composer window
-#: src/client/composer/composer-widget.vala:31
+#: src/client/composer/composer-widget.vala:32
 msgid "New Message"
 msgstr "Missatge nou"
 
-#: src/client/composer/composer-widget.vala:235
+#: src/client/composer/composer-widget.vala:167
 msgid "Saved"
 msgstr "Desat"
 
-#: src/client/composer/composer-widget.vala:236
+#: src/client/composer/composer-widget.vala:168
 msgid "Saving"
 msgstr "S'està desant"
 
-#: src/client/composer/composer-widget.vala:237
+#: src/client/composer/composer-widget.vala:169
 msgid "Error saving"
 msgstr "S'ha produït un error en desar"
 
-#: src/client/composer/composer-widget.vala:238
+#: src/client/composer/composer-widget.vala:170
 msgid "Press Backspace to delete quote"
 msgstr "Premi la tecla Retrocés per a esborrar la cita"
 
@@ -1666,7 +1672,7 @@ msgstr "Premi la tecla Retrocés per a esborrar la cita"
 #. 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:254
+#: src/client/composer/composer-widget.vala:186
 msgid ""
 
"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|enclosing|encloses|enclosure|enclosures"
 msgstr ""
@@ -1676,109 +1682,105 @@ 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:903
+#: src/client/composer/composer-widget.vala:865
 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:929
+#: src/client/composer/composer-widget.vala:891
 msgid "Do you want to discard this draft message?"
 msgstr "Vols descartar aquest esborrany de missatge?"
 
-#: src/client/composer/composer-widget.vala:1575
+#: src/client/composer/composer-widget.vala:1443
 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:1577
+#: src/client/composer/composer-widget.vala:1445
 msgid "Send message with an empty subject?"
 msgstr "Vols enviar un missatge amb un assumpte buit?"
 
-#: src/client/composer/composer-widget.vala:1579
+#: src/client/composer/composer-widget.vala:1447
 msgid "Send message with an empty body?"
 msgstr "Vols enviar un missatge amb un cos buit?"
 
-#: src/client/composer/composer-widget.vala:1588
+#: src/client/composer/composer-widget.vala:1456
 msgid "Send message without an attachment?"
 msgstr "Vols enviar un missatge sense un fitxer adjunt?"
 
-#: src/client/composer/composer-widget.vala:1906
+#: src/client/composer/composer-widget.vala:1775
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "«%s» ja està seleccionat com a fitxer adjunt per a l'enviament."
 
-#: src/client/composer/composer-widget.vala:1942
-#: src/client/composer/composer-widget.vala:1992
+#: src/client/composer/composer-widget.vala:1807
+#: src/client/composer/composer-widget.vala:1857
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "«%s» és un fitxer buit."
 
-#: src/client/composer/composer-widget.vala:1980
+#: src/client/composer/composer-widget.vala:1845
 #, c-format
 msgid "“%s” could not be found."
 msgstr "No es pot conèixer «%s»."
 
-#: src/client/composer/composer-widget.vala:1986
+#: src/client/composer/composer-widget.vala:1851
 #, c-format
 msgid "“%s” is a folder."
 msgstr "«%s» és una carpeta."
 
-#: src/client/composer/composer-widget.vala:2005
+#: src/client/composer/composer-widget.vala:1870
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "No s'ha pogut obrir «%s» per a llegir."
 
-#: src/client/composer/composer-widget.vala:2013
+#: src/client/composer/composer-widget.vala:1878
 msgid "Cannot add attachment"
 msgstr "No s'ha pogut afegir el fitxer adjunt"
 
+#. Translators: This is the name of the file chooser filter
+#. when inserting an image in the composer.
+#: src/client/composer/composer-widget.vala:1949
+msgid "Images"
+msgstr "Imatges"
+
 #. Translators: Human-readable version of the RFC 822 To header
-#: src/client/composer/composer-widget.vala:2073
+#: src/client/composer/composer-widget.vala:2013
 #: src/client/conversation-viewer/conversation-email.vala:542
-#: src/client/util/util-email.vala:236 ui/conversation-message.ui:312
+#: src/client/util/util-email.vala:249 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:2079
+#: src/client/composer/composer-widget.vala:2019
 #: src/client/conversation-viewer/conversation-email.vala:547
-#: src/client/util/util-email.vala:241 ui/conversation-message.ui:357
+#: src/client/util/util-email.vala:254 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:2085
+#: src/client/composer/composer-widget.vala:2025
 #: src/client/conversation-viewer/conversation-email.vala:552
 #: 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:2091
+#: src/client/composer/composer-widget.vala:2031
 msgid "Reply-To: "
 msgstr "Respon a: "
 
-#: src/client/composer/composer-widget.vala:2343
-msgid "Select Color"
-msgstr "Selecciona el color"
-
 #. Displayed in the From dropdown to indicate an
 #. "alternate email address" for an account.  The first
 #. 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:2532
+#: src/client/composer/composer-widget.vala:2149
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s via %2$s"
 
-#. Translators: This is the name of the file chooser filter
-#. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2889
-msgid "Images"
-msgstr "Imatges"
-
 #: src/client/composer/spell-check-popover.vala:125
 msgid "Remove this language from the preferred list"
 msgstr "Elimina aquest idioma de la llista preferida"
@@ -1792,51 +1794,51 @@ msgid "Search for more languages"
 msgstr "Cerca més idiomes"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:335
+#: src/client/conversation-list/conversation-list-view.vala:339
 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"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:347
+#: src/client/conversation-list/conversation-list-view.vala:351
 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
+#: src/client/conversation-list/conversation-list-view.vala:364
 #: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "Ma_rca com a llegit"
 
-#: src/client/conversation-list/conversation-list-view.vala:368
+#: src/client/conversation-list/conversation-list-view.vala:372
 #: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "Marca com a no _llegit"
 
-#: src/client/conversation-list/conversation-list-view.vala:376
+#: src/client/conversation-list/conversation-list-view.vala:380
 #: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "_No destaquis"
 
-#: src/client/conversation-list/conversation-list-view.vala:383
+#: src/client/conversation-list/conversation-list-view.vala:387
 #: 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:392
+#: src/client/conversation-list/conversation-list-view.vala:396
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "_Respon"
 
-#: src/client/conversation-list/conversation-list-view.vala:398
+#: src/client/conversation-list/conversation-list-view.vala:402
 msgid "R_eply All"
 msgstr "R_espon tot"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:404
+#: src/client/conversation-list/conversation-list-view.vala:408
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "_Reenvia"
@@ -1847,19 +1849,19 @@ msgstr "En a mi"
 
 #. Translators: Human-readable version of the RFC 822 From header
 #: src/client/conversation-viewer/conversation-email.vala:537
-#: src/client/util/util-email.vala:227
+#: src/client/util/util-email.vala:240
 msgid "From:"
 msgstr "De:"
 
 #. Translators: Human-readable version of the RFC 822 Date header
 #: src/client/conversation-viewer/conversation-email.vala:557
-#: src/client/util/util-email.vala:232
+#: src/client/util/util-email.vala:245
 msgid "Date:"
 msgstr "Data:"
 
 #. Translators: Human-readable version of the RFC 822 Subject header
 #: src/client/conversation-viewer/conversation-email.vala:567
-#: src/client/util/util-email.vala:230
+#: src/client/util/util-email.vala:243
 msgid "Subject:"
 msgstr "Assumpte:"
 
@@ -1946,7 +1948,8 @@ msgstr "Diverses converses seleccionades"
 #. conversations have been selected.
 #: src/client/conversation-viewer/conversation-viewer.vala:100
 msgid "Choosing an action will apply to all selected conversations"
-msgstr "Quan s'esculli una acció s'aplicarà a totes les converses seleccionades"
+msgstr ""
+"Quan s'esculli una acció s'aplicarà a totes les converses seleccionades"
 
 #. Translators: Title label for placeholder when no
 #. conversations have exist in a folder.
@@ -2060,8 +2063,8 @@ msgstr "Hi ha hagut un error processant el certificat del servidor"
 #. / 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
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:99
+#: ui/problem-details-dialog.ui:17
 msgid "Details"
 msgstr "Detalls"
 
@@ -2116,14 +2119,6 @@ msgid_plural "%d results"
 msgstr[0] "%d resultat"
 msgstr[1] "%d resultats"
 
-#: src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in:4
-msgid "Desktop Notifications"
-msgstr "Notificacions d'escriptori"
-
-#: src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in:5
-msgid "Displays desktop notifications when new email is delivered"
-msgstr "Mostra una notificació a l'escriptori quan arribi correu nou"
-
 #. / Notification body when a message as been received
 #. / and other unread messages have not been
 #. / seen. First string substitution is the message
@@ -2189,33 +2184,30 @@ msgstr "Crea plantilles reutilitzables per a enviar correu electrònic"
 #. the front for the default. English names do not need to be
 #. included.
 #: src/client/plugin/email-templates/email-templates.vala:29
-#, fuzzy
-#| msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+#: src/client/plugin/mail-merge/mail-merge.vala:29
 msgid "Templates | Template Mail | Template Email | Template E-Mail"
-msgstr ""
-"Enviat | Correu enviat | El correu electrònic enviat | Enviat per correu "
-"electrònic"
+msgstr "Plantilles | Plantilla de correu | Plantilla de correu electrònic"
 
 #. Translators: The name of the folder used to
 #. store email templates
-#: src/client/plugin/email-templates/email-templates.vala:195
+#: src/client/plugin/email-templates/email-templates.vala:201
 msgid "Templates"
 msgstr "Plantilles"
 
 #. Translators: Info bar button label for creating a
 #. new email template
-#: src/client/plugin/email-templates/email-templates.vala:276
+#: src/client/plugin/email-templates/email-templates.vala:282
 msgid "New"
 msgstr "Nou"
 
 #. Translators: Infobar status label for an email template
-#: src/client/plugin/email-templates/email-templates.vala:287
+#: src/client/plugin/email-templates/email-templates.vala:293
 msgid "Message template"
 msgstr "Plantilla de missatge"
 
 #. Translators: Info bar button label for sending an
 #. email template
-#: src/client/plugin/email-templates/email-templates.vala:291
+#: src/client/plugin/email-templates/email-templates.vala:297
 msgid "Send"
 msgstr "Envia"
 
@@ -2223,86 +2215,126 @@ msgstr "Envia"
 #. existing email template
 #. Translators: Info bar button label for editing a draft
 #. email
-#: src/client/plugin/email-templates/email-templates.vala:299
-#: src/client/plugin/special-folders/special-folders.vala:180
+#: src/client/plugin/email-templates/email-templates.vala:305
+#: src/client/plugin/mail-merge/mail-merge.vala:336
+#: src/client/plugin/special-folders/special-folders.vala:187
 msgid "Edit"
 msgstr "Edita"
 
-#: src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in:4
-msgid "Folder Highlight"
-msgstr "Ressaltat de carpetes"
-
-#: src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in:5
-msgid "Highlights folders that have newly delivered mail"
-msgstr "Ressalta les carpetes que tenen correu nou lliurat"
+#. / Translators: Menu item label for invoking mail
+#. / merge in composer
+#. / Translators: File chooser title after invoking mail
+#. / merge in composer
+#. Translators: The name of the folder used to
+#. display merged email
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:5
+#: src/client/plugin/mail-merge/mail-merge.vala:288
+#: src/client/plugin/mail-merge/mail-merge.vala:389
+#: src/client/plugin/mail-merge/mail-merge.vala:488
+msgid "Mail Merge"
+msgstr "Combinació de correu"
+
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:6
+msgid "Fill in and send email templates using a spreadsheet"
+msgstr ""
+"Ompliu i envieu plantilles de correu electrònic mitjançant un full de càlcul"
+
+#. Translators: Info bar label for starting sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:118
+msgid "Start"
+msgstr "Inici"
+
+#. Translators: Info bar label for pausing sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:130
+msgid "Pause"
+msgstr "Pausa"
+
+#. Translators: Info bar description for the mail merge
+#. folder. The first string substitution the number of email
+#. already sent, the second is the total number to send.
+#: src/client/plugin/mail-merge/mail-merge.vala:240
+#, c-format
+msgid "Sent %u of %u"
+msgid_plural "Sent %u of %u"
+msgstr[0] "Enviat %u de %u"
+msgstr[1] "Enviats %u de %u"
+
+#. Translators: Infobar status label for an email mail merge
+#. template
+#: src/client/plugin/mail-merge/mail-merge.vala:324
+msgid "Mail merge template"
+msgstr "Plantilla de combinació de correu"
+
+#. Translators: Info bar button label for performing a
+#. mail-merge on an email template
+#: src/client/plugin/mail-merge/mail-merge.vala:328
+msgid "Merge"
+msgstr "Combina"
+
+#. / Translators: Action bar menu button label for
+#. / mail-merge plugin
+#: src/client/plugin/mail-merge/mail-merge.vala:377
+msgid "Insert field"
+msgstr "Insereix un camp"
+
+#. / Translators: File chooser filer label
+#: src/client/plugin/mail-merge/mail-merge.vala:396
+msgid "Comma separated values (CSV)"
+msgstr "Valors separats per comes (CSV)"
 
 #: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:4
 msgid "Messaging Menu"
 msgstr "Menú de missatges"
 
 #: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:5
-#, fuzzy
-#| msgid "Desktop notification of new mail"
 msgid "Displays Unity Messaging Menu notifications for new email"
-msgstr "Notificació a l'escriptori quan arribi correu nou"
+msgstr ""
+"Mostra notificacions al menú de l'Unity Messaging per a correus "
+"electrònics nous"
 
-#: src/client/plugin/messaging-menu/messaging-menu.vala:75
+#: src/client/plugin/messaging-menu/messaging-menu.vala:79
 #, c-format
 msgid "%s — New Messages"
 msgstr "%s — Missatges Nous"
 
-#: src/client/plugin/notification-badge/notification-badge.plugin.desktop.in:4
-#, fuzzy
-msgid "Notification Badge"
-msgstr "Insígnia de notificació"
-
-#: src/client/plugin/notification-badge/notification-badge.plugin.desktop.in:5
-#, fuzzy
-msgid "Displays a dock badge showing the number of new messages"
-msgstr ""
-"Mostra una insígnia de l'acoblador mostrant el nombre de missatges nous"
-
 #: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:4
 msgid "Sent Sound"
 msgstr "So d'enviat"
 
 #: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:5
-#, fuzzy
 msgid "Plays the desktop sent-mail sound when an email is sent"
 msgstr ""
 "Reprodueix el so de correu enviat de l'escriptori quan s'envia un correu "
 "electrònic"
 
-#: src/client/plugin/special-folders/special-folders.plugin.desktop.in:4
-msgid "Special Folders"
-msgstr "Carpetes especials"
-
 #. Translators: Info bar button label for emptying
 #. trash/spam folders
-#: src/client/plugin/special-folders/special-folders.vala:160
+#: src/client/plugin/special-folders/special-folders.vala:167
 msgid "Empty"
 msgstr "Buida"
 
 #. Translators: Info bar status message for a draft email
-#: src/client/plugin/special-folders/special-folders.vala:172
+#: src/client/plugin/special-folders/special-folders.vala:179
 msgid "Draft message"
 msgstr "Missatge de l'esborrany"
 
 #. Translators: Info bar status description for a draft
 #. email
-#: src/client/plugin/special-folders/special-folders.vala:175
+#: src/client/plugin/special-folders/special-folders.vala:182
 msgid "This message has not yet been sent."
 msgstr "Aquest missatge no s'ha enviat."
 
 #. Translators: Info bar status message for an sent but
 #. unsaved email
-#: src/client/plugin/special-folders/special-folders.vala:191
+#: src/client/plugin/special-folders/special-folders.vala:198
 msgid "Message not saved"
 msgstr "Missatge no desat"
 
 #. Translators: Info bar status description for a sent but
 #. unsaved email
-#: src/client/plugin/special-folders/special-folders.vala:194
+#: src/client/plugin/special-folders/special-folders.vala:201
 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."
 
@@ -2382,36 +2414,40 @@ msgstr "Ahir"
 msgid "%A"
 msgstr "%A"
 
-#. / 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-
+#. / 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
+#: src/client/util/util-date.vala:218
 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-
+#. / 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
+#: src/client/util/util-date.vala:224
 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 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
+#: src/client/util/util-date.vala:230
 msgid "%a, %b %-e, %Y at %X"
 msgstr "%a, %-e %b %Y a les %-l:%M %p"
 
-#: src/client/util/util-email.vala:38
+#. Translators: Label used when an email has a missing or
+#. an empty subject
+#: src/client/util/util-email.vala:50
 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:135
+#: src/client/util/util-email.vala:148
 msgid "(No recipients)"
 msgstr "(No hi ha destinataris)"
 
@@ -2420,7 +2456,7 @@ msgstr "(No hi ha destinataris)"
 #. / 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:147
+#: src/client/util/util-email.vala:160
 #, c-format
 msgid "%s and %d other"
 msgid_plural "%s and %d others"
@@ -2430,7 +2466,7 @@ 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:180
+#: src/client/util/util-email.vala:193
 #, c-format
 msgid "On %1$s, %2$s wrote:"
 msgstr "En %1$s, %2$s ha escrit:"
@@ -2438,7 +2474,7 @@ 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:187
+#: src/client/util/util-email.vala:200
 #, c-format
 msgid "%s wrote:"
 msgstr "%s ha escrit:"
@@ -2446,12 +2482,12 @@ 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:193
+#: src/client/util/util-email.vala:206
 #, c-format
 msgid "On %s:"
 msgstr "En %s:"
 
-#: src/client/util/util-email.vala:222
+#: src/client/util/util-email.vala:235
 msgid "---------- Forwarded message ----------"
 msgstr "---------- Missatge reenviat ----------"
 
@@ -2678,7 +2714,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:892
+#: src/engine/imap-engine/imap-engine-generic-account.vala:998
 msgid "Drafts | Draft"
 msgstr "Esborranys | Esborrany"
 
@@ -2686,7 +2722,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:901
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1007
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr ""
 "Enviat | Correu enviat | El correu electrònic enviat | Enviat per correu "
@@ -2694,7 +2730,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:906
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1012
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Elements enviats"
@@ -2703,7 +2739,7 @@ msgstr "Elements enviats"
 #. Junk/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:916
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1022
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2716,13 +2752,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:926
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1032
 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:931
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1037
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Elements suprimits"
@@ -2731,23 +2767,23 @@ 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:941
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1047
 msgid "Archive | Archives"
 msgstr "Arxiu | Arxius"
 
-#: src/engine/rfc822/rfc822-message.vala:531
+#: src/engine/rfc822/rfc822-message.vala:528
 #, c-format
 msgid "Could not determine mime type for “%s”."
 msgstr "No s'ha pogut determinar el tipus mime per a «%s»."
 
-#: src/engine/rfc822/rfc822-message.vala:542
+#: src/engine/rfc822/rfc822-message.vala:539
 #, c-format
 msgid "Could not determine content type for mime type “%s” on “%s”."
 msgstr ""
 "No s'ha pogut determinar el tipus de contingut per al tipus MIME «%s» a "
 "«%s»."
 
-#: src/engine/rfc822/rfc822-message.vala:1001
+#: src/engine/rfc822/rfc822-message.vala:1013
 msgid "(no subject)"
 msgstr "(sense assumpte)"
 
@@ -2853,250 +2889,250 @@ msgstr "Confia en aques_t servidor"
 msgid "_Don’t Trust This Server"
 msgstr "No confiï aquest servi_dor"
 
-#: 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:135
-msgid "_Send"
-msgstr "_Envia"
-
-#: ui/composer-headerbar.ui:162
-msgid "Discard and Close"
-msgstr "Descarta i tanca"
-
-#: 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:42
-msgid "Insert the new link with this URL"
-msgstr "Insereix el nou enllaç amb aquest URL"
-
-#: 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:61
-msgid "Update this link’s URL"
-msgstr "Actualitza l'URL d'aquest enllaç"
-
-#: 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-menus.ui:8
-msgid "_Undo"
-msgstr "_Desfés"
-
-#: ui/composer-menus.ui:12
-msgid "_Redo"
-msgstr "_Refés"
-
-#: ui/composer-menus.ui:18 ui/composer-menus.ui:36
-msgid "Cu_t"
-msgstr "_Retalla"
-
-#: ui/composer-menus.ui:22 ui/composer-menus.ui:40
-#: ui/conversation-message-menus.ui:37
-msgid "_Copy"
-msgstr "_Copia"
-
-#: ui/composer-menus.ui:26 ui/composer-menus.ui:44
-msgid "_Paste"
-msgstr "_Enganxa"
-
-#: ui/composer-menus.ui:30
-msgctxt "Clipboard paste as plain text"
-msgid "Paste _Without Formatting"
-msgstr "_Enganxa sense format"
-
-#: ui/composer-menus.ui:50
-msgid "Select _All"
-msgstr "Seleccion_a-ho tot"
-
-#: ui/composer-menus.ui:57 ui/conversation-message-menus.ui:43
-msgid "_Inspect…"
-msgstr "_Inspecciona…"
-
-#. Geary account mail will be sent from
-#: ui/composer-widget.ui:60
-msgid "_From"
-msgstr "_De"
-
-#. 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, Cco, i respon a"
-
-#: ui/composer-widget.ui:219
-msgid "_Cc"
-msgstr "_Cc"
-
-#: ui/composer-widget.ui:267
-msgid "_Bcc"
-msgstr "_Cco"
-
-#: 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:461
-msgid "To add them as attachments"
-msgstr "Per a afegir-los com a fitxers adjunts"
-
-#: ui/composer-widget.ui:602
+#: ui/composer-editor.ui:100
 msgid "Bold text"
 msgstr "Text en negreta"
 
-#: ui/composer-widget.ui:626
+#: ui/composer-editor.ui:124
 msgid "Italic text"
 msgstr "Text en cursiva"
 
-#: ui/composer-widget.ui:650
+#: ui/composer-editor.ui:148
 msgid "Underline text"
 msgstr "Text subratllat"
 
-#: ui/composer-widget.ui:674
+#: ui/composer-editor.ui:172
 msgid "Strikethrough text"
 msgstr "Text ratllat"
 
-#: ui/composer-widget.ui:707
+#: ui/composer-editor.ui:205
 msgid "Insert bulleted list"
 msgstr "Insereix una llista de pics"
 
-#: ui/composer-widget.ui:731
+#: ui/composer-editor.ui:229
 msgid "Insert numbered list"
 msgstr "Insereix una llista numerada"
 
-#: ui/composer-widget.ui:764
+#: ui/composer-editor.ui:262
 msgid "Indent or quote text"
 msgstr "Sagna o cita el text"
 
-#: ui/composer-widget.ui:788
+#: ui/composer-editor.ui:286
 msgid "Un-indent or unquote text"
 msgstr "Desfés el sagnat o no citis el text"
 
-#: ui/composer-widget.ui:817
+#: ui/composer-editor.ui:315
 msgid "Remove text formatting"
 msgstr "Suprimeix la formatació"
 
-#: ui/composer-widget.ui:836
+#: ui/composer-editor.ui:334
 msgid "Change font type"
 msgstr "Canvia el tipus de lletra"
 
-#: ui/composer-widget.ui:851
+#: ui/composer-editor.ui:349
 msgid "Sans Serif"
 msgstr "Sans Serif"
 
-#: ui/composer-widget.ui:862
+#: ui/composer-editor.ui:360
 msgid "Serif"
 msgstr "Serif"
 
-#: ui/composer-widget.ui:873
+#: ui/composer-editor.ui:371
 msgid "Fixed Width"
 msgstr "Ample fix"
 
-#: ui/composer-widget.ui:899
+#: ui/composer-editor.ui:397
 msgid "Change font color"
 msgstr "Canvia el color del tipus de lletra"
 
-#: ui/composer-widget.ui:914
+#: ui/composer-editor.ui:412
 msgid "Change font size"
 msgstr "Canvia la mida del tipus de lletra"
 
-#: ui/composer-widget.ui:949
+#: ui/composer-editor.ui:447
 msgid "Insert or update text link"
 msgstr "Insereix o actualitza l'enllaç del text"
 
-#: ui/composer-widget.ui:973
+#: ui/composer-editor.ui:471
 msgid "Insert an image"
 msgstr "Insereix una imatge"
 
-#: ui/composer-widget.ui:1015
+#: ui/composer-editor.ui:513
 msgid "Undo last edit"
 msgstr "Desfés l'última edició"
 
-#: ui/composer-widget.ui:1039
+#: ui/composer-editor.ui:537
 msgid "Redo last edit"
 msgstr "Refés l'última edició"
 
-#: ui/composer-widget.ui:1068 ui/composer-widget.ui:1093
+#: ui/composer-editor.ui:566 ui/composer-editor.ui:591
 msgid "Attach a file"
 msgstr "Adjunta un fitxer"
 
-#: ui/composer-widget.ui:1117
+#: ui/composer-editor.ui:615
 msgid "Add original attachments"
 msgstr "Inclou les adjuncions originals"
 
-#: ui/composer-widget.ui:1162
+#: ui/composer-editor.ui:660
 msgid "More options"
 msgstr "Més opcions"
 
-#: ui/composer-widget.ui:1182
+#: ui/composer-editor.ui:680
 msgid "Show formatting toolbar"
 msgstr "Mostra la barra de format"
 
-#: ui/composer-widget.ui:1200
+#: ui/composer-editor.ui:698
 msgid "Select spell checking languages"
 msgstr "Seleccioneu els idiomes de la correcció ortogràfica"
 
-#: ui/composer-widget.ui:1263
+#: ui/composer-editor.ui:723
 msgid "S_ans Serif"
 msgstr "S_ans Serif"
 
-#: ui/composer-widget.ui:1268
+#: ui/composer-editor.ui:728
 msgid "S_erif"
 msgstr "S_erif"
 
-#: ui/composer-widget.ui:1273
+#: ui/composer-editor.ui:733
 msgid "_Fixed Width"
 msgstr "Ample _fix"
 
-#: ui/composer-widget.ui:1283
+#: ui/composer-editor.ui:743
 msgid "_Small"
 msgstr "_Petit"
 
-#: ui/composer-widget.ui:1288
+#: ui/composer-editor.ui:748
 msgid "_Medium"
 msgstr "_Mitjà"
 
-#: ui/composer-widget.ui:1293
+#: ui/composer-editor.ui:753
 msgid "Lar_ge"
 msgstr "_Gran"
 
-#: ui/composer-widget.ui:1303
+#: ui/composer-editor.ui:763
 msgid "_Rich Text"
 msgstr "Text en_riquit"
 
-#: ui/composer-widget.ui:1308
+#: ui/composer-editor.ui:768
 msgid "_Plain Text"
 msgstr "_Text pla"
 
+#: ui/composer-editor-menus.ui:8
+msgid "_Undo"
+msgstr "_Desfés"
+
+#: ui/composer-editor-menus.ui:12
+msgid "_Redo"
+msgstr "_Refés"
+
+#: ui/composer-editor-menus.ui:18 ui/composer-editor-menus.ui:36
+msgid "Cu_t"
+msgstr "_Retalla"
+
+#: ui/composer-editor-menus.ui:22 ui/composer-editor-menus.ui:40
+#: ui/conversation-message-menus.ui:37
+msgid "_Copy"
+msgstr "_Copia"
+
+#: ui/composer-editor-menus.ui:26 ui/composer-editor-menus.ui:44
+msgid "_Paste"
+msgstr "_Enganxa"
+
+#: ui/composer-editor-menus.ui:30
+msgctxt "Clipboard paste as plain text"
+msgid "Paste _Without Formatting"
+msgstr "_Enganxa sense format"
+
+#: ui/composer-editor-menus.ui:50
+msgid "Select _All"
+msgstr "Seleccion_a-ho tot"
+
+#: ui/composer-editor-menus.ui:57 ui/conversation-message-menus.ui:43
+msgid "_Inspect…"
+msgstr "_Inspecciona…"
+
+#: 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:135
+msgid "_Send"
+msgstr "_Envia"
+
+#: ui/composer-headerbar.ui:162
+msgid "Discard and Close"
+msgstr "Descarta i tanca"
+
+#: 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:42
+msgid "Insert the new link with this URL"
+msgstr "Insereix el nou enllaç amb aquest URL"
+
+#: 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:61
+msgid "Update this link’s URL"
+msgstr "Actualitza l'URL d'aquest enllaç"
+
+#: ui/composer-link-popover.ui:62
+msgid "Update"
+msgstr "Actualitza"
+
+#: ui/composer-link-popover.ui:75
+msgid "Delete this link"
+msgstr "Suprimeix aquest enllaç"
+
+#. Geary account mail will be sent from
+#: ui/composer-widget.ui:61
+msgid "_From"
+msgstr "_De"
+
+#. Address(es) e-mail is to be sent to
+#: ui/composer-widget.ui:131
+msgid "_To"
+msgstr "_Per a"
+
+#: ui/composer-widget.ui:159
+msgid "Show Cc, Bcc, and Reply-To fields"
+msgstr "Mostra els camps Cc, Cco, i respon a"
+
+#: ui/composer-widget.ui:220
+msgid "_Cc"
+msgstr "_Cc"
+
+#: ui/composer-widget.ui:268
+msgid "_Bcc"
+msgstr "_Cco"
+
+#: ui/composer-widget.ui:316
+msgid "_Reply-To"
+msgstr "_Respon a"
+
+#: ui/composer-widget.ui:373
+msgid "_Subject"
+msgstr "A_ssumpte"
+
+#: ui/composer-widget.ui:446
+msgid "Drop files here"
+msgstr "Deixeu anar els fitxers aquí"
+
+#: ui/composer-widget.ui:462
+msgid "To add them as attachments"
+msgstr "Per a afegir-los com a fitxers adjunts"
+
 #: ui/components-attachment-pane.ui:29 ui/components-attachment-pane.ui:47
 msgid "Select all attachments"
 msgstr "Selecciona tots els fitxers adjunts"
@@ -3113,25 +3149,25 @@ msgstr "Obre els fitxers adjunts seleccionats"
 msgid "Save _All"
 msgstr "De_sa-ho tot"
 
-#: ui/components-inspector-error-view.ui:33
+#: ui/components-inspector-error-view.ui:31
 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 "
+" one of the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>contact "
+"channels</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 "
+"Si el problema és greu o persisteix, copieu i envieu aquestes dades als <a "
+"href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>canals de contacte</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
+#: ui/components-inspector-error-view.ui:47
 msgid "Details:"
 msgstr "Detalls:"
 
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:19 ui/problem-details-dialog.ui:19
+#: ui/components-inspector.ui:19 ui/problem-details-dialog.ui:24
 msgid "Search for matching log entries"
 msgstr "Cerca per a entrades de registre coincidents"
 
@@ -3142,19 +3178,18 @@ msgstr "Commuta afegir noves entrades de registre"
 
 #. Tooltip for inspector button
 #: ui/components-inspector.ui:55
-#, fuzzy
 msgid "Add a marker entry to the log"
 msgstr "Afegeix una entrada de marcador al registre"
 
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:81 ui/problem-details-dialog.ui:46
+#: ui/components-inspector.ui:81 ui/problem-details-dialog.ui:51
 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:101 ui/problem-details-dialog.ui:62
+#: ui/components-inspector.ui:101 ui/problem-details-dialog.ui:67
 msgid "Copy to clipboard"
 msgstr "Copia al porta-retalls"
 
@@ -3483,7 +3518,7 @@ msgctxt "shortcut window"
 msgid "Reset zoom"
 msgstr "Restableix el zoom"
 
-#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:397
+#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:404
 msgctxt "shortcut window"
 msgid "General"
 msgstr "General"
@@ -3566,87 +3601,92 @@ msgctxt "shortcut window"
 msgid "Add attachment"
 msgstr "Afegeix el fitxer adjunt"
 
-#: ui/gtk/help-overlay.ui:401
+#: ui/gtk/help-overlay.ui:395
+msgctxt "shortcut window"
+msgid "Detach the composer"
+msgstr "Separa l'editor"
+
+#: ui/gtk/help-overlay.ui:408
 msgctxt "shortcut window"
 msgid "Close composer window"
 msgstr "Tanca finestra de l'editor"
 
-#: ui/gtk/help-overlay.ui:408
+#: ui/gtk/help-overlay.ui:415
 msgctxt "shortcut window"
 msgid "Detach composer window"
 msgstr "Separa finestra de l'editor"
 
-#: ui/gtk/help-overlay.ui:415
+#: ui/gtk/help-overlay.ui:422
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "Edició"
 
-#: ui/gtk/help-overlay.ui:420
+#: ui/gtk/help-overlay.ui:427
 msgctxt "shortcut window"
 msgid "Move selection to the clipboard"
 msgstr "Mou la selecció al porta-retalls"
 
-#: ui/gtk/help-overlay.ui:427
+#: ui/gtk/help-overlay.ui:434
 msgctxt "shortcut window"
 msgid "Copy selection to clipboard"
 msgstr "Copia la selecció al porta-retalls"
 
-#: ui/gtk/help-overlay.ui:434
+#: ui/gtk/help-overlay.ui:441
 msgctxt "shortcut window"
 msgid "Paste from the clipboard"
 msgstr "Enganxa des del porta-retalls"
 
-#: ui/gtk/help-overlay.ui:441
+#: ui/gtk/help-overlay.ui:448
 msgctxt "shortcut window"
 msgid "Quote text"
 msgstr "Cita text"
 
-#: ui/gtk/help-overlay.ui:448
+#: ui/gtk/help-overlay.ui:455
 msgctxt "shortcut window"
 msgid "Unquote text"
 msgstr "No citis text"
 
-#: ui/gtk/help-overlay.ui:457
+#: ui/gtk/help-overlay.ui:464
 msgctxt "shortcut window"
 msgid "Rich text editing"
 msgstr "Edició en text enriquit"
 
-#: ui/gtk/help-overlay.ui:461
+#: ui/gtk/help-overlay.ui:468
 msgctxt "shortcut window"
 msgid "Paste without formatting"
 msgstr "Enganxa sense format"
 
-#: ui/gtk/help-overlay.ui:468
+#: ui/gtk/help-overlay.ui:475
 msgctxt "shortcut window"
 msgid "Bold text"
 msgstr "Text en negreta"
 
-#: ui/gtk/help-overlay.ui:475
+#: ui/gtk/help-overlay.ui:482
 msgctxt "shortcut window"
 msgid "Italicize text"
 msgstr "Text en cursiva"
 
-#: ui/gtk/help-overlay.ui:482
+#: ui/gtk/help-overlay.ui:489
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "Text subratllat"
 
-#: ui/gtk/help-overlay.ui:489
+#: ui/gtk/help-overlay.ui:496
 msgctxt "shortcut window"
 msgid "Strike text"
 msgstr "Text ratllat"
 
-#: ui/gtk/help-overlay.ui:496
+#: ui/gtk/help-overlay.ui:503
 msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "Suprimeix la formatació"
 
-#: ui/gtk/help-overlay.ui:503
+#: ui/gtk/help-overlay.ui:510
 msgctxt "shortcut window"
 msgid "Insert an image"
 msgstr "Insereix una imatge"
 
-#: ui/gtk/help-overlay.ui:510
+#: ui/gtk/help-overlay.ui:517
 msgctxt "shortcut window"
 msgid "Insert a link"
 msgstr "Insereix un enllaç"
@@ -3681,10 +3721,8 @@ msgid "_Archive"
 msgstr "_Arxiva"
 
 #: ui/main-toolbar-menus.ui:21
-#, fuzzy
-#| msgid "Toggle as S_pam"
 msgid "Toggle as _Junk"
-msgstr "_Marca o desmarca com a correu brossa"
+msgstr "_Marca com a correu brossa"
 
 #: ui/main-toolbar-menus.ui:28
 msgid "_Accounts"
@@ -3717,4 +3755,3 @@ msgstr "_Autenticació"
 #: ui/upgrade_dialog.glade:60
 msgid "Geary update in progress…"
 msgstr "Actualització del Geary en curs…"
-


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