diff --git a/po/pt_BR.po b/po/pt_BR.po
index 555a4f69..103f51bf 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,7 +10,7 @@
 # Guilherme Gondim <semente@taurinus.org>, 2013
 # José Agnaldo Jr. <agjunior.sd@gmail.com>, 2013
 # Translators (GNOME):
-# Enrico Nicoletto <liverig@gmail.com>, 2014, 2016.
+# Enrico Nicoletto <liverig@gmail.com>, 2014, 2016, 2019.
 # Freire de Almeida <laudivan@riseup.net>, 2016.
 # Ronan Arraes Jardim Chagas <ronisbr@gmail.com>, 2016.
 # Isaac Ferreira Filho <isaacmob@riseup.net>, 2018.
@@ -20,16 +20,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n"
-"POT-Creation-Date: 2019-07-17 09:05+0000\n"
-"PO-Revision-Date: 2019-07-18 10:56-0300\n"
-"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
+"POT-Creation-Date: 2019-08-28 09:14+0000\n"
+"PO-Revision-Date: 2019-08-28 16:05-0300\n"
+"Last-Translator: Enrico Nicoletto <enrico.nicoletto@src.gnome.org>\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.2.3\n"
 "X-Project-Style: gnome\n"
 
 #: desktop/geary-attach.contract.desktop.in:3
@@ -41,36 +41,37 @@ msgid "Send files using Geary"
 msgstr "Envia arquivos usando Geary"
 
 #. Translators: The application name
-#: desktop/geary-autostart.desktop.in:3
-#: desktop/org.gnome.Geary.appdata.xml.in:12
-#: desktop/org.gnome.Geary.desktop.in:3
+#: desktop/geary-autostart.desktop.in.in:3
+#: desktop/org.gnome.Geary.appdata.xml.in.in:12
+#: desktop/org.gnome.Geary.desktop.in.in:3
 #: src/client/accounts/accounts-editor-servers-pane.vala:555
 msgid "Geary"
 msgstr "Geary"
 
-#: desktop/geary-autostart.desktop.in:4 desktop/org.gnome.Geary.desktop.in:4
+#: desktop/geary-autostart.desktop.in.in:4
+#: desktop/org.gnome.Geary.desktop.in.in:4
 msgid "Email"
 msgstr "E-mail"
 
 #. Translators: The application's summary / tagline
-#: desktop/geary-autostart.desktop.in:5
-#: desktop/org.gnome.Geary.appdata.xml.in:16
-#: desktop/org.gnome.Geary.desktop.in:5
-#: src/client/application/geary-application.vala:24
+#: desktop/geary-autostart.desktop.in.in:5
+#: desktop/org.gnome.Geary.appdata.xml.in.in:16
+#: desktop/org.gnome.Geary.desktop.in.in:5
+#: src/client/application/geary-application.vala:29
 msgid "Send and receive email"
 msgstr "Envie e receba e-mail"
 
 #. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
-#: desktop/geary-autostart.desktop.in:7
+#: desktop/geary-autostart.desktop.in.in:7
 msgid "Email;E-mail;Mail;"
 msgstr "Email;E-mail;Mail;Correio eletrônico;e-mails;mensagens;"
 
 #. Translators: The development team's name
-#: desktop/org.gnome.Geary.appdata.xml.in:14
+#: desktop/org.gnome.Geary.appdata.xml.in.in:14
 msgid "Geary Development Team"
 msgstr "Equipe de Desenvolvimento do Geary"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:18
+#: desktop/org.gnome.Geary.appdata.xml.in.in:18
 msgid ""
 "Geary is an email application built around conversations, for the GNOME 3 "
 "desktop. It allows you to read, find and send email with a straightforward, "
@@ -80,7 +81,7 @@ msgstr ""
 "GNOME 3. Ele permite que você leia, localize e envie e-mail com uma "
 "interface simples e moderna."
 
-#: desktop/org.gnome.Geary.appdata.xml.in:23
+#: desktop/org.gnome.Geary.appdata.xml.in.in:23
 msgid ""
 "Conversations allow you to read a complete discussion without having to find "
 "and click from message to message."
@@ -88,51 +89,51 @@ msgstr ""
 "As conversas permitem que você leia uma discussão completa sem ter que "
 "procurar e clicar de mensagem em mensagem."
 
-#: desktop/org.gnome.Geary.appdata.xml.in:27
+#: desktop/org.gnome.Geary.appdata.xml.in.in:27
 msgid "Geary’s features include:"
 msgstr "Os recursos do Geary incluem:"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:29
+#: desktop/org.gnome.Geary.appdata.xml.in.in:29
 msgid "Quick email account setup"
 msgstr "Configuração rápida de conta de e-mail"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:30
+#: desktop/org.gnome.Geary.appdata.xml.in.in:30
 msgid "Shows related messages together in conversations"
 msgstr "Mostrar mensagens relacionadas juntas, nas conversas"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:31
+#: desktop/org.gnome.Geary.appdata.xml.in.in:31
 msgid "Fast, full text and keyword search"
 msgstr "Pesquisa rápida, de texto completo e de palavra-chave"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:32
+#: desktop/org.gnome.Geary.appdata.xml.in.in:32
 msgid "Full-featured HTML and plain text message composer"
 msgstr "Compositor repleto de recursos para mensagens em HTML e texto simples"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:33
+#: desktop/org.gnome.Geary.appdata.xml.in.in:33
 msgid "Desktop notification of new mail"
 msgstr "Notificação na área de trabalho de novo e-mail"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:34
+#: desktop/org.gnome.Geary.appdata.xml.in.in:34
 msgid "Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers"
 msgstr ""
 "Compatível com GMail, Yahoo! Mail, Outlook.com e outros servidores IMAP"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in:48
+#: desktop/org.gnome.Geary.appdata.xml.in.in:48
 msgid "Geary displaying a conversation"
 msgstr "Geary exibindo uma conversa"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in:59
+#: desktop/org.gnome.Geary.appdata.xml.in.in:59
 msgid "Geary showing the rich text composer"
 msgstr "Geary mostrando um compositor de texto rico"
 
 #. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
-#: desktop/org.gnome.Geary.desktop.in:7
+#: desktop/org.gnome.Geary.desktop.in.in:7
 msgid "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 msgstr "Correio;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 
-#: desktop/org.gnome.Geary.desktop.in:22
+#: desktop/org.gnome.Geary.desktop.in.in:22
 msgid "Compose Message"
 msgstr "Escrever mensagem"
 
@@ -335,7 +336,7 @@ msgstr ""
 #. Translators: In-app notification label, when
 #. the app had a problem pinning an otherwise
 #. untrusted TLS certificate
