[geary] Update Brazilian Portuguese translation

From: Translations User D-L <translations src gnome org>
To: commits-list gnome org
Cc:
Subject: [geary] Update Brazilian Portuguese translation
Date: Thu, 27 Aug 2020 13:02:34 +0000 (UTC)
commit 8426648a7f861760ee0df84124c5ddf03f7be777
Author: Enrico Nicoletto <liverig gmail com>
Date:   Thu Aug 27 13:02:30 2020 +0000

    Update Brazilian Portuguese translation

 po/pt_BR.po | 680 +++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 375 insertions(+), 305 deletions(-)
---
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c63a5405d..99e4b2770 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -22,16 +22,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n";
-"POT-Creation-Date: 2020-07-30 04:08+0000\n"
-"PO-Revision-Date: 2020-08-10 07:17-0300\n"
-"Last-Translator: Rafael Fontenelle <rafaelff gnome org>\n"
+"POT-Creation-Date: 2020-08-27 12:37+0000\n"
+"PO-Revision-Date: 2020-08-26 08:34-0300\n"
+"Last-Translator: Enrico Nicoletto <liverig gmail com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list gnome org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-"X-Generator: Gtranslator 3.36.0\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 2.4.1\n"
 "X-Project-Style: gnome\n"
 
 #: desktop/geary-attach.contract.desktop.in:3
@@ -46,8 +46,8 @@ msgstr "Envie arquivos usando Geary"
 #: desktop/geary-autostart.desktop.in.in:3
 #: 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:601
+#: src/client/accounts/accounts-editor-servers-pane.vala:560
+#: src/client/application/application-main-window.vala:608
 msgid "Geary"
 msgstr "Geary"
 
@@ -60,7 +60,7 @@ msgstr "E-mail"
 #: desktop/geary-autostart.desktop.in.in:5
 #: 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 "Envie e receba e-mail"
 
@@ -392,13 +392,13 @@ msgstr "Todos os outros"
 
 #. 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 "Verifique seu login e senha de recebimento"
 
 #. 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 "Verifique seus detalhes de servidor de recebimento"
 
@@ -408,13 +408,13 @@ msgstr "Verifique seus detalhes de servidor de recebimento"
 #. 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 "Verifique seu login e senha de recebimento"
 
 #. 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 "Verifique seus detalhes de envio"
 
@@ -470,14 +470,14 @@ msgstr "pessoa exemplo 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 "Nome de login"
 
 #. 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 "Senha"
@@ -487,7 +487,7 @@ msgstr "Senha"
 #. 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"
 
@@ -502,7 +502,7 @@ msgstr "imap.exemplo.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"
 
@@ -647,55 +647,54 @@ msgstr[0] "%d dia atrás"
 msgstr[1] "%d dias atrás"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:255
-#: src/client/application/application-main-window.vala:2038
+#: src/client/application/application-main-window.vala:2061
 msgid "Undo"
 msgstr "Desfazer"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:264
-#: src/client/application/application-main-window.vala:2021
+#: src/client/application/application-main-window.vala:2044
 msgid "Redo"
 msgstr "Refazer"
 
 #: 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 "Essa conta foi desabilitada"
 
 #. 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 "Essa conta encontrou um problema e está indisponível"
 
-#. 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 "Outros provedores de e-mail"
 
 #. 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 "Conta “%s” removida"
@@ -703,7 +702,7 @@ msgstr "Conta “%s” removida"
 #. 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 "Conta “%s” restaurada"
@@ -716,30 +715,30 @@ msgstr "Arraste para mover esse item"
 #. 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 "Provedor do serviço"
 
 #. 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 "Segurança da conexão"
 
 #. 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 "Nenhum"
 
-#: 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"
 
@@ -747,35 +746,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:553
+#: src/client/accounts/accounts-editor-row.vala:539
+#: src/client/application/application-main-window.vala:554
 msgid "Login"
 msgstr "Login"
 
 #. 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 "Nenhum login necessário"
 
 #. 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 "Usar o mesmo login como recebimento"
 
 #. 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 "Usa um login diferente"
 
 #. 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 "Conta não atualizada: %s"
@@ -783,23 +782,23 @@ msgstr "Conta não atualizada: %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 "Origem da conta"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:552
+#: src/client/accounts/accounts-editor-servers-pane.vala:557
 msgid "GNOME Online Accounts"
 msgstr "Contas On-line do 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 "Salvar e-mails de rascunho no 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 "Salvar e-mails enviados no servidor"
 
@@ -808,12 +807,12 @@ msgstr "Salvar e-mails enviados no 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 usando 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 "Usar login do servidor de recebimento"
 
@@ -845,143 +844,143 @@ msgstr ""
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: 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 Geary Development Team."
 
-#: src/client/application/application-client.vala:36
+#: src/client/application/application-client.vala:37
 msgid "Visit the Geary web site"
 msgstr "Visite o website do Geary"
 
 #. / Command line option
-#: src/client/application/application-client.vala:96
+#: src/client/application/application-client.vala:97
 msgid "Print debug logging"
 msgstr "Emite log de depuração"
 
 #. / 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 "Inicia com a janela principal oculta (obsoleto)"
 
 #. / 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 Inspetor WebKitGTK em exibições web"
 
 #. / Command line option
