[geary] Update Brazilian Portuguese translation

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

commit ffe4775eb047743cb89f005dea6fd384484ac733
Author: Rafael Fontenelle <rafaelff gnome org>
Date:   Wed Mar 6 20:29:30 2019 +0000

    Update Brazilian Portuguese translation

 po/pt_BR.po | 321 ++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 172 insertions(+), 149 deletions(-)
---
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0fde66c8..f0d8686a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n";
-"POT-Creation-Date: 2019-02-20 03:32+0000\n"
-"PO-Revision-Date: 2019-02-20 20:04-0300\n"
+"POT-Creation-Date: 2019-02-24 16:03+0000\n"
+"PO-Revision-Date: 2019-03-06 17:26-0300\n"
 "Last-Translator: Rafael Fontenelle <rafaelff gnome org>\n"
 "Language-Team: Portuguese - Brazil <gnome-pt_br-list gnome org>\n"
 "Language: pt_BR\n"
@@ -61,7 +61,7 @@ msgstr "E-mail"
 #: desktop/geary-autostart.desktop.in:5
 #: desktop/org.gnome.Geary.appdata.xml.in:15
 #: desktop/org.gnome.Geary.desktop.in:5
-#: src/client/application/geary-application.vala:22
+#: src/client/application/geary-application.vala:23
 msgid "Send and receive email"
 msgstr "Envie e receba e-mail"
 
@@ -142,7 +142,7 @@ msgstr "Geary mostrando um compositor de texto rico"
 msgid "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 msgstr "Correio;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 
-#: desktop/org.gnome.Geary.desktop.in:21 ui/gtk/menus.ui:7
+#: desktop/org.gnome.Geary.desktop.in:21
 msgid "Compose Message"
 msgstr "Escrever mensagem"
 
@@ -230,8 +230,7 @@ msgstr "Autosselecionar a próxima mensagem"
 
 #: desktop/org.gnome.Geary.gschema.xml:57
 msgid "True if we should autoselect the next available conversation."
-msgstr ""
-"Verdadeiro se devemos autosselecionar a próxima conversação disponível."
+msgstr "Verdadeiro se devemos autosselecionar a próxima conversa disponível."
 
 #: desktop/org.gnome.Geary.gschema.xml:62
 msgid "Display message previews"
@@ -551,7 +550,7 @@ msgstr "Desfazer alterações a “%s”"
 #. Translators: Label used as the undo tooltip after removing
 #. a sender address from an account. The string substitution
 #. is the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:690
+#: src/client/accounts/accounts-editor-edit-pane.vala:688
 #, c-format
 msgid "Add “%s” back"
 msgstr "Adicione “%s” de volta"
@@ -559,14 +558,14 @@ msgstr "Adicione “%s” de volta"
 #. Translators: Label used as the undo tooltip after removing
 #. a sender address from an account. The string substitution
 #. is the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:732
+#: src/client/accounts/accounts-editor-edit-pane.vala:730
 msgid "Undo signature changes"
 msgstr "Desfazer alterações a assinatura"
 
 #. Translators: This label describes the account
 #. preference for the length of time (weeks, months or
 #. years) that past email should be downloaded.
-#: src/client/accounts/accounts-editor-edit-pane.vala:780
+#: src/client/accounts/accounts-editor-edit-pane.vala:778
 msgid "Download mail"
 msgstr "Baixar e-mail"
 
@@ -575,44 +574,44 @@ msgstr "Baixar e-mail"
 #. should be downloaded for an account. The
 #. string substitution is the duration,
 #. e.g. "1 month back".
-#: src/client/accounts/accounts-editor-edit-pane.vala:812
+#: src/client/accounts/accounts-editor-edit-pane.vala:810
 #, c-format
 msgid "Change download period back to: %s"
 msgstr "Altera o período de download de volta para: %s"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:833
