[geary] Update Brazilian Portuguese translation

[Translations User D-L <translations src gnome org>]

commit 9a5ecac8405767214ae169dea1e654f081fb9295
Author: Enrico Nicoletto <liverig gmail com>
Date:   Fri Feb 28 12:51:54 2020 +0000

    Update Brazilian Portuguese translation

 po/pt_BR.po | 754 +++++++++++++++++++++++++++++-------------------------------
 1 file changed, 369 insertions(+), 385 deletions(-)
---
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2a6f7dee..11bbb114 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,5 +1,5 @@
 # Brazilian Portuguese translation for geary.
-# Copyright 2019 Software Freedom Conservancy Inc.
+# Copyright 2020 Software Freedom Conservancy Inc.
 # This file is distributed under the same license as the geary package.
 #
 # Translators (Transifex):
@@ -10,9 +10,8 @@
 #   Elder Marco <eldermarco gmail com>, 2013
 #   Guilherme Gondim <semente taurinus org>, 2013
 #   José Agnaldo Jr. <agjunior sd gmail com>, 2013
-
 # Translators (GNOME):
-#   Enrico Nicoletto <liverig gmail com>, 2014, 2016, 2019.
+#   Enrico Nicoletto <liverig gmail com>, 2014, 2016, 2019, 2020.
 #   Freire de Almeida <laudivan riseup net>, 2016.
 #   Ronan Arraes Jardim Chagas <ronisbr gmail com>, 2016.
 #   Isaac Ferreira Filho <isaacmob riseup net>, 2018.
@@ -22,16 +21,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n";
-"POT-Creation-Date: 2019-11-28 14:38+0000\n"
-"PO-Revision-Date: 2019-11-29 03:09-0300\n"
-"Last-Translator: Rafael Fontenelle <rafaelff gnome org>\n"
+"POT-Creation-Date: 2020-02-25 11:10+0000\n"
+"PO-Revision-Date: 2020-02-28 09:47-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.32.0\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 2.3\n"
 "X-Project-Style: gnome\n"
 
 #: desktop/geary-attach.contract.desktop.in:3
@@ -47,7 +46,7 @@ msgstr "Envia arquivos usando Geary"
 #: desktop/org.gnome.Geary.appdata.xml.in.in:12
 #: desktop/org.gnome.Geary.desktop.in.in:3
 #: src/client/accounts/accounts-editor-servers-pane.vala:555
-#: src/client/application/application-main-window.vala:547
+#: src/client/application/application-main-window.vala:555
 msgid "Geary"
 msgstr "Geary"
 
@@ -213,38 +212,45 @@ msgstr ""
 "Verdadeiro se o Paned da lista de pastas estiver na orientação horizontal."
 
 #: desktop/org.gnome.Geary.gschema.xml:50
+msgid "Show/hide formatting toolbar"
+msgstr "Mostrar/ocultar barra de ferramenta de formatação"
+
+#: desktop/org.gnome.Geary.gschema.xml:51
+msgid "True if the formatting toolbar in the composer is shown."
+msgstr ""
+"Verdadeiro se a barra de ferramenta de formatação é mostrada no compositor."
+
+#: desktop/org.gnome.Geary.gschema.xml:56
 msgid "Position of message list pane"
 msgstr "Posição do painel de lista de mensagens"
 
 # O termo "Paned" se refere a gtk.Paned, uma class for painéis.
 # "Grabber" é termo usado no desenvolvimento para função da captura de frame
-#: desktop/org.gnome.Geary.gschema.xml:51
+#: desktop/org.gnome.Geary.gschema.xml:57
 msgid "Position of the message list Paned grabber."
 msgstr "Posição do grabber do Paned da lista de mensagens."
 
-#: desktop/org.gnome.Geary.gschema.xml:56
+#: desktop/org.gnome.Geary.gschema.xml:62
 msgid "Autoselect next message"
 msgstr "Autosselecionar a próxima mensagem"
 
-#: desktop/org.gnome.Geary.gschema.xml:57
+#: desktop/org.gnome.Geary.gschema.xml:63
 msgid "True if we should autoselect the next available conversation."
 msgstr "Verdadeiro se devemos autosselecionar a próxima conversa disponível."
 
-#: desktop/org.gnome.Geary.gschema.xml:62
+#: desktop/org.gnome.Geary.gschema.xml:68
 msgid "Display message previews"
 msgstr "Exibir visualizações de mensagens"
 
-#: desktop/org.gnome.Geary.gschema.xml:63
+#: desktop/org.gnome.Geary.gschema.xml:69
 msgid "True if we should display a short preview of each message."
 msgstr "Verdadeiro se devemos exibir uma visualização curta de cada mensagem."
 
-#: desktop/org.gnome.Geary.gschema.xml:68
-#| msgctxt "shortcut window"
-#| msgid "Single-key shortcuts"
+#: desktop/org.gnome.Geary.gschema.xml:74
 msgid "Use single key shortcuts"
 msgstr "Usar atalhos de tecla única"
 
-#: desktop/org.gnome.Geary.gschema.xml:69
+#: desktop/org.gnome.Geary.gschema.xml:75
 msgid ""
 "Enables shortcuts for email actions that do not require pressing <Ctrl> to "
 "emulate those used by Gmail."
@@ -252,11 +258,11 @@ msgstr ""
 "Habilita atalhos de teclado para ações de e-mail que não exigem pressionar "
 "<Ctrl> para emular aqueles usados pelo Gmail."
 
-#: desktop/org.gnome.Geary.gschema.xml:76
+#: desktop/org.gnome.Geary.gschema.xml:82
 msgid "Languages that shall be used in the spell checker"
 msgstr "Idiomas que devem ser usados na verificação ortográfica"
 
-#: desktop/org.gnome.Geary.gschema.xml:77
+#: desktop/org.gnome.Geary.gschema.xml:83
 msgid ""
 "A list of POSIX locales, with the empty list disabling spell checking and "
 "the null list using desktop languages by default."
@@ -264,12 +270,12 @@ msgstr ""
 "Uma lista de localidades POSIX, com a lista vazia desabilitando verificação "
 "ortográfica e a lista nula usando idiomas de desktop por padrão."
 
-#: desktop/org.gnome.Geary.gschema.xml:84
+#: desktop/org.gnome.Geary.gschema.xml:90
 msgid "Languages that are displayed in the spell checker popover"
 msgstr ""
 "Idiomas que são exibidos na janela sobreposta de verificação ortográfica"
 
-#: desktop/org.gnome.Geary.gschema.xml:85
+#: desktop/org.gnome.Geary.gschema.xml:91
 msgid ""
 "List of languages that are always displayed in the popover of the spell "
 "checker."
@@ -277,62 +283,61 @@ msgstr ""
 "Lista de idiomas que sempre são exibidos na janela sobreposta da verificação "
 "ortográfica."
 
-#: desktop/org.gnome.Geary.gschema.xml:90
+#: desktop/org.gnome.Geary.gschema.xml:96
 msgid "Notify of new mail at startup"
 msgstr "Notificar sobre novo e-mail na inicialização"
 
-#: desktop/org.gnome.Geary.gschema.xml:91
+#: desktop/org.gnome.Geary.gschema.xml:97
 msgid "True to notify of new mail at startup."
 msgstr "Verdadeiro para notificar sobre novo e-mail na inicialização."
 
-#: desktop/org.gnome.Geary.gschema.xml:96
+#: desktop/org.gnome.Geary.gschema.xml:102
 msgid "Ask when opening an attachment"
 msgstr "Perguntar ao abrir um anexo"
 