-#: src/client/accounts/accounts-editor.vala:203
+#: src/client/accounts/accounts-editor.vala:204
 msgid "Failed to store certificate"
 msgstr "Falha ao armazenar o certificado"
 
@@ -601,55 +602,55 @@ 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:243
-#: src/client/application/application-controller.vala:2407
+#: src/client/accounts/accounts-editor-list-pane.vala:247
+#: src/client/application/application-controller.vala:2392
 msgid "Undo"
 msgstr "Desfazer"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:251
+#: src/client/accounts/accounts-editor-list-pane.vala:255
 msgid "Redo"
 msgstr "Refazer"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:345
-#: src/client/accounts/accounts-editor-list-pane.vala:433
+#: src/client/accounts/accounts-editor-list-pane.vala:349
+#: src/client/accounts/accounts-editor-list-pane.vala:437
 #: src/client/accounts/accounts-editor-row.vala:279
 msgid "Gmail"
 msgstr "Gmail"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:349
-#: src/client/accounts/accounts-editor-list-pane.vala:437
+#: src/client/accounts/accounts-editor-list-pane.vala:353
+#: src/client/accounts/accounts-editor-list-pane.vala:441
 #: src/client/accounts/accounts-editor-row.vala:283
 msgid "Outlook.com"
 msgstr "Outlook.com"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:353
-#: src/client/accounts/accounts-editor-list-pane.vala:441
+#: src/client/accounts/accounts-editor-list-pane.vala:357
+#: src/client/accounts/accounts-editor-list-pane.vala:445
 #: src/client/accounts/accounts-editor-row.vala:287
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #. Translators: Tooltip for accounts that have been
 #. loaded but disabled by the user.
-#: src/client/accounts/accounts-editor-list-pane.vala:371
+#: src/client/accounts/accounts-editor-list-pane.vala:375
 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:380
+#: src/client/accounts/accounts-editor-list-pane.vala:384
 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:430
+#: src/client/accounts/accounts-editor-list-pane.vala:434
 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:547
+#: src/client/accounts/accounts-editor-list-pane.vala:551
 #, c-format
 msgid "Account “%s” removed"
 msgstr "Conta “%s” removida"
@@ -657,7 +658,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:554
+#: src/client/accounts/accounts-editor-list-pane.vala:558
 #, c-format
 msgid "Account “%s” restored"
 msgstr "Conta “%s” restaurada"
@@ -769,38 +770,38 @@ msgstr "%s usando OAuth2"
 
 #: src/client/accounts/accounts-editor-servers-pane.vala:960
 msgid "Use receiving server login"
-msgstr "usar login do servidor de recebimento"
+msgstr "Usar login do servidor de recebimento"
 
 #. Translators: File name used in save chooser when saving
 #. attachments that do not otherwise have a name.
-#: src/client/application/application-controller.vala:57
+#: src/client/application/application-controller.vala:59
 msgid "Untitled"
 msgstr "Sem_título"
 
 #. / Notification title.
-#: src/client/application/application-controller.vala:561
+#: src/client/application/application-controller.vala:551
 #, 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:565
+#: src/client/application/application-controller.vala:555
 msgid "Email will not be sent until re-connected"
 msgstr "O e-mail não será enviado até estar reconectado."
 
-#: src/client/application/application-controller.vala:901
+#: src/client/application/application-controller.vala:906
 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/application-controller.vala:914
+#: src/client/application/application-controller.vala:919
 #, 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:915
+#: src/client/application/application-controller.vala:920
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -825,20 +826,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:917
+#: src/client/application/application-controller.vala:922
 msgid "_Rebuild"
 msgstr "_Reconstruir"
 
-#: src/client/application/application-controller.vala:917
+#: src/client/application/application-controller.vala:922
 msgid "E_xit"
 msgstr "S_air"
 
-#: src/client/application/application-controller.vala:926
+#: src/client/application/application-controller.vala:931
 #, 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:927
+#: src/client/application/application-controller.vala:932
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -849,20 +850,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/client/application/application-controller.vala:1711
+#: src/client/application/application-controller.vala:1726
 #, c-format
-#| msgid "%d message"
-#| msgid_plural "%d messages"
 msgid "Moved %d message to %s"
 msgid_plural "Moved %d messages to %s"
 msgstr[0] "Movida %d mensagem para %s"
 msgstr[1] "Movidas %d mensagens para %s"
 
-#: src/client/application/application-controller.vala:1721
+#: src/client/application/application-controller.vala:1736
 msgid "Are you sure you want to open these attachments?"
 msgstr "Você tem certeza de que deseja abrir esses anexos?"
 
-#: src/client/application/application-controller.vala:1722
+#: src/client/application/application-controller.vala:1737
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -870,14 +869,14 @@ msgstr ""
 "Anexos podem causar danos ao seu sistema se abertos. Apenas abra arquivos de "
 "fontes confiáveis."
 
-#: src/client/application/application-controller.vala:1723
+#: src/client/application/application-controller.vala:1738
 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/application-controller.vala:1846
+#: src/client/application/application-controller.vala:1861
 #, 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?"
@@ -885,69 +884,59 @@ 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/application-controller.vala:1853
+#: src/client/application/application-controller.vala:1868
 #, 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/application-controller.vala:1857
+#: src/client/application/application-controller.vala:1872
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: src/client/application/application-controller.vala:2119
-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/application-controller.vala:2244
+#: src/client/application/application-controller.vala:2232
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "Esvaziar todos os e-mails de sua pasta %s?"
 
-#: src/client/application/application-controller.vala:2245
+#: src/client/application/application-controller.vala:2233
 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-controller.vala:2246
+#: src/client/application/application-controller.vala:2234
 msgid "This cannot be undone."
 msgstr "Isso não pode ser desfeito."
 
-#: src/client/application/application-controller.vala:2247
+#: src/client/application/application-controller.vala:2235
 #, c-format
 msgid "Empty %s"
 msgstr "Esvaziar %s"
 
-#: src/client/application/application-controller.vala:2264
+#: src/client/application/application-controller.vala:2252
 #, c-format
 msgid "Error emptying %s"
 msgstr "Erro ao esvaziar %s"
 
-#: src/client/application/application-controller.vala:2295
+#: src/client/application/application-controller.vala:2283
 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-controller.vala:2297
+#: src/client/application/application-controller.vala:2285
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/client/application/application-controller.vala:2311
+#: src/client/application/application-controller.vala:2299
 #, c-format