-#: src/client/application/application-client.vala:105
+#: src/client/application/application-client.vala:106
 msgid "Log conversation monitoring"
 msgstr "Registra monitoramento de conversa"
 
 #. / Command line option
-#: src/client/application/application-client.vala:108
+#: src/client/application/application-client.vala:109
 msgid "Log IMAP network deserialization"
 msgstr "Registra desserialização de rede 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 normalização de pasta"
 
 #. / Command line option
-#: src/client/application/application-client.vala:115
+#: src/client/application/application-client.vala:116
 msgid "Log IMAP network activity"
 msgstr "Registra atividade de rede de 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 lista de repetição de 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 atividade de rede de STMP"
 
 #. / 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 consultas ao banco de dados (gera muitas mensagens)"
 
 #. / Command line option
-#: src/client/application/application-client.vala:129
+#: src/client/application/application-client.vala:130
 msgid "Perform a graceful quit"
 msgstr "Realiza uma saída graciosa"
 
-#: src/client/application/application-client.vala:131
+#: src/client/application/application-client.vala:132
 msgid "Open a new window"
 msgstr "Abre uma nova janela"
 
 #. / 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 "Revoga todos os certificados de servidor TLS fixados"
 
 #. / Command line option
-#: src/client/application/application-client.vala:137
+#: src/client/application/application-client.vala:138
 msgid "Display program version"
 msgstr "Mostra versão do programa"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:261
+#: src/client/application/application-client.vala:262
 msgid "Geary version"
 msgstr "Versão do Geary"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:263
+#: src/client/application/application-client.vala:264
 msgid "Geary revision"
 msgstr "Revisão do Geary"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:265
+#: src/client/application/application-client.vala:266
 msgid "GTK version"
 msgstr "Versão do GTK"
 
 #. / Applciation runtime information label
-#: src/client/application/application-client.vala:272
+#: src/client/application/application-client.vala:273
 msgid "GLib version"
 msgstr "Versão do GLib"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:279
+#: src/client/application/application-client.vala:280
 msgid "WebKitGTK version"
 msgstr "Versão do WebKitGTK"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:286
+#: src/client/application/application-client.vala:287
 msgid "Desktop environment"
 msgstr "Ambiente"
 
 #. 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 "Desconhecido"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:318
+#: src/client/application/application-client.vala:293
 msgid "Distribution name"
 msgstr "Nome da distribuição"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:323
+#: src/client/application/application-client.vala:298
 msgid "Distribution release"
 msgstr "Lançamento da distribuição"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:331
+#: src/client/application/application-client.vala:303
 msgid "Installation prefix"
 msgstr "Prefixo de lançamento"
 
-#: src/client/application/application-client.vala:584
+#: src/client/application/application-client.vala:558
 #, c-format
 msgid "About %s"
 msgstr "Sobre %s"
@@ -989,7 +988,7 @@ msgstr "Sobre %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:562
 msgid "translator-credits"
 msgstr ""
 "Leonardo Lemos <leonardolemos live com>\n"
@@ -1000,37 +999,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:1046
 msgid "The `--hidden` option is deprecated and will be removed in the future."
 msgstr "A opção `--hidden` está obsoleta e será removida no futuro."
 
 #. / Command line warning, string substitution
 #. / is the given argument
-#: src/client/application/application-client.vala:1082
+#: src/client/application/application-client.vala:1079
 #, c-format
 msgid "Unrecognised program argument: “%s”"
 msgstr "Argumento do programa não reconhecida “%s”"
 
 #. / Notification title.
-#: src/client/application/application-controller.vala:499
+#: src/client/application/application-controller.vala:479
 #, c-format
 msgid "A problem occurred sending email for %s"
 msgstr "Ocorreu um problema ao enviar e-mail para %s"
 
 #. / Notification body
-#: src/client/application/application-controller.vala:503
+#: src/client/application/application-controller.vala:483
 msgid "Email will not be sent until re-connected"
 msgstr "O e-mail não será enviado até reconectar"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:602
+#: src/client/application/application-controller.vala:582
 msgid "Conversation marked"
 msgid_plural "Conversations marked"
 msgstr[0] "Conversa marcada"
 msgstr[1] "Conversas marcadas"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:608
+#: src/client/application/application-controller.vala:588
 msgid "Conversation un-marked"
 msgid_plural "Conversations un-marked"
 msgstr[0] "Conversa desmarcada"
@@ -1039,8 +1038,8 @@ msgstr[1] "Conversas desmarcadas"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:634
-#: src/client/application/application-controller.vala:718
+#: 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"
@@ -1052,8 +1051,8 @@ msgstr[1] "Conversas movidas para %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:642
-#: src/client/application/application-controller.vala:664
+#: 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"
@@ -1061,7 +1060,7 @@ msgstr[0] "Conversa restaurada para %s"
 msgstr[1] "Conversas restauradas para %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:685
+#: src/client/application/application-controller.vala:665
 msgid "Conversation archived"
 msgid_plural "Conversations archived"
 msgstr[0] "Conversa arquivada"
@@ -1069,7 +1068,7 @@ msgstr[1] "Conversas arquivadas"
 
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
-#: src/client/application/application-controller.vala:741
+#: src/client/application/application-controller.vala:721
 #, c-format
 msgid "Message restored to %s"
 msgid_plural "Messages restored to %s"