+#: src/client/accounts/accounts-editor-edit-pane.vala:831
 msgid "Everything"
 msgstr "Tudo"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:837
+#: src/client/accounts/accounts-editor-edit-pane.vala:835
 msgid "2 weeks back"
 msgstr "2 semanas atrás"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:841
+#: src/client/accounts/accounts-editor-edit-pane.vala:839
 msgid "1 month back"
 msgstr "1 mês atrás"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:845
+#: src/client/accounts/accounts-editor-edit-pane.vala:843
 msgid "3 months back"
 msgstr "3 meses atrás"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:849
+#: src/client/accounts/accounts-editor-edit-pane.vala:847
 msgid "6 months back"
 msgstr "6 meses atrás"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:853
+#: src/client/accounts/accounts-editor-edit-pane.vala:851
 msgid "1 year back"
 msgstr "1 ano atrás"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:857
+#: src/client/accounts/accounts-editor-edit-pane.vala:855
 msgid "2 years back"
 msgstr "2 anos atrás"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:861
+#: src/client/accounts/accounts-editor-edit-pane.vala:859
 msgid "4 years back"
 msgstr "4 anos atrás"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:867
+#: src/client/accounts/accounts-editor-edit-pane.vala:865
 #, c-format
 msgid "%d day back"
 msgid_plural "%d days back"
@@ -771,7 +770,6 @@ msgstr "Salvar rascunhos no servidor"
 #. Translators: This label describes an account
 #. preference.
 #: src/client/accounts/accounts-editor-servers-pane.vala:666
-#| msgid "_Save sent mail"
 msgid "Save sent email on server"
 msgstr "Salvar e-mails enviados no servidor"
 
@@ -789,19 +787,19 @@ msgstr "%s usando OAuth2"
 msgid "Use receiving server login"
 msgstr "usar login do servidor de recebimento"
 
-#: src/client/application/geary-application.vala:23
+#: src/client/application/geary-application.vala:24
 msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
-#: src/client/application/geary-application.vala:24
+#: src/client/application/geary-application.vala:25
 msgid "Copyright 2016-2019 Geary Development Team."
 msgstr "Copyright 2016-2019 Geary Development Team."
 
-#: src/client/application/geary-application.vala:26
+#: src/client/application/geary-application.vala:27
 msgid "Visit the Geary web site"
 msgstr "Visite o website do Geary"
 
-#: src/client/application/geary-application.vala:420
+#: src/client/application/geary-application.vala:454
 #, c-format
 msgid "About %s"
 msgstr "Sobre %s"
@@ -809,7 +807,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/geary-application.vala:424
+#: src/client/application/geary-application.vala:458
 msgid "translator-credits"
 msgstr ""
 "Leonardo Lemos <leonardolemos live com>\n"
@@ -902,23 +900,23 @@ msgstr "Opção de linha de comando não reconhecida “%s”\n"
 
 #. Translators: File name used in save chooser when saving
 #. attachments that do not otherwise have a name.
-#: src/client/application/geary-controller.vala:61
+#: src/client/application/geary-controller.vala:58
 msgid "Untitled"
 msgstr "Sem_título"
 
-#: src/client/application/geary-controller.vala:924
+#: src/client/application/geary-controller.vala:919
 msgid "Labels"
 msgstr "Marcadores"
 
 #. give the user two options: reset the Account local store, or exit Geary.  A third
 #. could be done to leave the Account in an unopened state, but we don't currently
 #. have provisions for that.
-#: src/client/application/geary-controller.vala:937
+#: src/client/application/geary-controller.vala:932
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Incapaz de abrir o banco de dados para %s"
 
-#: src/client/application/geary-controller.vala:938
+#: src/client/application/geary-controller.vala:933
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -943,20 +941,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/geary-controller.vala:940
+#: src/client/application/geary-controller.vala:935
 msgid "_Rebuild"
 msgstr "_Reconstruir"
 