-#| msgid "%d message"
-#| msgid_plural "%d messages"
 msgid "Trashed %d message"
 msgid_plural "Trashed %d messages"
 msgstr[0] "Descartada %d mensagem"
 msgstr[1] "Descartadas %d mensagens"
 
-#: src/client/application/application-controller.vala:2361
+#: src/client/application/application-controller.vala:2346
 #, c-format
-#| msgid "%d message"
-#| msgid_plural "%d messages"
 msgid "Archived %d message"
 msgid_plural "Archived %d messages"
 msgstr[0] "Arquivada %d mensagem"
@@ -955,160 +944,150 @@ msgstr[1] "Arquivadas %d mensagens"
 
 #. 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:2489
+#: src/client/application/application-controller.vala:2474
 #, c-format
 msgid "Successfully sent mail to %s."
 msgstr "E-mail enviado com sucesso para %s."
 
-#: src/client/application/application-controller.vala:2567
+#: src/client/application/application-controller.vala:2552
 msgid "Failed to open default text editor."
 msgstr "Falha ao abrir o editor de texto padrão."
 
-#: src/client/application/geary-application.vala:25
+#: src/client/application/geary-application.vala:30
 msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
-#: src/client/application/geary-application.vala:26
+#: src/client/application/geary-application.vala:31
 msgid "Copyright 2016-2019 Geary Development Team."
 msgstr "Copyright 2016-2019 Geary Development Team."
 
-#: src/client/application/geary-application.vala:28
+#: src/client/application/geary-application.vala:33
 msgid "Visit the Geary web site"
 msgstr "Visite o website do Geary"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:104
+#: src/client/application/geary-application.vala:108
 msgid "Print debug logging"
 msgstr "Emite log de depuração"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:107
+#: src/client/application/geary-application.vala:111
 msgid "Start with the main window hidden (deprecated)"
 msgstr "Inicia com a janela principal oculta (obsoleto)"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:110
+#: src/client/application/geary-application.vala:114
 msgid "Enable WebKitGTK Inspector in web views"
 msgstr "Habilita Inspetor WebKitGTK em exibições web"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:113
+#: src/client/application/geary-application.vala:117
 msgid "Log conversation monitoring"
 msgstr "Registra monitoramento de conversa"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:116
+#: src/client/application/geary-application.vala:120
 msgid "Log IMAP network deserialization"
 msgstr "Registra desserialização de rede IMAP"
 
 #. / Command line option. "Normalization" can also be called
 #. / "synchronization".
-#: src/client/application/geary-application.vala:120
+#: src/client/application/geary-application.vala:124
 msgid "Log folder normalization"
 msgstr "Registra normalização de pasta"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:123
+#: src/client/application/geary-application.vala:127
 msgid "Log network activity"
 msgstr "Registra atividade de rede"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:126
+#: src/client/application/geary-application.vala:130
 msgid "Log periodic activity"
 msgstr "Registra atividade periódica"
 
 #. / Command line option. The IMAP replay queue is how changes
 #. / on the server are replicated on the client.  It could
 #. / also be called the IMAP events queue.
-#: src/client/application/geary-application.vala:131
+#: src/client/application/geary-application.vala:135
 msgid "Log IMAP replay queue"
 msgstr "Registra lista de repetição do IMAP"
 
 #. / Command line option. Serialization is how commands and
 #. / responses are converted into a stream of bytes for
 #. / network transmission
-#: src/client/application/geary-application.vala:136
+#: src/client/application/geary-application.vala:140
 msgid "Log IMAP network serialization"
 msgstr "Registra serialização de rede IMAP"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:139
+#: src/client/application/geary-application.vala:143
 msgid "Log database queries (generates lots of messages)"
 msgstr "Registra consultas ao banco de dados (gera muitas mensagens)"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:142
+#: src/client/application/geary-application.vala:146
 msgid "Perform a graceful quit"
 msgstr "Realiza uma saída graciosa"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:145
+#: src/client/application/geary-application.vala:149
 msgid "Revoke all pinned TLS server certificates"
 msgstr "Revoga todos os certificados de servidor TLS fixados"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:148
+#: src/client/application/geary-application.vala:152
 msgid "Display program version"
 msgstr "Mostra versão do programa"
 
-#. Use this to specify arguments in the help section
-#. / Command line option
-#: src/client/application/geary-application.vala:152
-msgid "Display program version and revision id"
-msgstr "Mostra versão do programa e id de revisão"
-
 #. / Application runtime information label
 #: src/client/application/geary-application.vala:279
 msgid "Geary version"
 msgstr "Versão do Geary"
 
-#: src/client/application/geary-application.vala:280
-msgid "Geary revision"
-msgstr "Revisão do Geary"
-
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:282
+#: src/client/application/geary-application.vala:281
 msgid "GTK version"
 msgstr "Versão do GTK"
 
 #. / Applciation runtime information label
-#: src/client/application/geary-application.vala:289
+#: src/client/application/geary-application.vala:288
 msgid "GLib version"
 msgstr "Versão do GLib"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:296
+#: src/client/application/geary-application.vala:295
 msgid "WebKitGTK version"
 msgstr "Versão do WebKitGTK"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:303
+#: src/client/application/geary-application.vala:302
 msgid "Desktop environment"
 msgstr "Ambiente"
 
 #. Translators: This is the file type displayed for
 #. attachments with unknown file types.
-#: src/client/application/geary-application.vala:305
+#: src/client/application/geary-application.vala:304
 #: src/client/conversation-viewer/conversation-email.vala:159
 msgid "Unknown"
 msgstr "Desconhecido"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:335
+#: src/client/application/geary-application.vala:334
 msgid "Distribution name"
 msgstr "Nome da distribuição"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:340
+#: src/client/application/geary-application.vala:339
 msgid "Distribution release"
 msgstr "Lançamento da distribuição"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:348
+#: src/client/application/geary-application.vala:347
 msgid "Installation prefix"
 msgstr "Prefixo de lançamento"
 
-#: src/client/application/geary-application.vala:513
+#: src/client/application/geary-application.vala:487
 #, c-format
 msgid "About %s"
 msgstr "Sobre %s"
@@ -1116,7 +1095,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:517
+#: src/client/application/geary-application.vala:491
 msgid "translator-credits"
 msgstr ""
 "Leonardo Lemos <leonardolemos@live.com>\n"
@@ -1127,13 +1106,13 @@ msgstr ""
 
 #. / Warning printed to the console when a deprecated
 #. / command line option is used.
-#: src/client/application/geary-application.vala:790
+#: src/client/application/geary-application.vala:774
 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/geary-application.vala:822
+#: src/client/application/geary-application.vala:806
 #, c-format
 msgid "Unrecognised program argument: “%s”"
 msgstr "Argumento do programa não reconhecida “%s”"