-#: desktop/org.gnome.Geary.gschema.xml:97
+#: desktop/org.gnome.Geary.gschema.xml:103
 msgid "True to ask when opening an attachment."
 msgstr "Verdadeiro para perguntar ao abrir um anexo."
 
-#: desktop/org.gnome.Geary.gschema.xml:102
+#: desktop/org.gnome.Geary.gschema.xml:108
 msgid "Whether to compose emails in HTML"
 msgstr "Se deve compor e-mails em HTML"
 
-#: desktop/org.gnome.Geary.gschema.xml:103
+#: desktop/org.gnome.Geary.gschema.xml:109
 msgid "True to compose emails in HTML; false for plain text."
 msgstr "Verdadeiro para compor e-mails em HTML; falso para texto simples."
 
-#: desktop/org.gnome.Geary.gschema.xml:108
+#: desktop/org.gnome.Geary.gschema.xml:114
 msgid "Advisory strategy for full-text searching"
 msgstr "Estratégia consultiva para pesquisa de texto completo"
 
-#: desktop/org.gnome.Geary.gschema.xml:109
+#: desktop/org.gnome.Geary.gschema.xml:115
 msgid ""
 "Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
 msgstr ""
 "Valores aceitáveis são “exact”, “conservative”, “aggressive” e “horizon”."
 
-#: desktop/org.gnome.Geary.gschema.xml:114
+#: desktop/org.gnome.Geary.gschema.xml:120
 msgid "Zoom of conversation viewer"
 msgstr "Ampliação do visualizador de conversa"
 
-#: desktop/org.gnome.Geary.gschema.xml:115
+#: desktop/org.gnome.Geary.gschema.xml:121
 msgid "The zoom to apply on the conservation view."
 msgstr "A ampliação a ser aplicada no visualizador de conversa."
 
-#: desktop/org.gnome.Geary.gschema.xml:120
+#: desktop/org.gnome.Geary.gschema.xml:126
 msgid "Size of detached composer window"
 msgstr "Tamanho da janela do compositor destacada"
 
-#: desktop/org.gnome.Geary.gschema.xml:121
+#: desktop/org.gnome.Geary.gschema.xml:127
 msgid "The last recorded size of the detached composer window."
 msgstr "O último tamanho registrado da janela do compositor destacada."
 
-#: desktop/org.gnome.Geary.gschema.xml:126
-#| msgid "Error sending email"
+#: desktop/org.gnome.Geary.gschema.xml:132
 msgid "Undo sending email delay"
 msgstr "Desfazer atraso de envio de e-mail"
 
-#: desktop/org.gnome.Geary.gschema.xml:127
+#: desktop/org.gnome.Geary.gschema.xml:133
 msgid ""
 "The number of seconds to wait before sending an email. Set to zero or less "
 "to disable."
@@ -340,11 +345,23 @@ msgstr ""
 "O número de segundos para aguardar antes de eenviar um e-mail. Defina para "
 "zero ou menos para desabilitar."
 
-#: desktop/org.gnome.Geary.gschema.xml:133
+#: desktop/org.gnome.Geary.gschema.xml:139
+msgid "Brief notification display time"
+msgstr "Tempo de exibição de notificação breve"
+
+#: desktop/org.gnome.Geary.gschema.xml:140
+msgid ""
+"The length of time in seconds for which brief notifications should be "
+"displayed."
+msgstr ""
+"O comprimento de tempo, em segundos, pelo qual as notificações breves devem "
+"ser exibidas."
+
+#: desktop/org.gnome.Geary.gschema.xml:146
 msgid "Whether we migrated the old settings"
 msgstr "Se migramos as configurações antigas"
 
-#: desktop/org.gnome.Geary.gschema.xml:134
+#: desktop/org.gnome.Geary.gschema.xml:147
 msgid ""
 "False to check for the old “org.yorba.geary”-schema and copy its values."
 msgstr ""
@@ -620,56 +637,56 @@ msgid_plural "%d days back"
 msgstr[0] "%d dia atrás"
 msgstr[1] "%d dias atrás"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:248
-#: src/client/application/application-main-window.vala:2021
+#: src/client/accounts/accounts-editor-list-pane.vala:255
+#: src/client/application/application-main-window.vala:2053
 msgid "Undo"
 msgstr "Desfazer"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:257
-#: src/client/application/application-main-window.vala:2011
+#: src/client/accounts/accounts-editor-list-pane.vala:264
+#: src/client/application/application-main-window.vala:2036
 msgid "Redo"
 msgstr "Refazer"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:351
-#: src/client/accounts/accounts-editor-list-pane.vala:439
+#: src/client/accounts/accounts-editor-list-pane.vala:358
+#: src/client/accounts/accounts-editor-list-pane.vala:446
 #: src/client/accounts/accounts-editor-row.vala:279
 msgid "Gmail"
 msgstr "Gmail"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:355
-#: src/client/accounts/accounts-editor-list-pane.vala:443
+#: src/client/accounts/accounts-editor-list-pane.vala:362
+#: src/client/accounts/accounts-editor-list-pane.vala:450
 #: src/client/accounts/accounts-editor-row.vala:283
 msgid "Outlook.com"
 msgstr "Outlook.com"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:359
-#: src/client/accounts/accounts-editor-list-pane.vala:447
+#: src/client/accounts/accounts-editor-list-pane.vala:366
+#: src/client/accounts/accounts-editor-list-pane.vala:454
 #: src/client/accounts/accounts-editor-row.vala:287
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #. Translators: Tooltip for accounts that have been
 #. loaded but disabled by the user.
-#: src/client/accounts/accounts-editor-list-pane.vala:377
+#: src/client/accounts/accounts-editor-list-pane.vala:384
 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:386
+#: src/client/accounts/accounts-editor-list-pane.vala:393
 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:436
+#: src/client/accounts/accounts-editor-list-pane.vala:443
 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:553
+#: src/client/accounts/accounts-editor-list-pane.vala:560
 #, c-format
 msgid "Account “%s” removed"
 msgstr "Conta “%s” removida"
@@ -677,7 +694,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:560
+#: src/client/accounts/accounts-editor-list-pane.vala:567
 #, c-format
 msgid "Account “%s” restored"
 msgstr "Conta “%s” restaurada"
@@ -898,7 +915,6 @@ msgid "Perform a graceful quit"
 msgstr "Realiza uma saída graciosa"
 
 #: src/client/application/application-client.vala:134
-#| msgid "Use %s to open a new composer window"
 msgid "Open a new window"
 msgstr "Abre uma nova janela"
 
@@ -964,7 +980,7 @@ msgstr "Lançamento da distribuição"
 msgid "Installation prefix"
 msgstr "Prefixo de lançamento"
 
-#: src/client/application/application-client.vala:566
+#: src/client/application/application-client.vala:587
 #, c-format
 msgid "About %s"
 msgstr "Sobre %s"
@@ -972,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:570
+#: src/client/application/application-client.vala:591
 msgid "translator-credits"
 msgstr ""
 "Leonardo Lemos <leonardolemos live com>\n"
@@ -983,39 +999,37 @@ msgstr ""
 
 #. / Warning printed to the console when a deprecated
 #. / command line option is used.
-#: src/client/application/application-client.vala:913
+#: src/client/application/application-client.vala:937
 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:946
+#: src/client/application/application-client.vala:970
 #, c-format
 msgid "Unrecognised program argument: “%s”"
 msgstr "Argumento do programa não reconhecida “%s”"
 
 #. / Notification title.
-#: src/client/application/application-controller.vala:477
+#: src/client/application/application-controller.vala:458
 #, 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:481