@@ -1077,7 +1076,7 @@ msgstr[0] "Mensagem restaurada para %s"
 msgstr[1] "Mensagens restauradas para %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:762
+#: src/client/application/application-controller.vala:742
 msgid "Message archived"
 msgid_plural "Messages archived"
 msgstr[0] "Mensagem arquivada"
@@ -1086,7 +1085,7 @@ msgstr[1] "Mensagens arquivadas"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:797
+#: src/client/application/application-controller.vala:777
 #, c-format
 msgid "Message moved to %s"
 msgid_plural "Messages moved to %s"
@@ -1096,7 +1095,7 @@ msgstr[1] "Mensagens movidas para %s"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:825
+#: src/client/application/application-controller.vala:805
 #, c-format
 msgid "Conversation labelled as %s"
 msgid_plural "Conversations labelled as %s"
@@ -1106,19 +1105,19 @@ msgstr[1] "Conversas rotuladas como %s"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:833
+#: src/client/application/application-controller.vala:813
 #, c-format
 msgid "Conversation un-labelled as %s"
 msgid_plural "Conversations un-labelled as %s"
 msgstr[0] "Conversa desrotulada como %s"
 msgstr[1] "Conversas desrotuladas como %s"
 
-#: src/client/application/application-controller.vala:1319
+#: src/client/application/application-controller.vala:1320
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Incapaz de abrir o banco de dados para %s"
 
-#: src/client/application/application-controller.vala:1320
+#: src/client/application/application-controller.vala:1321
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -1143,20 +1142,20 @@ msgstr ""
 "Reconstruir o banco de dados irá destruir todos e-mails locais e seus "
 "anexos. <b>Os e-mails no seu servidor não serão afetados.</b>"
 
-#: src/client/application/application-controller.vala:1322
+#: src/client/application/application-controller.vala:1323
 msgid "_Rebuild"
 msgstr "_Reconstruir"
 
-#: src/client/application/application-controller.vala:1322
+#: src/client/application/application-controller.vala:1323
 msgid "E_xit"
 msgstr "S_air"
 
-#: src/client/application/application-controller.vala:1332
+#: src/client/application/application-controller.vala:1333
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "Incapaz de reconstruir o banco de dados para “%s”"
 
-#: src/client/application/application-controller.vala:1333
+#: src/client/application/application-controller.vala:1334
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -1169,87 +1168,87 @@ 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:1492
+#: src/client/application/application-controller.vala:1501
 #, c-format
 msgid "Email sent to %s"
 msgstr "E-mail enviado para %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:2515
+#: src/client/application/application-controller.vala:2491
 #, c-format
 msgid "Email to %s queued for delivery"
 msgstr "E-mail para %s enfileirado para entrega"
 
 #. / 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:2579
+#: src/client/application/application-controller.vala:2555
 #, c-format
 msgid "Email to %s saved"
 msgstr "E-mail para %s salvo"
 
 #. / Translators: A label for an in-app notification.
-#: src/client/application/application-controller.vala:2594
-#: src/client/application/application-controller.vala:2652
+#: src/client/application/application-controller.vala:2570
+#: src/client/application/application-controller.vala:2628
 msgid "Composer could not be restored"
 msgstr "O compositor não pôde ser restaurado"
 
 #. / 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:2637
+#: src/client/application/application-controller.vala:2613
 #, c-format
 msgid "Email to %s discarded"
 msgstr "E-mail para %s descartado"
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:539
+#: src/client/application/application-main-window.vala:540
 msgid "Working offline"
 msgstr "Trabalhar desconectado"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:541
+#: src/client/application/application-main-window.vala:542
 msgid "You will not be able to send or receive email until re-connected."
 msgstr "Você não poderá enviar ou receber e-mails até que seja reconectado."
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:548
+#: src/client/application/application-main-window.vala:549
 msgid "Login problem"
 msgstr "Problema de login"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:550
+#: src/client/application/application-main-window.vala:551
 msgid "An account has reported an incorrect login or password."
 msgstr "Uma conta relatou um login ou senha incorretos."
 
 #. Translators: An info bar button tool-tip
-#: src/client/application/application-main-window.vala:557
+#: src/client/application/application-main-window.vala:558
 msgid "Retry login, you will be prompted for your password"
 msgstr "Tente novamente, você será solicitado a inserir uma senha"
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:564
+#: src/client/application/application-main-window.vala:565
 msgid "Security problem"
 msgstr "Problema de segurança"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:566
-msgid "An account has reported an untrusted server.."
+#: src/client/application/application-main-window.vala:567
+msgid "An account has reported an untrusted server."
 msgstr "Uma conta relatou um servidor não confiável."
 
 #. Translators: An info bar button label
-#: src/client/application/application-main-window.vala:569
+#: src/client/application/application-main-window.vala:570
 msgid "Check"
 msgstr "Verificar"
 
 #. Translators: An info bar button tool-tip
-#: src/client/application/application-main-window.vala:573
+#: src/client/application/application-main-window.vala:574
 msgid "Check the security details for the connection"
 msgstr "Verifica os detalhes de segurança da conexão"
 
 #. / 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:606
+#: src/client/application/application-main-window.vala:617
 #, c-format
 msgid "%s — %s"
 msgstr "%s — %s"
