[geary] Update British English translation
- From: Translations User D-L <translations src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary] Update British English translation
- Date: Mon, 31 Aug 2020 18:51:53 +0000 (UTC)
commit 923a6b7a422b6f7fc927a95140d468a62501bcf5
Author: Bruce Cowan <bruce bcowan me uk>
Date: Mon Aug 31 18:51:49 2020 +0000
Update British English translation
po/en_GB.po | 2733 +++++++++++++++++++++++++++++++++++------------------------
1 file changed, 1625 insertions(+), 1108 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 76e1cffc8..4ec9aa1ad 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,14 +8,14 @@
# ajshephard <andrew james shephard gmail com>, 2013
# andrubuntu <andrubuntu gmail com>, 2013
# Zander Brown <zbrown gnome org>, 2019.
-# Bruce Cowan <bruce bcowan me uk>, 2019.
+# Bruce Cowan <bruce bcowan me uk>, 2019-2020.
#
msgid ""
msgstr ""
"Project-Id-Version: geary-0.4.1\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n";
-"POT-Creation-Date: 2019-08-29 23:05+0000\n"
-"PO-Revision-Date: 2019-08-31 10:42+0100\n"
+"POT-Creation-Date: 2020-08-29 01:59+0000\n"
+"PO-Revision-Date: 2020-08-31 19:51+0100\n"
"Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
"Language-Team: English - United Kingdom <en li org>\n"
"Language: en_GB\n"
@@ -23,7 +23,7 @@ msgstr ""
"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.1\n"
+"X-Generator: Gtranslator 3.36.0\n"
#: desktop/geary-attach.contract.desktop.in:3
msgid "Send by email"
@@ -35,9 +35,10 @@ msgstr "Send files using Geary"
#. Translators: The application name
#: desktop/geary-autostart.desktop.in.in:3
-#: desktop/org.gnome.Geary.appdata.xml.in.in:12
+#: desktop/org.gnome.Geary.appdata.xml.in.in:11
#: desktop/org.gnome.Geary.desktop.in.in:3
-#: src/client/accounts/accounts-editor-servers-pane.vala:555
+#: src/client/accounts/accounts-editor-servers-pane.vala:560
+#: src/client/application/application-main-window.vala:608
msgid "Geary"
msgstr "Geary"
@@ -48,9 +49,9 @@ msgstr "E-mail"
#. Translators: The application's summary / tagline
#: desktop/geary-autostart.desktop.in.in:5
-#: desktop/org.gnome.Geary.appdata.xml.in.in:16
+#: desktop/org.gnome.Geary.appdata.xml.in.in:15
#: desktop/org.gnome.Geary.desktop.in.in:5
-#: src/client/application/geary-application.vala:30
+#: src/client/application/application-client.vala:33
msgid "Send and receive email"
msgstr "Send and receive e-mail"
@@ -60,11 +61,11 @@ msgid "Email;E-mail;Mail;"
msgstr "Email;E-mail;Mail;"
#. Translators: The development team's name
-#: desktop/org.gnome.Geary.appdata.xml.in.in:14
+#: desktop/org.gnome.Geary.appdata.xml.in.in:13
msgid "Geary Development Team"
msgstr "Geary Development Team"
-#: desktop/org.gnome.Geary.appdata.xml.in.in:18
+#: desktop/org.gnome.Geary.appdata.xml.in.in:17
msgid ""
"Geary is an email application built around conversations, for the GNOME 3 "
"desktop. It allows you to read, find and send email with a straightforward, "
@@ -74,7 +75,7 @@ msgstr ""
"desktop. It allows you to read, find and send e-mail with a straightforward, "
"modern interface."
-#: desktop/org.gnome.Geary.appdata.xml.in.in:23
+#: desktop/org.gnome.Geary.appdata.xml.in.in:22
msgid ""
"Conversations allow you to read a complete discussion without having to find "
"and click from message to message."
@@ -82,41 +83,41 @@ msgstr ""
"Conversations allow you to read a complete discussion without having to find "
"and click from message to message."
-#: desktop/org.gnome.Geary.appdata.xml.in.in:27
+#: desktop/org.gnome.Geary.appdata.xml.in.in:26
msgid "Geary’s features include:"
msgstr "Geary’s features include:"
-#: desktop/org.gnome.Geary.appdata.xml.in.in:29
+#: desktop/org.gnome.Geary.appdata.xml.in.in:28
msgid "Quick email account setup"
msgstr "Quick e-mail account setup"
-#: desktop/org.gnome.Geary.appdata.xml.in.in:30
+#: desktop/org.gnome.Geary.appdata.xml.in.in:29
msgid "Shows related messages together in conversations"
msgstr "Shows related messages together in conversations"
-#: desktop/org.gnome.Geary.appdata.xml.in.in:31
+#: desktop/org.gnome.Geary.appdata.xml.in.in:30
msgid "Fast, full text and keyword search"
msgstr "Fast, full text and keyword search"
-#: desktop/org.gnome.Geary.appdata.xml.in.in:32
+#: desktop/org.gnome.Geary.appdata.xml.in.in:31
msgid "Full-featured HTML and plain text message composer"
msgstr "Full-featured HTML and plain text message composer"
-#: desktop/org.gnome.Geary.appdata.xml.in.in:33
+#: desktop/org.gnome.Geary.appdata.xml.in.in:32
msgid "Desktop notification of new mail"
msgstr "Desktop notification of new mail"
-#: desktop/org.gnome.Geary.appdata.xml.in.in:34
+#: desktop/org.gnome.Geary.appdata.xml.in.in:33
msgid "Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers"
msgstr "Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers"
#. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in.in:48
+#: desktop/org.gnome.Geary.appdata.xml.in.in:47
msgid "Geary displaying a conversation"
msgstr "Geary displaying a conversation"
#. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in.in:59
+#: desktop/org.gnome.Geary.appdata.xml.in.in:58
msgid "Geary showing the rich text composer"
msgstr "Geary showing the rich text composer"
@@ -129,6 +130,10 @@ msgstr "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
msgid "Compose Message"
msgstr "Compose Message"
+#: desktop/org.gnome.Geary.desktop.in.in:26
+msgid "New Window"
+msgstr "New Window"
+
#: desktop/org.gnome.Geary.gschema.xml:8
msgid "Maximize window"
msgstr "Maximise window"
@@ -188,34 +193,54 @@ msgid "True if the folder list Paned is in the horizontal orientation."
msgstr "True if the folder list Paned is in the horizontal orientation."
#: desktop/org.gnome.Geary.gschema.xml:50
+msgid "Show/hide formatting toolbar"
+msgstr "Show/hide formatting toolbar"
+
+#: desktop/org.gnome.Geary.gschema.xml:51
+msgid "True if the formatting toolbar in the composer is shown."
+msgstr "True if the formatting toolbar in the composer is shown."
+
+#: desktop/org.gnome.Geary.gschema.xml:56
msgid "Position of message list pane"
msgstr "Position of message list pane"
-#: desktop/org.gnome.Geary.gschema.xml:51
+#: desktop/org.gnome.Geary.gschema.xml:57
msgid "Position of the message list Paned grabber."
msgstr "Position of the message list Paned grabber."
-#: desktop/org.gnome.Geary.gschema.xml:56
+#: desktop/org.gnome.Geary.gschema.xml:62
msgid "Autoselect next message"
msgstr "Autoselect next message"
-#: 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 "True if we should autoselect the next available conversation."
-#: desktop/org.gnome.Geary.gschema.xml:62
+#: desktop/org.gnome.Geary.gschema.xml:68
msgid "Display message previews"
msgstr "Display message previews"
-#: 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 "True if we should display a short preview of each message."
-#: desktop/org.gnome.Geary.gschema.xml:68
+#: desktop/org.gnome.Geary.gschema.xml:74
+msgid "Use single key shortcuts"
+msgstr "Use single key shortcuts"
+
+#: 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."
+msgstr ""
+"Enables shortcuts for e-mail actions that do not require pressing <Ctrl> to "
+"emulate those used by Gmail."
+
+#: desktop/org.gnome.Geary.gschema.xml:82
msgid "Languages that shall be used in the spell checker"
msgstr "Languages that shall be used in the spell checker"
-#: desktop/org.gnome.Geary.gschema.xml:69
+#: 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."
@@ -223,11 +248,11 @@ msgstr ""
"A list of POSIX locales, with the empty list disabling spell checking and "
"the null list using desktop languages by default."
-#: desktop/org.gnome.Geary.gschema.xml:76
+#: desktop/org.gnome.Geary.gschema.xml:90
msgid "Languages that are displayed in the spell checker popover"
msgstr "Languages that are displayed in the spell checker popover"
-#: desktop/org.gnome.Geary.gschema.xml:77
+#: desktop/org.gnome.Geary.gschema.xml:91
msgid ""
"List of languages that are always displayed in the popover of the spell "
"checker."
@@ -235,77 +260,93 @@ msgstr ""
"List of languages that are always displayed in the popover of the spell "
"checker."
-#: desktop/org.gnome.Geary.gschema.xml:82
-msgid "Enable notification sounds"
-msgstr "Enable notification sounds"
-
-#: desktop/org.gnome.Geary.gschema.xml:83
-msgid "True to play sounds for notifications and sending."
-msgstr "True to play sounds for notifications and sending."
-
-#: desktop/org.gnome.Geary.gschema.xml:88
-msgid "Show notifications for new mail"
-msgstr "Show notifications for new mail"
-
-#: desktop/org.gnome.Geary.gschema.xml:89
-msgid "True to show notification bubbles."
-msgstr "True to show notification bubbles."
-
-#: desktop/org.gnome.Geary.gschema.xml:94
+#: desktop/org.gnome.Geary.gschema.xml:96
msgid "Notify of new mail at startup"
msgstr "Notify of new mail at startup"
-#: desktop/org.gnome.Geary.gschema.xml:95
+#: desktop/org.gnome.Geary.gschema.xml:97
msgid "True to notify of new mail at startup."
msgstr "True to notify of new mail at startup."
-#: desktop/org.gnome.Geary.gschema.xml:100
+#: desktop/org.gnome.Geary.gschema.xml:102
msgid "Ask when opening an attachment"
msgstr "Ask when opening an attachment"
-#: desktop/org.gnome.Geary.gschema.xml:101
+#: desktop/org.gnome.Geary.gschema.xml:103
msgid "True to ask when opening an attachment."
msgstr "True to ask when opening an attachment."
-#: desktop/org.gnome.Geary.gschema.xml:106
+#: desktop/org.gnome.Geary.gschema.xml:108
msgid "Whether to compose emails in HTML"
msgstr "Whether to compose e-mails in HTML"
-#: desktop/org.gnome.Geary.gschema.xml:107
+#: desktop/org.gnome.Geary.gschema.xml:109
msgid "True to compose emails in HTML; false for plain text."
msgstr "True to compose e-mails in HTML; false for plain text."
-#: desktop/org.gnome.Geary.gschema.xml:112
+#: desktop/org.gnome.Geary.gschema.xml:114
msgid "Advisory strategy for full-text searching"
msgstr "Advisory strategy for full-text searching"
-#: desktop/org.gnome.Geary.gschema.xml:113
+#: desktop/org.gnome.Geary.gschema.xml:115
msgid ""
"Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
msgstr ""
"Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
-#: desktop/org.gnome.Geary.gschema.xml:118
+#: desktop/org.gnome.Geary.gschema.xml:120
msgid "Zoom of conversation viewer"
msgstr "Zoom of conversation viewer"
-#: desktop/org.gnome.Geary.gschema.xml:119
+#: desktop/org.gnome.Geary.gschema.xml:121
msgid "The zoom to apply on the conservation view."
msgstr "The zoom to apply on the conservation view."
-#: desktop/org.gnome.Geary.gschema.xml:124
+#: desktop/org.gnome.Geary.gschema.xml:126
msgid "Size of detached composer window"
msgstr "Size of detached composer window"
-#: desktop/org.gnome.Geary.gschema.xml:125
+#: desktop/org.gnome.Geary.gschema.xml:127
msgid "The last recorded size of the detached composer window."
msgstr "The last recorded size of the detached composer window."
-#: desktop/org.gnome.Geary.gschema.xml:130
+#: desktop/org.gnome.Geary.gschema.xml:132
+msgid "Undo sending email delay"
+msgstr "Undo sending e-mail delay"
+
+#: 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."
+msgstr ""
+"The number of seconds to wait before sending an e-mail. Set to zero or less "
+"to disable."
+
+#: desktop/org.gnome.Geary.gschema.xml:139
+msgid "Brief notification display time"
+msgstr "Brief notification display time"
+
+#: desktop/org.gnome.Geary.gschema.xml:140
+msgid ""
+"The length of time in seconds for which brief notifications should be "
+"displayed."
+msgstr ""
+"The length of time in seconds for which brief notifications should be "
+"displayed."
+
+#: desktop/org.gnome.Geary.gschema.xml:146
+msgid "List of optional plugins"
+msgstr "List of optional plug-ins"
+
+#: desktop/org.gnome.Geary.gschema.xml:147
+msgid "Plugins listed here will be loaded on startup."
+msgstr "Plug-ins listed here will be loaded on startup."
+
+#: desktop/org.gnome.Geary.gschema.xml:152
msgid "Whether we migrated the old settings"
msgstr "Whether we migrated the old settings"
-#: desktop/org.gnome.Geary.gschema.xml:131
+#: desktop/org.gnome.Geary.gschema.xml:153
msgid ""
"False to check for the old “org.yorba.geary”-schema and copy its values."
msgstr ""
@@ -314,25 +355,25 @@ msgstr ""
#. Translators: In-app notification label, when
#. the app had a problem pinning an otherwise
#. untrusted TLS certificate
-#: src/client/accounts/accounts-editor.vala:204
+#: src/client/accounts/accounts-editor.vala:210
msgid "Failed to store certificate"
msgstr "Failed to store certificate"
#. Translators: Label for adding an email account
#. account for a generic IMAP service provider.
-#: src/client/accounts/accounts-editor-add-pane.vala:109
+#: src/client/accounts/accounts-editor-add-pane.vala:108
msgid "All others"
msgstr "All others"
#. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:196
-#: src/client/accounts/accounts-editor-servers-pane.vala:316
+#: src/client/accounts/accounts-editor-add-pane.vala:195
+#: src/client/accounts/accounts-editor-servers-pane.vala:321
msgid "Check your receiving login and password"
msgstr "Check your receiving login and password"
#. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:211
-#: src/client/accounts/accounts-editor-servers-pane.vala:329
+#: src/client/accounts/accounts-editor-add-pane.vala:210
+#: src/client/accounts/accounts-editor-servers-pane.vala:334
msgid "Check your receiving server details"
msgstr "Check your receiving server details"
@@ -341,51 +382,51 @@ msgstr "Check your receiving server details"
#. succeeded, so the user probably needs to
#. specify custom creds here
#. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:233
-#: src/client/accounts/accounts-editor-servers-pane.vala:350
+#: src/client/accounts/accounts-editor-add-pane.vala:232
+#: src/client/accounts/accounts-editor-servers-pane.vala:355
msgid "Check your sending login and password"
msgstr "Check your sending login and password"
#. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:247
-#: src/client/accounts/accounts-editor-servers-pane.vala:363
+#: src/client/accounts/accounts-editor-add-pane.vala:246
+#: src/client/accounts/accounts-editor-servers-pane.vala:368
msgid "Check your sending server details"
msgstr "Check your sending server details"
#. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:262
+#: src/client/accounts/accounts-editor-add-pane.vala:261
msgid "Check your email address and password"
msgstr "Check your e-mail address and password"
#. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:273
+#: src/client/accounts/accounts-editor-add-pane.vala:272
msgid "Could not connect, check your network"
msgstr "Could not connect, check your network"
#. Translators: In-app notification label for a
#. generic error creating an account
-#: src/client/accounts/accounts-editor-add-pane.vala:286
+#: src/client/accounts/accounts-editor-add-pane.vala:285
msgid "An unexpected problem occurred"
msgstr "An unexpected problem occurred"
#. Translators: In-app notification label, the
#. string substitution is a more detailed reason.
-#: src/client/accounts/accounts-editor-add-pane.vala:304
+#: src/client/accounts/accounts-editor-add-pane.vala:303
#, c-format
msgid "Account not created: %s"
msgstr "Account not created: %s"
#. Translators: Label for the person's actual name when adding
#. an account
-#: src/client/accounts/accounts-editor-add-pane.vala:551
+#: src/client/accounts/accounts-editor-add-pane.vala:558
msgid "Your name"
msgstr "Your name"
#. Translators: Label used for the address part of an
#. email address when editing a user's sender address
#. preferences for an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:568
-#: src/client/accounts/accounts-editor-edit-pane.vala:501
+#: src/client/accounts/accounts-editor-add-pane.vala:575
+#: src/client/accounts/accounts-editor-edit-pane.vala:513
msgid "Email address"
msgstr "E-mail address"
@@ -394,8 +435,8 @@ msgstr "E-mail address"
#. Translators: This is used as a placeholder for the
#. address part of an email address when editing a user's
#. sender address preferences for an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:571
-#: src/client/accounts/accounts-editor-edit-pane.vala:469
+#: src/client/accounts/accounts-editor-add-pane.vala:579
+#: src/client/accounts/accounts-editor-edit-pane.vala:479
msgid "person example com"
msgstr "person example com"
@@ -403,15 +444,15 @@ msgstr "person example com"
#. when adding an account
#. Translators: Label for the user's login name for an
#. IMAP, SMTP, etc service
-#: src/client/accounts/accounts-editor-add-pane.vala:585
-#: src/client/accounts/accounts-editor-servers-pane.vala:880
+#: src/client/accounts/accounts-editor-add-pane.vala:593
+#: src/client/accounts/accounts-editor-servers-pane.vala:889
msgid "Login name"
msgstr "Login name"
#. Translators: Label for the user's password for an IMAP,
#. SMTP, etc service
-#: src/client/accounts/accounts-editor-add-pane.vala:599
-#: src/client/accounts/accounts-editor-servers-pane.vala:999
+#: src/client/accounts/accounts-editor-add-pane.vala:607
+#: src/client/accounts/accounts-editor-servers-pane.vala:1011
#: ui/password-dialog.glade:108
msgid "Password"
msgstr "Password"
@@ -420,14 +461,14 @@ msgstr "Password"
#. adding an account.
#. Translators: This label describes the host name or IP
#. address and port used by an account's IMAP service.
-#: src/client/accounts/accounts-editor-add-pane.vala:621
-#: src/client/accounts/accounts-editor-servers-pane.vala:727
+#: src/client/accounts/accounts-editor-add-pane.vala:629
+#: src/client/accounts/accounts-editor-servers-pane.vala:733
msgid "IMAP server"
msgstr "IMAP server"
#. Translators: Placeholder for the IMAP server hostname
#. when adding an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:624
+#: src/client/accounts/accounts-editor-add-pane.vala:632
msgid "imap.example.com"
msgstr "imap.example.com"
@@ -435,20 +476,20 @@ msgstr "imap.example.com"
#. adding an account.
#. Translators: This label describes the host name or IP
#. address and port used by an account's SMTP service.
-#: src/client/accounts/accounts-editor-add-pane.vala:630
-#: src/client/accounts/accounts-editor-servers-pane.vala:733
+#: src/client/accounts/accounts-editor-add-pane.vala:638
+#: src/client/accounts/accounts-editor-servers-pane.vala:739
msgid "SMTP server"
msgstr "SMTP server"
#. Translators: Placeholder for the SMTP server hostname
#. when adding an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:633
+#: src/client/accounts/accounts-editor-add-pane.vala:641
msgid "smtp.example.com"
msgstr "smtp.example.com"
#. Translators: Label in the account editor for the user's
#. custom name for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:278
+#: src/client/accounts/accounts-editor-edit-pane.vala:277
#: ui/accounts_editor_remove_pane.ui:123
msgid "Account name"
msgstr "Account name"
@@ -457,46 +498,46 @@ msgstr "Account name"
#. the name of an account. The string
#. substitution is the old name of the
#. account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:312
+#: src/client/accounts/accounts-editor-edit-pane.vala:318
#, c-format
msgid "Change account name back to “%s”"
msgstr "Change account name back to “%s”"
#. Translators: Tooltip for adding a new email sender/from
#. address's address to an account
-#: src/client/accounts/accounts-editor-edit-pane.vala:336
+#: src/client/accounts/accounts-editor-edit-pane.vala:342
msgid "Add a new sender email address"
msgstr "Add a new sender e-mail address"
#. Translators: Label used to indicate the user has
#. provided no display name for one of their sender
#. email addresses in their account settings.
-#: src/client/accounts/accounts-editor-edit-pane.vala:417
+#: src/client/accounts/accounts-editor-edit-pane.vala:423
msgid "Name not set"
msgstr "Name not set"
#. Translators: This is used as a placeholder for the
#. display name for an email address when editing a user's
#. sender address preferences for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:456
+#: src/client/accounts/accounts-editor-edit-pane.vala:464
msgid "Sender Name"
msgstr "Sender Name"
-#: src/client/accounts/accounts-editor-edit-pane.vala:479
+#: src/client/accounts/accounts-editor-edit-pane.vala:491
msgid "Remove"
msgstr "Remove"
#. Translators: Label used for the display name part of an
#. email address when editing a user's sender address
#. preferences for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:494
+#: src/client/accounts/accounts-editor-edit-pane.vala:506
msgid "Sender name"
msgstr "Sender name"
#. Translators: Label used as the undo tooltip after adding an
#. new sender email address to an account. The string
#. substitution is the email address added.
-#: src/client/accounts/accounts-editor-edit-pane.vala:561
+#: src/client/accounts/accounts-editor-edit-pane.vala:573
#, c-format
msgid "Remove “%s”"
msgstr "Remove “%s”"
@@ -504,7 +545,7 @@ msgstr "Remove “%s”"
#. Translators: Label used as the undo tooltip after editing a
#. sender address for an account. The string substitution is
#. the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:601
+#: src/client/accounts/accounts-editor-edit-pane.vala:613
#, c-format
msgid "Undo changes to “%s”"
msgstr "Undo changes to “%s”"
@@ -512,7 +553,7 @@ msgstr "Undo changes to “%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:688
+#: src/client/accounts/accounts-editor-edit-pane.vala:700
#, c-format
msgid "Add “%s” back"
msgstr "Add “%s” back"
@@ -520,14 +561,14 @@ msgstr "Add “%s” back"
#. 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:730
+#: src/client/accounts/accounts-editor-edit-pane.vala:742
msgid "Undo signature changes"
msgstr "Undo signature changes"
#. 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:778
+#: src/client/accounts/accounts-editor-edit-pane.vala:790
msgid "Download mail"
msgstr "Download mail"
@@ -536,99 +577,99 @@ msgstr "Download 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:810
+#: src/client/accounts/accounts-editor-edit-pane.vala:822
#, c-format
msgid "Change download period back to: %s"
msgstr "Change download period back to: %s"
-#: src/client/accounts/accounts-editor-edit-pane.vala:831
+#: src/client/accounts/accounts-editor-edit-pane.vala:843
msgid "Everything"
msgstr "Everything"
-#: src/client/accounts/accounts-editor-edit-pane.vala:835
+#: src/client/accounts/accounts-editor-edit-pane.vala:847
msgid "2 weeks back"
msgstr "2 weeks back"
-#: src/client/accounts/accounts-editor-edit-pane.vala:839
+#: src/client/accounts/accounts-editor-edit-pane.vala:851
msgid "1 month back"
msgstr "1 month back"
-#: src/client/accounts/accounts-editor-edit-pane.vala:843
+#: src/client/accounts/accounts-editor-edit-pane.vala:855
msgid "3 months back"
msgstr "3 months back"
-#: src/client/accounts/accounts-editor-edit-pane.vala:847
+#: src/client/accounts/accounts-editor-edit-pane.vala:859
msgid "6 months back"
msgstr "6 months back"
-#: src/client/accounts/accounts-editor-edit-pane.vala:851
+#: src/client/accounts/accounts-editor-edit-pane.vala:863
msgid "1 year back"
msgstr "1 year back"
-#: src/client/accounts/accounts-editor-edit-pane.vala:855
+#: src/client/accounts/accounts-editor-edit-pane.vala:867
msgid "2 years back"
msgstr "2 years back"
-#: src/client/accounts/accounts-editor-edit-pane.vala:859
+#: src/client/accounts/accounts-editor-edit-pane.vala:871
msgid "4 years back"
msgstr "4 years back"
-#: src/client/accounts/accounts-editor-edit-pane.vala:865
+#: src/client/accounts/accounts-editor-edit-pane.vala:877
#, c-format
msgid "%d day back"
msgid_plural "%d days back"
msgstr[0] "%d day back"
msgstr[1] "%d days back"
-#: src/client/accounts/accounts-editor-list-pane.vala:247
-#: src/client/application/application-controller.vala:2392
+#: src/client/accounts/accounts-editor-list-pane.vala:255
+#: src/client/application/application-main-window.vala:2061
msgid "Undo"
msgstr "Undo"
-#: src/client/accounts/accounts-editor-list-pane.vala:255
+#: src/client/accounts/accounts-editor-list-pane.vala:264
+#: src/client/application/application-main-window.vala:2044
msgid "Redo"
msgstr "Redo"
-#: 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:358
+#: src/client/accounts/accounts-editor-list-pane.vala:454
#: src/client/accounts/accounts-editor-row.vala:279
msgid "Gmail"
msgstr "Gmail"
-#: src/client/accounts/accounts-editor-list-pane.vala:353
-#: src/client/accounts/accounts-editor-list-pane.vala:441
+#: src/client/accounts/accounts-editor-list-pane.vala:362
+#: src/client/accounts/accounts-editor-list-pane.vala:458
#: src/client/accounts/accounts-editor-row.vala:283
msgid "Outlook.com"
msgstr "Outlook.com"
-#: src/client/accounts/accounts-editor-list-pane.vala:357
-#: src/client/accounts/accounts-editor-list-pane.vala:445
+#: src/client/accounts/accounts-editor-list-pane.vala:366
+#: src/client/accounts/accounts-editor-list-pane.vala:462
#: src/client/accounts/accounts-editor-row.vala:287
msgid "Yahoo"
msgstr "Yahoo"
#. Translators: Tooltip for accounts that have been
#. loaded but disabled by the user.
-#: src/client/accounts/accounts-editor-list-pane.vala:375
+#: src/client/accounts/accounts-editor-list-pane.vala:388
msgid "This account has been disabled"
msgstr "This account has been disabled"
#. 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:384
+#: src/client/accounts/accounts-editor-list-pane.vala:397
msgid "This account has encountered a problem and is unavailable"
msgstr "This account has encountered a problem and is unavailable"
-#. Translators: Label for adding a generic email account
-#: src/client/accounts/accounts-editor-list-pane.vala:434
+#: src/client/accounts/accounts-editor-list-pane.vala:466
msgid "Other email providers"
msgstr "Other e-mail providers"
#. Translators: Notification shown after removing an
#. account. The string substitution is the name of the
#. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:551
+#: src/client/accounts/accounts-editor-list-pane.vala:572
#, c-format
msgid "Account “%s” removed"
msgstr "Account “%s” removed"
@@ -636,7 +677,7 @@ msgstr "Account “%s” removed"
#. 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:558
+#: src/client/accounts/accounts-editor-list-pane.vala:579
#, c-format
msgid "Account “%s” restored"
msgstr "Account “%s” restored"
@@ -649,66 +690,66 @@ msgstr " "
#. Translators: Label describes the service provider
#. hosting the email account, e.g. Gmail, Yahoo, or some
#. other generic IMAP service.
-#: src/client/accounts/accounts-editor-row.vala:295
+#: src/client/accounts/accounts-editor-row.vala:299
msgid "Service provider"
msgstr "Service provider"
#. Translators: This label describes what form of transport
#. security (TLS, StartTLS, etc) used by an account's IMAP or SMTP
#. service.
-#: src/client/accounts/accounts-editor-row.vala:468
+#: src/client/accounts/accounts-editor-row.vala:473
msgid "Connection security"
msgstr "Connection security"
#. Translators: Label used when no auth scheme is used
#. by an account's IMAP or SMTP service.
-#: src/client/accounts/accounts-editor-row.vala:479
-#: src/client/accounts/accounts-editor-servers-pane.vala:752
-#: src/client/accounts/accounts-editor-servers-pane.vala:964
-#: src/engine/api/geary-special-folder-type.vala:58
+#: src/client/accounts/accounts-editor-row.vala:484
+#: src/client/accounts/accounts-editor-servers-pane.vala:760
+#: src/client/accounts/accounts-editor-servers-pane.vala:975
msgid "None"
msgstr "None"
-#: src/client/accounts/accounts-editor-row.vala:486
+#: src/client/accounts/accounts-editor-row.vala:491
msgid "StartTLS"
msgstr "StartTLS"
-#: src/client/accounts/accounts-editor-row.vala:493
+#: src/client/accounts/accounts-editor-row.vala:498
msgid "TLS"
msgstr "TLS"
#. Translators: Label for source of SMTP authentication
#. credentials (none, use IMAP, custom) when adding a new
#. account
-#. Button label for retrying when a login error has occurred
-#: src/client/accounts/accounts-editor-row.vala:534 ui/main-window.ui:346
+#. Translators: An info bar button label
+#: src/client/accounts/accounts-editor-row.vala:539
+#: src/client/application/application-main-window.vala:554
msgid "Login"
msgstr "Login"
#. Translators: ComboBox value for source of SMTP
#. authentication credentials (none) when adding a new
#. account
-#: src/client/accounts/accounts-editor-row.vala:541
+#: src/client/accounts/accounts-editor-row.vala:546
msgid "No login needed"
msgstr "No login needed"
#. Translators: ComboBox value for source of SMTP
#. authentication credentials (use IMAP) when adding a new
#. account
-#: src/client/accounts/accounts-editor-row.vala:549
+#: src/client/accounts/accounts-editor-row.vala:554
msgid "Use same login as receiving"
msgstr "Use same login as receiving"
#. Translators: ComboBox value for source of SMTP
#. authentication credentials (custom) when adding a new
#. account
-#: src/client/accounts/accounts-editor-row.vala:557
+#: src/client/accounts/accounts-editor-row.vala:562
msgid "Use a different login"
msgstr "Use a different login"
#. Translators: In-app notification label, the
#. string substitution is a more detailed reason.
-#: src/client/accounts/accounts-editor-servers-pane.vala:377
+#: src/client/accounts/accounts-editor-servers-pane.vala:382
#, c-format
msgid "Account not updated: %s"
msgstr "Account not updated: %s"
@@ -716,23 +757,23 @@ msgstr "Account not updated: %s"
#. Translators: This label describes the program that
#. created the account, e.g. an SSO service like GOA, or
#. locally by Geary.
-#: src/client/accounts/accounts-editor-servers-pane.vala:540
+#: src/client/accounts/accounts-editor-servers-pane.vala:545
msgid "Account source"
msgstr "Account source"
-#: src/client/accounts/accounts-editor-servers-pane.vala:552
+#: src/client/accounts/accounts-editor-servers-pane.vala:557
msgid "GNOME Online Accounts"
msgstr "GNOME Online Accounts"
#. Translators: This label describes an account
#. preference.
-#: src/client/accounts/accounts-editor-servers-pane.vala:611
+#: src/client/accounts/accounts-editor-servers-pane.vala:616
msgid "Save draft email on server"
msgstr "Save draft e-mail on server"
#. Translators: This label describes an account
#. preference.
-#: src/client/accounts/accounts-editor-servers-pane.vala:666
+#: src/client/accounts/accounts-editor-servers-pane.vala:671
msgid "Save sent email on server"
msgstr "Save sent e-mail on server"
@@ -741,334 +782,180 @@ msgstr "Save sent e-mail on server"
#. Translators: Label used when an account's IMAP or
#. SMTP service uses OAuth2. The string replacement is
#. the service's login name.
-#: src/client/accounts/accounts-editor-servers-pane.vala:950
+#: src/client/accounts/accounts-editor-servers-pane.vala:961
#, c-format
msgid "%s using OAuth2"
msgstr "%s using OAuth2"
-#: src/client/accounts/accounts-editor-servers-pane.vala:960
+#: src/client/accounts/accounts-editor-servers-pane.vala:971
msgid "Use receiving server login"
msgstr "Use receiving server login"
#. Translators: File name used in save chooser when saving
#. attachments that do not otherwise have a name.
-#: src/client/application/application-controller.vala:59
+#: src/client/application/application-attachment-manager.vala:21
msgid "Untitled"
msgstr "Untitled"
-#. / Notification title.
-#: src/client/application/application-controller.vala:551
-#, c-format
-msgid "A problem occurred sending email for %s"
-msgstr "A problem occurred sending e-mail for %s"
-
-#. / Notification body
-#: src/client/application/application-controller.vala:555
-msgid "Email will not be sent until re-connected"
-msgstr "E-mail will not be sent until re-connected"
-
-#: src/client/application/application-controller.vala:906
-msgid "Labels"
-msgstr "Labels"
-
-#. 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:919
-#, c-format
-msgid "Unable to open the database for %s"
-msgstr "Unable to open the database for %s"
-
-#: src/client/application/application-controller.vala:920
-#, c-format
-msgid ""
-"There was an error opening the local mail database for this account. This is "
-"possibly due to corruption of the database file in this directory:\n"
-"\n"
-"%s\n"
-"\n"
-"Geary can rebuild the database and re-synchronize with the server or exit.\n"
-"\n"
-"Rebuilding the database will destroy all local email and its attachments. "
-"<b>The mail on the your server will not be affected.</b>"
-msgstr ""
-"There was an error opening the local mail database for this account. This is "
-"possibly due to corruption of the database file in this directory:\n"
-"\n"
-"%s\n"
-"\n"
-"Geary can rebuild the database and re-synchronise with the server or exit.\n"
-"\n"
-"Rebuilding the database will destroy all local e-mail and its attachments. "
-"<b>The mail on the your server will not be affected.</b>"
-
-#: src/client/application/application-controller.vala:922
-msgid "_Rebuild"
-msgstr "_Rebuild"
-
-#: src/client/application/application-controller.vala:922
-msgid "E_xit"
-msgstr "E_xit"
-
-#: src/client/application/application-controller.vala:931
-#, c-format
-msgid "Unable to rebuild database for “%s”"
-msgstr "Unable to rebuild database for “%s”"
-
-#: src/client/application/application-controller.vala:932
-#, c-format
-msgid ""
-"Error during rebuild:\n"
-"\n"
-"%s"
-msgstr ""
-"Error during rebuild:\n"
-"\n"
-"%s"
-
-#: src/client/application/application-controller.vala:1726
-#, c-format
-msgid "Moved %d message to %s"
-msgid_plural "Moved %d messages to %s"
-msgstr[0] "Moved %d message to %s"
-msgstr[1] "Moved %d messages to %s"
-
-#: src/client/application/application-controller.vala:1736
-msgid "Are you sure you want to open these attachments?"
-msgstr "Are you sure you want to open these attachments?"
-
-#: src/client/application/application-controller.vala:1737
-msgid ""
-"Attachments may cause damage to your system if opened. Only open files from "
-"trusted sources."
-msgstr ""
-"Attachments may cause damage to your system if opened. Only open files from "
-"trusted sources."
-
-#: src/client/application/application-controller.vala:1738
-msgid "Don’t _ask me again"
-msgstr "Don’t _ask me again"
-
-#. Translators: Dialog primary label when prompting to
-#. overwrite a file. The string substitution is the file'sx
-#. name.
-#: src/client/application/application-controller.vala:1861
+#. / Translators: Dialog primary label when prompting to
+#. / overwrite a file. The string substitution is the file'sx
+#. / name.
+#: src/client/application/application-attachment-manager.vala:222
#, c-format
msgid "A file named “%s” already exists. Do you want to replace it?"
msgstr "A file named “%s” already exists. Do you want to replace it?"
-#. 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:1868
+#. / Translators: Dialog secondary label when prompting to
+#. / overwrite a file. The string substitution is the parent
+#. / folder's name.
+#: src/client/application/application-attachment-manager.vala:229
#, c-format
msgid ""
"The file already exists in “%s”. Replacing it will overwrite its contents."
msgstr ""
"The file already exists in “%s”. Replacing it will overwrite its contents."
-#: src/client/application/application-controller.vala:1872
+#: src/client/application/application-attachment-manager.vala:236
msgid "_Replace"
msgstr "_Replace"
-#: src/client/application/application-controller.vala:2232
-#, c-format
-msgid "Empty all email from your %s folder?"
-msgstr "Empty all e-mail from your %s folder?"
-
-#: src/client/application/application-controller.vala:2233
-msgid "This removes the email from Geary and your email server."
-msgstr "This removes the e-mail from Geary and your e-mail server."
-
-#: src/client/application/application-controller.vala:2234
-msgid "This cannot be undone."
-msgstr "This cannot be undone."
-
-#: src/client/application/application-controller.vala:2235
-#, c-format
-msgid "Empty %s"
-msgstr "Empty %s"
-
-#: src/client/application/application-controller.vala:2252
-#, c-format
-msgid "Error emptying %s"
-msgstr "Error emptying %s"
-
-#: 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] "Do you want to permanently delete this message?"
-msgstr[1] "Do you want to permanently delete these messages?"
-
-#: src/client/application/application-controller.vala:2285
-msgid "Delete"
-msgstr "Delete"
-
-#: src/client/application/application-controller.vala:2299
-#, c-format
-msgid "Trashed %d message"
-msgid_plural "Trashed %d messages"
-msgstr[0] "Moved %d message to Wastebasket"
-msgstr[1] "Moved %d messages to Wastebasket"
-
-#: src/client/application/application-controller.vala:2346
-#, c-format
-msgid "Archived %d message"
-msgid_plural "Archived %d messages"
-msgstr[0] "Archived %d message"
-msgstr[1] "Archived %d messages"
-
-#. 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:2474
-#, c-format
-msgid "Successfully sent mail to %s."
-msgstr "Successfully sent mail to %s."
-
-#: src/client/application/application-controller.vala:2552
-msgid "Failed to open default text editor."
-msgstr "Failed to open default text editor."
-
-#: src/client/application/geary-application.vala:31
+#: src/client/application/application-client.vala:34
msgid "Copyright 2016 Software Freedom Conservancy Inc."
msgstr "Copyright 2016 Software Freedom Conservancy Inc."
-#: src/client/application/geary-application.vala:32
-msgid "Copyright 2016-2019 Geary Development Team."
-msgstr "Copyright 2016-2019 Geary Development Team."
+#: src/client/application/application-client.vala:35
+msgid "Copyright 2016-2020 Geary Development Team."
+msgstr "Copyright 2016-2020 Geary Development Team."
-#: src/client/application/geary-application.vala:34
+#: src/client/application/application-client.vala:37
msgid "Visit the Geary web site"
msgstr "Visit the Geary web site"
#. / Command line option
-#: src/client/application/geary-application.vala:109
+#: src/client/application/application-client.vala:97
msgid "Print debug logging"
msgstr "Print debug logging"
#. / Command line option
-#: src/client/application/geary-application.vala:112
+#: src/client/application/application-client.vala:100
msgid "Start with the main window hidden (deprecated)"
msgstr "Start with the main window hidden (deprecated)"
#. / Command line option
-#: src/client/application/geary-application.vala:115
+#: src/client/application/application-client.vala:103
msgid "Enable WebKitGTK Inspector in web views"
msgstr "Enable WebKitGTK Inspector in web views"
#. / Command line option
-#: src/client/application/geary-application.vala:118
+#: src/client/application/application-client.vala:106
msgid "Log conversation monitoring"
msgstr "Log conversation monitoring"
#. / Command line option
-#: src/client/application/geary-application.vala:121
+#: src/client/application/application-client.vala:109
msgid "Log IMAP network deserialization"
msgstr "Log IMAP network deserialisation"
#. / Command line option. "Normalization" can also be called
#. / "synchronization".
-#: src/client/application/geary-application.vala:125
+#: src/client/application/application-client.vala:113
msgid "Log folder normalization"
msgstr "Log folder normalisation"
#. / Command line option
-#: src/client/application/geary-application.vala:128
-msgid "Log network activity"
-msgstr "Log network activity"
-
-#. / Command line option
-#: src/client/application/geary-application.vala:131
-msgid "Log periodic activity"
-msgstr "Log periodic activity"
+#: src/client/application/application-client.vala:116
+msgid "Log IMAP network activity"
+msgstr "Log IMAP network activity"
#. / 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:136
+#: src/client/application/application-client.vala:121
msgid "Log IMAP replay queue"
msgstr "Log IMAP replay queue"
-#. / 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:141
-msgid "Log IMAP network serialization"
-msgstr "Log IMAP network serialisation"
+#. / Command line option
+#: src/client/application/application-client.vala:124
+msgid "Log SMTP network activity"
+msgstr "Log SMTP network activity"
#. / Command line option
-#: src/client/application/geary-application.vala:144
+#: src/client/application/application-client.vala:127
msgid "Log database queries (generates lots of messages)"
msgstr "Log database queries (generates lots of messages)"
#. / Command line option
-#: src/client/application/geary-application.vala:147
+#: src/client/application/application-client.vala:130
msgid "Perform a graceful quit"
msgstr "Perform a graceful quit"
+#: src/client/application/application-client.vala:132
+msgid "Open a new window"
+msgstr "Open a new window"
+
#. / Command line option
-#: src/client/application/geary-application.vala:150
+#: src/client/application/application-client.vala:135
msgid "Revoke all pinned TLS server certificates"
msgstr "Revoke all pinned TLS server certificates"
#. / Command line option
-#: src/client/application/geary-application.vala:153
+#: src/client/application/application-client.vala:138
msgid "Display program version"
msgstr "Display program version"
#. / Application runtime information label
-#: src/client/application/geary-application.vala:280
+#: src/client/application/application-client.vala:262
msgid "Geary version"
msgstr "Geary version"
#. / Application runtime information label
-#: src/client/application/geary-application.vala:282
+#: src/client/application/application-client.vala:264
msgid "Geary revision"
msgstr "Geary revision"
#. / Application runtime information label
-#: src/client/application/geary-application.vala:284
+#: src/client/application/application-client.vala:266
msgid "GTK version"
msgstr "GTK version"
#. / Applciation runtime information label
-#: src/client/application/geary-application.vala:291
+#: src/client/application/application-client.vala:273
msgid "GLib version"
msgstr "GLib version"
#. / Application runtime information label
-#: src/client/application/geary-application.vala:298
+#: src/client/application/application-client.vala:280
msgid "WebKitGTK version"
msgstr "WebKitGTK version"
#. / Application runtime information label
-#: src/client/application/geary-application.vala:305
+#: src/client/application/application-client.vala:287
msgid "Desktop environment"
msgstr "Desktop environment"
#. Translators: This is the file type displayed for
#. attachments with unknown file types.
-#: src/client/application/geary-application.vala:307
-#: src/client/conversation-viewer/conversation-email.vala:159
+#: src/client/application/application-client.vala:289
+#: src/client/components/components-attachment-pane.vala:91
msgid "Unknown"
msgstr "Unknown"
#. / Application runtime information label
-#: src/client/application/geary-application.vala:337
+#: src/client/application/application-client.vala:293
msgid "Distribution name"
msgstr "Distribution name"
#. / Application runtime information label
-#: src/client/application/geary-application.vala:342
+#: src/client/application/application-client.vala:298
msgid "Distribution release"
msgstr "Distribution release"
#. / Application runtime information label
-#: src/client/application/geary-application.vala:350
+#: src/client/application/application-client.vala:303
msgid "Installation prefix"
msgstr "Installation prefix"
-#: src/client/application/geary-application.vala:490
+#: src/client/application/application-client.vala:559
#, c-format
msgid "About %s"
msgstr "About %s"
@@ -1076,136 +963,436 @@ msgstr "About %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:494
+#: src/client/application/application-client.vala:563
msgid "translator-credits"
msgstr ""
"Alfredo Hernández <aldomann designs gmail com>\n"
"Andrew Shephard <andrew james shephard gmail com>\n"
-"Bruce Cowan <bruce bcowan me uk>"
+"Bruce Cowan <bruce bcowan me uk>\n"
+"Zander Brown <zbrown gnome org>"
#. / Warning printed to the console when a deprecated
#. / command line option is used.
-#: src/client/application/geary-application.vala:778
+#: src/client/application/application-client.vala:1047
msgid "The `--hidden` option is deprecated and will be removed in the future."
msgstr "The `--hidden` option is deprecated and will be removed in the future."
#. / Command line warning, string substitution
#. / is the given argument
-#: src/client/application/geary-application.vala:810
+#: src/client/application/application-client.vala:1080
#, c-format
msgid "Unrecognised program argument: “%s”"
msgstr "Unrecognised program argument: “%s”"
-#: src/client/components/components-inspector.vala:68
+#. / Notification title.
+#: src/client/application/application-controller.vala:479
+#, c-format
+msgid "A problem occurred sending email for %s"
+msgstr "A problem occurred sending e-mail for %s"
+
+#. / Notification body
+#: src/client/application/application-controller.vala:483
+msgid "Email will not be sent until re-connected"
+msgstr "E-mail will not be sent until re-connected"
+
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:582
+msgid "Conversation marked"
+msgid_plural "Conversations marked"
+msgstr[0] "Conversation marked"
+msgstr[1] "Conversations marked"
+
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:588
+msgid "Conversation un-marked"
+msgid_plural "Conversations un-marked"
+msgstr[0] "Conversation un-marked"
+msgstr[1] "Conversations un-marked"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:614
+#: src/client/application/application-controller.vala:698
+#, c-format
+msgid "Conversation moved to %s"
+msgid_plural "Conversations moved to %s"
+msgstr[0] "Conversation moved to %s"
+msgstr[1] "Conversations moved to %s"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / 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:622
+#: src/client/application/application-controller.vala:644
+#, c-format
+msgid "Conversation restored to %s"
+msgid_plural "Conversations restored to %s"
+msgstr[0] "Conversation restored to %s"
+msgstr[1] "Conversations restored to %s"
+
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:665
+msgid "Conversation archived"
+msgid_plural "Conversations archived"
+msgstr[0] "Conversation archived"
+msgstr[1] "Conversations archived"
+
+#. / Translators: Label for in-app notification. String
+#. / substitution is the name of the destination folder.
+#: src/client/application/application-controller.vala:721
+#, c-format
+msgid "Message restored to %s"
+msgid_plural "Messages restored to %s"
+msgstr[0] "Message restored to %s"
+msgstr[1] "Messages restored to %s"
+
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:742
+msgid "Message archived"
+msgid_plural "Messages archived"
+msgstr[0] "Message archived"
+msgstr[1] "Messages archived"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:777
+#, c-format
+msgid "Message moved to %s"
+msgid_plural "Messages moved to %s"
+msgstr[0] "Message moved to %s"
+msgstr[1] "Messages moved to %s"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:805
+#, c-format
+msgid "Conversation labelled as %s"
+msgid_plural "Conversations labelled as %s"
+msgstr[0] "Conversation labelled as %s"
+msgstr[1] "Conversations labelled as %s"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:813
+#, c-format
+msgid "Conversation un-labelled as %s"
+msgid_plural "Conversations un-labelled as %s"
+msgstr[0] "Conversation un-labelled as %s"
+msgstr[1] "Conversations un-labelled as %s"
+
+#: src/client/application/application-controller.vala:1320
+#, c-format
+msgid "Unable to open the database for %s"
+msgstr "Unable to open the database for %s"
+
+#: src/client/application/application-controller.vala:1321
+#, c-format
+msgid ""
+"There was an error opening the local mail database for this account. This is "
+"possibly due to corruption of the database file in this directory:\n"
+"\n"
+"%s\n"
+"\n"
+"Geary can rebuild the database and re-synchronize with the server or exit.\n"
+"\n"
+"Rebuilding the database will destroy all local email and its attachments. "
+"<b>The mail on the your server will not be affected.</b>"
+msgstr ""
+"There was an error opening the local mail database for this account. This is "
+"possibly due to corruption of the database file in this directory:\n"
+"\n"
+"%s\n"
+"\n"
+"Geary can rebuild the database and re-synchronise with the server or exit.\n"
+"\n"
+"Rebuilding the database will destroy all local e-mail and its attachments. "
+"<b>The mail on the your server will not be affected.</b>"
+
+#: src/client/application/application-controller.vala:1323
+msgid "_Rebuild"
+msgstr "_Rebuild"
+
+#: src/client/application/application-controller.vala:1323
+msgid "E_xit"
+msgstr "E_xit"
+
+#: src/client/application/application-controller.vala:1333
+#, c-format
+msgid "Unable to rebuild database for “%s”"
+msgstr "Unable to rebuild database for “%s”"
+
+#: src/client/application/application-controller.vala:1334
+#, c-format
+msgid ""
+"Error during rebuild:\n"
+"\n"
+"%s"
+msgstr ""
+"Error during rebuild:\n"
+"\n"
+"%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:1501
+#, c-format
+msgid "Email sent to %s"
+msgstr "E-mail sent to %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:2491
+#, c-format
+msgid "Email to %s queued for delivery"
+msgstr "E-mail to %s queued for delivery"
+
+#. / 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:2555
+#, c-format
+msgid "Email to %s saved"
+msgstr "E-mail to %s saved"
+
+#. / Translators: A label for an in-app notification.
+#: src/client/application/application-controller.vala:2570
+#: src/client/application/application-controller.vala:2628
+msgid "Composer could not be restored"
+msgstr "Composer could not be restored"
+
+#. / 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:2613
+#, c-format
+msgid "Email to %s discarded"
+msgstr "E-mail to %s discarded"
+
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:540
+msgid "Working offline"
+msgstr "Working offline"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:542
+msgid "You will not be able to send or receive email until re-connected."
+msgstr "You will not be able to send or receive e-mail until re-connected."
+
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:549
+msgid "Login problem"
+msgstr "Login problem"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:551
+msgid "An account has reported an incorrect login or password."
+msgstr "An account has reported an incorrect login or password."
+
+#. Translators: An info bar button tool-tip
+#: src/client/application/application-main-window.vala:558
+msgid "Retry login, you will be prompted for your password"
+msgstr "Retry login, you will be prompted for your password"
+
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:565
+msgid "Security problem"
+msgstr "Security problem"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:567
+msgid "An account has reported an untrusted server."
+msgstr "An account has reported an untrusted server."
+
+#. Translators: An info bar button label
+#: src/client/application/application-main-window.vala:570
+msgid "Check"
+msgstr "Check"
+
+#. Translators: An info bar button tool-tip
+#: src/client/application/application-main-window.vala:574
+msgid "Check the security details for the connection"
+msgstr "Check the security details for the connection"
+
+#. / 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:617
+#, c-format
+msgid "%s — %s"
+msgstr "%s — %s"
+
+#. Translators: The name of the folder group containing
+#. folders created by people (as opposed to special-use
+#. folders)
+#: src/client/application/application-main-window.vala:996
+#: src/client/folder-list/folder-list-account-branch.vala:43
+msgid "Labels"
+msgstr "Labels"
+
+#: src/client/application/application-main-window.vala:1293
+#, c-format
+msgid "Empty all email from your %s folder?"
+msgstr "Empty all e-mail from your %s folder?"
+
+#: src/client/application/application-main-window.vala:1294
+msgid "This removes the email from Geary and your email server."
+msgstr "This removes the e-mail from Geary and your e-mail server."
+
+#: src/client/application/application-main-window.vala:1295
+msgid "This cannot be undone."
+msgstr "This cannot be undone."
+
+#: src/client/application/application-main-window.vala:1296
+#, c-format
+msgid "Empty %s"
+msgstr "Empty %s"
+
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/application/application-main-window.vala:1353
+msgid "Do you want to permanently delete this conversation?"
+msgid_plural "Do you want to permanently delete these conversations?"
+msgstr[0] "Do you want to permanently delete this conversation?"
+msgstr[1] "Do you want to permanently delete these conversations?"
+
+#: src/client/application/application-main-window.vala:1358
+#: src/client/application/application-main-window.vala:1373
+msgid "Delete"
+msgstr "Delete"
+
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/application/application-main-window.vala:1368
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] "Do you want to permanently delete this message?"
+msgstr[1] "Do you want to permanently delete these messages?"
+
+#: src/client/application/application-main-window.vala:1691
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#. Translators: The first argument will be a
+#. description of the document type, the second will
+#. be a human-friendly size string. For example:
+#. 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:1784
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: src/client/components/components-attachment-pane.vala:379
+msgid "Are you sure you want to open these attachments?"
+msgstr "Are you sure you want to open these attachments?"
+
+#: src/client/components/components-attachment-pane.vala:380
+msgid ""
+"Attachments may cause damage to your system if opened. Only open files from "
+"trusted sources."
+msgstr ""
+"Attachments may cause damage to your system if opened. Only open files from "
+"trusted sources."
+
+#: src/client/components/components-attachment-pane.vala:381
+msgid "Don’t _ask me again"
+msgstr "Don’t _ask me again"
+
+#: src/client/components/components-inspector.vala:78
msgid "Inspector"
msgstr "Inspector"
#. / Translators: Title for Inspector logs pane
#. / Translators: Title for problem report dialog logs pane
-#: src/client/components/components-inspector.vala:77
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:91
+#: src/client/components/components-inspector.vala:93
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:101
msgid "Logs"
msgstr "Logs"
#. / Translators: Title for Inspector system system information pane
#. / Translators: Title for problem report system information
#. / pane
-#: src/client/components/components-inspector.vala:81
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:94
+#: src/client/components/components-inspector.vala:97
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:104
msgid "System"
msgstr "System"
#. Button label for saving problem report information
-#: src/client/components/components-inspector.vala:198
-#: src/client/components/components-inspector.vala:201
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:210
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:213
-#: ui/problem-details-dialog.ui:42
+#: src/client/components/components-inspector.vala:226
+#: src/client/components/components-inspector.vala:229
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:220
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:223
+#: ui/problem-details-dialog.ui:47
msgid "Save As"
msgstr "Save As"
-#: src/client/components/components-inspector.vala:202
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:214
+#: src/client/components/components-inspector.vala:230
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:224
#: ui/accounts_editor_servers_pane.ui:17
msgid "Cancel"
msgstr "Cancel"
-#. 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:378
-msgid "An email address is required"
-msgstr "An e-mail address is required"
-
-#. Translators: Tooltip used when an entry requires a valid
-#. email address to be entered, but the address is invalid.
-#: src/client/components/components-validator.vala:382
-msgid "Not a valid email address"
-msgstr "Not a valid e-mail address"
-
-#. Translators: Tooltip used when an entry requires a valid,
-#. resolvable server name to be entered, but one is not
-#. provided.
-#: src/client/components/components-validator.vala:428
-msgid "A server name is required"
-msgstr "A server name is required"
-
-#. Translators: Tooltip used when an entry requires a valid
-#. server name to be entered, but it was unable to be
-#. looked-up in the DNS.
-#: src/client/components/components-validator.vala:433
-msgid "Could not look up server name"
-msgstr "Could not look up server name"
-
-#: src/client/components/main-toolbar.vala:139
-msgid "Mark conversation"
-msgid_plural "Mark conversations"
-msgstr[0] "Mark conversation"
-msgstr[1] "Mark conversations"
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:124
+msgid "_Automatically select next message"
+msgstr "_Automatically select next message"
-#: src/client/components/main-toolbar.vala:144
-msgid "Add label to conversation"
-msgid_plural "Add label to conversations"
-msgstr[0] "Add label to conversation"
-msgstr[1] "Add label to conversations"
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:134
+msgid "_Display conversation preview"
+msgstr "_Display conversation preview"
-#: src/client/components/main-toolbar.vala:149
-msgid "Move conversation"
-msgid_plural "Move conversations"
-msgstr[0] "Move conversation"
-msgstr[1] "Move conversations"
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:144
+msgid "Use _three pane view"
+msgstr "Use _three pane view"
-#: src/client/components/main-toolbar.vala:154
-msgid "Archive conversation"
-msgid_plural "Archive conversations"
-msgstr[0] "Archive conversation"
-msgstr[1] "Archive conversations"
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:154
+msgid "Use _single key email shortcuts"
+msgstr "Use _single key e-mail shortcuts"
-#: src/client/components/main-toolbar.vala:163
-msgid "Move conversation to Trash"
-msgid_plural "Move conversations to Trash"
-msgstr[0] "Move conversation to Wastebasket"
-msgstr[1] "Move conversations to Wastebasket"
+#: src/client/components/components-preferences-window.vala:156
+msgid ""
+"Enable keyboard shortcuts for email actions that do not require pressing "
+"<Ctrl>"
+msgstr ""
+"Enable keyboard shortcuts for e-mail actions that do not require pressing "
+"<Ctrl>"
-#: src/client/components/main-toolbar.vala:171
-msgid "Delete conversation"
-msgid_plural "Delete conversations"
-msgstr[0] "Delete conversation"
-msgstr[1] "Delete conversations"
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:167
+msgid "_Watch for new mail when closed"
+msgstr "_Watch for new mail when closed"
-#: src/client/components/main-window.vala:738
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#. / Translators: Preferences tooltip
+#: src/client/components/components-preferences-window.vala:171
+msgid "Geary will keep running after all windows are closed"
+msgstr "Geary will keep running after all windows are closed"
+
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:189
+msgid "Preferences"
+msgstr "Preferences"
+
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:250
+msgid "Plugins"
+msgstr "Plug-ins"
#. Translators: Info bar title for a generic account
#. problem.
-#: src/client/components/main-window-info-bar.vala:44
+#: src/client/components/components-problem-report-info-bar.vala:36
msgid "Account problem"
msgstr "Account problem"
#. Translators: Info bar sub-title for a generic account
#. problem. String substitution is the account name.
-#: src/client/components/main-window-info-bar.vala:48
+#: src/client/components/components-problem-report-info-bar.vala:40
#, c-format
msgid "Geary has encountered a problem with %s."
msgstr "Geary has encountered a problem with %s."
@@ -1213,81 +1400,141 @@ msgstr "Geary has encountered a problem with %s."
#. Translators: Info bar sub-title for a generic
#. account problem. String substitution is the
#. account name.
-#: src/client/components/main-window-info-bar.vala:61
+#: src/client/components/components-problem-report-info-bar.vala:53
#, c-format
msgid "Geary encountered a problem checking mail for %s."
msgstr "Geary encountered a problem checking mail for %s."
#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:65
+#: src/client/components/components-problem-report-info-bar.vala:57
msgid "Try reconnecting"
msgstr "Try reconnecting"
#. Translators: Info bar title for an outgoing
#. account problem. String substitution is the
#. account name
-#: src/client/components/main-window-info-bar.vala:73
+#: src/client/components/components-problem-report-info-bar.vala:65
#, c-format
msgid "Geary encountered a problem sending email for %s."
msgstr "Geary encountered a problem sending e-mail for %s."
#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:77
+#: src/client/components/components-problem-report-info-bar.vala:69
msgid "Retry sending queued messages"
msgstr "Retry sending queued messages"
#. Translators: Info bar title for a generic application
#. problem.
-#: src/client/components/main-window-info-bar.vala:84
+#: src/client/components/components-problem-report-info-bar.vala:76
msgid "Geary has encountered a problem"
msgstr "Geary has encountered a problem"
#. Translators: Info bar sub-title for a generic
#. application problem.
-#: src/client/components/main-window-info-bar.vala:88
+#: src/client/components/components-problem-report-info-bar.vala:80
msgid "Please report the details if it persists."
msgstr "Please report the details if it persists."
#. Translators: Button label for viewing technical details
#. for a problem report.
-#: src/client/components/main-window-info-bar.vala:99
+#: src/client/components/components-problem-report-info-bar.vala:94
msgid "_Details"
msgstr "_Details"
#. Translators: Tooltip for viewing technical details for
#. a problem report.
-#: src/client/components/main-window-info-bar.vala:102
+#: src/client/components/components-problem-report-info-bar.vala:97
msgid "View technical details about the error"
msgstr "View technical details about the error"
#. Translators: Button label for retrying a server
#. connection
-#: src/client/components/main-window-info-bar.vala:108
+#: src/client/components/components-problem-report-info-bar.vala:103
msgid "_Retry"
msgstr "_Retry"
-#: src/client/components/search-bar.vala:8
-#: src/client/folder-list/folder-list-search-branch.vala:38
-#: src/engine/api/geary-special-folder-type.vala:51
+#. / Translators: Search entry placeholder text
+#: src/client/components/components-search-bar.vala:12
+#: src/client/folder-list/folder-list-search-branch.vala:53
+#: src/client/util/util-i18n.vala:298
msgid "Search"
msgstr "Search"
-#. Search entry.
-#: src/client/components/search-bar.vala:23
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Search all mail in account for keywords (Ctrl+S)"
-
-#: src/client/components/search-bar.vala:83
-#, c-format
-msgid "Indexing %s account"
-msgstr "Indexing %s account"
+#. / Translators: Search entry tooltip
+#: src/client/components/components-search-bar.vala:32
+msgid "Search all mail in account for keywords"
+msgstr "Search all mail in account for keywords"
-#: src/client/components/search-bar.vala:110
-#: src/client/folder-list/folder-list-search-branch.vala:39
+#. / 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 "Search %s account"
+#. 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:394
+msgid "An email address is required"
+msgstr "An e-mail address is required"
+
+#. Translators: Tooltip used when an entry requires a valid
+#. email address to be entered, but the address is invalid.
+#: src/client/components/components-validator.vala:398
+msgid "Not a valid email address"
+msgstr "Not a valid e-mail address"
+
+#. Translators: Tooltip used when an entry requires a valid,
+#. resolvable server name to be entered, but one is not
+#. provided.
+#: src/client/components/components-validator.vala:444
+msgid "A server name is required"
+msgstr "A server name is required"
+
+#. Translators: Tooltip used when an entry requires a valid
+#. server name to be entered, but it was unable to be
+#. looked-up in the DNS.
+#: src/client/components/components-validator.vala:449
+msgid "Could not look up server name"
+msgstr "Could not look up server name"
+
+#: src/client/components/main-toolbar.vala:116
+msgid "Mark conversation"
+msgid_plural "Mark conversations"
+msgstr[0] "Mark conversation"
+msgstr[1] "Mark conversations"
+
+#: src/client/components/main-toolbar.vala:121
+msgid "Add label to conversation"
+msgid_plural "Add label to conversations"
+msgstr[0] "Add label to conversation"
+msgstr[1] "Add label to conversations"
+
+#: src/client/components/main-toolbar.vala:126
+msgid "Move conversation"
+msgid_plural "Move conversations"
+msgstr[0] "Move conversation"
+msgstr[1] "Move conversations"
+
+#: src/client/components/main-toolbar.vala:131
+msgid "Archive conversation"
+msgid_plural "Archive conversations"
+msgstr[0] "Archive conversation"
+msgstr[1] "Archive conversations"
+
+#: src/client/components/main-toolbar.vala:142
+msgid "Move conversation to Trash"
+msgid_plural "Move conversations to Trash"
+msgstr[0] "Move conversation to Wastebasket"
+msgstr[1] "Move conversations to Wastebasket"
+
+#: src/client/components/main-toolbar.vala:152
+msgid "Delete conversation"
+msgid_plural "Delete conversations"
+msgstr[0] "Delete conversation"
+msgstr[1] "Delete conversations"
+
#. / 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…"
@@ -1308,7 +1555,9 @@ msgstr "Error saving sent mail"
msgid "_OK"
msgstr "_OK"
-#: src/client/components/stock.vala:19 ui/password-dialog.glade:196
+#: src/client/components/stock.vala:19
+#: src/client/plugin/mail-merge/mail-merge.vala:392
+#: ui/password-dialog.glade:196
msgid "_Cancel"
msgstr "_Cancel"
@@ -1328,15 +1577,17 @@ msgstr "_Close"
msgid "_Discard"
msgstr "_Discard"
-#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:56
+#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:42
msgid "_Help"
msgstr "_Help"
-#: src/client/components/stock.vala:26 ui/conversation-email-menus.ui:77
+#: src/client/components/stock.vala:26
+#: src/client/plugin/mail-merge/mail-merge.vala:391
+#: ui/components-attachment-pane-menus.ui:7
msgid "_Open"
msgstr "_Open"
-#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:46
+#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:32
msgid "_Preferences"
msgstr "_Preferences"
@@ -1353,7 +1604,8 @@ msgstr "_Quit"
msgid "_Remove"
msgstr "_Remove"
-#: src/client/components/stock.vala:31 ui/conversation-email-menus.ui:83
+#: src/client/components/stock.vala:31
+#: ui/components-attachment-pane-menus.ui:11
msgid "_Save"
msgstr "_Save"
@@ -1361,39 +1613,49 @@ msgstr "_Save"
msgid "_Keep"
msgstr "_Keep"
-#: src/client/composer/composer-link-popover.vala:149
+#: src/client/composer/composer-editor.vala:675
+msgid "Select Color"
+msgstr "Select Colour"
+
+#: src/client/composer/composer-link-popover.vala:139
msgid "Link URL is not correctly formatted, e.g. http://example.com";
msgstr "Link URL is not correctly formatted, e.g. http://example.com";
-#: src/client/composer/composer-link-popover.vala:156
+#: src/client/composer/composer-link-popover.vala:146
msgid "Invalid link URL"
msgstr "Invalid link URL"
-#: src/client/composer/composer-link-popover.vala:156
+#: src/client/composer/composer-link-popover.vala:146
msgid "Invalid email address"
msgstr "Invalid e-mail address"
-#: src/client/composer/composer-widget.vala:156
+#. / Translators: Title for an empty composer window
+#: src/client/composer/composer-widget.vala:32
+msgid "New Message"
+msgstr "New Message"
+
+#: src/client/composer/composer-widget.vala:167
msgid "Saved"
msgstr "Saved"
-#: src/client/composer/composer-widget.vala:157
+#: src/client/composer/composer-widget.vala:168
msgid "Saving"
msgstr "Saving"
-#: src/client/composer/composer-widget.vala:158
+#: src/client/composer/composer-widget.vala:169
msgid "Error saving"
msgstr "Error saving"
-#: src/client/composer/composer-widget.vala:159
+#: src/client/composer/composer-widget.vala:170
msgid "Press Backspace to delete quote"
msgstr "Press Backspace to delete quote"
#. Translators: This is list of keywords, separated by pipe ("|")
#. 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:168
+#. 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:186
msgid ""
"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
"enclosing|encloses|enclosure|enclosures"
@@ -1404,187 +1666,163 @@ 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:1181
+#: src/client/composer/composer-widget.vala:862
msgid "Do you want to keep or discard this draft message?"
msgstr "Do you want to keep or discard this draft message?"
#. 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:1211
+#: src/client/composer/composer-widget.vala:888
msgid "Do you want to discard this draft message?"
msgstr "Do you want to discard this draft message?"
-#: src/client/composer/composer-widget.vala:1330
+#: src/client/composer/composer-widget.vala:1440
msgid "Send message with an empty subject and body?"
msgstr "Send message with an empty subject and body?"
-#: src/client/composer/composer-widget.vala:1332
+#: src/client/composer/composer-widget.vala:1442
msgid "Send message with an empty subject?"
msgstr "Send message with an empty subject?"
-#: src/client/composer/composer-widget.vala:1334
+#: src/client/composer/composer-widget.vala:1444
msgid "Send message with an empty body?"
msgstr "Send message with an empty body?"
-#: src/client/composer/composer-widget.vala:1338
+#: src/client/composer/composer-widget.vala:1453
msgid "Send message without an attachment?"
msgstr "Send message without an attachment?"
-#: src/client/composer/composer-widget.vala:1652
+#: src/client/composer/composer-widget.vala:1772
#, c-format
msgid "“%s” already attached for delivery."
msgstr "“%s” already attached for delivery."
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#. Translators: The first argument will be a
-#. 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:1660
-#: src/client/conversation-viewer/conversation-email.vala:173
+#: src/client/composer/composer-widget.vala:1804
+#: src/client/composer/composer-widget.vala:1854
#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+msgid "“%s” is an empty file."
+msgstr "“%s” is an empty file."
-#: src/client/composer/composer-widget.vala:1697
+#: src/client/composer/composer-widget.vala:1842
#, c-format
msgid "“%s” could not be found."
msgstr "“%s” could not be found."
-#: src/client/composer/composer-widget.vala:1703
+#: src/client/composer/composer-widget.vala:1848
#, c-format
msgid "“%s” is a folder."
msgstr "“%s” is a folder."
-#: src/client/composer/composer-widget.vala:1709
-#, c-format
-msgid "“%s” is an empty file."
-msgstr "“%s” is an empty file."
-
-#: src/client/composer/composer-widget.vala:1722
+#: src/client/composer/composer-widget.vala:1867
#, c-format
msgid "“%s” could not be opened for reading."
msgstr "“%s” could not be opened for reading."
-#: src/client/composer/composer-widget.vala:1730
+#: src/client/composer/composer-widget.vala:1875
msgid "Cannot add attachment"
msgstr "Cannot add attachment"
+#. Translators: This is the name of the file chooser filter
+#. when inserting an image in the composer.
+#: src/client/composer/composer-widget.vala:1946
+msgid "Images"
+msgstr "Images"
+
#. Translators: Human-readable version of the RFC 822 To header
-#: 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
+#: src/client/composer/composer-widget.vala:2010
+#: src/client/conversation-viewer/conversation-email.vala:542
+#: src/client/util/util-email.vala:249 ui/conversation-message.ui:312
msgid "To:"
msgstr "To:"
#. Translators: Human-readable version of the RFC 822 CC header
-#: 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
+#: src/client/composer/composer-widget.vala:2016
+#: src/client/conversation-viewer/conversation-email.vala:547
+#: src/client/util/util-email.vala:254 ui/conversation-message.ui:357
msgid "Cc:"
msgstr "Cc:"
#. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:1799
-#: src/client/conversation-viewer/conversation-email.vala:986
+#: src/client/composer/composer-widget.vala:2022
+#: src/client/conversation-viewer/conversation-email.vala:552
#: ui/conversation-message.ui:402
msgid "Bcc:"
msgstr "Bcc:"
#. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:1805
+#: src/client/composer/composer-widget.vala:2028
msgid "Reply-To: "
msgstr "Reply-To: "
-#: src/client/composer/composer-widget.vala:1945
-msgid "Select Color"
-msgstr "Select Colour"
-
#. Displayed in the From dropdown to indicate an
#. "alternate email address" for an account. The first
#. printf argument will be the alternate email address,
#. and the second will be the account's primary email
#. address.
-#: src/client/composer/composer-widget.vala:2137
+#: src/client/composer/composer-widget.vala:2146
#, 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:2192
-msgid "_From:"
-msgstr "_From:"
-
-#. Translators: This is the name of the file chooser filter
-#. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2472
-msgid "Images"
-msgstr "Images"
-
-#: src/client/composer/composer-window.vala:14
-msgid "New Message"
-msgstr "New Message"
-
-#: 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 "Remove this language from the preferred list"
-#: 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 "Add this language to the preferred list"
-#: src/client/composer/spell-check-popover.vala:199
+#: src/client/composer/spell-check-popover.vala:225
msgid "Search for more languages"
msgstr "Search for more languages"
#. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:337
+#: src/client/conversation-list/conversation-list-view.vala:339
msgid "Move conversation to _Trash"
msgid_plural "Move conversations to _Trash"
msgstr[0] "Move conversation to Was_tebasket"
msgstr[1] "Move conversations to Was_tebasket"
#. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:347
+#: src/client/conversation-list/conversation-list-view.vala:351
msgid "_Delete conversation"
msgid_plural "_Delete conversations"
msgstr[0] "_Delete conversation"
msgstr[1] "_Delete conversations"
-#: src/client/conversation-list/conversation-list-view.vala:356
+#: src/client/conversation-list/conversation-list-view.vala:364
#: ui/main-toolbar-menus.ui:5
msgid "Mark as _Read"
msgstr "Mark as _Read"
-#: src/client/conversation-list/conversation-list-view.vala:359
+#: src/client/conversation-list/conversation-list-view.vala:372
#: ui/main-toolbar-menus.ui:9
msgid "Mark as _Unread"
msgstr "Mark as _Unread"
-#: src/client/conversation-list/conversation-list-view.vala:362
+#: src/client/conversation-list/conversation-list-view.vala:380
#: ui/main-toolbar-menus.ui:17
msgid "U_nstar"
msgstr "U_nstar"
-#: src/client/conversation-list/conversation-list-view.vala:364
+#: src/client/conversation-list/conversation-list-view.vala:387
#: ui/main-toolbar-menus.ui:13
msgid "_Star"
msgstr "_Star"
#. Translators: Menu item to reply to a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:367
+#: src/client/conversation-list/conversation-list-view.vala:396
#: ui/conversation-email-menus.ui:9
msgid "_Reply"
msgstr "_Reply"
-#: src/client/conversation-list/conversation-list-view.vala:368
+#: src/client/conversation-list/conversation-list-view.vala:402
msgid "R_eply All"
msgstr "R_eply All"
#. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:369
+#: src/client/conversation-list/conversation-list-view.vala:408
#: ui/conversation-email-menus.ui:21
msgid "_Forward"
msgstr "_Forward"
@@ -1594,69 +1832,105 @@ msgid "Me"
msgstr "Me"
#. Translators: Human-readable version of the RFC 822 From header
-#: src/client/conversation-viewer/conversation-email.vala:971
-#: src/client/util/util-email.vala:207
+#: src/client/conversation-viewer/conversation-email.vala:537
+#: src/client/util/util-email.vala:240
msgid "From:"
msgstr "From:"
#. Translators: Human-readable version of the RFC 822 Date header
-#: src/client/conversation-viewer/conversation-email.vala:991
-#: src/client/util/util-email.vala:212
+#: src/client/conversation-viewer/conversation-email.vala:557
+#: src/client/util/util-email.vala:245
msgid "Date:"
msgstr "Date:"
#. Translators: Human-readable version of the RFC 822 Subject header
-#: src/client/conversation-viewer/conversation-email.vala:1001
-#: src/client/util/util-email.vala:210
+#: src/client/conversation-viewer/conversation-email.vala:567
+#: src/client/util/util-email.vala:243
msgid "Subject:"
msgstr "Subject:"
-#: src/client/conversation-viewer/conversation-message.vala:129
+#: src/client/conversation-viewer/conversation-message.vala:128
msgid "This email address may have been forged"
msgstr "This e-mail address may have been forged"
+#. Translators: Label text displayed when there are too
+#. many email addresses to be shown by default in an
+#. email's header, but they are all being shown anyway.
+#: src/client/conversation-viewer/conversation-message.vala:234
+msgid "Show less"
+msgstr "Show less"
+
+#. Translators: Label text displayed when there are
+#. too many email addresses to be shown by default in
+#. an email's header. The string substitution is the
+#. number of extra email to be shown.
+#: src/client/conversation-viewer/conversation-message.vala:260
+#, c-format
+msgid "%d more…"
+msgstr "%d more…"
+
#. Compact headers. These are partially done here and partially
#. 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:447
+#: src/client/conversation-viewer/conversation-message.vala:529
msgid "No sender"
msgstr "No sender"
#. Translators: This separates multiple 'from'
#. addresses in the compact header for a message.
-#: src/client/conversation-viewer/conversation-message.vala:840
+#: src/client/conversation-viewer/conversation-message.vala:920
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:960
+#: src/client/conversation-viewer/conversation-message.vala:1040
msgid "Image"
msgstr "Image"
+#. Translators: Info bar status message
+#: src/client/conversation-viewer/conversation-message.vala:1305
+msgid "Remote images not shown"
+msgstr "Remote images not shown"
+
+#. Translators: Info bar description
+#: src/client/conversation-viewer/conversation-message.vala:1307
+msgid "Only show remote images from senders you trust."
+msgstr "Only show remote images from senders you trust."
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1311
+msgid "Show"
+msgstr "Show"
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1315
+msgid "Always show from sender"
+msgstr "Always show from sender"
+
#. Translators: Title label for placeholder when no
#. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:82
+#: src/client/conversation-viewer/conversation-viewer.vala:83
msgid "No conversations selected"
msgstr "No conversations selected"
#. Translators: Sub-title label for placeholder when no
#. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:86
+#: src/client/conversation-viewer/conversation-viewer.vala:87
msgid "Selecting a conversation from the list will display it here"
msgstr "Selecting a conversation from the list will display it here"
#. Translators: Title label for placeholder when multiple
#. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:95
+#: src/client/conversation-viewer/conversation-viewer.vala:96
msgid "Multiple conversations selected"
msgstr "Multiple conversations selected"
#. Translators: Sub-title label for placeholder when multiple
#. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:99
+#: src/client/conversation-viewer/conversation-viewer.vala:100
msgid "Choosing an action will apply to all selected conversations"
msgstr "Choosing an action will apply to all selected conversations"
@@ -1664,20 +1938,20 @@ msgstr "Choosing an action will apply to all selected conversations"
#. 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:108
-#: src/client/conversation-viewer/conversation-viewer.vala:121
+#: src/client/conversation-viewer/conversation-viewer.vala:109
+#: src/client/conversation-viewer/conversation-viewer.vala:122
msgid "No conversations found"
msgstr "No conversations found"
#. Translators: Sub-title label for placeholder when no
#. conversations have exist in a folder.
-#: src/client/conversation-viewer/conversation-viewer.vala:112
+#: src/client/conversation-viewer/conversation-viewer.vala:113
msgid "This folder does not contain any conversations"
msgstr "This folder does not contain any conversations"
#. Translators: Sub-title label for placeholder when no
#. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:125
+#: src/client/conversation-viewer/conversation-viewer.vala:126
msgid "Your search returned no results, try refining your search terms"
msgstr "Your search returned no results, try refining your search terms"
@@ -1766,8 +2040,8 @@ msgstr "An error has occurred processing the server’s certificate"
#. / 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:89
-#: ui/problem-details-dialog.ui:12
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:99
+#: ui/problem-details-dialog.ui:17
msgid "Details"
msgstr "Details"
@@ -1778,26 +2052,32 @@ msgstr "Details"
msgid "Geary requires your email password to continue"
msgstr "Geary requires your e-mail password to continue"
-#. Label displaying total number of email messages in a folder
-#: src/client/folder-list/folder-list-folder-entry.vala:32
+#. Translators: Label displaying total number of email
+#. messages in a folder. String substitution is the actual
+#. number.
+#: src/client/folder-list/folder-list-folder-entry.vala:42
#, c-format
msgid "%d message"
msgid_plural "%d messages"
msgstr[0] "%d message"
msgstr[1] "%d messages"
-#. / Label displaying number of unread email messages in a folder
-#: src/client/folder-list/folder-list-folder-entry.vala:39
+#. Translators: Label displaying number of unread email
+#. messages in a folder. String substitution is the actual
+#. number.
+#: src/client/folder-list/folder-list-folder-entry.vala:52
#, c-format
msgid "%d unread"
msgid_plural "%d unread"
msgstr[0] "%d unread"
msgstr[1] "%d unread"
-#. / This string represents the divider between two messages: "n messages" and "n unread",
-#. / shown in the folder list as a tooltip. Please use your languages conventions for
-#. / combining the two, i.e. a comma (",") for English; "6 messages, 3 unread"
-#: src/client/folder-list/folder-list-folder-entry.vala:45
+#. Translators: This string represents the divider between two
+#. messages: "n messages" and "n unread", shown in the folder
+#. list as a tooltip. Please use your languages conventions
+#. for combining the two, i.e. a comma (",") for English; "6
+#. messages, 3 unread"
+#: src/client/folder-list/folder-list-folder-entry.vala:60
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
@@ -1806,51 +2086,227 @@ msgstr "%s, %s"
msgid "Inboxes"
msgstr "Inboxes"
-#: src/client/folder-list/folder-list-search-branch.vala:44
+#: src/client/folder-list/folder-list-search-branch.vala:59
#, c-format
msgid "%d result"
msgid_plural "%d results"
msgstr[0] "%d result"
msgstr[1] "%d results"
-#: src/client/notification/libmessagingmenu.vala:75
+#. / Notification body when a message as been received
+#. / and other unread messages have not been
+#. / seen. First string substitution is the message
+#. / subject and the second is the number of unseen
+#. / messages
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:138
#, c-format
-msgid "%s — New Messages"
-msgstr "%s — New Messages"
+msgid ""
+"%s\n"
+"(%d other new message)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages)"
+msgstr[0] ""
+"%s\n"
+"(%d other new message)"
+msgstr[1] ""
+"%s\n"
+"(%d other new messages)"
-#. / Notification body text for new email when no other
-#. / new messages are already awaiting.
-#: src/client/notification/notification-desktop.vala:90
+#. / Notification body when multiple messages have been
+#. / received at the same time and other unseen messages
+#. / exist. String substitution is the number of new
+#. / messages that have arrived.
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:157
#, c-format
msgid "%d new message"
msgid_plural "%d new messages"
msgstr[0] "%d new message"
msgstr[1] "%d new messages"
-#. / Notification body text for new email when
-#. / other new messages have already been notified
-#. / about
-#: src/client/notification/notification-desktop.vala:98
+#. / Notification body when multiple messages have been
+#. / received at the same time and some unseen messages
+#. / already exist. String substitution is the message
+#. / above with the number of new messages that have
+#. / arrived, number substitution is the total number
+#. / of unseen messages.
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:167
#, c-format
msgid "%s, %d new message total"
msgid_plural "%s, %d new messages total"
msgstr[0] "%s, %d new message total"
msgstr[1] "%s, %d new messages total"
-#: src/client/notification/notification-desktop.vala:130
+#. / Notification title when new messages have been
+#. / received
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:282
+msgid "New message"
+msgid_plural "New messages"
+msgstr[0] "New message"
+msgstr[1] "New messages"
+
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:4
+msgid "Email Templates"
+msgstr "E-mail Templates"
+
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:5
+msgid "Create reusable templates for sending email"
+msgstr "Create reusable templates for sending e-mail"
+
+#. Translators: Templates folder name alternatives. 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/client/plugin/email-templates/email-templates.vala:29
+#: src/client/plugin/mail-merge/mail-merge.vala:29
+msgid "Templates | Template Mail | Template Email | Template E-Mail"
+msgstr "Templates | Template Mail | Template Email | Template E-Mail"
+
+#. Translators: The name of the folder used to
+#. store email templates
+#: src/client/plugin/email-templates/email-templates.vala:201
+msgid "Templates"
+msgstr "Templates"
+
+#. Translators: Info bar button label for creating a
+#. new email template
+#: src/client/plugin/email-templates/email-templates.vala:282
+msgid "New"
+msgstr "New"
+
+#. Translators: Infobar status label for an email template
+#: src/client/plugin/email-templates/email-templates.vala:293
+msgid "Message template"
+msgstr "Message template"
+
+#. Translators: Info bar button label for sending an
+#. email template
+#: src/client/plugin/email-templates/email-templates.vala:297
+msgid "Send"
+msgstr "Send"
+
+#. Translators: Info bar button label for editing an
+#. existing email template
+#. Translators: Info bar button label for editing a draft
+#. email
+#: src/client/plugin/email-templates/email-templates.vala:305
+#: src/client/plugin/mail-merge/mail-merge.vala:336
+#: src/client/plugin/special-folders/special-folders.vala:187
+msgid "Edit"
+msgstr "Edit"
+
+#. / Translators: Menu item label for invoking mail
+#. / merge in composer
+#. / Translators: File chooser title after invoking mail
+#. / merge in composer
+#. Translators: The name of the folder used to
+#. display merged email
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:5
+#: src/client/plugin/mail-merge/mail-merge.vala:288
+#: src/client/plugin/mail-merge/mail-merge.vala:389
+#: src/client/plugin/mail-merge/mail-merge.vala:488
+msgid "Mail Merge"
+msgstr "Mail Merge"
+
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:6
+msgid "Fill in and send email templates using a spreadsheet"
+msgstr "Fill in and send e-mail templates using a spreadsheet"
+
+#. Translators: Info bar label for starting sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:118
+msgid "Start"
+msgstr "Start"
+
+#. Translators: Info bar label for pausing sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:130
+msgid "Pause"
+msgstr "Pause"
+
+#. Translators: Info bar description for the mail merge
+#. folder. The first string substitution the number of email
+#. already sent, the second is the total number to send.
+#: src/client/plugin/mail-merge/mail-merge.vala:240
#, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] ""
-"%s\n"
-"(%d other new message for %s)"
-msgstr[1] ""
-"%s\n"
-"(%d other new messages for %s)"
+#| msgid "Sent %u of %u"
+msgid "Sent %u of %u"
+msgid_plural "Sent %u of %u"
+msgstr[0] "Sent %u of %u"
+msgstr[1] "Sent %u of %u"
+
+#. Translators: Infobar status label for an email mail merge
+#. template
+#: src/client/plugin/mail-merge/mail-merge.vala:324
+msgid "Mail merge template"
+msgstr "Mail merge template"
+
+#. Translators: Info bar button label for performing a
+#. mail-merge on an email template
+#: src/client/plugin/mail-merge/mail-merge.vala:328
+msgid "Merge"
+msgstr "Merge"
+
+#. / Translators: Action bar menu button label for
+#. / mail-merge plugin
+#: src/client/plugin/mail-merge/mail-merge.vala:377
+msgid "Insert field"
+msgstr "Insert field"
+
+#. / Translators: File chooser filer label
+#: src/client/plugin/mail-merge/mail-merge.vala:396
+msgid "Comma separated values (CSV)"
+msgstr "Comma separated values (CSV)"
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:4
+msgid "Messaging Menu"
+msgstr "Messaging Menu"
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:5
+msgid "Displays Unity Messaging Menu notifications for new email"
+msgstr "Displays Unity Messaging Menu notifications for new e-mail"
+
+#: src/client/plugin/messaging-menu/messaging-menu.vala:79
+#, c-format
+msgid "%s — New Messages"
+msgstr "%s — New Messages"
+
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:4
+msgid "Sent Sound"
+msgstr "Sent Sound"
+
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:5
+msgid "Plays the desktop sent-mail sound when an email is sent"
+msgstr "Plays the desktop sent-mail sound when an e-mail is sent"
+
+#. Translators: Info bar button label for emptying
+#. trash/spam folders
+#: src/client/plugin/special-folders/special-folders.vala:167
+msgid "Empty"
+msgstr "Empty"
+
+#. Translators: Info bar status message for a draft email
+#: src/client/plugin/special-folders/special-folders.vala:179
+msgid "Draft message"
+msgstr "Draft message"
+
+#. Translators: Info bar status description for a draft
+#. email
+#: src/client/plugin/special-folders/special-folders.vala:182
+msgid "This message has not yet been sent."
+msgstr "This message has not yet been sent."
+
+#. Translators: Info bar status message for an sent but
+#. unsaved email
+#: src/client/plugin/special-folders/special-folders.vala:198
+msgid "Message not saved"
+msgstr "Message not saved"
+
+#. Translators: Info bar status description for a sent but
+#. unsaved email
+#: src/client/plugin/special-folders/special-folders.vala:201
+msgid "This message was sent, but has not been saved to your account."
+msgstr "This message was sent, but has not been saved to your account."
#. / Datetime format for 12-hour time, i.e. 8:31 am
#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
@@ -1920,41 +2376,46 @@ msgstr "Yesterday"
msgid "%A"
msgstr "%A"
-#. / 12 hours format for datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:216
+#. / 12 hours format for datetime that a message being replied
+#. / to was received See
+#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:218
msgid "%a, %b %-e, %Y at %l:%M %P"
msgstr "%a, %-e %b, %Y at %l:%M %P"
-#. / 24 hours format for the datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:220
+#. / 24 hours format for the datetime that a message being
+#. / replied to was received See
+#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:224
msgid "%a, %b %-e, %Y at %H:%M"
msgstr "%a, %-e %b, %Y at %H:%M"
-#. / Format for the datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:224
+#. / Format for the datetime that a message being replied to
+#. / was received See
+#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:230
msgid "%a, %b %-e, %Y at %X"
msgstr "%a, %-e %b, %Y at %X"
-#: src/client/util/util-email.vala:38 src/engine/rfc822/rfc822-message.vala:948
-msgid "(no subject)"
-msgstr "(no subject)"
+#. Translators: Label used when an email has a missing or
+#. an empty subject
+#: src/client/util/util-email.vala:50
+msgid "(No subject)"
+msgstr "(No subject)"
-#. Translators: This is shown for displaying a list of
-#. email recipients that happens to be empty,
-#. i.e. contains no email addresses.
-#: src/client/util/util-email.vala:116
+#. / Translators: This is shown for displaying a list of email
+#. / recipients that happens to be empty, i.e. contains no
+#. / email addresses.
+#: src/client/util/util-email.vala:148
msgid "(No recipients)"
msgstr "(No recipients)"
-#. Translators: This is used for displaying a short list of
-#. email recipients lists with two or more addresses. The
-#. first (string) substitution is address of the first, the
-#. second substitution is the number of n - 1 remaining
-#. recipients.
-#: src/client/util/util-email.vala:130
+#. / Translators: This is used for displaying a short
+#. / list of email recipients lists with two or more
+#. / addresses. The first (string) substitution is
+#. / address of the first, the second substitution is
+#. / the number of n - 1 remaining recipients.
+#: src/client/util/util-email.vala:160
#, c-format
msgid "%s and %d other"
msgid_plural "%s and %d others"
@@ -1964,26 +2425,26 @@ msgstr[1] "%s and %d others"
#. / The quoted header for a message being replied to.
#. / %1$s will be substituted for the date, and %2$s will be substituted for
#. / the original sender.
-#: src/client/util/util-email.vala:160
+#: src/client/util/util-email.vala:193
#, c-format
msgid "On %1$s, %2$s wrote:"
msgstr "On %1$s, %2$s wrote:"
#. / The quoted header for a message being replied to (in case the date is not known).
#. / %s will be replaced by the original sender.
-#: src/client/util/util-email.vala:167
+#: src/client/util/util-email.vala:200
#, c-format
msgid "%s wrote:"
msgstr "%s wrote:"
#. / The quoted header for a message being replied to (in case the sender is not known).
#. / %s will be replaced by the original date
-#: src/client/util/util-email.vala:173
+#: src/client/util/util-email.vala:206
#, c-format
msgid "On %s:"
msgstr "On %s:"
-#: src/client/util/util-email.vala:202
+#: src/client/util/util-email.vala:235
msgid "---------- Forwarded message ----------"
msgstr "---------- Forwarded message ----------"
@@ -2011,43 +2472,43 @@ msgctxt "Abbreviation for kilobyte"
msgid "KB"
msgstr "KB"
-#: src/engine/api/geary-special-folder-type.vala:24
+#: src/client/util/util-i18n.vala:271
msgid "Inbox"
msgstr "Inbox"
-#: src/engine/api/geary-special-folder-type.vala:27
+#: src/client/util/util-i18n.vala:274
msgid "Drafts"
msgstr "Drafts"
-#: src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Sent Mail"
+#: src/client/util/util-i18n.vala:277
+msgid "Sent"
+msgstr "Sent"
-#: src/engine/api/geary-special-folder-type.vala:33
+#: src/client/util/util-i18n.vala:280
msgid "Starred"
msgstr "Starred"
-#: src/engine/api/geary-special-folder-type.vala:36
+#: src/client/util/util-i18n.vala:283
msgid "Important"
msgstr "Important"
-#: src/engine/api/geary-special-folder-type.vala:39
+#: src/client/util/util-i18n.vala:286
msgid "All Mail"
msgstr "All Mail"
-#: src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Spam"
+#: src/client/util/util-i18n.vala:289
+msgid "Junk"
+msgstr "Junk"
-#: src/engine/api/geary-special-folder-type.vala:45
+#: src/client/util/util-i18n.vala:292
msgid "Trash"
msgstr "Wastebasket"
-#: src/engine/api/geary-special-folder-type.vala:48
+#: src/client/util/util-i18n.vala:295
msgid "Outbox"
msgstr "Outbox"
-#: src/engine/api/geary-special-folder-type.vala:54
+#: src/client/util/util-i18n.vala:301
msgid "Archive"
msgstr "Archive"
@@ -2064,7 +2525,7 @@ msgstr "Archive"
#. 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 "attachment"
@@ -2077,7 +2538,7 @@ msgstr "attachment"
#. 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 "bcc"
@@ -2089,7 +2550,7 @@ msgstr "bcc"
#. 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 "body"
@@ -2102,7 +2563,7 @@ msgstr "body"
#. 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"
@@ -2115,7 +2576,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 "from"
@@ -2127,7 +2588,7 @@ msgstr "from"
#. 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 "is"
@@ -2139,7 +2600,7 @@ msgstr "is"
#. 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 "subject"
@@ -2152,7 +2613,7 @@ msgstr "subject"
#. 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 "to"
@@ -2165,7 +2626,7 @@ msgstr "to"
#. 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 "me"
@@ -2177,7 +2638,7 @@ msgstr "me"
#. 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 "me"
@@ -2189,7 +2650,7 @@ msgstr "me"
#. 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 "read"
@@ -2202,7 +2663,7 @@ msgstr "read"
#. 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 "starred"
@@ -2214,7 +2675,7 @@ msgstr "starred"
#. 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 "unread"
@@ -2223,7 +2684,7 @@ msgstr "unread"
#. 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:953
+#: src/engine/imap-engine/imap-engine-generic-account.vala:996
msgid "Drafts | Draft"
msgstr "Drafts | Draft"
@@ -2231,22 +2692,22 @@ msgstr "Drafts | Draft"
#. 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:962
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1005
msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
msgstr "Sent | Sent Mail | Sent E-mail | Sent E-Mail"
#. The localised name(s) of the Sent folder name as used
#. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:967
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1010
msgctxt "Outlook localised name"
msgid "Sent Items"
msgstr "Sent Items"
#. List of general possible folder names to match for the
-#. 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:977
+#. Junk/Spam mailbox. Separate names using a vertical bar
+#. and put the most common localized name to the front for
+#. the default. English names do not need to be included.
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1020
msgid ""
"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
"| Bulk E-Mail"
@@ -2258,13 +2719,13 @@ msgstr ""
#. Trash mailbox. Separate names using a vertical bar and
#. put the most common localized name to the front for the
#. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:987
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1030
msgid "Trash | Rubbish | Rubbish Bin"
msgstr "Wastebasket"
#. The localised name(s) of the Trash folder name as used
#. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:992
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1035
msgctxt "Outlook localised name"
msgid "Deleted Items"
msgstr "Deleted items"
@@ -2273,23 +2734,37 @@ msgstr "Deleted items"
#. 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:1002
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1045
msgid "Archive | Archives"
msgstr "Archive | Archives"
+#: src/engine/rfc822/rfc822-message.vala:528
+#, c-format
+msgid "Could not determine mime type for “%s”."
+msgstr "Could not determine mime type for “%s”."
+
+#: src/engine/rfc822/rfc822-message.vala:539
+#, c-format
+msgid "Could not determine content type for mime type “%s” on “%s”."
+msgstr "Could not determine content type for mime type “%s” on “%s”."
+
+#: src/engine/rfc822/rfc822-message.vala:1013
+msgid "(no subject)"
+msgstr "(no subject)"
+
#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:126
msgid "Add an account"
msgstr "Add an account"
#: ui/accounts_editor_add_pane.ui:53
-msgid "Create"
-msgstr "Create"
+msgid "_Create"
+msgstr "_Create"
-#: ui/accounts_editor_add_pane.ui:130 ui/accounts_editor_servers_pane.ui:125
+#: ui/accounts_editor_add_pane.ui:131 ui/accounts_editor_servers_pane.ui:125
msgid "Receiving"
msgstr "Receiving"
-#: ui/accounts_editor_add_pane.ui:178 ui/accounts_editor_servers_pane.ui:165
+#: ui/accounts_editor_add_pane.ui:179 ui/accounts_editor_servers_pane.ui:165
msgid "Sending"
msgstr "Sending"
@@ -2377,263 +2852,313 @@ msgstr "_Trust This Server"
msgid "_Don’t Trust This Server"
msgstr "_Don’t Trust This Server"
-#: ui/composer-headerbar.ui:17 ui/composer-headerbar.ui:174
-msgid "Detach (Ctrl+D)"
-msgstr "Detach (Ctrl+D)"
+#: ui/composer-editor.ui:100
+msgid "Bold text"
+msgstr "Bold text"
+
+#: ui/composer-editor.ui:124
+msgid "Italic text"
+msgstr "Italic text"
+
+#: ui/composer-editor.ui:148
+msgid "Underline text"
+msgstr "Underline text"
-#: ui/composer-headerbar.ui:57 ui/composer-headerbar.ui:83
-msgid "Attach File (Ctrl+T)"
-msgstr "Attach File (Ctrl+T)"
+#: ui/composer-editor.ui:172
+msgid "Strikethrough text"
+msgstr "Strikethrough text"
-#: ui/composer-headerbar.ui:107
-msgid "Include Original Attachments"
-msgstr "Include Original Attachments"
+#: ui/composer-editor.ui:205
+msgid "Insert bulleted list"
+msgstr "Insert bulleted list"
-#: ui/composer-headerbar.ui:202
-msgid "_Send"
-msgstr "_Send"
+#: ui/composer-editor.ui:229
+msgid "Insert numbered list"
+msgstr "Insert numbered list"
-#: ui/composer-headerbar.ui:207
-msgid "Send (Ctrl+Enter)"
-msgstr "Send (Ctrl+Enter)"
+#: ui/composer-editor.ui:262
+msgid "Indent or quote text"
+msgstr "Indent or quote text"
-#: ui/composer-headerbar.ui:230
-msgid "Discard and Close"
-msgstr "Discard and Close"
+#: ui/composer-editor.ui:286
+msgid "Un-indent or unquote text"
+msgstr "Un-indent or unquote text"
-#: ui/composer-headerbar.ui:254
-msgid "Save and Close"
-msgstr "Save and Close"
+#: ui/composer-editor.ui:315
+msgid "Remove text formatting"
+msgstr "Remove text formatting"
-#. 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
-msgid "Insert the new link with this URL"
-msgstr "Insert the new link with this URL"
+#: ui/composer-editor.ui:334
+msgid "Change font type"
+msgstr "Change font type"
-#: ui/composer-link-popover.ui:52
-msgid "Link URL"
-msgstr "Link URL"
+#: ui/composer-editor.ui:349
+msgid "Sans Serif"
+msgstr "Sans Serif"
-#. 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
-msgid "Update this link’s URL"
-msgstr "Update this link’s URL"
+#: ui/composer-editor.ui:360
+msgid "Serif"
+msgstr "Serif"
-#: ui/composer-link-popover.ui:86
-msgid "Delete this link"
-msgstr "Delete this link"
+#: ui/composer-editor.ui:371
+msgid "Fixed Width"
+msgstr "Fixed Width"
+
+#: ui/composer-editor.ui:397
+msgid "Change font color"
+msgstr "Change font colour"
+
+#: ui/composer-editor.ui:412
+msgid "Change font size"
+msgstr "Change font size"
+
+#: ui/composer-editor.ui:447
+msgid "Insert or update text link"
+msgstr "Insert or update text link"
+
+#: ui/composer-editor.ui:471
+msgid "Insert an image"
+msgstr "Insert an image"
-#: ui/composer-link-popover.ui:106
-msgid "Open this link"
-msgstr "Open this link"
+#: ui/composer-editor.ui:513
+msgid "Undo last edit"
+msgstr "Undo last edit"
+
+#: ui/composer-editor.ui:537
+msgid "Redo last edit"
+msgstr "Redo last edit"
+
+#: ui/composer-editor.ui:566 ui/composer-editor.ui:591
+msgid "Attach a file"
+msgstr "Attach a file"
+
+#: ui/composer-editor.ui:615
+msgid "Add original attachments"
+msgstr "Add original attachments"
+
+#: ui/composer-editor.ui:660
+msgid "More options"
+msgstr "More options"
+
+#: ui/composer-editor.ui:680
+msgid "Show formatting toolbar"
+msgstr "Show formatting toolbar"
+
+#: ui/composer-editor.ui:698
+msgid "Select spell checking languages"
+msgstr "Select spell checking languages"
-#: ui/composer-menus.ui:7
+#: ui/composer-editor.ui:723
msgid "S_ans Serif"
msgstr "S_ans Serif"
-#: ui/composer-menus.ui:12
+#: ui/composer-editor.ui:728
msgid "S_erif"
msgstr "S_erif"
-#: ui/composer-menus.ui:17
+#: ui/composer-editor.ui:733
msgid "_Fixed Width"
msgstr "_Fixed Width"
-#: ui/composer-menus.ui:24
+#: ui/composer-editor.ui:743
msgid "_Small"
msgstr "_Small"
-#: ui/composer-menus.ui:29
+#: ui/composer-editor.ui:748
msgid "_Medium"
msgstr "_Medium"
-#: ui/composer-menus.ui:34
+#: ui/composer-editor.ui:753
msgid "Lar_ge"
msgstr "Lar_ge"
-#: ui/composer-menus.ui:41
-msgid "C_olor"
-msgstr "C_olour"
-
-#: ui/composer-menus.ui:47 ui/composer-menus.ui:62
+#: ui/composer-editor.ui:763
msgid "_Rich Text"
msgstr "_Rich Text"
-#: ui/composer-menus.ui:53 ui/composer-menus.ui:68
-msgid "Show Extended Fields"
-msgstr "Show Extended Fields"
+#: ui/composer-editor.ui:768
+msgid "_Plain Text"
+msgstr "_Plain Text"
-#: ui/composer-menus.ui:78
+#: ui/composer-editor-menus.ui:8
msgid "_Undo"
msgstr "_Undo"
-#: ui/composer-menus.ui:82
+#: ui/composer-editor-menus.ui:12
msgid "_Redo"
msgstr "_Redo"
-#: ui/composer-menus.ui:88 ui/composer-menus.ui:106
+#: ui/composer-editor-menus.ui:18 ui/composer-editor-menus.ui:36
msgid "Cu_t"
msgstr "Cu_t"
-#: ui/composer-menus.ui:92 ui/composer-menus.ui:110
+#: ui/composer-editor-menus.ui:22 ui/composer-editor-menus.ui:40
#: ui/conversation-message-menus.ui:37
msgid "_Copy"
msgstr "_Copy"
-#: ui/composer-menus.ui:96 ui/composer-menus.ui:114
-msgid "_Paste"
-msgstr "_Paste"
+#: ui/composer-editor-menus.ui:26 ui/composer-editor-menus.ui:44
+msgid "_Paste"
+msgstr "_Paste"
+
+#: ui/composer-editor-menus.ui:30
+msgctxt "Clipboard paste as plain text"
+msgid "Paste _Without Formatting"
+msgstr "Paste _Without Formatting"
+
+#: ui/composer-editor-menus.ui:50
+msgid "Select _All"
+msgstr "Select _All"
+
+#: ui/composer-editor-menus.ui:57 ui/conversation-message-menus.ui:43
+msgid "_Inspect…"
+msgstr "_Inspect…"
+
+#: ui/composer-headerbar.ui:23 ui/composer-headerbar.ui:107
+msgid "Detach the composer from the window"
+msgstr "Detach the composer from the window"
+
+#: ui/composer-headerbar.ui:135
+msgid "_Send"
+msgstr "_Send"
+
+#: ui/composer-headerbar.ui:162
+msgid "Discard and Close"
+msgstr "Discard and Close"
+
+#: ui/composer-headerbar.ui:186
+msgid "Save and Close"
+msgstr "Save and Close"
+
+#. Note that this button and the Update button will never be shown at the same time to the user.
+#: ui/composer-link-popover.ui:42
+msgid "Insert the new link with this URL"
+msgstr "Insert the new link with this URL"
+
+#: ui/composer-link-popover.ui:43
+msgid "Add"
+msgstr "Add"
+
+#: ui/composer-link-popover.ui:47
+msgid "Link URL"
+msgstr "Link URL"
+
+#. Note that this button and the Insert button will never be shown at the same time to the user.
+#: ui/composer-link-popover.ui:61
+msgid "Update this link’s URL"
+msgstr "Update this link’s URL"
-#: ui/composer-menus.ui:100
-msgctxt "Clipboard paste as plain text"
-msgid "Paste _Without Formatting"
-msgstr "Paste _Without Formatting"
+#: ui/composer-link-popover.ui:62
+msgid "Update"
+msgstr "Update"
-#: ui/composer-menus.ui:120
-msgid "Select _All"
-msgstr "Select _All"
+#: ui/composer-link-popover.ui:75
+msgid "Delete this link"
+msgstr "Delete this link"
-#: ui/composer-menus.ui:127 ui/conversation-message-menus.ui:43
-msgid "_Inspect…"
-msgstr "_Inspect…"
+#. Geary account mail will be sent from
+#: ui/composer-widget.ui:61
+msgid "_From"
+msgstr "_From"
#. Address(es) e-mail is to be sent to
-#: ui/composer-widget.ui:56
+#: ui/composer-widget.ui:131
msgid "_To"
msgstr "_To"
-#: ui/composer-widget.ui:75
+#: ui/composer-widget.ui:159
+msgid "Show Cc, Bcc, and Reply-To fields"
+msgstr "Show Cc, Bcc, and Reply-To fields"
+
+#: ui/composer-widget.ui:220
msgid "_Cc"
msgstr "_Cc"
-#: ui/composer-widget.ui:130
-msgid "_Subject"
-msgstr "_Subject"
-
-#: ui/composer-widget.ui:149
+#: ui/composer-widget.ui:268
msgid "_Bcc"
msgstr "_Bcc"
-#: ui/composer-widget.ui:179
+#: ui/composer-widget.ui:316
msgid "_Reply-To"
msgstr "_Reply-To"
-#. Geary account mail will be sent from
-#: ui/composer-widget.ui:208
-msgid "From"
-msgstr "From"
+#: ui/composer-widget.ui:373
+msgid "_Subject"
+msgstr "_Subject"
-#: ui/composer-widget.ui:293
+#: ui/composer-widget.ui:446
msgid "Drop files here"
msgstr "Drop files here"
-#: ui/composer-widget.ui:309
+#: ui/composer-widget.ui:462
msgid "To add them as attachments"
msgstr "To add them as attachments"
-#: ui/composer-widget.ui:353
-msgid "Undo last edit (Ctrl+Z)"
-msgstr "Undo last edit (Ctrl+Z)"
-
-#: ui/composer-widget.ui:377
-msgid "Redo last edit (Ctrl+Shift+Z)"
-msgstr "Redo last edit (Ctrl+Shift+Z)"
-
-#: ui/composer-widget.ui:415
-msgid "Bold (Ctrl+B)"
-msgstr "Bold (Ctrl+B)"
-
-#: ui/composer-widget.ui:439
-msgid "Italic (Ctrl+I)"
-msgstr "Italic (Ctrl+I)"
-
-#: ui/composer-widget.ui:463
-msgid "Underline (Ctrl+U)"
-msgstr "Underline (Ctrl+U)"
-
-#: ui/composer-widget.ui:487
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Strikethrough (Ctrl+K)"
-
-#: ui/composer-widget.ui:525
-msgid "Insert unordered list"
-msgstr "Insert unordered list"
-
-#: ui/composer-widget.ui:549
-msgid "Insert ordered list"
-msgstr "Insert ordered list"
-
-#: ui/composer-widget.ui:587
-msgid "Quote text (Ctrl+])"
-msgstr "Quote text (Ctrl+])"
-
-#: ui/composer-widget.ui:611
-msgid "Unquote text (Ctrl+[)"
-msgstr "Unquote text (Ctrl+[)"
-
-#: ui/composer-widget.ui:649
-msgid "Insert or update selection link (Ctrl+L)"
-msgstr "Insert or update selection link (Ctrl+L)"
+#: ui/components-attachment-pane.ui:29 ui/components-attachment-pane.ui:47
+msgid "Select all attachments"
+msgstr "Select all attachments"
-#: ui/composer-widget.ui:673
-msgid "Insert an image (Ctrl+G)"
-msgstr "Insert an image (Ctrl+G)"
+#: ui/components-attachment-pane.ui:66
+msgid "Save selected attachments"
+msgstr "Save selected attachments"
-#: ui/composer-widget.ui:707
-msgid "Remove selection formatting (Ctrl+Space)"
-msgstr "Remove selection formatting (Ctrl+Space)"
+#: ui/components-attachment-pane.ui:85
+msgid "Open selected attachments"
+msgstr "Open selected attachments"
-#: ui/composer-widget.ui:731
-msgid "Select spell checking languages"
-msgstr "Select spell checking languages"
+#: ui/components-attachment-pane-menus.ui:17
+msgid "Save _All"
+msgstr "Save _All"
-#: ui/components-inspector-error-view.ui:33
+#: ui/components-inspector-error-view.ui:31
msgid ""
"If the problem is serious or persists, please save and send these details to "
-"the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>mailing list</a> "
-"or attach to a <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug";
-"\">new bug report</a>."
+"one of the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>contact "
+"channels</a> or attach to a <a href=\"https://wiki.gnome.org/Apps/Geary/";
+"ReportingABug\">new bug report</a>."
msgstr ""
"If the problem is serious or persists, please save and send these details to "
-"the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>mailing list</a> "
-"or attach to a <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug";
-"\">new bug report</a>."
+"one of the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>contact "
+"channels</a> or attach to a <a href=\"https://wiki.gnome.org/Apps/Geary/";
+"ReportingABug\">new bug report</a>."
-#: ui/components-inspector-error-view.ui:49
+#: ui/components-inspector-error-view.ui:47
msgid "Details:"
msgstr "Details:"
-#: ui/components-inspector-log-view.ui:13
-msgid "Inspector opened"
-msgstr "Inspector opened"
-
-#: ui/components-inspector-log-view.ui:65
-msgid "column"
-msgstr "column"
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:19 ui/problem-details-dialog.ui:24
+msgid "Search for matching log entries"
+msgstr "Search for matching log entries"
#. Tooltip for inspector button
-#: ui/components-inspector.ui:20
+#: ui/components-inspector.ui:35
msgid "Toggle appending new log entries"
msgstr "Toggle appending new log entries"
#. Tooltip for inspector button
-#. Tooltip for problem report button
-#: ui/components-inspector.ui:37 ui/problem-details-dialog.ui:19
-msgid "Search for matching log entries"
-msgstr "Search for matching log entries"
+#: ui/components-inspector.ui:55
+msgid "Add a marker entry to the log"
+msgstr "Add a marker entry to the log"
#. Tooltip for inspector button
#. Tooltip for problem report button
-#: ui/components-inspector.ui:63 ui/problem-details-dialog.ui:46
+#: ui/components-inspector.ui:81 ui/problem-details-dialog.ui:51
msgid "Save logs entries and details"
msgstr "Save logs entries and details"
#. Tooltip for inspector button
#. Tooltip for problem report button
-#: ui/components-inspector.ui:84 ui/problem-details-dialog.ui:62
+#: ui/components-inspector.ui:101 ui/problem-details-dialog.ui:67
msgid "Copy to clipboard"
msgstr "Copy to clipboard"
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:121
+msgid "Clears all log entries"
+msgstr "Clears all log entries"
+
#: ui/conversation-contact-popover.ui:146
msgid "New Conversation…"
msgstr "New Conversation…"
@@ -2692,42 +3217,6 @@ msgstr "Mark this message as starred"
msgid "Mark this message as not starred"
msgstr "Mark this message as not starred"
-#: ui/conversation-email.ui:95
-msgid "Display the message menu"
-msgstr "Display the message menu"
-
-#: ui/conversation-email.ui:161
-msgid "Open selected attachments"
-msgstr "Open selected attachments"
-
-#: ui/conversation-email.ui:178
-msgid "Save selected attachments"
-msgstr "Save selected attachments"
-
-#: ui/conversation-email.ui:195
-msgid "Select all attachments"
-msgstr "Select all attachments"
-
-#: ui/conversation-email.ui:240
-msgid "Edit Draft"
-msgstr "Edit Draft"
-
-#: ui/conversation-email.ui:267
-msgid "Draft message"
-msgstr "Draft message"
-
-#: ui/conversation-email.ui:283
-msgid "This message has not yet been sent."
-msgstr "This message has not yet been sent."
-
-#: ui/conversation-email.ui:329
-msgid "Message not saved"
-msgstr "Message not saved"
-
-#: ui/conversation-email.ui:345
-msgid "This message was sent, but has not been saved to your account."
-msgstr "This message was sent, but has not been saved to your account."
-
#. Translators: Menu item to reply to a specific message.
#: ui/conversation-email-menus.ui:15
msgid "Reply to _All"
@@ -2765,9 +3254,25 @@ msgstr "_Delete message…"
msgid "_View Source"
msgstr "_View Source"
-#: ui/conversation-email-menus.ui:87
-msgid "_Save All"
-msgstr "_Save All"
+#: ui/conversation-message-link-popover.ui:54
+msgid "But actually goes to:"
+msgstr "But actually goes to:"
+
+#: ui/conversation-message-link-popover.ui:84
+msgid "The link appears to go to:"
+msgstr "The link appears to go to:"
+
+#: ui/conversation-message-link-popover.ui:96
+msgid "Deceptive link found"
+msgstr "Deceptive link found"
+
+#: ui/conversation-message-link-popover.ui:111
+msgid "The email sender may be leading you to the wrong web site."
+msgstr "The e-mail sender may be leading you to the wrong web site."
+
+#: ui/conversation-message-link-popover.ui:124
+msgid "If unsure, contact the sender and ask before continuing."
+msgstr "If unsure, contact the sender and ask before continuing."
#: ui/conversation-message-menus.ui:7
msgid "_Open Link"
@@ -2817,42 +3322,6 @@ msgstr "Reply to:"
msgid "Subject"
msgstr "Subject"
-#: ui/conversation-message.ui:501
-msgid "Show Images"
-msgstr "Show Images"
-
-#: ui/conversation-message.ui:514
-msgid "Always Show From Sender"
-msgstr "Always Show From Sender"
-
-#: ui/conversation-message.ui:542
-msgid "Remote images not shown"
-msgstr "Remote images not shown"
-
-#: ui/conversation-message.ui:559
-msgid "Only show remote images from senders you trust."
-msgstr "Only show remote images from senders you trust."
-
-#: ui/conversation-message.ui:692
-msgid "But actually goes to:"
-msgstr "But actually goes to:"
-
-#: ui/conversation-message.ui:723
-msgid "The link appears to go to:"
-msgstr "The link appears to go to:"
-
-#: ui/conversation-message.ui:735
-msgid "Deceptive link found"
-msgstr "Deceptive link found"
-
-#: ui/conversation-message.ui:750
-msgid "The email sender may be leading you to the wrong web site."
-msgstr "The e-mail sender may be leading you to the wrong web site."
-
-#: ui/conversation-message.ui:763
-msgid "If unsure, contact the sender and ask before continuing."
-msgstr "If unsure, contact the sender and ask before continuing."
-
#: ui/conversation-viewer.ui:60
msgid "Find in conversation"
msgstr "Find in conversation"
@@ -2889,7 +3358,7 @@ msgstr "label"
msgid "Conversation Shortcuts"
msgstr "Conversation Shortcuts"
-#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:347
+#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:377
msgctxt "shortcut window"
msgid "Actions"
msgstr "Actions"
@@ -2904,55 +3373,55 @@ msgctxt "shortcut window"
msgid "Reply to sender"
msgstr "Reply to sender"
-#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:282
+#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:281
msgctxt "shortcut window"
msgid "Reply to all"
msgstr "Reply to all"
-#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:289
+#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:288
msgctxt "shortcut window"
msgid "Forward"
msgstr "Forward"
-#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:296
+#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:295
msgctxt "shortcut window"
msgid "Un-mark/mark read"
msgstr "Un-mark/mark read"
-#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:303
+#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:302
msgctxt "shortcut window"
msgid "Mark/un-mark starred"
msgstr "Mark/un-mark starred"
-#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:310
+#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:309
msgctxt "shortcut window"
-msgid "Archive conversation"
-msgstr "Archive conversation"
+msgid "Archive conversations"
+msgstr "Archive conversations"
-#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:317
+#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:326
msgctxt "shortcut window"
-msgid "Move conversation"
-msgstr "Move conversation"
+msgid "Move conversations"
+msgstr "Move conversations"
-#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:324
+#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:333
msgctxt "shortcut window"
-msgid "Label conversation"
-msgstr "Label conversation"
+msgid "Label conversations"
+msgstr "Label conversations"
#: ui/gtk/help-overlay.ui:80
msgctxt "shortcut window"
-msgid "Trash conversation"
-msgstr "Move conversation to Wastebasket"
+msgid "Trash conversations"
+msgstr "Move conversations to Wastebasket"
-#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:331
+#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:340
msgctxt "shortcut window"
-msgid "Move to Spam"
-msgstr "Move to Spam"
+msgid "Junk conversations"
+msgstr "Junk conversations"
-#: ui/gtk/help-overlay.ui:95
+#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:347
msgctxt "shortcut window"
-msgid "Delete conversation"
-msgstr "Delete conversation"
+msgid "Delete conversations"
+msgstr "Delete conversations"
#: ui/gtk/help-overlay.ui:104
msgctxt "shortcut window"
@@ -2964,7 +3433,7 @@ msgctxt "shortcut window"
msgid "Search for conversations"
msgstr "Search for conversations"
-#: ui/gtk/help-overlay.ui:115
+#: ui/gtk/help-overlay.ui:115 ui/gtk/help-overlay.ui:354
msgctxt "shortcut window"
msgid "Find in current conversation"
msgstr "Find in current conversation"
@@ -3004,7 +3473,7 @@ msgctxt "shortcut window"
msgid "Reset zoom"
msgstr "Reset zoom"
-#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:367
+#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:404
msgctxt "shortcut window"
msgid "General"
msgstr "General"
@@ -3021,176 +3490,180 @@ msgstr "Show keyboard shortcuts"
#: ui/gtk/help-overlay.ui:206
msgctxt "shortcut window"
-msgid "Close current window"
-msgstr "Close current window"
+msgid "Open a new window"
+msgstr "Open a new window"
#: ui/gtk/help-overlay.ui:213
msgctxt "shortcut window"
+msgid "Close the current window"
+msgstr "Close the current window"
+
+#: ui/gtk/help-overlay.ui:220
+msgctxt "shortcut window"
msgid "Quit the application"
msgstr "Quit the application"
-#: ui/gtk/help-overlay.ui:222
+#: ui/gtk/help-overlay.ui:229
msgctxt "shortcut window"
msgid "Keyboard navigation"
msgstr "Keyboard navigation"
-#: ui/gtk/help-overlay.ui:226
-msgctxt "shortcut window"
-msgid "Focus the next pane"
-msgstr "Focus the next pane"
-
#: ui/gtk/help-overlay.ui:233
msgctxt "shortcut window"
-msgid "Focus the previous pane"
-msgstr "Focus the previous pane"
-
-#: ui/gtk/help-overlay.ui:240
-msgctxt "shortcut window"
-msgid "Focus the conversation list"
-msgstr "Focus the conversation list"
-
-#: ui/gtk/help-overlay.ui:247
-msgctxt "shortcut window"
-msgid "Select the conversation down"
-msgstr "Select the conversation down"
+msgid "Go to next/previous pane"
+msgstr "Go to next/previous pane"
-#: ui/gtk/help-overlay.ui:254
+#: ui/gtk/help-overlay.ui:241
msgctxt "shortcut window"
-msgid "Select the conversation up"
-msgstr "Select the conversation up"
+msgid "Select next/previous conversation"
+msgstr "Select next/previous conversation"
-#: ui/gtk/help-overlay.ui:261
+#: ui/gtk/help-overlay.ui:248
msgctxt "shortcut window"
msgid "Focus next/previous message"
msgstr "Focus next/previous message"
-#: ui/gtk/help-overlay.ui:271
+#: ui/gtk/help-overlay.ui:260
+msgid "Single-key Shortcuts"
+msgstr "Single-key Shortcuts"
+
+#: ui/gtk/help-overlay.ui:265
msgctxt "shortcut window"
-msgid "Single-key shortcuts"
-msgstr "Single-key shortcuts"
+msgid "Single-key shortcuts (if enabled)"
+msgstr "Single-key shortcuts (if enabled)"
-#: ui/gtk/help-overlay.ui:275
+#: ui/gtk/help-overlay.ui:274
msgctxt "shortcut window"
msgid "Reply to sender "
msgstr "Reply to sender "
-#: ui/gtk/help-overlay.ui:343
+#: ui/gtk/help-overlay.ui:361
+msgctxt "shortcut window"
+msgid "Select next/previous conversations"
+msgstr "Select next/previous conversations"
+
+#: ui/gtk/help-overlay.ui:373
msgid "Composer Shortcuts"
msgstr "Composer Shortcuts"
-#: ui/gtk/help-overlay.ui:351
+#: ui/gtk/help-overlay.ui:381
msgctxt "shortcut window"
msgid "Send"
msgstr "Send"
-#: ui/gtk/help-overlay.ui:358
+#: ui/gtk/help-overlay.ui:388
msgctxt "shortcut window"
msgid "Add attachment"
msgstr "Add attachment"
-#: ui/gtk/help-overlay.ui:371
+#: ui/gtk/help-overlay.ui:395
+msgctxt "shortcut window"
+msgid "Detach the composer"
+msgstr "Detach the composer"
+
+#: ui/gtk/help-overlay.ui:408
msgctxt "shortcut window"
msgid "Close composer window"
msgstr "Close composer window"
-#: ui/gtk/help-overlay.ui:378
+#: ui/gtk/help-overlay.ui:415
msgctxt "shortcut window"
msgid "Detach composer window"
msgstr "Detach composer window"
-#: ui/gtk/help-overlay.ui:385
+#: ui/gtk/help-overlay.ui:422
msgctxt "shortcut window"
msgid "Editing"
msgstr "Editing"
-#: ui/gtk/help-overlay.ui:390
+#: ui/gtk/help-overlay.ui:427
msgctxt "shortcut window"
msgid "Move selection to the clipboard"
msgstr "Move selection to the clipboard"
-#: ui/gtk/help-overlay.ui:397
+#: ui/gtk/help-overlay.ui:434
msgctxt "shortcut window"
msgid "Copy selection to clipboard"
msgstr "Copy selection to clipboard"
-#: ui/gtk/help-overlay.ui:404
+#: ui/gtk/help-overlay.ui:441
msgctxt "shortcut window"
msgid "Paste from the clipboard"
msgstr "Paste from the clipboard"
-#: ui/gtk/help-overlay.ui:411
+#: ui/gtk/help-overlay.ui:448
msgctxt "shortcut window"
msgid "Quote text"
msgstr "Quote text"
-#: ui/gtk/help-overlay.ui:418
+#: ui/gtk/help-overlay.ui:455
msgctxt "shortcut window"
msgid "Unquote text"
msgstr "Unquote text"
-#: ui/gtk/help-overlay.ui:427
+#: ui/gtk/help-overlay.ui:464
msgctxt "shortcut window"
msgid "Rich text editing"
msgstr "Rich text editing"
-#: ui/gtk/help-overlay.ui:431
+#: ui/gtk/help-overlay.ui:468
msgctxt "shortcut window"
msgid "Paste without formatting"
msgstr "Paste without formatting"
-#: ui/gtk/help-overlay.ui:438
+#: ui/gtk/help-overlay.ui:475
msgctxt "shortcut window"
msgid "Bold text"
msgstr "Bold text"
-#: ui/gtk/help-overlay.ui:445
+#: ui/gtk/help-overlay.ui:482
msgctxt "shortcut window"
msgid "Italicize text"
msgstr "Italicise text"
-#: ui/gtk/help-overlay.ui:452
+#: ui/gtk/help-overlay.ui:489
msgctxt "shortcut window"
msgid "Underline text"
msgstr "Underline text"
-#: ui/gtk/help-overlay.ui:459
+#: ui/gtk/help-overlay.ui:496
msgctxt "shortcut window"
msgid "Strike text"
msgstr "Strike text"
-#: ui/gtk/help-overlay.ui:466
+#: ui/gtk/help-overlay.ui:503
msgctxt "shortcut window"
msgid "Remove formatting"
msgstr "Remove formatting"
-#: ui/gtk/help-overlay.ui:473
+#: ui/gtk/help-overlay.ui:510
msgctxt "shortcut window"
msgid "Insert an image"
msgstr "Insert an image"
-#: ui/gtk/help-overlay.ui:480
+#: ui/gtk/help-overlay.ui:517
msgctxt "shortcut window"
msgid "Insert a link"
msgstr "Insert a link"
-#: ui/main-toolbar.ui:23
+#: ui/main-toolbar.ui:24
msgctxt "tooltip"
msgid "Compose Message"
msgstr "Compose Message"
-#: ui/main-toolbar.ui:61
+#: ui/main-toolbar.ui:62
msgid "Toggle search bar"
msgstr "Toggle search bar"
-#: ui/main-toolbar.ui:113
+#: ui/main-toolbar.ui:114
msgid "Reply"
msgstr "Reply"
-#: ui/main-toolbar.ui:136
+#: ui/main-toolbar.ui:137
msgid "Reply All"
msgstr "Reply All"
-#: ui/main-toolbar.ui:159
+#: ui/main-toolbar.ui:160
msgid "Forward"
msgstr "Forward"
@@ -3203,105 +3676,21 @@ msgid "_Archive"
msgstr "_Archive"
#: ui/main-toolbar-menus.ui:21
-msgid "Mark as S_pam"
-msgstr "Mark as S_pam"
+msgid "Toggle as _Junk"
+msgstr "Toggle as _Junk"
-#: ui/main-toolbar-menus.ui:25
-msgid "Mark as not S_pam"
-msgstr "Mark as not S_pam"
-
-#: ui/main-toolbar-menus.ui:32
-msgid "Empty _Spam…"
-msgstr "Empty _Spam…"
-
-#: ui/main-toolbar-menus.ui:36
-msgid "Empty _Trash…"
-msgstr "Empty Was_tebasket…"
-
-#: ui/main-toolbar-menus.ui:42
+#: ui/main-toolbar-menus.ui:28
msgid "_Accounts"
msgstr "_Accounts"
-#: ui/main-toolbar-menus.ui:50
+#: ui/main-toolbar-menus.ui:36
msgid "_Keyboard Shortcuts"
msgstr "_Keyboard Shortcuts"
-#: ui/main-toolbar-menus.ui:61
+#: ui/main-toolbar-menus.ui:47
msgid "_About Geary"
msgstr "_About Geary"
-#. Infobar title when one or more accounts are offline
-#: ui/main-window.ui:185
-msgid "Working offline"
-msgstr "Working offline"
-
-#. Label and tooltip for offline infobar
-#: ui/main-window.ui:199
-msgid ""
-"Your computer does not appear to be connected to the Internet.\n"
-"You will not be able to send or receive email until it is re-connected."
-msgstr ""
-"Your computer does not appear to be connected to the Internet.\n"
-"You will not be able to send or receive e-mail until it is re-connected."
-
-#. Label and tooltip for offline infobar
-#: ui/main-window.ui:202
-msgid "You will not be able to send or receive email until re-connected."
-msgstr "You will not be able to send or receive e-mail until re-connected."
-
-#. Button label for retrying TLS cert validation
-#: ui/main-window.ui:249
-msgid "Check"
-msgstr "Check"
-
-#. Button tooltip for retrying TLS cert validation
-#: ui/main-window.ui:253
-msgid "Check the security details for the connection"
-msgstr "Check the security details for the connection"
-
-#. Infobar title when one or more accounts have a TLS cert validation error
-#: ui/main-window.ui:282
-msgid "Security problem"
-msgstr "Security problem"
-
-#. Label and tooltip for TLS cert validation error infobar
-#: ui/main-window.ui:296
-msgid ""
-"An account has reported an untrusted server.\n"
-"Please check the server configuration and try again."
-msgstr ""
-"An account has reported an untrusted server.\n"
-"Please check the server configuration and try again."
-
-#. Label and tooltip for TLS cert validation error infobar
-#: ui/main-window.ui:299
-msgid "An account has reported an untrusted server."
-msgstr "An account has reported an untrusted server."
-
-#. Button tooltip for retrying when a login error has occurred
-#: ui/main-window.ui:350
-msgid "Retry login, you will be prompted for your password"
-msgstr "Retry login, you will be prompted for your password"
-
-#. Infobar title when one or more accounts have a login error
-#: ui/main-window.ui:379
-msgid "Login problem"
-msgstr "Login problem"
-
-#. Label and tooltip for authentication problem infobar
-#: ui/main-window.ui:393
-msgid ""
-"An account has reported an incorrect login or password.\n"
-"Please check your login name and try again."
-msgstr ""
-"An account has reported an incorrect login or password.\n"
-"Please check your login name and try again."
-
-#. Label and tooltip for authentication problem infobar
-#: ui/main-window.ui:396
-msgid "An account has reported an incorrect login or password."
-msgstr "An account has reported an incorrect login or password."
-
#: ui/password-dialog.glade:74
msgid "SMTP Credentials"
msgstr "SMTP Credentials"
@@ -3318,49 +3707,204 @@ msgstr "_Remember password"
msgid "_Authenticate"
msgstr "_Authenticate"
-#: ui/preferences-dialog.ui:38
-msgid "Reading"
-msgstr "Reading"
+#: ui/upgrade_dialog.glade:60
+msgid "Geary update in progress…"
+msgstr "Geary update in progress…"
-#: ui/preferences-dialog.ui:51
-msgid "_Automatically select next message"
-msgstr "_Automatically select next message"
+#~| msgid "Notifications"
+#~ msgid "Desktop Notifications"
+#~ msgstr "Desktop Notifications"
-#: ui/preferences-dialog.ui:70
-msgid "_Display conversation preview"
-msgstr "_Display conversation preview"
+#~ msgid "Folder Highlight"
+#~ msgstr "Folder Highlight"
-#: ui/preferences-dialog.ui:89
-msgid "Use _three pane view"
-msgstr "Use _three pane view"
+#~| msgid "Notifications"
+#~ msgid "Notification Badge"
+#~ msgstr "Notification Badge"
-#: ui/preferences-dialog.ui:113
-msgid "Notifications"
-msgstr "Notifications"
+#~ msgid "Special Folders"
+#~ msgstr "Special Folders"
-#: ui/preferences-dialog.ui:126
-msgid "_Play notification sounds"
-msgstr "_Play notification sounds"
+#~ msgid "Enable notification sounds"
+#~ msgstr "Enable notification sounds"
-#: ui/preferences-dialog.ui:145
-msgid "Show _notifications for new mail"
-msgstr "Show _notifications for new mail"
+#~ msgid "True to play sounds for notifications and sending."
+#~ msgstr "True to play sounds for notifications and sending."
-#: ui/preferences-dialog.ui:164
-msgid "_Watch for new mail when closed"
-msgstr "_Watch for new mail when closed"
+#~ msgid "True to show notification bubbles."
+#~ msgstr "True to show notification bubbles."
-#: ui/preferences-dialog.ui:168
-msgid "Geary will keep running after all windows are closed"
-msgstr "Geary will keep running after all windows are closed"
+#~ msgid "Moved %d message to %s"
+#~ msgid_plural "Moved %d messages to %s"
+#~ msgstr[0] "Moved %d message to %s"
+#~ msgstr[1] "Moved %d messages to %s"
-#: ui/preferences-dialog.ui:195
-msgid "Preferences"
-msgstr "Preferences"
+#~ msgid "Error emptying %s"
+#~ msgstr "Error emptying %s"
-#: ui/upgrade_dialog.glade:60
-msgid "Geary update in progress…"
-msgstr "Geary update in progress…"
+#~ msgid "Trashed %d message"
+#~ msgid_plural "Trashed %d messages"
+#~ msgstr[0] "Moved %d message to Wastebasket"
+#~ msgstr[1] "Moved %d messages to Wastebasket"
+
+#~ msgid "Archived %d message"
+#~ msgid_plural "Archived %d messages"
+#~ msgstr[0] "Archived %d message"
+#~ msgstr[1] "Archived %d messages"
+
+#~ msgid "Successfully sent mail to %s."
+#~ msgstr "Successfully sent mail to %s."
+
+#~ msgid "Failed to open default text editor."
+#~ msgstr "Failed to open default text editor."
+
+#~ msgid "Log periodic activity"
+#~ msgstr "Log periodic activity"
+
+#~ msgid "Log IMAP network serialization"
+#~ msgstr "Log IMAP network serialisation"
+
+#~ msgid "Indexing %s account"
+#~ msgstr "Indexing %s account"
+
+#~ msgid "Sent Mail"
+#~ msgstr "Sent Mail"
+
+#~ msgid "Spam"
+#~ msgstr "Spam"
+
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Detach (Ctrl+D)"
+
+#~ msgid "Attach File (Ctrl+T)"
+#~ msgstr "Attach File (Ctrl+T)"
+
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Send (Ctrl+Enter)"
+
+#~ msgid "Open this link"
+#~ msgstr "Open this link"
+
+#~ msgid "C_olor"
+#~ msgstr "C_olour"
+
+#~ msgid "Show Extended Fields"
+#~ msgstr "Show Extended Fields"
+
+#~ msgid "From"
+#~ msgstr "From"
+
+#~ msgid "Redo last edit (Ctrl+Shift+Z)"
+#~ msgstr "Redo last edit (Ctrl+Shift+Z)"
+
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Bold (Ctrl+B)"
+
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Italic (Ctrl+I)"
+
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Underline (Ctrl+U)"
+
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Strikethrough (Ctrl+K)"
+
+#~ msgid "Insert ordered list"
+#~ msgstr "Insert ordered list"
+
+#~ msgid "Quote text (Ctrl+])"
+#~ msgstr "Quote text (Ctrl+])"
+
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Unquote text (Ctrl+[)"
+
+#~ msgid "Insert an image (Ctrl+G)"
+#~ msgstr "Insert an image (Ctrl+G)"
+
+#~ msgid "Remove selection formatting (Ctrl+Space)"
+#~ msgstr "Remove selection formatting (Ctrl+Space)"
+
+#~ msgid "Inspector opened"
+#~ msgstr "Inspector opened"
+
+#~ msgid "column"
+#~ msgstr "column"
+
+#~ msgid "Display the message menu"
+#~ msgstr "Display the message menu"
+
+#~ msgid "Edit Draft"
+#~ msgstr "Edit Draft"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Archive conversation"
+#~ msgstr "Archive conversation"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Move conversation"
+#~ msgstr "Move conversation"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Move to Spam"
+#~ msgstr "Move to Spam"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Delete conversation"
+#~ msgstr "Delete conversation"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Focus the next pane"
+#~ msgstr "Focus the next pane"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Focus the conversation list"
+#~ msgstr "Focus the conversation list"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Select the conversation down"
+#~ msgstr "Select the conversation down"
+
+#~ msgid "Mark as S_pam"
+#~ msgstr "Mark as S_pam"
+
+#~ msgid "Mark as not S_pam"
+#~ msgstr "Mark as not S_pam"
+
+#~ msgid "Empty _Spam…"
+#~ msgstr "Empty _Spam…"
+
+#~ msgid "Empty _Trash…"
+#~ msgstr "Empty Was_tebasket…"
+
+#~ msgid ""
+#~ "Your computer does not appear to be connected to the Internet.\n"
+#~ "You will not be able to send or receive email until it is re-connected."
+#~ msgstr ""
+#~ "Your computer does not appear to be connected to the Internet.\n"
+#~ "You will not be able to send or receive e-mail until it is re-connected."
+
+#~ msgid ""
+#~ "An account has reported an untrusted server.\n"
+#~ "Please check the server configuration and try again."
+#~ msgstr ""
+#~ "An account has reported an untrusted server.\n"
+#~ "Please check the server configuration and try again."
+
+#~ msgid ""
+#~ "An account has reported an incorrect login or password.\n"
+#~ "Please check your login name and try again."
+#~ msgstr ""
+#~ "An account has reported an incorrect login or password.\n"
+#~ "Please check your login name and try again."
+
+#~ msgid "Reading"
+#~ msgstr "Reading"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Play notification sounds"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Show _notifications for new mail"
#~| msgid "Display program version"
#~ msgid "Display program version and revision id"
@@ -3378,9 +3922,6 @@ msgstr "Geary update in progress…"
#~ msgid "Allow inspection of WebView"
#~ msgstr "Allow inspection of WebView"
-#~ msgid "Use %s to open a new composer window"
-#~ msgstr "Use %s to open a new composer window"
-
#~ msgid "Please report comments, suggestions and bugs to:"
#~ msgstr "Please report comments, suggestions and bugs to:"
@@ -3544,10 +4085,6 @@ msgstr "Geary update in progress…"
#~ msgid "Archive"
#~ msgstr "Archive"
-#~ msgctxt "shortcut window"
-#~ msgid "Toggle spam"
-#~ msgstr "Toggle spam"
-
#~| msgid "Move conversation"
#~ msgctxt "shortcut window"
#~ msgid "Move the conversation"
@@ -3562,11 +4099,6 @@ msgstr "Geary update in progress…"
#~ msgid "Additional Shortcuts"
#~ msgstr "Additional Shortcuts"
-#~| msgid "_Star"
-#~ msgctxt "shortcut window"
-#~ msgid "Star"
-#~ msgstr "Star"
-
#~| msgid "U_nstar"
#~ msgctxt "shortcut window"
#~ msgid "Unstar"
@@ -3716,9 +4248,6 @@ msgstr "Geary update in progress…"
#~ msgid "First Last"
#~ msgstr "First Last"
-#~ msgid "Fixed Width"
-#~ msgstr "Fixed Width"
-
#~ msgid "Forward (Ctrl+L, F)"
#~ msgstr "Forward (Ctrl+L, F)"
@@ -3753,9 +4282,6 @@ msgstr "Geary update in progress…"
#~ msgid "Medium"
#~ msgstr "Medium"
-#~ msgid "More options"
-#~ msgstr "More options"
-
#~ msgid "N_ame:"
#~ msgstr "N_ame:"
@@ -3822,9 +4348,6 @@ msgstr "Geary update in progress…"
#~ msgid "S_ervice:"
#~ msgstr "S_ervice:"
-#~ msgid "Sans Serif"
-#~ msgstr "Sans Serif"
-
#~ msgid "Se_rver:"
#~ msgstr "Se_rver:"
@@ -3834,9 +4357,6 @@ msgstr "Geary update in progress…"
#~ msgid "Ser_ver:"
#~ msgstr "Ser_ver:"
-#~ msgid "Serif"
-#~ msgstr "Serif"
-
#~ msgid "Server:"
#~ msgstr "Server:"
@@ -3955,6 +4475,3 @@ msgstr "Geary update in progress…"
#~ msgid "none"
#~ msgstr "none"
-
-#~ msgid "not found"
-#~ msgstr "not found"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