+#: src/client/application/application-controller.vala:462
 msgid "Email will not be sent until re-connected"
-msgstr "O e-mail não será enviado até estar reconectado."
+msgstr "O e-mail não será enviado até reconectar"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:587
-#| msgid "Conversation Shortcuts"
+#: src/client/application/application-controller.vala:568
 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:593
-#| msgid "No conversations found"
+#: src/client/application/application-controller.vala:574
 msgid "Conversation un-marked"
 msgid_plural "Conversations un-marked"
 msgstr[0] "Conversa desmarcada"
@@ -1024,10 +1038,9 @@ 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:619
-#: src/client/application/application-controller.vala:703
+#: src/client/application/application-controller.vala:600
+#: src/client/application/application-controller.vala:684
 #, c-format
-#| msgid "Conversation Shortcuts"
 msgid "Conversation moved to %s"
 msgid_plural "Conversations moved to %s"
 msgstr[0] "Conversa movida para %s"
@@ -1038,18 +1051,16 @@ 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:627
-#: src/client/application/application-controller.vala:649
+#: src/client/application/application-controller.vala:608
+#: src/client/application/application-controller.vala:630
 #, c-format
-#| msgid "Conversation Shortcuts"
 msgid "Conversation restored to %s"
 msgid_plural "Conversations restored to %s"
 msgstr[0] "Conversa restaurada para %s"
 msgstr[1] "Conversas restauradas para %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:670
-#| msgid "Conversation Shortcuts"
+#: src/client/application/application-controller.vala:651
 msgid "Conversation archived"
 msgid_plural "Conversations archived"
 msgstr[0] "Conversa arquivada"
@@ -1057,17 +1068,15 @@ 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:726
+#: src/client/application/application-controller.vala:707
 #, c-format
-#| msgid "Message not saved"
 msgid "Message restored to %s"
 msgid_plural "Messages restored to %s"
 msgstr[0] "Mensagem restaurada para %s"
 msgstr[1] "Mensagens restauradas para %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:747
-#| msgid "Message not saved"
+#: src/client/application/application-controller.vala:728
 msgid "Message archived"
 msgid_plural "Messages archived"
 msgstr[0] "Mensagem arquivada"
@@ -1076,9 +1085,8 @@ 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:782
+#: src/client/application/application-controller.vala:763
 #, c-format
-#| msgid "Message not saved"
 msgid "Message moved to %s"
 msgid_plural "Messages moved to %s"
 msgstr[0] "Mensagem movida para %s"
@@ -1087,9 +1095,8 @@ 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:810
+#: src/client/application/application-controller.vala:791
 #, c-format
-#| msgid "No conversations selected"
 msgid "Conversation labelled as %s"
 msgid_plural "Conversations labelled as %s"
 msgstr[0] "Conversa rotulada como %s"
@@ -1098,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:818
+#: src/client/application/application-controller.vala:799
 #, 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:1238
+#: src/client/application/application-controller.vala:1222
 #, 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:1239
+#: src/client/application/application-controller.vala:1223
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -1135,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:1241
+#: src/client/application/application-controller.vala:1225
 msgid "_Rebuild"
 msgstr "_Reconstruir"
 
-#: src/client/application/application-controller.vala:1241
+#: src/client/application/application-controller.vala:1225
 msgid "E_xit"
 msgstr "S_air"
 
-#: src/client/application/application-controller.vala:1251
+#: src/client/application/application-controller.vala:1235
 #, 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:1252
+#: src/client/application/application-controller.vala:1236
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -1161,34 +1168,34 @@ 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:1575
+#: src/client/application/application-controller.vala:1559
 #, 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:2648
+#: src/client/application/application-controller.vala:2642
 #, 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:2713
+#: src/client/application/application-controller.vala:2706
 #, 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:2728
-#: src/client/application/application-controller.vala:2786
+#: src/client/application/application-controller.vala:2721
+#: src/client/application/application-controller.vala:2779
 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:2771
+#: src/client/application/application-controller.vala:2764
 #, c-format
 msgid "Email to %s discarded"
 msgstr "E-mail para %s descartado"
@@ -1196,55 +1203,53 @@ msgstr "E-mail para %s descartado"
 #. / 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:552
+#: src/client/application/application-main-window.vala:560
 #, c-format
 msgid "%s — %s"
 msgstr "%s — %s"
 
-#: src/client/application/application-main-window.vala:949
+#: src/client/application/application-main-window.vala:967
 msgid "Labels"
 msgstr "Marcadores"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1281
-#| msgid "Do you want to permanently delete this message?"
-#| msgid_plural "Do you want to permanently delete these messages?"
+#: src/client/application/application-main-window.vala:1306
 msgid "Do you want to permanently delete this conversation?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Você deseja descartar permanentemente essa conversa?"
 msgstr[1] "Você deseja descartar permanentemente essas conversas?"
 
-#: src/client/application/application-main-window.vala:1286
-#: src/client/application/application-main-window.vala:1301
+#: src/client/application/application-main-window.vala:1311
+#: src/client/application/application-main-window.vala:1326
 msgid "Delete"
 msgstr "Excluir"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1296
+#: src/client/application/application-main-window.vala:1321
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Você deseja descartar permanentemente essa mensagem?"
 msgstr[1] "Você deseja descartar permanentemente essas mensagens?"
 
-#: src/client/application/application-main-window.vala:1309
+#: src/client/application/application-main-window.vala:1334
 #, 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:1312
+#: src/client/application/application-main-window.vala:1337
 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:1313
+#: src/client/application/application-main-window.vala:1338
 msgid "This cannot be undone."
 msgstr "Isso não pode ser desfeito."
 
-#: src/client/application/application-main-window.vala:1314
+#: src/client/application/application-main-window.vala:1339
 #, c-format
 msgid "Empty %s"
 msgstr "Esvaziar %s"
 
-#: src/client/application/application-main-window.vala:1644
+#: src/client/application/application-main-window.vala:1669
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -1255,7 +1260,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:1796
+#: src/client/composer/composer-widget.vala:1834
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -1283,7 +1288,7 @@ msgstr "Inspetor"
 #. / Translators: Title for Inspector logs pane
 #. / Translators: Title for problem report dialog logs pane
 #: src/client/components/components-inspector.vala:87
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:101
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:102
 msgid "Logs"
 msgstr "Logs"
 
@@ -1291,21 +1296,21 @@ msgstr "Logs"
 #. / Translators: Title for problem report system information
 #. / pane
 #: src/client/components/components-inspector.vala:91
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:104
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:105
 msgid "System"
 msgstr "Sistema"
 
 #. Button label for saving problem report information
 #: src/client/components/components-inspector.vala:208
 #: src/client/components/components-inspector.vala:211
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:220
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:223
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:221
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:224
 #: ui/problem-details-dialog.ui:42
 msgid "Save As"
 msgstr "Salvar como"
 
 #: src/client/components/components-inspector.vala:212
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:224
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:225
 #: ui/accounts_editor_servers_pane.ui:17
 msgid "Cancel"
 msgstr "Cancelar"
@@ -1327,8 +1332,6 @@ msgstr "Usar visão de _três painéis"
 
 #. / Translators: Preferences label
 #: src/client/components/components-preferences-window.vala:73
-#| msgctxt "shortcut window"
-#| msgid "Single-key shortcuts"
 msgid "Use _single key email shortcuts"
 msgstr "Usar atalhos de e-mail de tecla única"
 