@@ -1257,49 +1256,49 @@ 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:983
+#: src/client/application/application-main-window.vala:996
 #: src/client/folder-list/folder-list-account-branch.vala:43
 msgid "Labels"
 msgstr "Marcadores"
 
-#: src/client/application/application-main-window.vala:1272
+#: src/client/application/application-main-window.vala:1293
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "Esvaziar todos os e-mails de sua pasta %s?"
 
-#: src/client/application/application-main-window.vala:1273
+#: src/client/application/application-main-window.vala:1294
 msgid "This removes the email from Geary and your email server."
 msgstr "Isto remove o e-mail do Geary e do seu servidor de e-mail."
 
-#: src/client/application/application-main-window.vala:1274
+#: src/client/application/application-main-window.vala:1295
 msgid "This cannot be undone."
 msgstr "Isso não pode ser desfeito."
 
-#: src/client/application/application-main-window.vala:1275
+#: src/client/application/application-main-window.vala:1296
 #, c-format
 msgid "Empty %s"
 msgstr "Esvaziar %s"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1332
+#: src/client/application/application-main-window.vala:1353
 msgid "Do you want to permanently delete this conversation?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Você deseja descartar permanentemente essa conversa?"
 msgstr[1] "Você deseja descartar permanentemente essas conversas?"
 
-#: src/client/application/application-main-window.vala:1337
-#: src/client/application/application-main-window.vala:1352
+#: src/client/application/application-main-window.vala:1358
+#: src/client/application/application-main-window.vala:1373
 msgid "Delete"
 msgstr "Excluir"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1347
+#: src/client/application/application-main-window.vala:1368
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Você deseja descartar permanentemente essa mensagem?"
 msgstr[1] "Você deseja descartar permanentemente essas mensagens?"
 
-#: src/client/application/application-main-window.vala:1670
+#: src/client/application/application-main-window.vala:1691
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -1310,7 +1309,7 @@ msgstr "%s (%d)"
 #. 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:1930
+#: src/client/composer/composer-widget.vala:1989
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -1338,7 +1337,7 @@ msgstr "Inspetor"
 #. / 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 "Logs"
 
@@ -1346,46 +1345,46 @@ msgstr "Logs"
 #. / 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 "Salvar como"
 
 #: src/client/components/components-inspector.vala:230
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:225
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:224
 #: ui/accounts_editor_servers_pane.ui:17
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. / 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 "Selecionar _automaticamente a próxima mensagem"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:62
+#: src/client/components/components-preferences-window.vala:134
 msgid "_Display conversation preview"
 msgstr "_Exibir visualização de 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 "Usar visão de _três painéis"
 
 #. / 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 "Usar atalhos de e-mail de tecla única"
 
-#: 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>"
@@ -1394,22 +1393,22 @@ msgstr ""
 "<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 "_Monitorar por um novo e-mail quando fechado"
 
 #. / 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á em execução após todas as janelas estarem fechadas"
 
 #. / Translators: Preferences page title
-#: src/client/components/components-preferences-window.vala:117
+#: src/client/components/components-preferences-window.vala:189
 msgid "Preferences"
 msgstr "Preferências"
 
 #. / Translators: Preferences page title
-#: src/client/components/components-preferences-window.vala:180
+#: src/client/components/components-preferences-window.vala:250
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -1482,6 +1481,22 @@ msgstr "Veja detalhes técnicos sobre o erro"
 msgid "_Retry"
 msgstr "_Tentar novamente"
 
+#: src/client/components/components-reflow-box.c:454
+msgid "Spacing"
+msgstr "Espaçamento"
+
+#: src/client/components/components-reflow-box.c:455
+msgid "Spacing between children"
+msgstr "Espaçamento entre filhos"
+
+#: src/client/components/components-reflow-box.c:470
+msgid "Row spacing"
+msgstr "Espaçamento de linha"
+
+#: src/client/components/components-reflow-box.c:471
+msgid "Spacing between rows of children"
+msgstr "Espaçamento entre linhas de filhos"
+
 #. / Translators: Search entry placeholder text
 #: src/client/components/components-search-bar.vala:12
 #: src/client/folder-list/folder-list-search-branch.vala:53
@@ -1504,27 +1519,27 @@ msgstr "Pesquisar conta %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 "Um endereço de e-mail é necessário"
 
 #. 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 "Não é um endereço de e-mail válido"
 
 #. 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 "Um nome de servidor é necessário"
 
 #. 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 "Não foi possível procurar por nome do servidor"
 
@@ -1584,7 +1599,9 @@ msgstr "Erro ao salvar e-mail enviado"
 msgid "_OK"
 msgstr "_OK"
 
-#: 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 "_Cancelar"
 
@@ -1608,7 +1625,9 @@ msgstr "_Descartar"
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: src/client/components/stock.vala:26 ui/components-attachment-pane-menus.ui:7
+#: 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 "_Abrir"
 
@@ -1687,90 +1706,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:913
+#: src/client/composer/composer-widget.vala:997
 msgid "Do you want to keep or discard this draft message?"
 msgstr "Você deseja manter ou descartar esta mensagem de rascunho?"
 
 #. 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:939
+#: src/client/composer/composer-widget.vala:1023
 msgid "Do you want to discard this draft message?"
 msgstr "Você deseja descartar esta mensagem de rascunho?"
 