-#: src/client/application/geary-controller.vala:940
+#: src/client/application/geary-controller.vala:935
 msgid "E_xit"
 msgstr "S_air"
 
-#: src/client/application/geary-controller.vala:949
+#: src/client/application/geary-controller.vala:944
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "Incapaz de reconstruir o banco de dados para “%s”"
 
-#: src/client/application/geary-controller.vala:950
+#: src/client/application/geary-controller.vala:945
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -967,15 +965,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/client/application/geary-controller.vala:1803
+#: src/client/application/geary-controller.vala:1800
 msgid "Undo move (Ctrl+Z)"
 msgstr "Desfazer movimento (Ctrl+Z)"
 
-#: src/client/application/geary-controller.vala:1813
+#: src/client/application/geary-controller.vala:1810
 msgid "Are you sure you want to open these attachments?"
 msgstr "Você tem certeza de que deseja abrir esses anexos?"
 
-#: src/client/application/geary-controller.vala:1814
+#: src/client/application/geary-controller.vala:1811
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -983,14 +981,14 @@ msgstr ""
 "Anexos podem causar danos ao seu sistema se abertos. Apenas abra arquivos de "
 "fontes confiáveis."
 
-#: src/client/application/geary-controller.vala:1815
+#: src/client/application/geary-controller.vala:1812
 msgid "Don’t _ask me again"
 msgstr "Não me _pergunte novamente"
 
 #. Translators: Dialog primary label when prompting to
 #. overwrite a file. The string substitution is the file'sx
 #. name.
-#: src/client/application/geary-controller.vala:1944
+#: src/client/application/geary-controller.vala:1941
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Um arquivo chamado “%s” já existe. Você deseja substituí-lo?"
@@ -998,76 +996,76 @@ msgstr "Um arquivo chamado “%s” já existe. Você deseja substituí-lo?"
 #. Translators: Dialog secondary label when prompting to
 #. overwrite a file. The string substitution is the parent
 #. folder's name.
-#: src/client/application/geary-controller.vala:1951
+#: src/client/application/geary-controller.vala:1948
 #, c-format
 msgid ""
 "The file already exists in “%s”.  Replacing it will overwrite its contents."
 msgstr ""
 "O arquivo já existe em “%s”. Substituí-lo irá sobrescrever o seu conteúdo."
 
-#: src/client/application/geary-controller.vala:1955
+#: src/client/application/geary-controller.vala:1952
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: src/client/application/geary-controller.vala:2231
+#: src/client/application/geary-controller.vala:2228
 msgid "Close the draft message?"
 msgid_plural "Close all draft messages?"
 msgstr[0] "Fechar a mensagem de rascunho?"
 msgstr[1] "Fechar as mensagens de rascunho?"
 
-#: src/client/application/geary-controller.vala:2357
+#: src/client/application/geary-controller.vala:2354
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "Esvaziar todos os e-mails de sua pasta %s?"
 
-#: src/client/application/geary-controller.vala:2358
+#: src/client/application/geary-controller.vala:2355
 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/geary-controller.vala:2359
+#: src/client/application/geary-controller.vala:2356
 msgid "This cannot be undone."
 msgstr "Isso não pode ser desfeito."
 
-#: src/client/application/geary-controller.vala:2360
+#: src/client/application/geary-controller.vala:2357
 #, c-format
 msgid "Empty %s"
 msgstr "Esvaziar %s"
 
-#: src/client/application/geary-controller.vala:2377
+#: src/client/application/geary-controller.vala:2374
 #, c-format
 msgid "Error emptying %s"
 msgstr "Erro ao esvaziar %s"
 
-#: src/client/application/geary-controller.vala:2409
+#: src/client/application/geary-controller.vala:2406
 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/geary-controller.vala:2411
+#: src/client/application/geary-controller.vala:2408
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/client/application/geary-controller.vala:2425
+#: src/client/application/geary-controller.vala:2422
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Desfazer exclusão (Ctrl+Z)"
 