@@ -1350,6 +1353,26 @@ msgstr "_Monitorar por um novo e-mail quando fechado"
 msgid "Geary will keep running after all windows are closed"
 msgstr "Geary continuará em execução após todas as janelas estarem fechadas"
 
+#. / Translators: Search entry placeholder text
+#: src/client/components/components-search-bar.vala:12
+#: src/client/folder-list/folder-list-search-branch.vala:53
+#: src/engine/api/geary-special-folder-type.vala:51
+msgid "Search"
+msgstr "Pesquisar"
+
+#. / Translators: Search entry tooltip
+#: src/client/components/components-search-bar.vala:32
+msgid "Search all mail in account for keywords"
+msgstr "Pesquisar todos os e-mails na conta por palavras-chave"
+
+#. / Translators: Search entry placeholder, string
+#. / replacement is the name of an account
+#: src/client/components/components-search-bar.vala:81
+#: src/client/folder-list/folder-list-search-branch.vala:54
+#, c-format
+msgid "Search %s account"
+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
@@ -1376,37 +1399,37 @@ msgstr "Um nome de servidor é necessário"
 msgid "Could not look up server name"
 msgstr "Não foi possível procurar por nome do servidor"
 
-#: src/client/components/main-toolbar.vala:142
+#: src/client/components/main-toolbar.vala:116
 msgid "Mark conversation"
 msgid_plural "Mark conversations"
 msgstr[0] "Marca a conversa"
 msgstr[1] "Marca as conversas"
 
-#: src/client/components/main-toolbar.vala:147
+#: src/client/components/main-toolbar.vala:121
 msgid "Add label to conversation"
 msgid_plural "Add label to conversations"
 msgstr[0] "Adiciona marcador à conversa"
 msgstr[1] "Adiciona marcador às conversas"
 
-#: src/client/components/main-toolbar.vala:152
+#: src/client/components/main-toolbar.vala:126
 msgid "Move conversation"
 msgid_plural "Move conversations"
 msgstr[0] "Move a conversa"
 msgstr[1] "Move as conversas"
 
-#: src/client/components/main-toolbar.vala:157
+#: src/client/components/main-toolbar.vala:131
 msgid "Archive conversation"
 msgid_plural "Archive conversations"
 msgstr[0] "Arquivar a conversa"
 msgstr[1] "Arquivar as conversas"
 
-#: src/client/components/main-toolbar.vala:168
+#: src/client/components/main-toolbar.vala:142
 msgid "Move conversation to Trash"
 msgid_plural "Move conversations to Trash"
 msgstr[0] "Move a conversa para a lixeira"
 msgstr[1] "Move as conversas para a lixeira"
 
-#: src/client/components/main-toolbar.vala:178
+#: src/client/components/main-toolbar.vala:152
 msgid "Delete conversation"
 msgid_plural "Delete conversations"
 msgstr[0] "Excluir conversa"
@@ -1481,28 +1504,6 @@ msgstr "Veja detalhes técnicos sobre o erro"
 msgid "_Retry"
 msgstr "_Tentar novamente"
 
-#: src/client/components/search-bar.vala:8
-#: src/client/folder-list/folder-list-search-branch.vala:53
-#: src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Pesquisar"
-
-#. Search entry.
-#: src/client/components/search-bar.vala:24
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Pesquisar todos os e-mails na conta por palavras-chave (Ctrl+S)"
-
-#: src/client/components/search-bar.vala:88
-#, c-format
-msgid "Indexing %s account"
-msgstr "Indexando a conta %s"
-
-#: src/client/components/search-bar.vala:119
-#: src/client/folder-list/folder-list-search-branch.vala:54
-#, c-format
-msgid "Search %s account"
-msgstr "Pesquisar conta %s"
-
 #. / Displayed in the space-limited status bar while a message is in the process of being sent.
 #: src/client/components/status-bar.vala:26
 msgid "Sending…"
@@ -1577,36 +1578,36 @@ msgstr "_Salvar"
 msgid "_Keep"
 msgstr "_Manter"
 
-#: src/client/composer/composer-link-popover.vala:149
+#: src/client/composer/composer-link-popover.vala:139
 msgid "Link URL is not correctly formatted, e.g. http://example.com";
 msgstr "URL de link não está corretamente formatado, ex.: http://example.com";
 
-#: src/client/composer/composer-link-popover.vala:156
+#: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid link URL"
 msgstr "URL de link inválido"
 
-#: src/client/composer/composer-link-popover.vala:156
+#: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid email address"
 msgstr "Endereço de e-mail inválido"
 
 #. / Translators: Title for an empty composer window
-#: src/client/composer/composer-widget.vala:28
+#: src/client/composer/composer-widget.vala:30
 msgid "New Message"
 msgstr "Nova mensagem"
 
-#: src/client/composer/composer-widget.vala:211
+#: src/client/composer/composer-widget.vala:217
 msgid "Saved"
 msgstr "Salvo"
 
-#: src/client/composer/composer-widget.vala:212
+#: src/client/composer/composer-widget.vala:218
 msgid "Saving"
 msgstr "Salvando"
 
-#: src/client/composer/composer-widget.vala:213
+#: src/client/composer/composer-widget.vala:219
 msgid "Error saving"
 msgstr "Erro ao salvar"
 
-#: src/client/composer/composer-widget.vala:214
+#: src/client/composer/composer-widget.vala:220
 msgid "Press Backspace to delete quote"
 msgstr "Pressione Backspace para excluir citação"
 
@@ -1615,7 +1616,7 @@ msgstr "Pressione Backspace para excluir citação"
 #. 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:230
+#: src/client/composer/composer-widget.vala:236
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1626,90 +1627,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:798
+#: src/client/composer/composer-widget.vala:843
 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:824
+#: src/client/composer/composer-widget.vala:869
 msgid "Do you want to discard this draft message?"
 msgstr "Você deseja descartar esta mensagem de rascunho?"
 
-#: src/client/composer/composer-widget.vala:1465
+#: src/client/composer/composer-widget.vala:1503
 msgid "Send message with an empty subject and body?"
 msgstr "Enviar mensagem com o assunto e corpo vazio?"
 
-#: src/client/composer/composer-widget.vala:1467
+#: src/client/composer/composer-widget.vala:1505
 msgid "Send message with an empty subject?"
 msgstr "Enviar mensagem com o assunto vazio?"
 
-#: src/client/composer/composer-widget.vala:1469
+#: src/client/composer/composer-widget.vala:1507
 msgid "Send message with an empty body?"
 msgstr "Enviar mensagem com o corpo vazio?"
 
-#: src/client/composer/composer-widget.vala:1478
+#: src/client/composer/composer-widget.vala:1516
 msgid "Send message without an attachment?"
 msgstr "Enviar mensagem sem anexo?"
 
-#: src/client/composer/composer-widget.vala:1788
+#: src/client/composer/composer-widget.vala:1820
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "“%s” já foi anexado para envio."
 
-#: src/client/composer/composer-widget.vala:1818
-#: src/client/composer/composer-widget.vala:1868
+#: src/client/composer/composer-widget.vala:1856
+#: src/client/composer/composer-widget.vala:1906
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "“%s” é um arquivo vazio."
 
-#: src/client/composer/composer-widget.vala:1856
+#: src/client/composer/composer-widget.vala:1894
 #, c-format
 msgid "“%s” could not be found."
 msgstr "“%s” não foi encontrado."
 
-#: src/client/composer/composer-widget.vala:1862
+#: src/client/composer/composer-widget.vala:1900
 #, c-format
 msgid "“%s” is a folder."
 msgstr "“%s” é uma pasta."
 
-#: src/client/composer/composer-widget.vala:1881
+#: src/client/composer/composer-widget.vala:1919
 #, 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:1889