-#: src/client/composer/composer-widget.vala:1585
+#: src/client/composer/composer-widget.vala:1645
 msgid "Send message with an empty subject and body?"
 msgstr "Enviar mensagem com o assunto e corpo vazio?"
 
-#: src/client/composer/composer-widget.vala:1587
+#: src/client/composer/composer-widget.vala:1647
 msgid "Send message with an empty subject?"
 msgstr "Enviar mensagem com o assunto vazio?"
 
-#: src/client/composer/composer-widget.vala:1589
+#: src/client/composer/composer-widget.vala:1649
 msgid "Send message with an empty body?"
 msgstr "Enviar mensagem com o corpo vazio?"
 
-#: src/client/composer/composer-widget.vala:1598
+#: src/client/composer/composer-widget.vala:1658
 msgid "Send message without an attachment?"
 msgstr "Enviar mensagem sem anexo?"
 
-#: src/client/composer/composer-widget.vala:1916
+#: src/client/composer/composer-widget.vala:1977
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "“%s” já foi anexado para envio."
 
-#: src/client/composer/composer-widget.vala:1952
-#: src/client/composer/composer-widget.vala:2002
+#: src/client/composer/composer-widget.vala:2009
+#: src/client/composer/composer-widget.vala:2059
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "“%s” é um arquivo vazio."
 
-#: src/client/composer/composer-widget.vala:1990
+#: src/client/composer/composer-widget.vala:2047
 #, c-format
 msgid "“%s” could not be found."
 msgstr "“%s” não foi encontrado."
 
-#: src/client/composer/composer-widget.vala:1996
+#: src/client/composer/composer-widget.vala:2053
 #, c-format
 msgid "“%s” is a folder."
 msgstr "“%s” é uma pasta."
 
-#: src/client/composer/composer-widget.vala:2015
+#: src/client/composer/composer-widget.vala:2072
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "“%s” não pôde ser aberto para leitura."
 
-#: src/client/composer/composer-widget.vala:2023
+#: src/client/composer/composer-widget.vala:2080
 msgid "Cannot add attachment"
 msgstr "Não é possível adicionar anexo"
 
 #. Translators: Human-readable version of the RFC 822 To header
-#: src/client/composer/composer-widget.vala:2083
+#: src/client/composer/composer-widget.vala:2140
 #: 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 "Para:"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:2089
+#: src/client/composer/composer-widget.vala:2146
 #: 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:2095
+#: src/client/composer/composer-widget.vala:2152
 #: 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:2101
+#: src/client/composer/composer-widget.vala:2158
 msgid "Reply-To: "
 msgstr "Responder-a: "
 
-#: src/client/composer/composer-widget.vala:2353
+#: src/client/composer/composer-widget.vala:2410
 msgid "Select Color"
 msgstr "Selecione a cor"
 
@@ -1779,14 +1798,14 @@ msgstr "Selecione a cor"
 #. 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:2542
+#: src/client/composer/composer-widget.vala:2599
 #, 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:2899
+#: src/client/composer/composer-widget.vala:2959
 msgid "Images"
 msgstr "Imagens"
 
@@ -1803,51 +1822,51 @@ msgid "Search for more languages"
 msgstr "Procurar por mais idiomas"
 
 #. / 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] "Mover a conversa para a Li_xeira"
 msgstr[1] "Mover as conversas para a Li_xeira"
 
 #. / 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] "_Excluir conversa"
 msgstr[1] "_Excluir conversas"
 
-#: 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 "Marcar como l_ida"
 
-#: 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 "Marcar como _não lida"
 
-#: 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 "_Tirar estrela"
 
-#: 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 "_Marcar estrela"
 
 #. 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 "_Responder"
 
-#: src/client/conversation-list/conversation-list-view.vala:398
+#: src/client/conversation-list/conversation-list-view.vala:402
 msgid "R_eply All"
 msgstr "R_esponder todos"
 
 #. 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 "_Encaminhar"
@@ -1858,19 +1877,19 @@ msgstr "Eu"
 
 #. 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 "Assunto:"
 
@@ -2068,8 +2087,8 @@ msgstr "Ocorreu um erro ao processar o certificado do 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
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:99
+#: ui/problem-details-dialog.ui:17
 msgid "Details"
 msgstr "Detalhes"
 
@@ -2121,15 +2140,6 @@ msgid_plural "%d results"
 msgstr[0] "%d resultado"
 msgstr[1] "%d resultados"
 
-#: src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in:4
-msgid "Desktop Notifications"
-msgstr "Notificações na área de trabalho"
-
-#: src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in:5
-msgid "Displays desktop notifications when new email is delivered"
-msgstr ""
-"Exibe notificações na área de trabalho quando um novo e-mail é entregue"
-
 #. / Notification body when a message as been received
 #. / and other unread messages have not been
 #. / seen. First string substitution is the message
@@ -2195,6 +2205,7 @@ msgstr "Crie modelos reusáveis para enviar e-mails"
 #. the front for the default. English names do not need to be
 #. included.
 #: src/client/plugin/email-templates/email-templates.vala:29
+#: src/client/plugin/mail-merge/mail-merge.vala:29
 msgid "Templates | Template Mail | Template Email | Template E-Mail"
 msgstr ""
 "Modelos | Modelos de correio | Modelos de e-mail | Modelos de e-mail | "