-#: src/client/application/geary-controller.vala:2475
+#: src/client/application/geary-controller.vala:2472
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Desfazer arquivamento (Ctrl+Z)"
 
-#: src/client/application/geary-controller.vala:2520
+#: src/client/application/geary-controller.vala:2517
 msgid "Undo (Ctrl+Z)"
 msgstr "Desfazer (Ctrl+Z)"
 
 #. Translators: The label for an in-app notification. The
 #. string substitution is a list of recipients of the email.
-#: src/client/application/geary-controller.vala:2597
+#: src/client/application/geary-controller.vala:2598
 #, c-format
 msgid "Successfully sent mail to %s."
 msgstr "E-mail enviado com sucesso para %s."
 
-#: src/client/application/geary-controller.vala:2679
+#: src/client/application/geary-controller.vala:2680
 msgid "Failed to open default text editor."
 msgstr "Falha ao abrir o editor de texto padrão."
 
@@ -1097,54 +1095,47 @@ 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"
 
-#. Tooltips
-#: src/client/components/main-toolbar.vala:69
-msgid "Delete conversation (Shift+Delete)"
-msgstr "Exclui a conversa (Shift+Delete)"
-
-#: src/client/components/main-toolbar.vala:70
-msgid "Delete conversations (Shift+Delete)"
-msgstr "Exclui as conversas (Shift+Delete)"
-
-#: src/client/components/main-toolbar.vala:71
-msgid "Move conversation to Trash (Delete, Backspace)"
-msgstr "Move a conversa para a lixeira (Delete, Backspace)"
-
-#: src/client/components/main-toolbar.vala:72
-msgid "Move conversations to Trash (Delete, Backspace)"
-msgstr "Move as conversas para a lixeira (Delete, Backspace)"
-
-#: src/client/components/main-toolbar.vala:73
-msgid "Archive conversation (A)"
-msgstr "Arquiva a conversa (A)"
-
-#: src/client/components/main-toolbar.vala:74
-msgid "Archive conversations (A)"
-msgstr "Arquiva as conversas (A)"
-
-#: src/client/components/main-toolbar.vala:75
+#: src/client/components/main-toolbar.vala:151
+#| msgid "Mark conversation"
 msgid "Mark conversation"
-msgstr "Marca a conversação"
-
-#: src/client/components/main-toolbar.vala:76
-msgid "Mark conversations"
-msgstr "Marca as conversas"
+msgid_plural "Mark conversations"
+msgstr[0] "Marca a conversa"
+msgstr[1] "Marca as conversas"
 
-#: src/client/components/main-toolbar.vala:77
+#: src/client/components/main-toolbar.vala:156
+#| msgid "Add label to conversation"
 msgid "Add label to conversation"
-msgstr "Adiciona marcador à conversa"
+msgid_plural "Add label to conversations"
+msgstr[0] "Adiciona marcador à conversa"
+msgstr[1] "Adiciona marcador às conversas"
 
-#: src/client/components/main-toolbar.vala:78
-msgid "Add label to conversations"
-msgstr "Adiciona marcador às conversas"
-
-#: src/client/components/main-toolbar.vala:79
+#: src/client/components/main-toolbar.vala:161
+#| msgid "Move conversation"
 msgid "Move conversation"
-msgstr "Move a conversa"
+msgid_plural "Move conversations"
+msgstr[0] "Move a conversa"
+msgstr[1] "Move as conversas"
+
+#: src/client/components/main-toolbar.vala:166
+#| msgid "Archive conversation (A)"
+msgid "Archive conversation (A)"
+msgid_plural "Archive conversations (A)"
+msgstr[0] "Arquiva a conversa (A)"
+msgstr[1] "Arquiva as conversas (A)"
+
+#: src/client/components/main-toolbar.vala:175
+#| msgid "Move conversation to Trash (Delete, Backspace)"
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgid_plural "Move conversations to Trash (Delete, Backspace)"
+msgstr[0] "Move a conversa para a lixeira (Delete, Backspace)"
+msgstr[1] "Move as conversas para a lixeira (Delete, Backspace)"
 