+#: src/client/composer/composer-widget.vala:1927
 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:1946
+#: src/client/composer/composer-widget.vala:1984
 #: src/client/conversation-viewer/conversation-email.vala:559
 #: src/client/util/util-email.vala:235 ui/conversation-message.ui:312
 msgid "To:"
 msgstr "Para:"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:1952
+#: src/client/composer/composer-widget.vala:1990
 #: src/client/conversation-viewer/conversation-email.vala:564
 #: src/client/util/util-email.vala:240 ui/conversation-message.ui:357
 msgid "Cc:"
 msgstr "Cc:"
 
 #. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:1958
+#: src/client/composer/composer-widget.vala:1996
 #: src/client/conversation-viewer/conversation-email.vala:569
 #: ui/conversation-message.ui:402
 msgid "Bcc:"
 msgstr "Cco:"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:1964
+#: src/client/composer/composer-widget.vala:2002
 msgid "Reply-To: "
 msgstr "Responder-a: "
 
-#: src/client/composer/composer-widget.vala:2144
+#: src/client/composer/composer-widget.vala:2254
 msgid "Select Color"
 msgstr "Selecione a cor"
 
@@ -1718,32 +1719,32 @@ 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:2336
+#: src/client/composer/composer-widget.vala:2440
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s via %2$s"
 
 #. Composer label (with mnemonic underscore) for the account selector
 #. when choosing what address to send a message from.
-#: src/client/composer/composer-widget.vala:2392
+#: src/client/composer/composer-widget.vala:2496
 msgid "_From:"
 msgstr "_De:"
 
 #. Translators: This is the name of the file chooser filter
 #. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2695
+#: src/client/composer/composer-widget.vala:2801
 msgid "Images"
 msgstr "Imagens"
 
-#: src/client/composer/spell-check-popover.vala:108
+#: src/client/composer/spell-check-popover.vala:125
 msgid "Remove this language from the preferred list"
 msgstr "Remover esse idioma da lista de preferência"
 
-#: src/client/composer/spell-check-popover.vala:112
+#: src/client/composer/spell-check-popover.vala:129
 msgid "Add this language to the preferred list"
 msgstr "Adicionar esse idioma à lista de preferência"
 
-#: src/client/composer/spell-check-popover.vala:199
+#: src/client/composer/spell-check-popover.vala:225
 msgid "Search for more languages"
 msgstr "Procurar por mais idiomas"
 
@@ -1819,7 +1820,7 @@ msgstr "Data:"
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: src/client/conversation-viewer/conversation-message.vala:132
+#: src/client/conversation-viewer/conversation-message.vala:128
 msgid "This email address may have been forged"
 msgstr "Esse endereço de e-mail foi forjado"
 
@@ -1827,44 +1828,44 @@ msgstr "Esse endereço de e-mail foi forjado"
 #. in load_contacts.
 #. Translators: This is displayed in place of the from address
 #. when the message has no from address.
-#: src/client/conversation-viewer/conversation-message.vala:469
+#: src/client/conversation-viewer/conversation-message.vala:439
 msgid "No sender"
 msgstr "Sem remetente"
 
 #. Translators: This separates multiple 'from'
 #. addresses in the compact header for a message.
-#: src/client/conversation-viewer/conversation-message.vala:963
+#: src/client/conversation-viewer/conversation-message.vala:831
 msgid ", "
 msgstr ", "
 
 #. Translators: This string is used as the HTML IMG ALT
 #. attribute value when displaying an inline image in an email
 #. that did not specify a file name. E.g. <IMG ALT="Image" ...
-#: src/client/conversation-viewer/conversation-message.vala:1085
+#: src/client/conversation-viewer/conversation-message.vala:951
 msgid "Image"
 msgstr "Imagem"
 
 #. Translators: Title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:91
+#: src/client/conversation-viewer/conversation-viewer.vala:83
 msgid "No conversations selected"
 msgstr "Não há conversas selecionadas"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:95
+#: src/client/conversation-viewer/conversation-viewer.vala:87
 msgid "Selecting a conversation from the list will display it here"
 msgstr "Se for selecionada uma conversa da lista, ela será mostrada aqui"
 
 #. Translators: Title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:104
+#: src/client/conversation-viewer/conversation-viewer.vala:96
 msgid "Multiple conversations selected"
 msgstr "Várias conversas selecionadas"
 
 #. Translators: Sub-title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:108
+#: src/client/conversation-viewer/conversation-viewer.vala:100
 msgid "Choosing an action will apply to all selected conversations"
 msgstr "A escolha de uma ação será aplicada a todas as conversas selecionadas"
 
@@ -1872,20 +1873,20 @@ msgstr "A escolha de uma ação será aplicada a todas as conversas selecionadas
 #. conversations have exist in a folder.
 #. Translators: Title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:117
-#: src/client/conversation-viewer/conversation-viewer.vala:130
+#: src/client/conversation-viewer/conversation-viewer.vala:109
+#: src/client/conversation-viewer/conversation-viewer.vala:122
 msgid "No conversations found"
 msgstr "Nenhuma conversa encontrada"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have exist in a folder.
-#: src/client/conversation-viewer/conversation-viewer.vala:121
+#: src/client/conversation-viewer/conversation-viewer.vala:113
 msgid "This folder does not contain any conversations"
 msgstr "Essa pasta não contém nenhuma conversa"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:134
+#: src/client/conversation-viewer/conversation-viewer.vala:126
 msgid "Your search returned no results, try refining your search terms"
 msgstr "Sua busca não retornou resultado, tente refinar os termos da pesquisa"
 
@@ -1976,7 +1977,7 @@ 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:99
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:100
 #: ui/problem-details-dialog.ui:12
 msgid "Details"
 msgstr "Detalhes"
@@ -2148,7 +2149,8 @@ msgstr "%a, %-e de %b de %Y às %H:%M"
 msgid "%a, %b %-e, %Y at %X"
 msgstr "%a, %-e de %b de %Y às %X"
 
-#: src/client/util/util-email.vala:38 src/engine/rfc822/rfc822-message.vala:998
+#: src/client/util/util-email.vala:38
+#: src/engine/rfc822/rfc822-message.vala:1000
 msgid "(no subject)"
 msgstr "(sem assunto)"
 
@@ -2274,7 +2276,7 @@ msgstr "Arquivar"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:73
+#: src/engine/imap-db/imap-db-search-query.vala:130
 msgctxt "Search operator"
 msgid "attachment"
 msgstr "anexo"
@@ -2287,7 +2289,7 @@ msgstr "anexo"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:82
+#: src/engine/imap-db/imap-db-search-query.vala:139
 msgctxt "Search operator"
 msgid "bcc"
 msgstr "cco"
@@ -2299,7 +2301,7 @@ msgstr "cco"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:90
+#: src/engine/imap-db/imap-db-search-query.vala:147
 msgctxt "Search operator"
 msgid "body"
 msgstr "corpo"
@@ -2312,7 +2314,7 @@ msgstr "corpo"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:99
+#: src/engine/imap-db/imap-db-search-query.vala:156
 msgctxt "Search operator"
 msgid "cc"
 msgstr "cc"
@@ -2325,7 +2327,7 @@ msgstr "cc"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:108
+#: src/engine/imap-db/imap-db-search-query.vala:165
 msgctxt "Search operator"
 msgid "from"
 msgstr "de"
@@ -2337,7 +2339,7 @@ msgstr "de"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:116
+#: src/engine/imap-db/imap-db-search-query.vala:173
 msgctxt "Search operator"
 msgid "is"
 msgstr "está"