@@ -1198,43 +1177,43 @@ 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:134
+#: src/client/components/main-toolbar.vala:139
 msgid "Mark conversation"
 msgid_plural "Mark conversations"
 msgstr[0] "Marca a conversa"
 msgstr[1] "Marca as conversas"
 
-#: src/client/components/main-toolbar.vala:139
+#: src/client/components/main-toolbar.vala:144
 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:144
+#: src/client/components/main-toolbar.vala:149
 msgid "Move conversation"
 msgid_plural "Move conversations"
 msgstr[0] "Move a conversa"
 msgstr[1] "Move as conversas"
 
-#: src/client/components/main-toolbar.vala:149
-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:154
+msgid "Archive conversation"
+msgid_plural "Archive conversations"
+msgstr[0] "Arquivar a conversa"
+msgstr[1] "Arquivar as conversas"
 
-#: src/client/components/main-toolbar.vala:158
-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:163
+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:166
-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-toolbar.vala:171
+msgid "Delete conversation"
+msgid_plural "Delete conversations"
+msgstr[0] "Excluir conversa"
+msgstr[1] "Excluir conversas"
 
-#: src/client/components/main-window.vala:705
+#: src/client/components/main-window.vala:738
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -1249,7 +1228,6 @@ msgstr "Problema na conta"
 #. problem. String substitution is the account name.
 #: src/client/components/main-window-info-bar.vala:48
 #, c-format
-#| msgid "Geary has encountered a problem"
 msgid "Geary has encountered a problem with %s."
 msgstr "Geary encontrou um problema com %s."
 
@@ -1258,7 +1236,6 @@ msgstr "Geary encontrou um problema com %s."
 #. account name.
 #: src/client/components/main-window-info-bar.vala:61
 #, c-format
-#| msgid "Geary encountered a problem connecting to an account."
 msgid "Geary encountered a problem checking mail for %s."
 msgstr "Geary encontrou um problema ao verificar e-mails para %s."
 
@@ -1272,7 +1249,6 @@ msgstr "Tentar reconexão"
 #. account name
 #: src/client/components/main-window-info-bar.vala:73
 #, c-format
-#| msgid "Geary encountered a problem connecting to an account."
 msgid "Geary encountered a problem sending email for %s."
 msgstr "Geary encontrou um problema ao enviar e-mail para %s."
 
@@ -1290,8 +1266,6 @@ msgstr "Geary encontrou um problema"
 #. Translators: Info bar sub-title for a generic
 #. application problem.
 #: src/client/components/main-window-info-bar.vala:88
-#| msgid ""
-#| "Please check the technical details and report the problem if it persists."
 msgid "Please report the details if it persists."
 msgstr "Por favor, relate os detalhes se persistir."
 
@@ -1451,34 +1425,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:1146
+#: src/client/composer/composer-widget.vala:1181
 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:1176
+#: src/client/composer/composer-widget.vala:1211
 msgid "Do you want to discard this draft message?"
 msgstr "Você deseja descartar esta mensagem de rascunho?"
 
-#: src/client/composer/composer-widget.vala:1295
+#: src/client/composer/composer-widget.vala:1330
 msgid "Send message with an empty subject and body?"
 msgstr "Enviar mensagem com o assunto e corpo vazio?"
 
-#: src/client/composer/composer-widget.vala:1297
+#: src/client/composer/composer-widget.vala:1332
 msgid "Send message with an empty subject?"
 msgstr "Enviar mensagem com o assunto vazio?"
 
-#: src/client/composer/composer-widget.vala:1299
+#: src/client/composer/composer-widget.vala:1334
 msgid "Send message with an empty body?"
 msgstr "Enviar mensagem com o corpo vazio?"
 
-#: src/client/composer/composer-widget.vala:1303
+#: src/client/composer/composer-widget.vala:1338
 msgid "Send message without an attachment?"
 msgstr "Enviar mensagem sem anexo?"
 
-#: src/client/composer/composer-widget.vala:1608
+#: src/client/composer/composer-widget.vala:1652
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "“%s” já foi anexado para envio."
@@ -1488,63 +1462,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:1616
+#: src/client/composer/composer-widget.vala:1660
 #: src/client/conversation-viewer/conversation-email.vala:173
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: src/client/composer/composer-widget.vala:1653
+#: src/client/composer/composer-widget.vala:1697
 #, c-format
 msgid "“%s” could not be found."
 msgstr "“%s” não foi encontrado."
 
-#: src/client/composer/composer-widget.vala:1659
+#: src/client/composer/composer-widget.vala:1703
 #, c-format
 msgid "“%s” is a folder."
 msgstr "“%s” é uma pasta."
 
-#: src/client/composer/composer-widget.vala:1665
+#: src/client/composer/composer-widget.vala:1709
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "“%s” é um arquivo vazio."
 
-#: src/client/composer/composer-widget.vala:1678
+#: src/client/composer/composer-widget.vala:1722
 #, 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:1686
+#: src/client/composer/composer-widget.vala:1730
 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:1736
+#: src/client/composer/composer-widget.vala:1787
 #: src/client/conversation-viewer/conversation-email.vala:976
 #: src/client/util/util-email.vala:216 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:1742
+#: src/client/composer/composer-widget.vala:1793
 #: src/client/conversation-viewer/conversation-email.vala:981
 #: src/client/util/util-email.vala:221 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:1748
+#: src/client/composer/composer-widget.vala:1799
 #: src/client/conversation-viewer/conversation-email.vala:986
 #: 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:1754
+#: src/client/composer/composer-widget.vala:1805
 msgid "Reply-To: "
 msgstr "Responder-a: "
 
-#: src/client/composer/composer-widget.vala:1894
+#: src/client/composer/composer-widget.vala:1945
 msgid "Select Color"
 msgstr "Selecione a cor"
 
@@ -1553,20 +1527,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:2086
+#: src/client/composer/composer-widget.vala:2137
 #, 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:2141
+#: src/client/composer/composer-widget.vala:2192
 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:2421
+#: src/client/composer/composer-widget.vala:2472
 msgid "Images"
 msgstr "Imagens"
 
@@ -1586,42 +1560,52 @@ msgstr "Adicionar esse idioma à lista de preferência"
 msgid "Search for more languages"
 msgstr "Procurar por mais idiomas"
 
-#: src/client/conversation-list/conversation-list-view.vala:289
-msgid "Delete conversation"
-msgstr "Excluir conversa"
+#. / Translators: Context menu item
+#: src/client/conversation-list/conversation-list-view.vala:337
+msgid "Move conversation to _Trash"
+msgid_plural "Move conversations to _Trash"
+msgstr[0] "Mover a conversa para a Li_xeira"
+msgstr[1] "Mover as conversas para a Li_xeira"
 