-#: src/client/components/main-toolbar.vala:80
-msgid "Move conversations"
-msgstr "Move a conversas"
+#: src/client/components/main-toolbar.vala:183
+#| msgid "Delete conversation (Shift+Delete)"
+msgid "Delete conversation (Shift+Delete)"
+msgid_plural "Delete conversations (Shift+Delete)"
+msgstr[0] "Exclui a conversa (Shift+Delete)"
+msgstr[1] "Exclui as conversas (Shift+Delete)"
 
 #: src/client/components/main-window.vala:503
 #, c-format
@@ -1393,7 +1384,7 @@ msgstr "_OK"
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/client/components/stock.vala:21 ui/gtk/menus.ui:34
+#: src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_Sobre"
 
@@ -1409,7 +1400,7 @@ msgstr "_Fechar"
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: src/client/components/stock.vala:25 ui/gtk/menus.ui:29
+#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:56
 msgid "_Help"
 msgstr "_Ajuda"
 
@@ -1417,7 +1408,7 @@ msgstr "_Ajuda"
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/client/components/stock.vala:27 ui/gtk/menus.ui:17
+#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:46
 msgid "_Preferences"
 msgstr "_Preferências"
 
@@ -1426,7 +1417,7 @@ msgstr "_Preferências"
 msgid "_Print…"
 msgstr "_Imprimir…"
 
-#: src/client/components/stock.vala:29 ui/gtk/menus.ui:38
+#: src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Fechar"
 
@@ -1454,19 +1445,19 @@ msgstr "URL de link inválido"
 msgid "Invalid email address"
 msgstr "Endereço de e-mail inválido"
 
-#: src/client/composer/composer-widget.vala:157
+#: src/client/composer/composer-widget.vala:150
 msgid "Saved"
 msgstr "Salvo"
 
-#: src/client/composer/composer-widget.vala:158
+#: src/client/composer/composer-widget.vala:151
 msgid "Saving"
 msgstr "Salvando"
 
-#: src/client/composer/composer-widget.vala:159
+#: src/client/composer/composer-widget.vala:152
 msgid "Error saving"
 msgstr "Erro ao salvar"
 
-#: src/client/composer/composer-widget.vala:160
+#: src/client/composer/composer-widget.vala:153
 msgid "Press Backspace to delete quote"
 msgstr "Pressione Backspace para excluir citação"
 
@@ -1474,7 +1465,7 @@ msgstr "Pressione Backspace para excluir citação"
 #. characters, that suggest an attachment; since this is full-word
 #. checking, include all variants of each word.  No spaces are
 #. allowed.
-#: src/client/composer/composer-widget.vala:169
+#: src/client/composer/composer-widget.vala:162
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1485,34 +1476,34 @@ 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:1128
+#: src/client/composer/composer-widget.vala:1121
 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:1156
+#: src/client/composer/composer-widget.vala:1149
 msgid "Do you want to discard this draft message?"
 msgstr "Você deseja descartar esta mensagem de rascunho?"
 
-#: src/client/composer/composer-widget.vala:1273
+#: src/client/composer/composer-widget.vala:1266
 msgid "Send message with an empty subject and body?"
 msgstr "Enviar mensagem com o assunto e corpo vazio?"
 
-#: src/client/composer/composer-widget.vala:1275
+#: src/client/composer/composer-widget.vala:1268
 msgid "Send message with an empty subject?"
 msgstr "Enviar mensagem com o assunto vazio?"
 
-#: src/client/composer/composer-widget.vala:1277
+#: src/client/composer/composer-widget.vala:1270
 msgid "Send message with an empty body?"
 msgstr "Enviar mensagem com o corpo vazio?"
 