@@ -2349,7 +2351,7 @@ msgstr "está"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary
 #. User Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:124
+#: src/engine/imap-db/imap-db-search-query.vala:181
 msgctxt "Search operator"
 msgid "subject"
 msgstr "assunto"
@@ -2362,7 +2364,7 @@ msgstr "assunto"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:133
+#: src/engine/imap-db/imap-db-search-query.vala:190
 msgctxt "Search operator"
 msgid "to"
 msgstr "para"
@@ -2375,7 +2377,7 @@ msgstr "para"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:154
+#: src/engine/imap-db/imap-db-search-query.vala:211
 msgctxt "Search operator value - mail addressed to the user"
 msgid "me"
 msgstr "eu"
@@ -2387,7 +2389,7 @@ msgstr "eu"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:166
+#: src/engine/imap-db/imap-db-search-query.vala:223
 msgctxt "Search operator value - mail sent by the user"
 msgid "me"
 msgstr "eu"
@@ -2399,7 +2401,7 @@ msgstr "eu"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:178
+#: src/engine/imap-db/imap-db-search-query.vala:235
 msgctxt "'is:' search operator value"
 msgid "read"
 msgstr "lida"
@@ -2412,7 +2414,7 @@ msgstr "lida"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:189
+#: src/engine/imap-db/imap-db-search-query.vala:246
 msgctxt "'is:' search operator value"
 msgid "starred"
 msgstr "com-estrela"
@@ -2424,7 +2426,7 @@ msgstr "com-estrela"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:199
+#: src/engine/imap-db/imap-db-search-query.vala:256
 msgctxt "'is:' search operator value"
 msgid "unread"
 msgstr "não-lida"
@@ -2433,7 +2435,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:923
+#: src/engine/imap-engine/imap-engine-generic-account.vala:882
 msgid "Drafts | Draft"
 msgstr "Rascunhos | Rascunho"
 
@@ -2441,13 +2443,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:932
+#: src/engine/imap-engine/imap-engine-generic-account.vala:891
 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:937
+#: src/engine/imap-engine/imap-engine-generic-account.vala:896
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Itens enviados"
@@ -2456,7 +2458,7 @@ msgstr "Itens enviados"
 #. 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:947
+#: src/engine/imap-engine/imap-engine-generic-account.vala:906
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2466,13 +2468,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:957
+#: src/engine/imap-engine/imap-engine-generic-account.vala:916
 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:962
+#: src/engine/imap-engine/imap-engine-generic-account.vala:921
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Itens excluídos"
@@ -2481,18 +2483,18 @@ 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:972
+#: src/engine/imap-engine/imap-engine-generic-account.vala:931
 msgid "Archive | Archives"
 msgstr ""
 "Arquivo | Arquivos | Arquivado | Arquivados | Arquivamento | Archive | "
 "Archives"
 
-#: src/engine/rfc822/rfc822-message.vala:467
+#: src/engine/rfc822/rfc822-message.vala:458
 #, 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:475
+#: src/engine/rfc822/rfc822-message.vala:469
 #, c-format
 msgid "Could not determine content type for mime type “%s” on “%s”."
 msgstr ""
@@ -2671,237 +2673,248 @@ msgstr "_Confiar nesse servidor"
 msgid "_Don’t Trust This Server"
 msgstr "_Não confiar nesse servidor"
 
-#: ui/composer-headerbar.ui:19 ui/composer-headerbar.ui:176
-#| msgctxt "shortcut window"
-#| msgid "Detach composer window"
+#: ui/composer-headerbar.ui:23 ui/composer-headerbar.ui:107
 msgid "Detach the composer from the window"
 msgstr "Destaca o compositor da janela"
 
-#: ui/composer-headerbar.ui:59 ui/composer-headerbar.ui:84
-#| msgid "Attach File"
-msgid "Attach a file"
-msgstr "Anexa um arquivo"
-
-#: ui/composer-headerbar.ui:108
-#| msgid "Include Original Attachments"
-msgid "Add original attachments"
-msgstr "Adiciona anexos originais"
-
-#: ui/composer-headerbar.ui:204
+#: ui/composer-headerbar.ui:135
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ui/composer-headerbar.ui:231
+#: ui/composer-headerbar.ui:162
 msgid "Discard and Close"
 msgstr "Descarta e fecha"
 
-#: ui/composer-headerbar.ui:255
+#: ui/composer-headerbar.ui:186
 msgid "Save and Close"
 msgstr "Salva e fecha"
 
 #. Note that this button and the Update button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:41
+#: ui/composer-link-popover.ui:42
 msgid "Insert the new link with this URL"
 msgstr "Insere o novo link com esse URL"
 
-#: ui/composer-link-popover.ui:52
+#: ui/composer-link-popover.ui:43
+msgid "Add"
+msgstr "Adicionar"
+
+#: ui/composer-link-popover.ui:47
 msgid "Link URL"
 msgstr "URL do link"
 
 #. Note that this button and the Insert button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:66
+#: ui/composer-link-popover.ui:61
 msgid "Update this link’s URL"
 msgstr "Atualiza a URL desse link"
 
-#: ui/composer-link-popover.ui:86
+#: ui/composer-link-popover.ui:62
+msgid "Update"
+msgstr "Atualizar"
+
+#: ui/composer-link-popover.ui:75
 msgid "Delete this link"
 msgstr "Exclui esse link"
 
-#: ui/composer-link-popover.ui:106
-msgid "Open this link"
-msgstr "Abre esse link"
-
-#: ui/composer-menus.ui:7
-msgid "S_ans Serif"
-msgstr "S_ans Serif"
-
-#: ui/composer-menus.ui:12
-msgid "S_erif"
-msgstr "S_erif"
-
-#: ui/composer-menus.ui:17
-msgid "_Fixed Width"
-msgstr "Largura _fixa"
-
-#: ui/composer-menus.ui:24
-msgid "_Small"
-msgstr "_Pequeno"
-
-#: ui/composer-menus.ui:29
-msgid "_Medium"
-msgstr "_Médio"
-
-#: ui/composer-menus.ui:34
-msgid "Lar_ge"
-msgstr "_Grande"
-
-#: ui/composer-menus.ui:41
-msgid "C_olor"
-msgstr "C_or"
-
-#: ui/composer-menus.ui:47 ui/composer-menus.ui:62
-msgid "_Rich Text"
-msgstr "Texto _rico"
-
-#: ui/composer-menus.ui:53 ui/composer-menus.ui:68
-msgid "Show Extended Fields"
-msgstr "Mostras campos estendidos"
-
-#: ui/composer-menus.ui:78
+#: ui/composer-menus.ui:8
 msgid "_Undo"
 msgstr "_Desfazer"
 
-#: ui/composer-menus.ui:82
+#: ui/composer-menus.ui:12
 msgid "_Redo"
 msgstr "_Refazer"
 
-#: ui/composer-menus.ui:88 ui/composer-menus.ui:106
+#: ui/composer-menus.ui:18 ui/composer-menus.ui:36
 msgid "Cu_t"
 msgstr "Recor_tar"
 
-#: ui/composer-menus.ui:92 ui/composer-menus.ui:110
+#: ui/composer-menus.ui:22 ui/composer-menus.ui:40
 #: ui/conversation-message-menus.ui:37
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ui/composer-menus.ui:96 ui/composer-menus.ui:114
+#: ui/composer-menus.ui:26 ui/composer-menus.ui:44
 msgid "_Paste"
 msgstr "_Colar"
 