-#: src/client/conversation-list/conversation-list-view.vala:292
+#. / Translators: Context menu item
+#: src/client/conversation-list/conversation-list-view.vala:347
+msgid "_Delete conversation"
+msgid_plural "_Delete conversations"
+msgstr[0] "_Excluir conversa"
+msgstr[1] "_Excluir conversas"
+
+#: src/client/conversation-list/conversation-list-view.vala:356
 #: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "Marcar como l_ida"
 
-#: src/client/conversation-list/conversation-list-view.vala:295
+#: src/client/conversation-list/conversation-list-view.vala:359
 #: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "Marcar como _não lida"
 
-#: src/client/conversation-list/conversation-list-view.vala:298
+#: src/client/conversation-list/conversation-list-view.vala:362
 #: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "_Tirar estrela"
 
-#: src/client/conversation-list/conversation-list-view.vala:300
+#: src/client/conversation-list/conversation-list-view.vala:364
 #: ui/main-toolbar-menus.ui:13
 msgid "_Star"
 msgstr "_Marcar estrela"
 
 #. Translators: Menu item to reply to a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:303
+#: src/client/conversation-list/conversation-list-view.vala:367
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "_Responder"
 
-#: src/client/conversation-list/conversation-list-view.vala:304
+#: src/client/conversation-list/conversation-list-view.vala:368
 msgid "R_eply All"
 msgstr "R_esponder todos"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:305
+#: src/client/conversation-list/conversation-list-view.vala:369
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "_Encaminhar"
@@ -1656,44 +1640,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:445
+#: src/client/conversation-viewer/conversation-message.vala:447
 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:838
+#: src/client/conversation-viewer/conversation-message.vala:840
 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:955
+#: src/client/conversation-viewer/conversation-message.vala:960
 msgid "Image"
 msgstr "Imagem"
 
 #. Translators: Title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:81
+#: src/client/conversation-viewer/conversation-viewer.vala:82
 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:85
+#: src/client/conversation-viewer/conversation-viewer.vala:86
 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:94
+#: src/client/conversation-viewer/conversation-viewer.vala:95
 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:98
+#: src/client/conversation-viewer/conversation-viewer.vala:99
 msgid "Choosing an action will apply to all selected conversations"
 msgstr "A escolha de uma ação será aplicada a todas as conversas selecionadas"
 
@@ -1701,20 +1685,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:107
-#: src/client/conversation-viewer/conversation-viewer.vala:120
+#: src/client/conversation-viewer/conversation-viewer.vala:108
+#: src/client/conversation-viewer/conversation-viewer.vala:121
 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:111
+#: src/client/conversation-viewer/conversation-viewer.vala:112
 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:124
+#: src/client/conversation-viewer/conversation-viewer.vala:125
 msgid "Your search returned no results, try refining your search terms"
 msgstr "Sua busca não retornou resultado, tente refinar os termos da pesquisa"
 
@@ -1977,7 +1961,7 @@ 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:862
+#: src/client/util/util-email.vala:38 src/engine/rfc822/rfc822-message.vala:948
 msgid "(no subject)"
 msgstr "(sem assunto)"
 
@@ -2103,7 +2087,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/imap-db-account.vala:117
+#: src/engine/imap-db/search/imap-db-search-query.vala:73
 msgctxt "Search operator"
 msgid "attachment"
 msgstr "anexo"
@@ -2116,7 +2100,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/imap-db-account.vala:126
+#: src/engine/imap-db/search/imap-db-search-query.vala:82
 msgctxt "Search operator"
 msgid "bcc"
 msgstr "cco"
@@ -2128,7 +2112,7 @@ msgstr "cco"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:134
+#: src/engine/imap-db/search/imap-db-search-query.vala:90
 msgctxt "Search operator"
 msgid "body"
 msgstr "corpo"
@@ -2141,7 +2125,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/imap-db-account.vala:143
+#: src/engine/imap-db/search/imap-db-search-query.vala:99
 msgctxt "Search operator"
 msgid "cc"
 msgstr "cc"
@@ -2154,7 +2138,7 @@ msgstr "cc"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:152
+#: src/engine/imap-db/search/imap-db-search-query.vala:108
 msgctxt "Search operator"
 msgid "from"
 msgstr "de"
@@ -2166,7 +2150,7 @@ msgstr "de"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:160
+#: src/engine/imap-db/search/imap-db-search-query.vala:116
 msgctxt "Search operator"
 msgid "is"
 msgstr "está"
@@ -2178,7 +2162,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/imap-db-account.vala:168
+#: src/engine/imap-db/search/imap-db-search-query.vala:124
 msgctxt "Search operator"
 msgid "subject"
 msgstr "assunto"
@@ -2191,7 +2175,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/imap-db-account.vala:177
+#: src/engine/imap-db/search/imap-db-search-query.vala:133
 msgctxt "Search operator"
 msgid "to"
 msgstr "para"
@@ -2204,7 +2188,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/imap-db-account.vala:198
+#: src/engine/imap-db/search/imap-db-search-query.vala:154
 msgctxt "Search operator value - mail addressed to the user"
 msgid "me"
 msgstr "eu"
@@ -2216,7 +2200,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/imap-db-account.vala:210
+#: src/engine/imap-db/search/imap-db-search-query.vala:166
 msgctxt "Search operator value - mail sent by the user"
 msgid "me"
 msgstr "eu"
@@ -2228,7 +2212,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/imap-db-account.vala:222
+#: src/engine/imap-db/search/imap-db-search-query.vala:178
 msgctxt "'is:' search operator value"
 msgid "read"
 msgstr "lida"
@@ -2241,7 +2225,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/imap-db-account.vala:233
+#: src/engine/imap-db/search/imap-db-search-query.vala:189
 msgctxt "'is:' search operator value"
 msgid "starred"
 msgstr "com-estrela"
@@ -2253,7 +2237,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/imap-db-account.vala:243
+#: src/engine/imap-db/search/imap-db-search-query.vala:199
 msgctxt "'is:' search operator value"
 msgid "unread"
 msgstr "não-lida"
@@ -2262,7 +2246,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:949
+#: src/engine/imap-engine/imap-engine-generic-account.vala:953
 msgid "Drafts | Draft"
 msgstr "Rascunhos | Rascunho"
 
@@ -2270,13 +2254,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:958
+#: src/engine/imap-engine/imap-engine-generic-account.vala:962
 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:963