-#: src/client/composer/composer-widget.vala:1281
+#: src/client/composer/composer-widget.vala:1274
 msgid "Send message without an attachment?"
 msgstr "Enviar mensagem sem anexo?"
 
-#: src/client/composer/composer-widget.vala:1586
+#: src/client/composer/composer-widget.vala:1579
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "“%s” já foi anexado para envio."
@@ -1522,63 +1513,63 @@ msgstr "“%s” já foi anexado para envio."
 #. description of the document type, the second will
 #. be a human-friendly size string. For example:
 #. Document (100.9MB)
-#: src/client/composer/composer-widget.vala:1594
+#: src/client/composer/composer-widget.vala:1587
 #: src/client/conversation-viewer/conversation-email.vala:173
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: src/client/composer/composer-widget.vala:1631
+#: src/client/composer/composer-widget.vala:1624
 #, c-format
 msgid "“%s” could not be found."
 msgstr "“%s” não foi encontrado."
 
-#: src/client/composer/composer-widget.vala:1637
+#: src/client/composer/composer-widget.vala:1630
 #, c-format
 msgid "“%s” is a folder."
 msgstr "“%s” é uma pasta."
 
-#: src/client/composer/composer-widget.vala:1643
+#: src/client/composer/composer-widget.vala:1636
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "“%s” é um arquivo vazio."
 
-#: src/client/composer/composer-widget.vala:1656
+#: src/client/composer/composer-widget.vala:1649
 #, 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:1664
+#: src/client/composer/composer-widget.vala:1657
 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:1714
+#: src/client/composer/composer-widget.vala:1707
 #: src/client/conversation-viewer/conversation-email.vala:975
 #: src/engine/rfc822/rfc822-utils.vala:298 ui/conversation-message.ui:313
 msgid "To:"
 msgstr "Para:"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:1720
+#: src/client/composer/composer-widget.vala:1713
 #: src/client/conversation-viewer/conversation-email.vala:980
 #: src/engine/rfc822/rfc822-utils.vala:303 ui/conversation-message.ui:358
 msgid "Cc:"
 msgstr "Cc:"
 
 #. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:1726
+#: src/client/composer/composer-widget.vala:1719
 #: src/client/conversation-viewer/conversation-email.vala:985
 #: ui/conversation-message.ui:403
 msgid "Bcc:"
 msgstr "Cco:"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:1732
+#: src/client/composer/composer-widget.vala:1725
 msgid "Reply-To: "
 msgstr "Responder-a: "
 
-#: src/client/composer/composer-widget.vala:1872
+#: src/client/composer/composer-widget.vala:1865
 msgid "Select Color"
 msgstr "Selecione a cor"
 
@@ -1587,20 +1578,20 @@ 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:2062
+#: src/client/composer/composer-widget.vala:2055
 #, 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:2121
+#: src/client/composer/composer-widget.vala:2116
 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:2349
+#: src/client/composer/composer-widget.vala:2344
 msgid "Images"
 msgstr "Imagens"
 
@@ -1625,22 +1616,22 @@ msgid "Delete conversation"
 msgstr "Excluir conversa"
 
 #: src/client/conversation-list/conversation-list-view.vala:286
-#: ui/main-toolbar-menus.ui:16
+#: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "Marcar como l_ida"
 
 #: src/client/conversation-list/conversation-list-view.vala:289
-#: ui/main-toolbar-menus.ui:20
+#: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "Marcar como _não lida"
 
 #: src/client/conversation-list/conversation-list-view.vala:292
-#: ui/main-toolbar-menus.ui:28
+#: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "_Tirar estrela"
 
 #: src/client/conversation-list/conversation-list-view.vala:294
-#: ui/main-toolbar-menus.ui:24
+#: ui/main-toolbar-menus.ui:13
 msgid "_Star"
 msgstr "_Marcar estrela"
 