-#: ui/composer-menus.ui:100
+#: ui/composer-menus.ui:30
 msgctxt "Clipboard paste as plain text"
 msgid "Paste _Without Formatting"
 msgstr "Colar _sem formatação"
 
-#: ui/composer-menus.ui:120
+#: ui/composer-menus.ui:50
 msgid "Select _All"
 msgstr "Selecionar _tudo"
 
-#: ui/composer-menus.ui:127 ui/conversation-message-menus.ui:43
+#: ui/composer-menus.ui:57 ui/conversation-message-menus.ui:43
 msgid "_Inspect…"
 msgstr "_Inspecionar…"
 
+#. 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:56
+#: ui/composer-widget.ui:130
 msgid "_To"
 msgstr "_Para"
 
-#: ui/composer-widget.ui:75
+#: ui/composer-widget.ui:158
+msgid "Show Cc, Bcc, and Reply-To fields"
+msgstr "Mostrar campos Cc, CCo e Responder-a"
+
+#: ui/composer-widget.ui:219
 msgid "_Cc"
 msgstr "_Cc"
 
-#: ui/composer-widget.ui:130
-msgid "_Subject"
-msgstr "A_ssunto"
-
-#: ui/composer-widget.ui:149
+#: ui/composer-widget.ui:267
 msgid "_Bcc"
 msgstr "Cc_o"
 
-#: ui/composer-widget.ui:179
+#: ui/composer-widget.ui:315
 msgid "_Reply-To"
 msgstr "_Responder-a"
 
-#. Geary account mail will be sent from
-#: ui/composer-widget.ui:208
-msgid "From"
-msgstr "De"
+#: ui/composer-widget.ui:372
+msgid "_Subject"
+msgstr "A_ssunto"
 
-#: ui/composer-widget.ui:293
+#: ui/composer-widget.ui:445
 msgid "Drop files here"
 msgstr "Solte arquivos aqui"
 
-#: ui/composer-widget.ui:309
+#: ui/composer-widget.ui:461
 msgid "To add them as attachments"
 msgstr "Para adicionar eles como anexos"
 
-#: ui/composer-widget.ui:353
-#| msgid "Undo last edit (Ctrl+Z)"
-msgid "Undo last edit"
-msgstr "Desfaz a última edição"
-
-#: ui/composer-widget.ui:377
-#| msgid "Undo last edit (Ctrl+Z)"
-msgid "Redo last edit"
-msgstr "Desfaz a última edição"
-
-#: ui/composer-widget.ui:415
-#| msgctxt "shortcut window"
-#| msgid "Bold text"
+#: ui/composer-widget.ui:602
 msgid "Bold text"
 msgstr "Negrito"
 
-#: ui/composer-widget.ui:439
-#| msgctxt "shortcut window"
-#| msgid "Italicize text"
+#: ui/composer-widget.ui:626
 msgid "Italic text"
 msgstr "Itálico"
 
-#: ui/composer-widget.ui:463
-#| msgctxt "shortcut window"
-#| msgid "Underline text"
+#: ui/composer-widget.ui:650
 msgid "Underline text"
 msgstr "Sublinhado"
 
-#: ui/composer-widget.ui:487
-#| msgctxt "shortcut window"
-#| msgid "Strike text"
+#: ui/composer-widget.ui:674
 msgid "Strikethrough text"
 msgstr "Tachado"
 
-#: ui/composer-widget.ui:525
-#| msgid "Insert unordered list"
+#: ui/composer-widget.ui:707
 msgid "Insert bulleted list"
 msgstr "Insere lista não ordenada"
 
-#: ui/composer-widget.ui:549
-#| msgid "Insert unordered list"
+#: ui/composer-widget.ui:731
 msgid "Insert numbered list"
 msgstr "Insere lista numerada"
 
-#: ui/composer-widget.ui:587
-#| msgctxt "shortcut window"
-#| msgid "Unquote text"
+#: ui/composer-widget.ui:764
 msgid "Indent or quote text"
 msgstr "Recua ou cita texto"
 
-#: ui/composer-widget.ui:611
-#| msgctxt "shortcut window"
-#| msgid "Unquote text"
+#: ui/composer-widget.ui:788
 msgid "Un-indent or unquote text"
 msgstr "Remove recuo ou citação de texto"
 
-#: ui/composer-widget.ui:649
-#| msgid "Insert or update selection link (Ctrl+L)"
+#: ui/composer-widget.ui:817
+msgid "Remove text formatting"
+msgstr "Remove formatação de texto"
+
+#: ui/composer-widget.ui:836
+msgid "Change font type"
+msgstr "Alterar tipo da fonte"
+
+#: ui/composer-widget.ui:851
+msgid "Sans Serif"
+msgstr "Sans Serif"
+
+#: ui/composer-widget.ui:862
+msgid "Serif"
+msgstr "Serif"
+
+#: ui/composer-widget.ui:873
+msgid "Fixed Width"
+msgstr "Largura fixa"
+
+#: ui/composer-widget.ui:899
+msgid "Change font color"
+msgstr "Alterar cor da fonte"
+
+#: ui/composer-widget.ui:914
+msgid "Change font size"
+msgstr "Alterar tamanho da fonte"
+
+#: ui/composer-widget.ui:949
 msgid "Insert or update text link"
 msgstr "Insere ou atualiza seleção de link"
 
-#: ui/composer-widget.ui:673
-#| msgctxt "shortcut window"
-#| msgid "Insert an image"
+#: ui/composer-widget.ui:973
 msgid "Insert an image"
 msgstr "Insere uma imagem"
 
-#: ui/composer-widget.ui:707
-#| msgctxt "shortcut window"
-#| msgid "Remove formatting"
-msgid "Remove text formatting"
-msgstr "Remove formatação de texto"
+#: ui/composer-widget.ui:1015
+msgid "Undo last edit"
+msgstr "Desfaz a última edição"
 
-#: ui/composer-widget.ui:731
+#: ui/composer-widget.ui:1039
+msgid "Redo last edit"
+msgstr "Desfaz a última edição"
+
+#: ui/composer-widget.ui:1068 ui/composer-widget.ui:1093
+msgid "Attach a file"
+msgstr "Anexa um arquivo"
+
+#: ui/composer-widget.ui:1117
+msgid "Add original attachments"
+msgstr "Adiciona anexos originais"
+
+#: ui/composer-widget.ui:1162
+msgid "More options"
+msgstr "Mais opções"
+
+#: ui/composer-widget.ui:1182
+msgid "Show formatting toolbar"
+msgstr "Mostrar barra de ferramenta de formatação"
+
+#: ui/composer-widget.ui:1200
 msgid "Select spell checking languages"
 msgstr "Seleciona idiomas para verificação ortográfica"
 
+#: ui/composer-widget.ui:1263
+msgid "S_ans Serif"
+msgstr "S_ans Serif"
+
+#: ui/composer-widget.ui:1268
+msgid "S_erif"
+msgstr "S_erif"
+
+#: ui/composer-widget.ui:1273
+msgid "_Fixed Width"
+msgstr "Largura _fixa"
+
+#: ui/composer-widget.ui:1283
+msgid "_Small"
+msgstr "_Pequeno"
+
+#: ui/composer-widget.ui:1288
+msgid "_Medium"
+msgstr "_Médio"
+
+#: ui/composer-widget.ui:1293
+msgid "Lar_ge"
+msgstr "_Grande"
+
+#: ui/composer-widget.ui:1303
+msgid "_Rich Text"
+msgstr "Texto _rico"
+
+#: ui/composer-widget.ui:1308
+msgid "_Plain Text"
+msgstr "Texto si_mples"
+
 #: ui/components-attachment-pane.ui:29 ui/components-attachment-pane.ui:47
 msgid "Select all attachments"
 msgstr "Seleciona todos os anexos"