+#: src/engine/imap-engine/imap-engine-generic-account.vala:967
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Itens enviados"
@@ -2285,7 +2269,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:973
+#: src/engine/imap-engine/imap-engine-generic-account.vala:977
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2295,13 +2279,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:983
+#: src/engine/imap-engine/imap-engine-generic-account.vala:987
 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:988
+#: src/engine/imap-engine/imap-engine-generic-account.vala:992
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Itens excluídos"
@@ -2310,13 +2294,13 @@ 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:998
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1002
 msgid "Archive | Archives"
 msgstr ""
 "Arquivo | Arquivos | Arquivado | Arquivados | Arquivamento | Archive | "
 "Archives"
 
-#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:127
+#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:126
 msgid "Add an account"
 msgstr "Adicionar uma conta"
 
@@ -2370,11 +2354,11 @@ msgstr "Remove esta conta do Geary"
 msgid "Accounts"
 msgstr "Contas"
 
-#: ui/accounts_editor_list_pane.ui:63
+#: ui/accounts_editor_list_pane.ui:62
 msgid "To get started, select an email provider below."
 msgstr "Para começar, selecione um provedor de e-mail abaixo."
 
-#: ui/accounts_editor_list_pane.ui:76
+#: ui/accounts_editor_list_pane.ui:75
 msgid "Welcome to Geary"
 msgstr "Seja bem-vindo ao Geary"
 
@@ -2628,11 +2612,6 @@ msgid "Select spell checking languages"
 msgstr "Seleciona idiomas para verificação ortográfica"
 
 #: ui/components-inspector-error-view.ui:33
-#| msgid ""
-#| "If the problem is serious or persists, please copy and send these details "
-#| "to the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\">mailing "
-#| "list</a> or file a <a href=\"https://wiki.gnome.org/Apps/Geary/"
-#| "ReportingABug\">new bug report</a>."
 msgid ""
 "If the problem is serious or persists, please save and send these details to "
 "the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\">mailing list</a> "
@@ -2664,7 +2643,6 @@ msgstr "Ativa acrescentar novas entradas de log"
 #. Tooltip for inspector button
 #. Tooltip for problem report button
 #: ui/components-inspector.ui:37 ui/problem-details-dialog.ui:19
-#| msgid "Search fo matching log entries"
 msgid "Search for matching log entries"
 msgstr "Pesquisa por entradas de log correspondentes"
 
@@ -2677,7 +2655,6 @@ msgstr "Salva entradas e detalhes de logs"
 #. Tooltip for inspector button
 #. Tooltip for problem report button
 #: ui/components-inspector.ui:84 ui/problem-details-dialog.ui:62
-#| msgid "Copy to Clipboard"
 msgid "Copy to clipboard"
 msgstr "Copia para área de transferência"
 
@@ -2797,15 +2774,15 @@ msgid "Mark Unread From _Here"
 msgstr "Marcar como não lida a partir _daqui"
 
 #. Translators: Menu item to move a single, specific message
-#. to the trash
+#. to the trash folder
 #: ui/conversation-email-menus.ui:50
-msgid "_Trash"
-msgstr "Li_xeira"
+msgid "Move message to _Trash"
+msgstr "Mover mensagem para a Li_xeira"
 
 #. Translators: Menu item to delete a single, specific message
 #: ui/conversation-email-menus.ui:57
-msgid "_Delete…"
-msgstr "E_xcluir…"
+msgid "_Delete message…"
+msgstr "E_xcluir mensagens…"
 
 #. Translators: Menu item to view the source for a message
 #: ui/conversation-email-menus.ui:69
@@ -2938,235 +2915,290 @@ msgstr "marcador"
 msgid "Conversation Shortcuts"
 msgstr "Atalhos da conversa"
 
-#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:254
-msgctxt "shortcut window"
-msgid "General"
-msgstr "Geral"
-
-#: ui/gtk/help-overlay.ui:17
-msgctxt "shortcut window"
-msgid "Move focus to the next/previous pane"
-msgstr "Move o foco para o painel próximo/anterior"
-
-#: ui/gtk/help-overlay.ui:24
-msgctxt "shortcut window"
-msgid "Move focus to conversation list"
-msgstr "Move o foco para a lista de conversas"
-
-#: ui/gtk/help-overlay.ui:31
-msgctxt "shortcut window"
-msgid "Detach composer window"
-msgstr "Destaca a janela do compositor"
-
-#: ui/gtk/help-overlay.ui:38
-msgctxt "shortcut window"
-msgid "Close composer window"
-msgstr "Fecha a janela do compositor"
-
-#: ui/gtk/help-overlay.ui:45
-msgctxt "shortcut window"
-msgid "Show keyboard shortcuts"
-msgstr "Mostra os atalhos do teclado"
-
-#: ui/gtk/help-overlay.ui:52
-msgctxt "shortcut window"
-msgid "Show help"
-msgstr "Mostra ajuda"
-
-#: ui/gtk/help-overlay.ui:59
-msgctxt "shortcut window"
-msgid "Quit the application"
-msgstr "Sai do aplicativo"
-
-#: ui/gtk/help-overlay.ui:68
-msgctxt "shortcut window"
-msgid "Search"
-msgstr "Pesquisa"
-
-#: ui/gtk/help-overlay.ui:72
-msgctxt "shortcut window"
-msgid "Jump to search box"
-msgstr "Vai para o campo de pesquisa"
-
-#: ui/gtk/help-overlay.ui:79
-msgctxt "shortcut window"
-msgid "Find in current conversation"
-msgstr "Pesquisa na conversa atual"
-
-#: ui/gtk/help-overlay.ui:86
-msgctxt "shortcut window"
-msgid "Find next/previous in current conversation"
-msgstr "Pesquisa próximo/anterior na conversa atual"
-
-#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:274
+#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:347
 msgctxt "shortcut window"
 msgid "Actions"
 msgstr "Ações"
 
-#: ui/gtk/help-overlay.ui:99
+#: ui/gtk/help-overlay.ui:17
 msgctxt "shortcut window"
-msgid "Compose a new message"
-msgstr "Escreve uma nova mensagem"
+msgid "New conversation"
+msgstr "Nova conversa"
 
-#: ui/gtk/help-overlay.ui:106
+#: ui/gtk/help-overlay.ui:24
 msgctxt "shortcut window"
-msgid "Reply to sender "
-msgstr "Responde para o remetente "
+msgid "Reply to sender"
+msgstr "Responder para o remetente"
 
-#: ui/gtk/help-overlay.ui:113
+#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:282
 msgctxt "shortcut window"
 msgid "Reply to all"
 msgstr "Responde para todos"
 