@@ -2202,24 +2213,24 @@ msgstr ""
 
 #. 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 "Modelos"
 
 #. 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 "Novo"
 
 #. 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 "Modelo de mensagem"
 
 #. 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 "Enviar"
 
@@ -2227,18 +2238,73 @@ msgstr "Enviar"
 #. 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 "Editar"
 
-#: src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in:4
-msgid "Folder Highlight"
-msgstr "Realce de pastas"
-
-#: src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in:5
-msgid "Highlights folders that have newly delivered mail"
-msgstr "Realça pasta que têm e-mails recentemente entregues"
+#. / 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 "Mesclar e-mail"
+
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:6
+msgid "Fill in and send email templates using a spreadsheet"
+msgstr "Preencha e envie modelos de e-mails usando uma planilha"
+
+#. Translators: Info bar label for starting sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:118
+msgid "Start"
+msgstr "Marca estrela"
+
+#. Translators: Info bar label for pausing sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:130
+msgid "Pause"
+msgstr "Pausar"
+
+#. 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] "Enviado %u de %u"
+msgstr[1] "Enviados %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 "Modelo de mesclagem de e-mail"
+
+#. 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 "Mesclar"
+
+#. / Translators: Action bar menu button label for
+#. / mail-merge plugin
+#: src/client/plugin/mail-merge/mail-merge.vala:377
+msgid "Insert field"
+msgstr "Inserir campo"
+
+#. / Translators: File chooser filer label
+#: src/client/plugin/mail-merge/mail-merge.vala:396
+msgid "Comma separated values (CSV)"
+msgstr "Valores separados por vírgula (CSV)"
 
 #: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:4
 msgid "Messaging Menu"
@@ -2248,19 +2314,11 @@ msgstr "Menu de mensagens"
 msgid "Displays Unity Messaging Menu notifications for new email"
 msgstr "Exibe notificações do menu de mensageria do Unity para novos e-mails"
 
-#: 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 — Novas Mensagens"
 
-#: src/client/plugin/notification-badge/notification-badge.plugin.desktop.in:4
-msgid "Notification Badge"
-msgstr "Selo de notificação"
-
-#: src/client/plugin/notification-badge/notification-badge.plugin.desktop.in:5
-msgid "Displays a dock badge showing the number of new messages"
-msgstr "Exibe um selo de dock mostrando o número de novas mensagens"
-
 #: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:4
 msgid "Sent Sound"
 msgstr "Som de envio"
@@ -2270,36 +2328,32 @@ msgid "Plays the desktop sent-mail sound when an email is sent"
 msgstr ""
 "Reproduz o som de envio de e-mail do ambiente quando um e-mail é enviado"
 
-#: src/client/plugin/special-folders/special-folders.plugin.desktop.in:4
-msgid "Special Folders"
-msgstr "Pastas especiais"
-
 #. 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 "Esvaziar"
 
 #. 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 "Rascunho de mensagem"
 
 #. 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 "Essa mensagem ainda não foi enviada."
 
 #. 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 "A mensagem não foi salva"
 
 #. 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 "Essa mensagem foi enviada, mas não pôde ser salva em sua conta."
 
@@ -2371,32 +2425,37 @@ msgstr "Ontem"
 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-format
-#: src/client/util/util-date.vala:216
+#. / 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:218
 msgid "%a, %b %-e, %Y at %l:%M %P"
 msgstr "%a, %-e de %b de %Y às %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
+#. / 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:224
 msgid "%a, %b %-e, %Y at %H:%M"
 msgstr "%a, %-e de %b de %Y às %H:%M"
 
-#. / 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
+#. / 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:230
 msgid "%a, %b %-e, %Y at %X"
 msgstr "%a, %-e de %b de %Y às %X"
 
-#: 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 "(Sem assunto)"
 
 #. / 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 "(Nenhum destinatário)"
 
@@ -2405,7 +2464,7 @@ msgstr "(Nenhum destinatário)"
 #. / 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"
@@ -2415,26 +2474,26 @@ msgstr[1] "%s e %d outros"
 #. / 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 "Em %1$s, %2$s escreveu:"
 
 #. / 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 escreveu:"
 
 #. / 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 "Em %s:"
 
-#: src/client/util/util-email.vala:222
+#: src/client/util/util-email.vala:235
 msgid "---------- Forwarded message ----------"
 msgstr "---------- Mensagem encaminhada ----------"
 
@@ -2674,7 +2733,7 @@ msgstr "não-lida"
 #. 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:929
+#: src/engine/imap-engine/imap-engine-generic-account.vala:996
 msgid "Drafts | Draft"
 msgstr "Rascunhos | Rascunho"
 
@@ -2682,13 +2741,13 @@ msgstr "Rascunhos | Rascunho"
 #. 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:938
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1005
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr "Enviados | Correios enviados | E-mails enviados"
 
 #. The localised name(s) of the Sent folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:943
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1010
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Itens enviados"
@@ -2697,7 +2756,7 @@ msgstr "Itens enviados"
 #. 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:953
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1020
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2707,13 +2766,13 @@ msgstr "Spam | Lixo eletrônico"
 #. 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:963
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1030
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "Lixeira | Lixo"
 
 #. The localised name(s) of the Trash folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:968
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1035
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Itens excluídos"
@@ -2722,24 +2781,24 @@ msgstr "Itens excluídos"
 #. 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:978
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1045
 msgid "Archive | Archives"
 msgstr ""
 "Arquivo | Arquivos | Arquivado | Arquivados | Arquivamento | Archive | "
 "Archives"
 