@@ -2915,7 +2928,6 @@ msgid "Open selected attachments"
 msgstr "Abre os anexos selecionados"
 
 #: ui/components-attachment-pane-menus.ui:17
-#| msgid "_Save All"
 msgid "Save _All"
 msgstr "Salvar _tudo"
 
@@ -3142,20 +3154,20 @@ msgstr "Responder para:"
 msgid "Subject"
 msgstr "Assunto"
 
-#: ui/conversation-message.ui:502
+#: ui/conversation-message.ui:501
 msgid "Show Images"
 msgstr "Mostrar imagens"
 
-#: ui/conversation-message.ui:515
+#: ui/conversation-message.ui:514
 msgid "Always Show From Sender"
 msgstr "Mostrar sempre do remetente"
 
-#: ui/conversation-message.ui:543
+#: ui/conversation-message.ui:542
 msgid "Remote images not shown"
 msgstr "Imagens remotas não mostradas"
 
 # Traduzido como se fosse uma ação do sistema, porém se possível verificar se isto se trata de uma descrição 
de tela para o usuário (hint) --Enrico
-#: ui/conversation-message.ui:560
+#: ui/conversation-message.ui:559
 msgid "Only show remote images from senders you trust."
 msgstr "Mostrar somente imagens remotas de remetentes que você confia."
 
@@ -3231,43 +3243,31 @@ msgid "Mark/un-mark starred"
 msgstr "Marca/desmarca com estrela"
 
 #: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:297
-#| msgid "Archive conversation"
-#| msgid_plural "Archive conversations"
 msgctxt "shortcut window"
 msgid "Archive conversations"
 msgstr "Arquiva conversas"
 
 #: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:304
-#| msgid "Move conversation"
-#| msgid_plural "Move conversations"
 msgctxt "shortcut window"
 msgid "Move conversations"
 msgstr "Move conversas"
 
 #: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:311
-#| msgctxt "shortcut window"
-#| msgid "Label conversation"
 msgctxt "shortcut window"
 msgid "Label conversations"
 msgstr "Rotula conversas"
 
 #: ui/gtk/help-overlay.ui:80
-#| msgctxt "shortcut window"
-#| msgid "Trash conversation"
 msgctxt "shortcut window"
 msgid "Trash conversations"
 msgstr "Move conversas para a lixeira"
 
 #: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:318
-#| msgid "Mark conversation"
-#| msgid_plural "Mark conversations"
 msgctxt "shortcut window"
 msgid "Junk conversations"
 msgstr "Move conversas para lixo eletrônico"
 
 #: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:325
-#| msgid "Delete conversation"
-#| msgid_plural "Delete conversations"
 msgctxt "shortcut window"
 msgid "Delete conversations"
 msgstr "Exclui conversas"
@@ -3338,14 +3338,11 @@ msgid "Show keyboard shortcuts"
 msgstr "Mostra os atalhos do teclado"
 
 #: ui/gtk/help-overlay.ui:206
-#| msgid "Use %s to open a new composer window"
 msgctxt "shortcut window"
 msgid "Open a new window"
 msgstr "Abre uma nova janela"
 
 #: ui/gtk/help-overlay.ui:213
-#| msgctxt "shortcut window"
-#| msgid "Close current window"
 msgctxt "shortcut window"
 msgid "Close the current window"
 msgstr "Fecha a janela atual"
@@ -3361,15 +3358,11 @@ msgid "Keyboard navigation"
 msgstr "Navegação por teclado"
 
 #: ui/gtk/help-overlay.ui:233
-#| msgctxt "shortcut window"
-#| msgid "Focus the previous pane"
 msgctxt "shortcut window"
 msgid "Go to next/previous pane"
 msgstr "Vai para o painel seguinte/anterior"
 
 #: ui/gtk/help-overlay.ui:241
-#| msgctxt "shortcut window"
-#| msgid "Select the conversation up"
 msgctxt "shortcut window"
 msgid "Select next/previous conversation"
 msgstr "Seleciona a conversa seguinte/anterior"
@@ -3390,15 +3383,11 @@ msgid "Reply to sender "
 msgstr "Responde para o remetente "
 
 #: ui/gtk/help-overlay.ui:332
-#| msgctxt "shortcut window"
-#| msgid "Find in current conversation"
 msgctxt "shortcut window"
 msgid "Find in current conversations"
 msgstr "Pesquisa em conversas atuais"
 
 #: ui/gtk/help-overlay.ui:339
-#| msgctxt "shortcut window"
-#| msgid "Select the conversation up"
 msgctxt "shortcut window"
 msgid "Select next/previous conversations"
 msgstr "Seleciona conversas seguintes/anteriores"
@@ -3502,12 +3491,12 @@ msgctxt "shortcut window"
 msgid "Insert a link"
 msgstr "Insere um link"
 
-#: ui/main-toolbar.ui:23
+#: ui/main-toolbar.ui:24
 msgctxt "tooltip"
 msgid "Compose Message"
 msgstr "Escreve mensagem"
 
-#: ui/main-toolbar.ui:61
+#: ui/main-toolbar.ui:62
 msgid "Toggle search bar"
 msgstr "Ativa/desativa a barra de pesquisa"
 
@@ -3532,8 +3521,6 @@ msgid "_Archive"
 msgstr "_Arquivar"
 
 #: ui/main-toolbar-menus.ui:21
-#| msgctxt "shortcut window"
-#| msgid "Toggle spam"
 msgid "Toggle as S_pam"
 msgstr "Marcar/desmarcar como s_pam"
 
@@ -3577,6 +3564,18 @@ msgstr "_Autenticar"
 msgid "Geary update in progress…"
 msgstr "Atualização do Geary em progresso…"
 
+#~ msgid "Indexing %s account"
+#~ msgstr "Indexando a conta %s"
+
+#~ msgid "Open this link"
+#~ msgstr "Abre esse link"
+
+#~ msgid "C_olor"
+#~ msgstr "C_or"
+
+#~ msgid "Show Extended Fields"
+#~ msgstr "Mostras campos estendidos"
+
 #~ msgid "Enable notification sounds"
 #~ msgstr "Habilitar sons de notificação"
 
@@ -4171,9 +4170,6 @@ msgstr "Atualização do Geary em progresso…"
 #~ "configurados no servidor. Contate seu provedor de e-mail para mais "
 #~ "informação."
 
-#~ msgid "_Update"
-#~ msgstr "Atuali_zar"
-
 #~ msgid "E_mail address"
 #~ msgstr "Endereço de e-_mail"
 
@@ -4401,9 +4397,6 @@ msgstr "Atualização do Geary em progresso…"
 #~ msgid "_Justify"
 #~ msgstr "_Justificar"
 
-#~ msgid "More options"
-#~ msgstr "Mais opções"
-
 #~ msgctxt "Short Label"
 #~ msgid "Close and Save"
 #~ msgstr "Fechar e salvar"
@@ -4429,15 +4422,6 @@ msgstr "Atualização do Geary em progresso…"
 #~ msgid "Small"
 #~ msgstr "Pequeno"
 
-#~ msgid "Sans Serif"
-#~ msgstr "Sans Serif"
-
-#~ msgid "Serif"
-#~ msgstr "Serif"
-
-#~ msgid "Fixed Width"
-#~ msgstr "Largura fixa"
-
 #~ msgid "Detach"
 #~ msgstr "Desanexar"