-#: ui/gtk/help-overlay.ui:120
+#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:289
 msgctxt "shortcut window"
 msgid "Forward"
 msgstr "Encaminha"
 
-#: ui/gtk/help-overlay.ui:127
+#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:296
 msgctxt "shortcut window"
-msgid "Archive"
-msgstr "Arquiva"
+msgid "Un-mark/mark read"
+msgstr "Marcar/desmarcar como lida"
 
-#: ui/gtk/help-overlay.ui:134
+#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:303
 msgctxt "shortcut window"
-msgid "Move to trash"
-msgstr "Move para a lixeira"
+msgid "Mark/un-mark starred"
+msgstr "Marcar/desmarcar com estrela"
+
+#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:310
+msgctxt "shortcut window"
+msgid "Archive conversation"
+msgstr "Arquivar a conversa"
+
+#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:317
+msgctxt "shortcut window"
+msgid "Move conversation"
+msgstr "Mover conversa"
+
+#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:324
+msgctxt "shortcut window"
+msgid "Label conversation"
+msgstr "Rotular conversa"
+
+#: ui/gtk/help-overlay.ui:80
+msgctxt "shortcut window"
+msgid "Trash conversation"
+msgstr "Mover conversa para a lixeira"
+
+#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:331
+msgctxt "shortcut window"
+msgid "Move to Spam"
+msgstr "Mover para Spam"
+
+#: ui/gtk/help-overlay.ui:95
+msgctxt "shortcut window"
+msgid "Delete conversation"
+msgstr "Excluir conversa"
+
+#: ui/gtk/help-overlay.ui:104
+msgctxt "shortcut window"
+msgid "Search"
+msgstr "Pesquisa"
+
+#: ui/gtk/help-overlay.ui:108
+msgctxt "shortcut window"
+msgid "Search for conversations"
+msgstr "Pesquisar conversas"
+
+#: ui/gtk/help-overlay.ui:115
+msgctxt "shortcut window"
+msgid "Find in current conversation"
+msgstr "Pesquisa na conversa atual"
 
 #: ui/gtk/help-overlay.ui:141
 msgctxt "shortcut window"
-msgid "Toggle spam"
-msgstr "Marca/desmarca como spam"
+msgid "Undo"
+msgstr "Desfazer"
 
-#: ui/gtk/help-overlay.ui:148
+#: ui/gtk/help-overlay.ui:145
 msgctxt "shortcut window"
-msgid "Move the conversation"
-msgstr "Move a conversa"
+msgid "Undo the last action"
+msgstr "Desfazer a última ação"
 
-#: ui/gtk/help-overlay.ui:155
+#: ui/gtk/help-overlay.ui:152
 msgctxt "shortcut window"
-msgid "Label the conversation"
-msgstr "Rotula a conversa"
+msgid "Redo the last action"
+msgstr "Refazer a última ação"
 
-#: ui/gtk/help-overlay.ui:163
-msgctxt "shortcut window"
-msgid "Mark read"
-msgstr "Marca como lida"
-
-#: ui/gtk/help-overlay.ui:170
-msgctxt "shortcut window"
-msgid "Mark unread"
-msgstr "Marca como não lida"
-
-#: ui/gtk/help-overlay.ui:179
+#: ui/gtk/help-overlay.ui:161
 msgctxt "shortcut window"
 msgid "View"
 msgstr "Visão"
 
-#: ui/gtk/help-overlay.ui:183
+#: ui/gtk/help-overlay.ui:165
 msgctxt "shortcut window"
 msgid "Zoom in"
 msgstr "Amplia"
 
-#: ui/gtk/help-overlay.ui:190
+#: ui/gtk/help-overlay.ui:172
 msgctxt "shortcut window"
 msgid "Zoom out"
 msgstr "Reduz"
 
-#: ui/gtk/help-overlay.ui:197
+#: ui/gtk/help-overlay.ui:179
 msgctxt "shortcut window"
 msgid "Reset zoom"
 msgstr "Redefine ampliação"
 
+#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:367
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Geral"
+
+#: ui/gtk/help-overlay.ui:192
+msgctxt "shortcut window"
+msgid "Show help"
+msgstr "Mostra ajuda"
+
+#: ui/gtk/help-overlay.ui:199
+msgctxt "shortcut window"
+msgid "Show keyboard shortcuts"
+msgstr "Mostra os atalhos do teclado"
+
 #: ui/gtk/help-overlay.ui:206
 msgctxt "shortcut window"
-msgid "Additional Shortcuts"
-msgstr "Atalhos adicionais"
+msgid "Close current window"
+msgstr "Fechar a janela atual"
 
-#: ui/gtk/help-overlay.ui:210
+#: ui/gtk/help-overlay.ui:213
 msgctxt "shortcut window"
-msgid "Star"
-msgstr "Marca estrela"
+msgid "Quit the application"
+msgstr "Sai do aplicativo"
 
-#: ui/gtk/help-overlay.ui:217
+#: ui/gtk/help-overlay.ui:222
 msgctxt "shortcut window"
-msgid "Unstar"
-msgstr "Remove estrela"
+msgid "Keyboard navigation"
+msgstr "Navegação por teclado"
 
-#: ui/gtk/help-overlay.ui:224
+#: ui/gtk/help-overlay.ui:226
 msgctxt "shortcut window"
-msgid "Delete"
-msgstr "Exclui"
+msgid "Focus the next pane"
+msgstr "Mover foco para o próximo painel"
 
-#: ui/gtk/help-overlay.ui:231
+#: ui/gtk/help-overlay.ui:233
 msgctxt "shortcut window"
-msgid "Jump to next (older) conversation"
-msgstr "Vai para a próxima conversa (mais antiga)"
+msgid "Focus the previous pane"
+msgstr "Mover foco para o painel anterior"
 
-#: ui/gtk/help-overlay.ui:238
+#: ui/gtk/help-overlay.ui:240
 msgctxt "shortcut window"
-msgid "Jump to previous (newer) conversation"
-msgstr "Vai para a conversa anterior (mais nova)"
+msgid "Focus the conversation list"
+msgstr "Mover foco para a lista de conversas"
 