-#: 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 "Não foi possível determinar o tipo mime para “%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 ""
 "Não foi possível determinar o tipo de conteúdo para o tipo mime “%s” em “%s”."
 
-#: src/engine/rfc822/rfc822-message.vala:1001
+#: src/engine/rfc822/rfc822-message.vala:1013
 msgid "(no subject)"
 msgstr "(sem assunto)"
 
@@ -2921,168 +2980,168 @@ msgid "_Inspect…"
 msgstr "_Inspecionar…"
 
 #. Geary account mail will be sent from
-#: ui/composer-widget.ui:60
+#: ui/composer-widget.ui:61
 msgid "_From"
 msgstr "_De"
 
 #. Address(es) e-mail is to be sent to
-#: ui/composer-widget.ui:130
+#: ui/composer-widget.ui:131
 msgid "_To"
 msgstr "_Para"
 
-#: ui/composer-widget.ui:158
+#: ui/composer-widget.ui:159
 msgid "Show Cc, Bcc, and Reply-To fields"
 msgstr "Mostrar campos Cc, CCo e Responder-a"
 
-#: ui/composer-widget.ui:219
+#: ui/composer-widget.ui:220
 msgid "_Cc"
 msgstr "_Cc"
 
-#: ui/composer-widget.ui:267
+#: ui/composer-widget.ui:268
 msgid "_Bcc"
 msgstr "Cc_o"
 
-#: ui/composer-widget.ui:315
+#: ui/composer-widget.ui:316
 msgid "_Reply-To"
 msgstr "_Responder-a"
 
-#: ui/composer-widget.ui:372
+#: ui/composer-widget.ui:373
 msgid "_Subject"
 msgstr "A_ssunto"
 
-#: ui/composer-widget.ui:445
+#: ui/composer-widget.ui:446
 msgid "Drop files here"
 msgstr "Solte arquivos aqui"
 
-#: ui/composer-widget.ui:461
+#: ui/composer-widget.ui:462
 msgid "To add them as attachments"
 msgstr "Para adicionar eles como anexos"
 
-#: ui/composer-widget.ui:602
+#: ui/composer-widget.ui:615
 msgid "Bold text"
 msgstr "Negrito"
 
-#: ui/composer-widget.ui:626
+#: ui/composer-widget.ui:639
 msgid "Italic text"
 msgstr "Itálico"
 
-#: ui/composer-widget.ui:650
+#: ui/composer-widget.ui:663
 msgid "Underline text"
 msgstr "Sublinhado"
 
-#: ui/composer-widget.ui:674
+#: ui/composer-widget.ui:687
 msgid "Strikethrough text"
 msgstr "Tachado"
 
-#: ui/composer-widget.ui:707
+#: ui/composer-widget.ui:720
 msgid "Insert bulleted list"
 msgstr "Insere lista não ordenada"
 
-#: ui/composer-widget.ui:731
+#: ui/composer-widget.ui:744
 msgid "Insert numbered list"
 msgstr "Insere lista numerada"
 
-#: ui/composer-widget.ui:764
+#: ui/composer-widget.ui:777
 msgid "Indent or quote text"
 msgstr "Recua ou cita texto"
 
-#: ui/composer-widget.ui:788
+#: ui/composer-widget.ui:801
 msgid "Un-indent or unquote text"
 msgstr "Remove recuo ou citação de texto"
 
-#: ui/composer-widget.ui:817
+#: ui/composer-widget.ui:830
 msgid "Remove text formatting"
 msgstr "Remove formatação de texto"
 
-#: ui/composer-widget.ui:836
+#: ui/composer-widget.ui:849
 msgid "Change font type"
 msgstr "Alterar tipo da fonte"
 
-#: ui/composer-widget.ui:851
+#: ui/composer-widget.ui:864
 msgid "Sans Serif"
 msgstr "Sans Serif"
 
-#: ui/composer-widget.ui:862
+#: ui/composer-widget.ui:875
 msgid "Serif"
 msgstr "Serif"
 
-#: ui/composer-widget.ui:873
+#: ui/composer-widget.ui:886
 msgid "Fixed Width"
 msgstr "Largura fixa"
 
-#: ui/composer-widget.ui:899
+#: ui/composer-widget.ui:912
 msgid "Change font color"
 msgstr "Alterar cor da fonte"
 
-#: ui/composer-widget.ui:914
+#: ui/composer-widget.ui:927
 msgid "Change font size"
 msgstr "Alterar tamanho da fonte"
 
-#: ui/composer-widget.ui:949
+#: ui/composer-widget.ui:962
 msgid "Insert or update text link"
 msgstr "Insere ou atualiza seleção de link"
 
-#: ui/composer-widget.ui:973
+#: ui/composer-widget.ui:986
 msgid "Insert an image"
 msgstr "Insere uma imagem"
 
-#: ui/composer-widget.ui:1015
+#: ui/composer-widget.ui:1028
 msgid "Undo last edit"
 msgstr "Desfaz a última edição"
 
-#: ui/composer-widget.ui:1039
+#: ui/composer-widget.ui:1052
 msgid "Redo last edit"
 msgstr "Desfaz a última edição"
 