@@ -3107,22 +3098,16 @@ msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "Remove formatação"
 
-#: ui/gtk/menus.ui:13
-msgid "A_ccounts"
-msgstr "_Contas"
-
-#: ui/gtk/menus.ui:23
-msgid "_Keyboard Shortcuts"
-msgstr "Atalhos de _teclado"
+#: ui/main-toolbar.ui:23
+#| msgid "Compose Message"
+msgctxt "tooltip"
+msgid "Compose Message"
+msgstr "Escreve mensagem"
 
-#: ui/main-toolbar.ui:51
+#: ui/main-toolbar.ui:52
 msgid "Toggle search bar"
 msgstr "Ativa/desativa a barra de pesquisa"
 
-#: ui/main-toolbar.ui:72
-msgid "Empty Spam or Trash folders"
-msgstr "Esvazia as pastas de spam e lixeira"
-
 #: ui/main-toolbar.ui:112
 msgid "Reply"
 msgstr "Responde"
@@ -3143,21 +3128,35 @@ msgstr "Ativa/desativa a barra de busca"
 msgid "_Archive"
 msgstr "_Arquivar"
 
-#: ui/main-toolbar-menus.ui:5
+#: ui/main-toolbar-menus.ui:21
+msgid "Mark as S_pam"
+msgstr "Marcar como S_pam"
+
+#: ui/main-toolbar-menus.ui:25
+msgid "Mark as not S_pam"
+msgstr "Marcar como não S_pam"
+
+#: ui/main-toolbar-menus.ui:32
 msgid "Empty _Spam…"
 msgstr "Esvaziar _spam…"
 
-#: ui/main-toolbar-menus.ui:9
+#: ui/main-toolbar-menus.ui:36
 msgid "Empty _Trash…"
 msgstr "Esvaziar _lixeira…"
 
-#: ui/main-toolbar-menus.ui:32
-msgid "Mark as S_pam"
-msgstr "Marcar como S_pam"
+#: ui/main-toolbar-menus.ui:42
+#| msgid "Accounts"
+msgid "_Accounts"
+msgstr "Cont_as"
 
-#: ui/main-toolbar-menus.ui:36
-msgid "Mark as not S_pam"
-msgstr "Marcar como não S_pam"
+#: ui/main-toolbar-menus.ui:50
+msgid "_Keyboard Shortcuts"
+msgstr "Atalhos de _teclado"
+
+#: ui/main-toolbar-menus.ui:61
+#| msgid "_About"
+msgid "_About Geary"
+msgstr "_Sobre o Geary"
 
 #. Infobar title when one or more accounts are offline
 #: ui/main-window.ui:183
@@ -3352,6 +3351,30 @@ msgstr "Detalhes:"
 msgid "Geary update in progress…"
 msgstr "Atualização do Geary em progresso…"
 
+#~ msgid "Delete conversations (Shift+Delete)"
+#~ msgstr "Exclui as conversas (Shift+Delete)"
+
+#~ msgid "Move conversations to Trash (Delete, Backspace)"
+#~ msgstr "Move as conversas para a lixeira (Delete, Backspace)"
+
+#~ msgid "Archive conversations (A)"
+#~ msgstr "Arquiva as conversas (A)"
+
+#~ msgid "Mark conversations"
+#~ msgstr "Marca as conversas"
+
+#~ msgid "Add label to conversations"
+#~ msgstr "Adiciona marcador às conversas"
+
+#~ msgid "Move conversations"
+#~ msgstr "Move a conversas"
+
+#~ msgid "A_ccounts"
+#~ msgstr "_Contas"
+
+#~ msgid "Empty Spam or Trash folders"
+#~ msgstr "Esvazia as pastas de spam e lixeira"
+
 #~ msgid "Retry connecting now"
 #~ msgstr "Tentar conexão novamente agora"