-#: ui/gtk/help-overlay.ui:250
+#: ui/gtk/help-overlay.ui:247
+msgctxt "shortcut window"
+msgid "Select the conversation down"
+msgstr "Selecionar a conversa posterior"
+
+#: ui/gtk/help-overlay.ui:254
+msgctxt "shortcut window"
+msgid "Select the conversation up"
+msgstr "Selecionar a conversa anterior"
+
+#: ui/gtk/help-overlay.ui:261
+msgctxt "shortcut window"
+msgid "Focus next/previous message"
+msgstr "Mover foco para a mensagem anterior ou próxima"
+
+#: ui/gtk/help-overlay.ui:271
+msgctxt "shortcut window"
+msgid "Single-key shortcuts"
+msgstr "Atalhos de tecla única"
+
+#: ui/gtk/help-overlay.ui:275
+msgctxt "shortcut window"
+msgid "Reply to sender "
+msgstr "Responde para o remetente "
+
+#: ui/gtk/help-overlay.ui:343
 msgid "Composer Shortcuts"
 msgstr "Atalhos do redator"
 
-#: ui/gtk/help-overlay.ui:258
-msgctxt "shortcut window"
-msgid "Quote text"
-msgstr "Texto citado"
-
-#: ui/gtk/help-overlay.ui:265
-msgctxt "shortcut window"
-msgid "Unquote text"
-msgstr "Texto não-citado"
-
-#: ui/gtk/help-overlay.ui:278
+#: ui/gtk/help-overlay.ui:351
 msgctxt "shortcut window"
 msgid "Send"
 msgstr "Envia"
 
-#: ui/gtk/help-overlay.ui:285
+#: ui/gtk/help-overlay.ui:358
 msgctxt "shortcut window"
 msgid "Add attachment"
 msgstr "Adiciona anexo"
 
-#: ui/gtk/help-overlay.ui:294
+#: ui/gtk/help-overlay.ui:371
 msgctxt "shortcut window"
-msgid "Rich text mode"
-msgstr "Modo de texto rico"
+msgid "Close composer window"
+msgstr "Fecha a janela do compositor"
 
-#: ui/gtk/help-overlay.ui:298
+#: ui/gtk/help-overlay.ui:378
+msgctxt "shortcut window"
+msgid "Detach composer window"
+msgstr "Destaca a janela do compositor"
+
+#: ui/gtk/help-overlay.ui:385
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "Editando"
+
+#: ui/gtk/help-overlay.ui:390
+msgctxt "shortcut window"
+msgid "Move selection to the clipboard"
+msgstr "Mover seleção para a área de transferência"
+
+#: ui/gtk/help-overlay.ui:397
+msgctxt "shortcut window"
+msgid "Copy selection to clipboard"
+msgstr "Copiar seleção para a área de transferência"
+
+#: ui/gtk/help-overlay.ui:404
+msgctxt "shortcut window"
+msgid "Paste from the clipboard"
+msgstr "Colar seleção da área de transferência"
+
+#: ui/gtk/help-overlay.ui:411
+msgctxt "shortcut window"
+msgid "Quote text"
+msgstr "Texto citado"
+
+#: ui/gtk/help-overlay.ui:418
+msgctxt "shortcut window"
+msgid "Unquote text"
+msgstr "Texto não-citado"
+
+#: ui/gtk/help-overlay.ui:427
+msgctxt "shortcut window"
+msgid "Rich text editing"
+msgstr "Edição de texto Rich text"
+
+#: ui/gtk/help-overlay.ui:431
+msgctxt "shortcut window"
+msgid "Paste without formatting"
+msgstr "Colar sem formatação"
+
+#: ui/gtk/help-overlay.ui:438
 msgctxt "shortcut window"
 msgid "Bold text"
 msgstr "Negrito"
 
-#: ui/gtk/help-overlay.ui:305
+#: ui/gtk/help-overlay.ui:445
 msgctxt "shortcut window"
 msgid "Italicize text"
 msgstr "Itálico"
 
-#: ui/gtk/help-overlay.ui:312
+#: ui/gtk/help-overlay.ui:452
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "Sublinhado"
 
-#: ui/gtk/help-overlay.ui:319
+#: ui/gtk/help-overlay.ui:459
 msgctxt "shortcut window"
 msgid "Strike text"
 msgstr "Tachado"
 
-#: ui/gtk/help-overlay.ui:326
-msgctxt "shortcut window"
-msgid "Insert a link"
-msgstr "Insere um link"
-
-#: ui/gtk/help-overlay.ui:333
+#: ui/gtk/help-overlay.ui:466
 msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "Remove formatação"
 
+#: ui/gtk/help-overlay.ui:473
+msgctxt "shortcut window"
+msgid "Insert an image"
+msgstr "Inserir uma imagem"
+
+#: ui/gtk/help-overlay.ui:480
+msgctxt "shortcut window"
+msgid "Insert a link"
+msgstr "Insere um link"
+
 #: ui/main-toolbar.ui:23
 msgctxt "tooltip"
 msgid "Compose Message"
@@ -3356,6 +3388,82 @@ msgstr "Preferências"
 msgid "Geary update in progress…"
 msgstr "Atualização do Geary em progresso…"
 
+#~ 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?"
+
+#~ msgid "Display program version and revision id"
+#~ msgstr "Mostra versão do programa e id de revisão"
+
+#~ msgid "Geary revision"
+#~ msgstr "Revisão do Geary"
+
+#~ 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)"
+
+#~ 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)"
+
+#~ msgid "_Trash"
+#~ msgstr "Li_xeira"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to search box"
+#~ msgstr "Vai para o campo de pesquisa"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Find next/previous in current conversation"
+#~ msgstr "Pesquisa próximo/anterior na conversa atual"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Compose a new message"
+#~ msgstr "Escreve uma nova mensagem"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Archive"
+#~ msgstr "Arquiva"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Toggle spam"
+#~ msgstr "Marca/desmarca como spam"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Move the conversation"
+#~ msgstr "Move a conversa"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Mark unread"
+#~ msgstr "Marca como não lida"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Additional Shortcuts"
+#~ msgstr "Atalhos adicionais"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Star"
+#~ msgstr "Marca estrela"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Unstar"
+#~ msgstr "Remove estrela"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Delete"
+#~ msgstr "Exclui"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to next (older) conversation"
+#~ msgstr "Vai para a próxima conversa (mais antiga)"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to previous (newer) conversation"
+#~ msgstr "Vai para a conversa anterior (mais nova)"
+
 #~ msgid "List of the languages to use in the spell checker."
 #~ msgstr "Lista de idiomas para usar na verificação ortográfica."
 
@@ -3549,9 +3657,6 @@ msgstr "Atualização do Geary em progresso…"
 #~ 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"
 
@@ -3606,9 +3711,6 @@ msgstr "Atualização do Geary em progresso…"
 #~ msgid "Enter your account information to get started."
 #~ msgstr "Entre com as informações de sua conta para iniciar."
 
-#~ msgid "Edit"
-#~ msgstr "Editar"
-
 #~ msgid "Preview"
 #~ msgstr "Visualizar"