-#: ui/composer-widget.ui:1068 ui/composer-widget.ui:1093
+#: ui/composer-widget.ui:1081 ui/composer-widget.ui:1106
 msgid "Attach a file"
 msgstr "Anexa um arquivo"
 
-#: ui/composer-widget.ui:1117
+#: ui/composer-widget.ui:1130
 msgid "Add original attachments"
 msgstr "Adiciona anexos originais"
 
-#: ui/composer-widget.ui:1162
+#: ui/composer-widget.ui:1175
 msgid "More options"
 msgstr "Mais opções"
 
-#: ui/composer-widget.ui:1182
+#: ui/composer-widget.ui:1195
 msgid "Show formatting toolbar"
 msgstr "Mostrar barra de ferramenta de formatação"
 
-#: ui/composer-widget.ui:1200
+#: ui/composer-widget.ui:1213
 msgid "Select spell checking languages"
 msgstr "Seleciona idiomas para verificação ortográfica"
 
-#: ui/composer-widget.ui:1263
+#: ui/composer-widget.ui:1273
 msgid "S_ans Serif"
 msgstr "S_ans Serif"
 
-#: ui/composer-widget.ui:1268
+#: ui/composer-widget.ui:1278
 msgid "S_erif"
 msgstr "S_erif"
 
-#: ui/composer-widget.ui:1273
+#: ui/composer-widget.ui:1283
 msgid "_Fixed Width"
 msgstr "Largura _fixa"
 
-#: ui/composer-widget.ui:1283
+#: ui/composer-widget.ui:1293
 msgid "_Small"
 msgstr "_Pequeno"
 
-#: ui/composer-widget.ui:1288
+#: ui/composer-widget.ui:1298
 msgid "_Medium"
 msgstr "_Médio"
 
-#: ui/composer-widget.ui:1293
+#: ui/composer-widget.ui:1303
 msgid "Lar_ge"
 msgstr "_Grande"
 
-#: ui/composer-widget.ui:1303
+#: ui/composer-widget.ui:1313
 msgid "_Rich Text"
 msgstr "Texto _rico"
 
-#: ui/composer-widget.ui:1308
+#: ui/composer-widget.ui:1318
 msgid "_Plain Text"
 msgstr "Texto si_mples"
 
@@ -3102,12 +3161,7 @@ msgstr "Abre os anexos selecionados"
 msgid "Save _All"
 msgstr "Salvar _tudo"
 
-#: 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>."
+#: ui/components-inspector-error-view.ui:31
 msgid ""
 "If the problem is serious or persists, please save and send these details to "
 "one of the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>contact "
@@ -3119,13 +3173,13 @@ msgstr ""
 "contato</a> ou anexe a um <a href=\"https://wiki.gnome.org/Apps/Geary/";
 "ReportingABug\">novo relatório de erro</a>."
 
-#: ui/components-inspector-error-view.ui:49
+#: ui/components-inspector-error-view.ui:47
 msgid "Details:"
 msgstr "Detalhes:"
 
 #. 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 "Pesquisa por entradas de log correspondentes"
 
@@ -3141,13 +3195,13 @@ msgstr "Adiciona uma entrada de marcador ao log"
 
 #. 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 "Salva entradas e detalhes de logs"
 
 #. 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 para área de transferência"
 
@@ -3555,8 +3609,6 @@ msgid "Add attachment"
 msgstr "Adiciona anexo"
 
 #: ui/gtk/help-overlay.ui:395
-#| msgctxt "shortcut window"
-#| msgid "Detach composer window"
 msgctxt "shortcut window"
 msgid "Detach the composer"
 msgstr "Destaca o compositor"
@@ -3711,6 +3763,28 @@ msgstr "_Autenticar"
 msgid "Geary update in progress…"
 msgstr "Atualização do Geary em progresso…"
 
+#~ msgid "Desktop Notifications"
+#~ msgstr "Notificações na área de trabalho"
+
+#~ msgid "Folder Highlight"
+#~ msgstr "Realce de pastas"
+
+#~ msgid "Notification Badge"
+#~ msgstr "Selo de notificação"
+
+#~ msgid "Special Folders"
+#~ msgstr "Pastas especiais"
+
+#~ msgid "Displays desktop notifications when new email is delivered"
+#~ msgstr ""
+#~ "Exibe notificações na área de trabalho quando um novo e-mail é entregue"
+
+#~ msgid "Highlights folders that have newly delivered mail"
+#~ msgstr "Realça pasta que têm e-mails recentemente entregues"
+
+#~ msgid "Displays a dock badge showing the number of new messages"
+#~ msgstr "Exibe um selo de dock mostrando o número de novas mensagens"
+
 #~ msgctxt "shortcut window"
 #~ msgid "Find in current conversations"
 #~ msgstr "Pesquisa em conversas atuais"
@@ -3948,10 +4022,6 @@ msgstr "Atualização do Geary em progresso…"
 #~ msgid "Additional Shortcuts"
 #~ msgstr "Atalhos adicionais"
 
-#~ msgctxt "shortcut window"
-#~ msgid "Star"
-#~ msgstr "Marca estrela"
-
 #~ msgctxt "shortcut window"
 #~ msgid "Unstar"
 #~ msgstr "Remove estrela"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]