[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: Sat, 31 Aug 2019 09:46:22 +0000 (UTC)
commit 36f0b9ae05028405b042cfb892718ccdacdb4161
Author: Zander Brown <zbrown gnome org>
Date: Sat Aug 31 09:46:21 2019 +0000
Update British English translation
po/en_GB.po | 2113 +++++++++++++++++++++++++++++++----------------------------
1 file changed, 1127 insertions(+), 986 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 31eb7fbf..76e1cffc 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,14 +7,15 @@
# Alfredo Hernández <aldomann designs gmail com>, 2012
# 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.
#
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-04-18 07:39+0000\n"
-"PO-Revision-Date: 2019-07-06 20:51+0100\n"
+"POT-Creation-Date: 2019-08-29 23:05+0000\n"
+"PO-Revision-Date: 2019-08-31 10:42+0100\n"
"Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
"Language-Team: English - United Kingdom <en li org>\n"
"Language: en_GB\n"
@@ -25,7 +26,6 @@ msgstr ""
"X-Generator: Gtranslator 3.32.1\n"
#: desktop/geary-attach.contract.desktop.in:3
-#| msgid "Send and receive email"
msgid "Send by email"
msgstr "Send by e-mail"
@@ -34,48 +34,47 @@ msgid "Send files using Geary"
msgstr "Send files using Geary"
#. Translators: The application name
-#: desktop/geary-autostart.desktop.in:3
-#: desktop/org.gnome.Geary.appdata.xml.in:11
-#: desktop/org.gnome.Geary.desktop.in:3
+#: desktop/geary-autostart.desktop.in.in:3
+#: desktop/org.gnome.Geary.appdata.xml.in.in:12
+#: desktop/org.gnome.Geary.desktop.in.in:3
#: src/client/accounts/accounts-editor-servers-pane.vala:555
-#| msgid "Geary Mail"
msgid "Geary"
msgstr "Geary"
-#: desktop/geary-autostart.desktop.in:4 desktop/org.gnome.Geary.desktop.in:4
-#| msgid "Gmail"
+#: desktop/geary-autostart.desktop.in.in:4
+#: desktop/org.gnome.Geary.desktop.in.in:4
msgid "Email"
msgstr "E-mail"
#. Translators: The application's summary / tagline
-#: desktop/geary-autostart.desktop.in:5
-#: desktop/org.gnome.Geary.appdata.xml.in:15
-#: desktop/org.gnome.Geary.desktop.in:5
-#: src/client/application/geary-application.vala:23
+#: desktop/geary-autostart.desktop.in.in:5
+#: desktop/org.gnome.Geary.appdata.xml.in.in:16
+#: desktop/org.gnome.Geary.desktop.in.in:5
+#: src/client/application/geary-application.vala:30
msgid "Send and receive email"
msgstr "Send and receive e-mail"
#. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
-#: desktop/geary-autostart.desktop.in:7
+#: desktop/geary-autostart.desktop.in.in:7
msgid "Email;E-mail;Mail;"
msgstr "Email;E-mail;Mail;"
#. Translators: The development team's name
-#: desktop/org.gnome.Geary.appdata.xml.in:13
+#: desktop/org.gnome.Geary.appdata.xml.in.in:14
msgid "Geary Development Team"
msgstr "Geary Development Team"
-#: desktop/org.gnome.Geary.appdata.xml.in:17
+#: desktop/org.gnome.Geary.appdata.xml.in.in:18
msgid ""
"Geary is an email application built around conversations, for the GNOME 3 "
"desktop. It allows you to read, find and send email with a straightforward, "
"modern interface."
msgstr ""
"Geary is an e-mail application built around conversations, for the GNOME 3 "
-"desktop. It allows you to read, find and send email with a straightforward, "
+"desktop. It allows you to read, find and send e-mail with a straightforward, "
"modern interface."
-#: desktop/org.gnome.Geary.appdata.xml.in:22
+#: desktop/org.gnome.Geary.appdata.xml.in.in:23
msgid ""
"Conversations allow you to read a complete discussion without having to find "
"and click from message to message."
@@ -83,52 +82,50 @@ 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:26
+#: desktop/org.gnome.Geary.appdata.xml.in.in:27
msgid "Geary’s features include:"
msgstr "Geary’s features include:"
-#: desktop/org.gnome.Geary.appdata.xml.in:28
+#: desktop/org.gnome.Geary.appdata.xml.in.in:29
msgid "Quick email account setup"
msgstr "Quick e-mail account setup"
-#: desktop/org.gnome.Geary.appdata.xml.in:29
+#: desktop/org.gnome.Geary.appdata.xml.in.in:30
msgid "Shows related messages together in conversations"
msgstr "Shows related messages together in conversations"
-#: desktop/org.gnome.Geary.appdata.xml.in:30
+#: desktop/org.gnome.Geary.appdata.xml.in.in:31
msgid "Fast, full text and keyword search"
msgstr "Fast, full text and keyword search"
-#: desktop/org.gnome.Geary.appdata.xml.in:31
+#: desktop/org.gnome.Geary.appdata.xml.in.in:32
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:32
-#| msgid "Show _notifications for new mail"
+#: desktop/org.gnome.Geary.appdata.xml.in.in:33
msgid "Desktop notification of new mail"
msgstr "Desktop notification of new mail"
-#: desktop/org.gnome.Geary.appdata.xml.in:33
+#: desktop/org.gnome.Geary.appdata.xml.in.in:34
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:47
-#| msgid "_Display conversation preview"
+#: desktop/org.gnome.Geary.appdata.xml.in.in:48
msgid "Geary displaying a conversation"
msgstr "Geary displaying a conversation"
#. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in:58
+#: desktop/org.gnome.Geary.appdata.xml.in.in:59
msgid "Geary showing the rich text composer"
msgstr "Geary showing the rich text composer"
#. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
-#: desktop/org.gnome.Geary.desktop.in:7
+#: desktop/org.gnome.Geary.desktop.in.in:7
msgid "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
msgstr "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
-#: desktop/org.gnome.Geary.desktop.in:21
+#: desktop/org.gnome.Geary.desktop.in.in:22
msgid "Compose Message"
msgstr "Compose Message"
@@ -199,7 +196,6 @@ msgid "Position of the message list Paned grabber."
msgstr "Position of the message list Paned grabber."
#: desktop/org.gnome.Geary.gschema.xml:56
-#| msgid "_Automatically select next message"
msgid "Autoselect next message"
msgstr "Autoselect next message"
@@ -208,7 +204,6 @@ 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
-#| msgid "_Display conversation preview"
msgid "Display message previews"
msgstr "Display message previews"
@@ -221,14 +216,18 @@ 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
-msgid "List of the languages to use in the spell checker."
-msgstr "List of the languages to use in the spell checker."
+msgid ""
+"A list of POSIX locales, with the empty list disabling spell checking and "
+"the null list using desktop languages by default."
+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:74
+#: desktop/org.gnome.Geary.gschema.xml:76
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:75
+#: desktop/org.gnome.Geary.gschema.xml:77
msgid ""
"List of languages that are always displayed in the popover of the spell "
"checker."
@@ -236,81 +235,77 @@ msgstr ""
"List of languages that are always displayed in the popover of the spell "
"checker."
-#: desktop/org.gnome.Geary.gschema.xml:80
-#| msgid "_Play notification sounds"
+#: desktop/org.gnome.Geary.gschema.xml:82
msgid "Enable notification sounds"
msgstr "Enable notification sounds"
-#: desktop/org.gnome.Geary.gschema.xml:81
+#: 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:86
-#| msgid "Show _notifications for new mail"
+#: 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:87
+#: 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:92
+#: desktop/org.gnome.Geary.gschema.xml:94
msgid "Notify of new mail at startup"
msgstr "Notify of new mail at startup"
-#: desktop/org.gnome.Geary.gschema.xml:93
+#: desktop/org.gnome.Geary.gschema.xml:95
msgid "True to notify of new mail at startup."
msgstr "True to notify of new mail at startup."
-#: desktop/org.gnome.Geary.gschema.xml:98
+#: desktop/org.gnome.Geary.gschema.xml:100
msgid "Ask when opening an attachment"
msgstr "Ask when opening an attachment"
-#: desktop/org.gnome.Geary.gschema.xml:99
-#| msgid "To add them as attachments"
+#: desktop/org.gnome.Geary.gschema.xml:101
msgid "True to ask when opening an attachment."
msgstr "True to ask when opening an attachment."
-#: desktop/org.gnome.Geary.gschema.xml:104
+#: desktop/org.gnome.Geary.gschema.xml:106
msgid "Whether to compose emails in HTML"
msgstr "Whether to compose e-mails in HTML"
-#: desktop/org.gnome.Geary.gschema.xml:105
+#: desktop/org.gnome.Geary.gschema.xml:107
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:110
+#: desktop/org.gnome.Geary.gschema.xml:112
msgid "Advisory strategy for full-text searching"
msgstr "Advisory strategy for full-text searching"
-#: desktop/org.gnome.Geary.gschema.xml:111
+#: desktop/org.gnome.Geary.gschema.xml:113
msgid ""
"Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
msgstr ""
"Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
-#: desktop/org.gnome.Geary.gschema.xml:116
-#| msgid "No conversations in folder."
+#: desktop/org.gnome.Geary.gschema.xml:118
msgid "Zoom of conversation viewer"
msgstr "Zoom of conversation viewer"
-#: desktop/org.gnome.Geary.gschema.xml:117
+#: desktop/org.gnome.Geary.gschema.xml:119
msgid "The zoom to apply on the conservation view."
msgstr "The zoom to apply on the conservation view."
-#: desktop/org.gnome.Geary.gschema.xml:122
+#: desktop/org.gnome.Geary.gschema.xml:124
msgid "Size of detached composer window"
msgstr "Size of detached composer window"
-#: desktop/org.gnome.Geary.gschema.xml:123
+#: desktop/org.gnome.Geary.gschema.xml:125
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:128
+#: desktop/org.gnome.Geary.gschema.xml:130
msgid "Whether we migrated the old settings"
msgstr "Whether we migrated the old settings"
-#: desktop/org.gnome.Geary.gschema.xml:129
+#: desktop/org.gnome.Geary.gschema.xml:131
msgid ""
"False to check for the old “org.yorba.geary”-schema and copy its values."
msgstr ""
@@ -319,7 +314,7 @@ msgstr ""
#. Translators: In-app notification label, when
#. the app had a problem pinning an otherwise
#. untrusted TLS certificate
-#: src/client/accounts/accounts-editor.vala:203
+#: src/client/accounts/accounts-editor.vala:204
msgid "Failed to store certificate"
msgstr "Failed to store certificate"
@@ -359,7 +354,6 @@ msgstr "Check your sending server details"
#. Translators: In-app notification label
#: src/client/accounts/accounts-editor-add-pane.vala:262
-#| msgid "Please enter your email password"
msgid "Check your email address and password"
msgstr "Check your e-mail address and password"
@@ -392,7 +386,6 @@ msgstr "Your name"
#. preferences for an account.
#: src/client/accounts/accounts-editor-add-pane.vala:568
#: src/client/accounts/accounts-editor-edit-pane.vala:501
-#| msgid "Email address:"
msgid "Email address"
msgstr "E-mail address"
@@ -429,7 +422,6 @@ msgstr "Password"
#. 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
-#| msgid "IMAP username"
msgid "IMAP server"
msgstr "IMAP server"
@@ -445,7 +437,6 @@ msgstr "imap.example.com"
#. 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
-#| msgid "SMTP username"
msgid "SMTP server"
msgstr "SMTP server"
@@ -459,7 +450,6 @@ msgstr "smtp.example.com"
#. custom name for an account.
#: src/client/accounts/accounts-editor-edit-pane.vala:278
#: ui/accounts_editor_remove_pane.ui:123
-#| msgid "Accounts"
msgid "Account name"
msgstr "Account name"
@@ -493,7 +483,6 @@ msgid "Sender Name"
msgstr "Sender Name"
#: src/client/accounts/accounts-editor-edit-pane.vala:479
-#| msgid "_Remove"
msgid "Remove"
msgstr "Remove"
@@ -501,7 +490,6 @@ msgstr "Remove"
#. email address when editing a user's sender address
#. preferences for an account.
#: src/client/accounts/accounts-editor-edit-pane.vala:494
-#| msgid "Username:"
msgid "Sender name"
msgstr "Sender name"
@@ -540,7 +528,6 @@ msgstr "Undo signature changes"
#. 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
-#| msgid "_Download mail:"
msgid "Download mail"
msgstr "Download mail"
@@ -579,74 +566,69 @@ msgid "1 year back"
msgstr "1 year back"
#: src/client/accounts/accounts-editor-edit-pane.vala:855
-#| msgid "1 year back"
msgid "2 years back"
msgstr "2 years back"
#: src/client/accounts/accounts-editor-edit-pane.vala:859
-#| msgid "1 year back"
msgid "4 years back"
msgstr "4 years back"
#: src/client/accounts/accounts-editor-edit-pane.vala:865
#, c-format
-#| msgid "1 year back"
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:243
-#| msgid "_Undo"
+#: src/client/accounts/accounts-editor-list-pane.vala:247
+#: src/client/application/application-controller.vala:2392
msgid "Undo"
msgstr "Undo"
-#: src/client/accounts/accounts-editor-list-pane.vala:251
-#| msgid "_Redo"
+#: src/client/accounts/accounts-editor-list-pane.vala:255
msgid "Redo"
msgstr "Redo"
-#: src/client/accounts/accounts-editor-list-pane.vala:345
-#: src/client/accounts/accounts-editor-list-pane.vala:433
-#: src/client/accounts/accounts-editor-row.vala:278
+#: src/client/accounts/accounts-editor-list-pane.vala:349
+#: src/client/accounts/accounts-editor-list-pane.vala:437
+#: src/client/accounts/accounts-editor-row.vala:279
msgid "Gmail"
msgstr "Gmail"
-#: src/client/accounts/accounts-editor-list-pane.vala:349
-#: src/client/accounts/accounts-editor-list-pane.vala:437
-#: src/client/accounts/accounts-editor-row.vala:282
+#: src/client/accounts/accounts-editor-list-pane.vala:353
+#: src/client/accounts/accounts-editor-list-pane.vala:441
+#: src/client/accounts/accounts-editor-row.vala:283
msgid "Outlook.com"
msgstr "Outlook.com"
-#: src/client/accounts/accounts-editor-list-pane.vala:353
-#: src/client/accounts/accounts-editor-list-pane.vala:441
-#: src/client/accounts/accounts-editor-row.vala:286
-#| msgid "Yahoo! Mail"
+#: src/client/accounts/accounts-editor-list-pane.vala:357
+#: src/client/accounts/accounts-editor-list-pane.vala:445
+#: src/client/accounts/accounts-editor-row.vala:287
msgid "Yahoo"
msgstr "Yahoo"
#. Translators: Tooltip for accounts that have been
#. loaded but disabled by the user.
-#: src/client/accounts/accounts-editor-list-pane.vala:371
+#: src/client/accounts/accounts-editor-list-pane.vala:375
msgid "This account has been disabled"
msgstr "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:380
+#: src/client/accounts/accounts-editor-list-pane.vala:384
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:430
+#: src/client/accounts/accounts-editor-list-pane.vala:434
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:547
+#: src/client/accounts/accounts-editor-list-pane.vala:551
#, c-format
msgid "Account “%s” removed"
msgstr "Account “%s” removed"
@@ -654,45 +636,44 @@ 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:554
+#: src/client/accounts/accounts-editor-list-pane.vala:558
#, c-format
msgid "Account “%s” restored"
msgstr "Account “%s” restored"
#. Translators: Tooltip for dragging list items
-#: src/client/accounts/accounts-editor-row.vala:49
+#: src/client/accounts/accounts-editor-row.vala:50
msgid "Drag to move this item"
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:294
+#: src/client/accounts/accounts-editor-row.vala:295
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:467
+#: src/client/accounts/accounts-editor-row.vala:468
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:478
+#: 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
msgid "None"
msgstr "None"
-#: src/client/accounts/accounts-editor-row.vala:485
-#| msgid "_Star"
+#: src/client/accounts/accounts-editor-row.vala:486
msgid "StartTLS"
msgstr "StartTLS"
-#: src/client/accounts/accounts-editor-row.vala:492
+#: src/client/accounts/accounts-editor-row.vala:493
msgid "TLS"
msgstr "TLS"
@@ -700,28 +681,28 @@ msgstr "TLS"
#. 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:533 ui/main-window.ui:455
+#: src/client/accounts/accounts-editor-row.vala:534 ui/main-window.ui:346
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:540
+#: src/client/accounts/accounts-editor-row.vala:541
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:548
+#: src/client/accounts/accounts-editor-row.vala:549
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:556
+#: src/client/accounts/accounts-editor-row.vala:557
msgid "Use a different login"
msgstr "Use a different login"
@@ -736,7 +717,6 @@ msgstr "Account not updated: %s"
#. created the account, e.g. an SSO service like GOA, or
#. locally by Geary.
#: src/client/accounts/accounts-editor-servers-pane.vala:540
-#| msgid "Accounts"
msgid "Account source"
msgstr "Account source"
@@ -747,13 +727,12 @@ msgstr "GNOME Online Accounts"
#. Translators: This label describes an account
#. preference.
#: src/client/accounts/accounts-editor-servers-pane.vala:611
-msgid "Save drafts on server"
-msgstr "Save drafts on server"
+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
-#| msgid "Unable to login to email server"
msgid "Save sent email on server"
msgstr "Save sent e-mail on server"
@@ -771,136 +750,36 @@ msgstr "%s using OAuth2"
msgid "Use receiving server login"
msgstr "Use receiving server login"
-#: src/client/application/geary-application.vala:24
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Copyright 2016 Software Freedom Conservancy Inc."
-
-#: src/client/application/geary-application.vala:25
-msgid "Copyright 2016-2019 Geary Development Team."
-msgstr "Copyright 2016-2019 Geary Development Team."
-
-#: src/client/application/geary-application.vala:27
-#| msgid "Visit the Yorba web site"
-msgid "Visit the Geary web site"
-msgstr "Visit the Geary web site"
-
-#: src/client/application/geary-application.vala:454
-#, c-format
-msgid "About %s"
-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:458
-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>"
-
-#: src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Start Geary with hidden main window"
-
-#: src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Output debugging information"
-
-#: src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Log conversation monitoring"
-
-#: src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Log network deserialisation"
-
-#: src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Log network activity"
-
-#. / 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-args.vala:17
-msgid "Log IMAP replay queue"
-msgstr "Log IMAP replay queue"
-
-#. / Serialization is how commands and responses are converted into a stream of bytes for
-#. / network transmission
-#: src/client/application/geary-args.vala:20
-msgid "Log network serialization"
-msgstr "Log network serialisation"
-
-#: src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Log periodic activity"
-
-#: src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Log database queries (generates lots of messages)"
-
-#. / "Normalization" can also be called "synchronization"
-#: src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Log folder normalisation"
-
-#: src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Allow inspection of WebView"
-
-#: src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Revoke all server certificates with TLS warnings"
-
-#: src/client/application/geary-args.vala:27
-msgid "Perform a graceful quit"
-msgstr "Perform a graceful quit"
-
-#: src/client/application/geary-args.vala:28
-msgid "Display program version"
-msgstr "Display program version"
-
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: src/client/application/geary-args.vala:53
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Use %s to open a new composer window"
-
-#: src/client/application/geary-args.vala:56
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Please report comments, suggestions and bugs to:"
-
-#. i18n: Command line arguments are invalid
-#: src/client/application/geary-args.vala:63
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Failed to parse command line options: %s\n"
-
-#: src/client/application/geary-args.vala:74
-#, c-format
-#| msgid "Unrecognized command line option \"%s\"\n"
-msgid "Unrecognized command line option “%s”\n"
-msgstr "Unrecognised command line option “%s”\n"
-
#. Translators: File name used in save chooser when saving
#. attachments that do not otherwise have a name.
-#: src/client/application/geary-controller.vala:58
+#: src/client/application/application-controller.vala:59
msgid "Untitled"
msgstr "Untitled"
-#: src/client/application/geary-controller.vala:959
+#. / 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/geary-controller.vala:972
+#: 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/geary-controller.vala:973
+#: src/client/application/application-controller.vala:920
#, c-format
msgid ""
"There was an error opening the local mail database for this account. This is "
@@ -920,24 +799,23 @@ msgstr ""
"\n"
"Geary can rebuild the database and re-synchronise with the server or exit.\n"
"\n"
-"Rebuilding the database will destroy all local email and its attachments. "
+"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/geary-controller.vala:975
+#: src/client/application/application-controller.vala:922
msgid "_Rebuild"
msgstr "_Rebuild"
-#: src/client/application/geary-controller.vala:975
+#: src/client/application/application-controller.vala:922
msgid "E_xit"
msgstr "E_xit"
-#: src/client/application/geary-controller.vala:984
+#: src/client/application/application-controller.vala:931
#, c-format
-#| msgid "Unable to rebuild database for \"%s\""
msgid "Unable to rebuild database for “%s”"
msgstr "Unable to rebuild database for “%s”"
-#: src/client/application/geary-controller.vala:985
+#: src/client/application/application-controller.vala:932
#, c-format
msgid ""
"Error during rebuild:\n"
@@ -948,17 +826,18 @@ msgstr ""
"\n"
"%s"
-#: src/client/application/geary-controller.vala:1840
-#| msgid "Underline (Ctrl+U)"
-msgid "Undo move (Ctrl+Z)"
-msgstr "Undo move (Ctrl+Z)"
+#: 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/geary-controller.vala:1850
-#| msgid "Are you sure you want to open \"%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/geary-controller.vala:1851
+#: src/client/application/application-controller.vala:1737
msgid ""
"Attachments may cause damage to your system if opened. Only open files from "
"trusted sources."
@@ -966,106 +845,291 @@ msgstr ""
"Attachments may cause damage to your system if opened. Only open files from "
"trusted sources."
-#: src/client/application/geary-controller.vala:1852
-#| msgid "Don't _ask me again"
+#: 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/geary-controller.vala:1981
+#: src/client/application/application-controller.vala:1861
#, c-format
-#| msgid "A file named \"%s\" already exists. Do you want to replace it?"
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/geary-controller.vala:1988
+#: src/client/application/application-controller.vala:1868
#, c-format
-#| msgid ""
-#| "The file already exists in \"%s\". Replacing it will overwrite its "
-#| "contents."
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/geary-controller.vala:1992
+#: src/client/application/application-controller.vala:1872
msgid "_Replace"
msgstr "_Replace"
-#: src/client/application/geary-controller.vala:2268
-msgid "Close the draft message?"
-msgid_plural "Close all draft messages?"
-msgstr[0] "Close the draft message?"
-msgstr[1] "Close all draft messages?"
-
-#: src/client/application/geary-controller.vala:2394
+#: 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/geary-controller.vala:2395
+#: 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 email server."
+msgstr "This removes the e-mail from Geary and your e-mail server."
-#: src/client/application/geary-controller.vala:2396
-#| msgid "\"%s\" could not be found."
+#: src/client/application/application-controller.vala:2234
msgid "This cannot be undone."
msgstr "This cannot be undone."
-#: src/client/application/geary-controller.vala:2397
+#: src/client/application/application-controller.vala:2235
#, c-format
msgid "Empty %s"
msgstr "Empty %s"
-#: src/client/application/geary-controller.vala:2414
+#: src/client/application/application-controller.vala:2252
#, c-format
-#| msgid "Error saving"
msgid "Error emptying %s"
msgstr "Error emptying %s"
-#: src/client/application/geary-controller.vala:2446
-#| msgid "Do you want to discard this message?"
+#: 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/geary-controller.vala:2448
-#| msgid "_Delete"
+#: src/client/application/application-controller.vala:2285
msgid "Delete"
msgstr "Delete"
-#: src/client/application/geary-controller.vala:2462
-#| msgid "Unquote text (Ctrl+[)"
-msgid "Undo trash (Ctrl+Z)"
-msgstr "Undo moving to wastebasket (Ctrl+Z)"
-
-#: src/client/application/geary-controller.vala:2512
-#| msgid "Underline (Ctrl+U)"
-msgid "Undo archive (Ctrl+Z)"
-msgstr "Undo archive (Ctrl+Z)"
+#: 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/geary-controller.vala:2557
-#| msgid "Underline (Ctrl+U)"
-msgid "Undo (Ctrl+Z)"
-msgstr "Undo (Ctrl+Z)"
+#: 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/geary-controller.vala:2638
+#: src/client/application/application-controller.vala:2474
#, c-format
msgid "Successfully sent mail to %s."
msgstr "Successfully sent mail to %s."
-#: src/client/application/geary-controller.vala:2720
+#: 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
+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/geary-application.vala:34
+msgid "Visit the Geary web site"
+msgstr "Visit the Geary web site"
+
+#. / Command line option
+#: src/client/application/geary-application.vala:109
+msgid "Print debug logging"
+msgstr "Print debug logging"
+
+#. / Command line option
+#: src/client/application/geary-application.vala:112
+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
+msgid "Enable WebKitGTK Inspector in web views"
+msgstr "Enable WebKitGTK Inspector in web views"
+
+#. / Command line option
+#: src/client/application/geary-application.vala:118
+msgid "Log conversation monitoring"
+msgstr "Log conversation monitoring"
+
+#. / Command line option
+#: src/client/application/geary-application.vala:121
+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
+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"
+
+#. / 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
+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/geary-application.vala:144
+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
+msgid "Perform a graceful quit"
+msgstr "Perform a graceful quit"
+
+#. / Command line option
+#: src/client/application/geary-application.vala:150
+msgid "Revoke all pinned TLS server certificates"
+msgstr "Revoke all pinned TLS server certificates"
+
+#. / Command line option
+#: src/client/application/geary-application.vala:153
+msgid "Display program version"
+msgstr "Display program version"
+
+#. / Application runtime information label
+#: src/client/application/geary-application.vala:280
+msgid "Geary version"
+msgstr "Geary version"
+
+#. / Application runtime information label
+#: src/client/application/geary-application.vala:282
+msgid "Geary revision"
+msgstr "Geary revision"
+
+#. / Application runtime information label
+#: src/client/application/geary-application.vala:284
+msgid "GTK version"
+msgstr "GTK version"
+
+#. / Applciation runtime information label
+#: src/client/application/geary-application.vala:291
+msgid "GLib version"
+msgstr "GLib version"
+
+#. / Application runtime information label
+#: src/client/application/geary-application.vala:298
+msgid "WebKitGTK version"
+msgstr "WebKitGTK version"
+
+#. / Application runtime information label
+#: src/client/application/geary-application.vala:305
+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
+msgid "Unknown"
+msgstr "Unknown"
+
+#. / Application runtime information label
+#: src/client/application/geary-application.vala:337
+msgid "Distribution name"
+msgstr "Distribution name"
+
+#. / Application runtime information label
+#: src/client/application/geary-application.vala:342
+msgid "Distribution release"
+msgstr "Distribution release"
+
+#. / Application runtime information label
+#: src/client/application/geary-application.vala:350
+msgid "Installation prefix"
+msgstr "Installation prefix"
+
+#: src/client/application/geary-application.vala:490
+#, c-format
+msgid "About %s"
+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
+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>"
+
+#. / Warning printed to the console when a deprecated
+#. / command line option is used.
+#: src/client/application/geary-application.vala:778
+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
+#, c-format
+msgid "Unrecognised program argument: “%s”"
+msgstr "Unrecognised program argument: “%s”"
+
+#: src/client/components/components-inspector.vala:68
+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
+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
+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
+msgid "Save As"
+msgstr "Save As"
+
+#: src/client/components/components-inspector.vala:202
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:214
+#: 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
@@ -1075,7 +1139,6 @@ 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 "Email address:"
msgid "Not a valid email address"
msgstr "Not a valid e-mail address"
@@ -1093,238 +1156,113 @@ msgstr "A server name is required"
msgid "Could not look up server name"
msgstr "Could not look up server name"
-#: src/client/components/main-toolbar.vala:151
-#| msgid "Mark conversation"
+#: src/client/components/main-toolbar.vala:139
msgid "Mark conversation"
msgid_plural "Mark conversations"
msgstr[0] "Mark conversation"
msgstr[1] "Mark conversations"
-#: src/client/components/main-toolbar.vala:156
-#| msgid "Add label to conversation"
+#: 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"
-#: src/client/components/main-toolbar.vala:161
-#| msgid "Move conversation"
+#: src/client/components/main-toolbar.vala:149
msgid "Move conversation"
msgid_plural "Move conversations"
msgstr[0] "Move conversation"
msgstr[1] "Move conversations"
-#: src/client/components/main-toolbar.vala:166
-#| msgid "Move conversation"
-msgid "Archive conversation (A)"
-msgid_plural "Archive conversations (A)"
-msgstr[0] "Archive conversation (A)"
-msgstr[1] "Archive conversations (A)"
-
-#: src/client/components/main-toolbar.vala:175
-#| msgid "Archive conversations (Delete, Backspace, A)"
-msgid "Move conversation to Trash (Delete, Backspace)"
-msgid_plural "Move conversations to Trash (Delete, Backspace)"
-msgstr[0] "Move conversation to Wastebasket (Delete, Backspace)"
-msgstr[1] "Move conversations to Wastebasket (Delete, Backspace)"
-
-#: src/client/components/main-toolbar.vala:183
-#| msgid "Delete conversation (Delete, Backspace, A)"
-msgid "Delete conversation (Shift+Delete)"
-msgid_plural "Delete conversations (Shift+Delete)"
-msgstr[0] "Delete conversation (Shift+Delete)"
-msgstr[1] "Delete conversation (Delete, Backspace, A)"
-
-#: src/client/components/main-window.vala:503
-#, c-format
-#| msgid "%s (%s)"
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:47
-#, c-format
-msgid "Problem connecting to incoming server for %s"
-msgstr "Problem connecting to incoming server for %s"
-
-#. Translators: String substitution is the server name
-#: src/client/components/main-window-info-bar.vala:49
-#: src/client/components/main-window-info-bar.vala:58
-#, c-format
-msgid ""
-"Could not connect to %s, check your Internet access and the server name and "
-"try again"
-msgstr ""
-"Could not connect to %s, check your Internet access and the server name and "
-"try again"
-
-#. Translators: Tooltip label for Retry button
-#. Button tooltip for retrying an account problem
-#: src/client/components/main-window-info-bar.vala:51
-#: src/client/components/main-window-info-bar.vala:60
-#: src/client/components/main-window-info-bar.vala:69
-#: src/client/components/main-window-info-bar.vala:78
-#: src/client/components/main-window-info-bar.vala:87
-#: src/client/components/main-window-info-bar.vala:96
-#: src/client/components/main-window-info-bar.vala:136 ui/main-window.ui:265
-msgid "Try reconnecting"
-msgstr "Try reconnecting"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:56
-#, c-format
-msgid "Problem connecting to outgoing server for %s"
-msgstr "Problem connecting to outgoing server for %s"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:65
-#: src/client/components/main-window-info-bar.vala:83
-#, c-format
-msgid "Problem communicating with incoming server for %s"
-msgstr "Problem communicating with incoming server for %s"
-
-#. Translators: String substitution is the server name
-#: src/client/components/main-window-info-bar.vala:67
-#: src/client/components/main-window-info-bar.vala:76
-#, c-format
-msgid "Network error talking to %s, check your Internet access and try again"
-msgstr "Network error talking to %s, check your Internet access and try again"
+#: src/client/components/main-toolbar.vala:154
+msgid "Archive conversation"
+msgid_plural "Archive conversations"
+msgstr[0] "Archive conversation"
+msgstr[1] "Archive conversations"
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:74
-#: src/client/components/main-window-info-bar.vala:91
-msgid "Problem communicating with outgoing mail server"
-msgstr "Problem communicating with outgoing mail server"
-
-#. Translators: String substitution is the server name
-#: src/client/components/main-window-info-bar.vala:85
-#, c-format
-msgid ""
-"Geary did not understand a message from %s or vice versa, please file a bug "
-"report"
-msgstr ""
-"Geary did not understand a message from %s or vice versa, please file a bug "
-"report"
+#: 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"
-#. Translators: First string substitution is the server
-#. name, second is the account name
-#: src/client/components/main-window-info-bar.vala:94
-#, c-format
-msgid ""
-"Could not communicate with %s for %s, check the server name and try again in "
-"a moment"
-msgstr ""
-"Could not communicate with %s for %s, check the server name and try again in "
-"a moment"
+#: src/client/components/main-toolbar.vala:171
+msgid "Delete conversation"
+msgid_plural "Delete conversations"
+msgstr[0] "Delete conversation"
+msgstr[1] "Delete conversations"
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:101
+#: src/client/components/main-window.vala:738
#, c-format
-msgid "Incoming mail server password required for %s"
-msgstr "Incoming mail server password required for %s"
-
-#: src/client/components/main-window-info-bar.vala:102
-msgid "Messages cannot be received without the correct password."
-msgstr "Messages cannot be received without the correct password."
+msgid "%s (%d)"
+msgstr "%s (%d)"
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:104
-msgid "Retry receiving email, you will be prompted for a password"
-msgstr "Retry receiving e-mail, you will be prompted for a password"
+#. Translators: Info bar title for a generic account
+#. problem.
+#: src/client/components/main-window-info-bar.vala:44
+msgid "Account problem"
+msgstr "Account problem"
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:109
+#. 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
#, c-format
-msgid "Outgoing mail server password required for %s"
-msgstr "Outgoing mail server password required for %s"
-
-#: src/client/components/main-window-info-bar.vala:110
-msgid "Messages cannot be sent without the correct password."
-msgstr "Messages cannot be sent without the correct password."
+msgid "Geary has encountered a problem with %s."
+msgstr "Geary has encountered a problem with %s."
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:112
-msgid "Retry sending queued messages, you will be prompted for a password"
-msgstr "Retry sending queued messages, you will be prompted for a password"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:117
+#. 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
#, c-format
-msgid "Incoming mail server security is not trusted for %s"
-msgstr "Incoming mail server security is not trusted for %s"
-
-#: src/client/components/main-window-info-bar.vala:118
-msgid "Messages will not be received until checked."
-msgstr "Messages will not be received until checked."
+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:120
-#: src/client/components/main-window-info-bar.vala:128
-msgid "Check security details"
-msgstr "Check security details"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:125
-#, c-format
-msgid "Outgoing mail server security is not trusted for %s"
-msgstr "Outgoing mail server security is not trusted for %s"
-
-#: src/client/components/main-window-info-bar.vala:126
-msgid "Messages cannot be sent until checked."
-msgstr "Messages cannot be sent until checked."
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:133
-#, c-format
-msgid "A problem occurred checking mail for %s"
-msgstr "A problem occurred checking mail for %s"
-
-#: src/client/components/main-window-info-bar.vala:134
-#: src/client/components/main-window-info-bar.vala:142
-msgid "Something went wrong, please file a bug report if the problem persists"
-msgstr "Something went wrong, please file a bug report if the problem persists"
+#: src/client/components/main-window-info-bar.vala:65
+msgid "Try reconnecting"
+msgstr "Try reconnecting"
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:141
+#. Translators: Info bar title for an outgoing
+#. account problem. String substitution is the
+#. account name
+#: src/client/components/main-window-info-bar.vala:73
#, c-format
-msgid "A problem occurred sending mail for %s"
-msgstr "A problem occurred sending mail for %s"
+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:144
+#: src/client/components/main-window-info-bar.vala:77
msgid "Retry sending queued messages"
msgstr "Retry sending queued messages"
-#: src/client/components/main-window-info-bar.vala:155
-msgid "A database problem has occurred"
-msgstr "A database problem has occurred"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:157
-#, c-format
-msgid "Messages for %s must be downloaded again."
-msgstr "Messages for %s must be downloaded again."
-
-#: src/client/components/main-window-info-bar.vala:170
+#. Translators: Info bar title for a generic application
+#. problem.
+#: src/client/components/main-window-info-bar.vala:84
msgid "Geary has encountered a problem"
msgstr "Geary has encountered a problem"
-#: src/client/components/main-window-info-bar.vala:171
-msgid ""
-"Please check the technical details and report the problem if it persists."
-msgstr ""
-"Please check the technical details and report the problem if it persists."
+#. Translators: Info bar sub-title for a generic
+#. application problem.
+#: src/client/components/main-window-info-bar.vala:88
+msgid "Please report the details if it persists."
+msgstr "Please report the details if it persists."
-#: src/client/components/main-window-info-bar.vala:179
+#. Translators: Button label for viewing technical details
+#. for a problem report.
+#: src/client/components/main-window-info-bar.vala:99
msgid "_Details"
msgstr "_Details"
-#. Button tooltip for displaying technical details about an account problem
-#: src/client/components/main-window-info-bar.vala:180 ui/main-window.ui:250
+#. Translators: Tooltip for viewing technical details for
+#. a problem report.
+#: src/client/components/main-window-info-bar.vala:102
msgid "View technical details about the error"
msgstr "View technical details about the error"
-#: src/client/components/main-window-info-bar.vala:184
+#. Translators: Button label for retrying a server
+#. connection
+#: src/client/components/main-window-info-bar.vala:108
msgid "_Retry"
msgstr "_Retry"
@@ -1339,12 +1277,12 @@ msgstr "Search"
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:101
+#: src/client/components/search-bar.vala:83
#, c-format
msgid "Indexing %s account"
msgstr "Indexing %s account"
-#: src/client/components/search-bar.vala:112
+#: src/client/components/search-bar.vala:110
#: src/client/folder-list/folder-list-search-branch.vala:39
#, c-format
msgid "Search %s account"
@@ -1352,19 +1290,17 @@ msgstr "Search %s account"
#. / 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..."
msgid "Sending…"
msgstr "Sending…"
#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
#: src/client/components/status-bar.vala:29
msgid "Error sending email"
-msgstr "Error sending email"
+msgstr "Error sending e-mail"
#. Displayed in the space-limited status bar when a message fails to be uploaded
#. to Sent Mail after being sent.
#: src/client/components/status-bar.vala:33
-#| msgid "Error sending email"
msgid "Error saving sent mail"
msgstr "Error saving sent mail"
@@ -1406,7 +1342,6 @@ msgstr "_Preferences"
#. Translators: Menu item to print a single, specific message
#: src/client/components/stock.vala:28 ui/conversation-email-menus.ui:64
-#| msgid "_Print..."
msgid "_Print…"
msgstr "_Print…"
@@ -1435,23 +1370,22 @@ msgid "Invalid link URL"
msgstr "Invalid link URL"
#: src/client/composer/composer-link-popover.vala:156
-#| msgid "Email address:"
msgid "Invalid email address"
msgstr "Invalid e-mail address"
-#: src/client/composer/composer-widget.vala:158
+#: src/client/composer/composer-widget.vala:156
msgid "Saved"
msgstr "Saved"
-#: src/client/composer/composer-widget.vala:159
+#: src/client/composer/composer-widget.vala:157
msgid "Saving"
msgstr "Saving"
-#: src/client/composer/composer-widget.vala:160
+#: src/client/composer/composer-widget.vala:158
msgid "Error saving"
msgstr "Error saving"
-#: src/client/composer/composer-widget.vala:161
+#: src/client/composer/composer-widget.vala:159
msgid "Press Backspace to delete quote"
msgstr "Press Backspace to delete quote"
@@ -1459,7 +1393,7 @@ msgstr "Press Backspace to delete quote"
#. 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:170
+#: src/client/composer/composer-widget.vala:168
msgid ""
"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
"enclosing|encloses|enclosure|enclosures"
@@ -1470,38 +1404,35 @@ 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:1130
-#| msgid "Do you want to discard this message?"
+#: src/client/composer/composer-widget.vala:1181
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:1158
-#| msgid "Do you want to discard this message?"
+#: src/client/composer/composer-widget.vala:1211
msgid "Do you want to discard this draft message?"
msgstr "Do you want to discard this draft message?"
-#: src/client/composer/composer-widget.vala:1275
+#: src/client/composer/composer-widget.vala:1330
msgid "Send message with an empty subject and body?"
msgstr "Send message with an empty subject and body?"
-#: src/client/composer/composer-widget.vala:1277
+#: src/client/composer/composer-widget.vala:1332
msgid "Send message with an empty subject?"
msgstr "Send message with an empty subject?"
-#: src/client/composer/composer-widget.vala:1279
+#: src/client/composer/composer-widget.vala:1334
msgid "Send message with an empty body?"
msgstr "Send message with an empty body?"
-#: src/client/composer/composer-widget.vala:1283
+#: src/client/composer/composer-widget.vala:1338
msgid "Send message without an attachment?"
msgstr "Send message without an attachment?"
-#: src/client/composer/composer-widget.vala:1588
+#: src/client/composer/composer-widget.vala:1652
#, c-format
-#| msgid "\"%s\" already attached for delivery."
msgid "“%s” already attached for delivery."
msgstr "“%s” already attached for delivery."
@@ -1510,68 +1441,63 @@ msgstr "“%s” already attached for delivery."
#. 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:1596
+#: src/client/composer/composer-widget.vala:1660
#: src/client/conversation-viewer/conversation-email.vala:173
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: src/client/composer/composer-widget.vala:1633
+#: src/client/composer/composer-widget.vala:1697
#, c-format
-#| msgid "\"%s\" could not be found."
msgid "“%s” could not be found."
msgstr "“%s” could not be found."
-#: src/client/composer/composer-widget.vala:1639
+#: src/client/composer/composer-widget.vala:1703
#, c-format
-#| msgid "\"%s\" is a folder."
msgid "“%s” is a folder."
msgstr "“%s” is a folder."
-#: src/client/composer/composer-widget.vala:1645
+#: src/client/composer/composer-widget.vala:1709
#, c-format
-#| msgid "\"%s\" is an empty file."
msgid "“%s” is an empty file."
msgstr "“%s” is an empty file."
-#: src/client/composer/composer-widget.vala:1658
+#: src/client/composer/composer-widget.vala:1722
#, c-format
-#| msgid "\"%s\" could not be opened for reading."
msgid "“%s” could not be opened for reading."
msgstr "“%s” could not be opened for reading."
-#: src/client/composer/composer-widget.vala:1666
+#: src/client/composer/composer-widget.vala:1730
msgid "Cannot add attachment"
msgstr "Cannot add attachment"
#. Translators: Human-readable version of the RFC 822 To header
-#: src/client/composer/composer-widget.vala:1716
-#: src/client/conversation-viewer/conversation-email.vala:982
-#: src/engine/rfc822/rfc822-utils.vala:298 ui/conversation-message.ui:312
+#: src/client/composer/composer-widget.vala:1787
+#: src/client/conversation-viewer/conversation-email.vala:976
+#: src/client/util/util-email.vala:216 ui/conversation-message.ui:312
msgid "To:"
msgstr "To:"
#. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:1722
-#: src/client/conversation-viewer/conversation-email.vala:987
-#: src/engine/rfc822/rfc822-utils.vala:303 ui/conversation-message.ui:357
+#: src/client/composer/composer-widget.vala:1793
+#: src/client/conversation-viewer/conversation-email.vala:981
+#: src/client/util/util-email.vala:221 ui/conversation-message.ui:357
msgid "Cc:"
msgstr "Cc:"
#. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:1728
-#: src/client/conversation-viewer/conversation-email.vala:992
+#: src/client/composer/composer-widget.vala:1799
+#: src/client/conversation-viewer/conversation-email.vala:986
#: 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:1734
-#| msgid "_Reply"
+#: src/client/composer/composer-widget.vala:1805
msgid "Reply-To: "
msgstr "Reply-To: "
-#: src/client/composer/composer-widget.vala:1874
+#: src/client/composer/composer-widget.vala:1945
msgid "Select Color"
msgstr "Select Colour"
@@ -1580,22 +1506,20 @@ msgstr "Select Colour"
#. 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:2064
+#: src/client/composer/composer-widget.vala:2137
#, c-format
msgid "%1$s via %2$s"
msgstr "%1$s via %2$s"
#. Composer label (with mnemonic underscore) for the account selector
#. when choosing what address to send a message from.
-#: src/client/composer/composer-widget.vala:2125
-#| msgid "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:2357
-#| msgid "Show Images"
+#: src/client/composer/composer-widget.vala:2472
msgid "Images"
msgstr "Images"
@@ -1603,135 +1527,136 @@ msgstr "Images"
msgid "New Message"
msgstr "New Message"
-#: src/client/composer/spell-check-popover.vala:117
+#: src/client/composer/spell-check-popover.vala:108
msgid "Remove this language from the preferred list"
msgstr "Remove this language from the preferred list"
-#: src/client/composer/spell-check-popover.vala:121
+#: src/client/composer/spell-check-popover.vala:112
msgid "Add this language to the preferred list"
msgstr "Add this language to the preferred list"
-#: src/client/composer/spell-check-popover.vala:217
+#: src/client/composer/spell-check-popover.vala:199
msgid "Search for more languages"
msgstr "Search for more languages"
-#: src/client/conversation-list/conversation-list-view.vala:283
-#| msgid "Move conversation"
-msgid "Delete conversation"
-msgstr "Delete conversation"
-
-#: src/client/conversation-list/conversation-list-view.vala:286
+#. / Translators: Context menu item
+#: src/client/conversation-list/conversation-list-view.vala:337
+msgid "Move conversation to _Trash"
+msgid_plural "Move conversations to _Trash"
+msgstr[0] "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
+msgid "_Delete conversation"
+msgid_plural "_Delete conversations"
+msgstr[0] "_Delete conversation"
+msgstr[1] "_Delete conversations"
+
+#: src/client/conversation-list/conversation-list-view.vala:356
#: ui/main-toolbar-menus.ui:5
msgid "Mark as _Read"
msgstr "Mark as _Read"
-#: src/client/conversation-list/conversation-list-view.vala:289
+#: src/client/conversation-list/conversation-list-view.vala:359
#: ui/main-toolbar-menus.ui:9
msgid "Mark as _Unread"
msgstr "Mark as _Unread"
-#: src/client/conversation-list/conversation-list-view.vala:292
+#: src/client/conversation-list/conversation-list-view.vala:362
#: ui/main-toolbar-menus.ui:17
msgid "U_nstar"
msgstr "U_nstar"
-#: src/client/conversation-list/conversation-list-view.vala:294
+#: src/client/conversation-list/conversation-list-view.vala:364
#: 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:297
+#: src/client/conversation-list/conversation-list-view.vala:367
#: ui/conversation-email-menus.ui:9
msgid "_Reply"
msgstr "_Reply"
-#: src/client/conversation-list/conversation-list-view.vala:298
+#: src/client/conversation-list/conversation-list-view.vala:368
msgid "R_eply All"
msgstr "R_eply All"
#. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:299
+#: src/client/conversation-list/conversation-list-view.vala:369
#: ui/conversation-email-menus.ui:21
msgid "_Forward"
msgstr "_Forward"
-#: src/client/conversation-list/formatted-conversation-data.vala:11
+#: src/client/conversation-list/formatted-conversation-data.vala:18
msgid "Me"
msgstr "Me"
-#. Translators: This is the file type displayed for
-#. attachments with unknown file types.
-#: src/client/conversation-viewer/conversation-email.vala:159
-msgid "Unknown"
-msgstr "Unknown"
-
#. Translators: Human-readable version of the RFC 822 From header
-#: src/client/conversation-viewer/conversation-email.vala:977
-#: src/engine/rfc822/rfc822-utils.vala:289
+#: src/client/conversation-viewer/conversation-email.vala:971
+#: src/client/util/util-email.vala:207
msgid "From:"
msgstr "From:"
#. Translators: Human-readable version of the RFC 822 Date header
-#: src/client/conversation-viewer/conversation-email.vala:997
-#: src/engine/rfc822/rfc822-utils.vala:294
+#: src/client/conversation-viewer/conversation-email.vala:991
+#: src/client/util/util-email.vala:212
msgid "Date:"
msgstr "Date:"
#. Translators: Human-readable version of the RFC 822 Subject header
-#: src/client/conversation-viewer/conversation-email.vala:1002
-#: src/engine/rfc822/rfc822-utils.vala:292
+#: src/client/conversation-viewer/conversation-email.vala:1001
+#: src/client/util/util-email.vala:210
msgid "Subject:"
msgstr "Subject:"
-#: src/client/conversation-viewer/conversation-message.vala:65
+#: src/client/conversation-viewer/conversation-message.vala:129
msgid "This email address may have been forged"
msgstr "This e-mail address may have been forged"
-#. Compact headers
+#. 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:394
+#: src/client/conversation-viewer/conversation-message.vala:447
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:766
+#: src/client/conversation-viewer/conversation-message.vala:840
msgid ", "
msgstr ", "
#. Translators: This string is used as the HTML IMG ALT
#. attribute value when displaying an inline image in an email
#. that did not specify a file name. E.g. <IMG ALT="Image" ...
-#: src/client/conversation-viewer/conversation-message.vala:869
-#| msgid "Show Images"
+#: src/client/conversation-viewer/conversation-message.vala:960
msgid "Image"
msgstr "Image"
#. Translators: Title label for placeholder when no
#. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:81
-#| msgid "No conversations selected."
+#: src/client/conversation-viewer/conversation-viewer.vala:82
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:85
+#: src/client/conversation-viewer/conversation-viewer.vala:86
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:94
-#| msgid "%u conversations selected."
+#: src/client/conversation-viewer/conversation-viewer.vala:95
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:98
+#: src/client/conversation-viewer/conversation-viewer.vala:99
msgid "Choosing an action will apply to all selected conversations"
msgstr "Choosing an action will apply to all selected conversations"
@@ -1739,21 +1664,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:107
-#: src/client/conversation-viewer/conversation-viewer.vala:120
-#| msgid "No conversations in folder."
+#: src/client/conversation-viewer/conversation-viewer.vala:108
+#: src/client/conversation-viewer/conversation-viewer.vala:121
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:111
+#: src/client/conversation-viewer/conversation-viewer.vala:112
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:124
+#: src/client/conversation-viewer/conversation-viewer.vala:125
msgid "Your search returned no results, try refining your search terms"
msgstr "Your search returned no results, try refining your search terms"
@@ -1839,11 +1763,18 @@ msgstr "The server’s certificate is considered insecure"
msgid "An error has occurred processing the server’s certificate"
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
+msgid "Details"
+msgstr "Details"
+
#. We can't keep these in the glade file, because Gnome doesn't want markup in translatable
#. strings, and Glade doesn't support the "larger" size attribute. See this bug report for
#. details: https://bugzilla.gnome.org/show_bug.cgi?id=679006
#: src/client/dialogs/password-dialog.vala:16
-#| msgid "Please enter your email password"
msgid "Geary requires your email password to continue"
msgstr "Geary requires your e-mail password to continue"
@@ -1877,7 +1808,6 @@ msgstr "Inboxes"
#: src/client/folder-list/folder-list-search-branch.vala:44
#, c-format
-#| msgid "%d results"
msgid "%d result"
msgid_plural "%d results"
msgstr[0] "%d result"
@@ -1885,25 +1815,29 @@ msgstr[1] "%d results"
#: src/client/notification/libmessagingmenu.vala:75
#, c-format
-#| msgid "%s - New Messages"
msgid "%s — New Messages"
msgstr "%s — New Messages"
-#: src/client/notification/libnotify.vala:75
+#. / Notification body text for new email when no other
+#. / new messages are already awaiting.
+#: src/client/notification/notification-desktop.vala:90
#, c-format
msgid "%d new message"
msgid_plural "%d new messages"
msgstr[0] "%d new message"
msgstr[1] "%d new messages"
-#: src/client/notification/libnotify.vala:78
+#. / Notification body text for new email when
+#. / other new messages have already been notified
+#. / about
+#: src/client/notification/notification-desktop.vala:98
#, 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/libnotify.vala:112
+#: src/client/notification/notification-desktop.vala:130
#, c-format
msgid ""
"%s\n"
@@ -1918,93 +1852,93 @@ msgstr[1] ""
"%s\n"
"(%d other new messages for %s)"
-#: src/client/notification/libnotify.vala:155
-msgid "Open"
-msgstr "Open"
-
#. / 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
-#: src/client/util/util-date.vala:68
+#: src/client/util/util-date.vala:69
msgid "%l:%M %P"
msgstr "%l:%M %P"
#. / Datetime format for 24-hour time, i.e. 16:35
#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:71
+#: src/client/util/util-date.vala:72
msgid "%H:%M"
msgstr "%H:%M"
#. / Datetime format for the locale default, i.e. 8:31 am or 16:35,
#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:74
-msgctxt "Default clock format"
-msgid "%l:%M %P"
-msgstr "%H:%M"
-
#. / Date format for dates within the current year, i.e. Nov 8
#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:78
+#: src/client/util/util-date.vala:79
msgid "%b %-e"
msgstr "%-e %b"
-#. / Date format for dates within a different year, i.e. 02/04/10
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:83
-#, no-c-format
-msgid "%x"
-msgstr "%x"
-
#. / Verbose datetime format for 12-hour time, i.e. November 8, 2010 8:42 am
#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:88
+#: src/client/util/util-date.vala:84
msgid "%B %-e, %Y %-l:%M %P"
msgstr "%-e %B, %Y %-l:%M %P"
#. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:91
+#: src/client/util/util-date.vala:87
msgid "%B %-e, %Y %-H:%M"
msgstr "%-e %B, %Y %H:%M"
#. / Verbose datetime format for the locale default (full month, day and time)
#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:94
+#: src/client/util/util-date.vala:90
msgctxt "Default full date"
msgid "%B %-e, %Y %-l:%M %P"
msgstr "%-e %B, %Y %H:%M"
-#: src/client/util/util-date.vala:164
+#: src/client/util/util-date.vala:159
msgid "Now"
msgstr "Now"
-#: src/client/util/util-date.vala:167
+#: src/client/util/util-date.vala:162
#, c-format
-#| msgid "%dm ago"
msgid "%dm ago"
msgid_plural "%dm ago"
msgstr[0] "%dm ago"
msgstr[1] "%dm ago"
-#: src/client/util/util-date.vala:171
+#: src/client/util/util-date.vala:166
#, c-format
-#| msgid "%dh ago"
msgid "%dh ago"
msgid_plural "%dh ago"
msgstr[0] "%dh ago"
msgstr[1] "%dh ago"
-#: src/client/util/util-date.vala:178
+#: src/client/util/util-date.vala:173
msgid "Yesterday"
msgstr "Yesterday"
#. / Date format that shows the weekday (Monday, Tuesday, ...)
#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:183
+#: src/client/util/util-date.vala:178
#, c-format
msgid "%A"
msgstr "%A"
-#: src/client/util/util-email.vala:38 src/engine/rfc822/rfc822-message.vala:862
+#. / 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
+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
+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
+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)"
@@ -2027,16 +1961,42 @@ msgid_plural "%s and %d others"
msgstr[0] "%s and %d other"
msgstr[1] "%s and %d others"
-#: src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "bytes"
-
-#: src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#. / 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
+#, c-format
+msgid "On %1$s, %2$s wrote:"
+msgstr "On %1$s, %2$s wrote:"
-#: src/client/util/util-files.vala:22
+#. / 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
+#, 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
+#, c-format
+msgid "On %s:"
+msgstr "On %s:"
+
+#: src/client/util/util-email.vala:202
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Forwarded message ----------"
+
+#: src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "bytes"
+
+#: src/client/util/util-files.vala:19
+msgctxt "Abbreviation for terabyte"
+msgid "TB"
+msgstr "TB"
+
+#: src/client/util/util-files.vala:22
msgctxt "Abbreviation for gigabyte"
msgid "GB"
msgstr "GB"
@@ -2104,9 +2064,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/imap-db-account.vala:125
-#| msgid "Save A_ttachment..."
-#| msgid_plural "Save All A_ttachments..."
+#: src/engine/imap-db/search/imap-db-search-query.vala:73
msgctxt "Search operator"
msgid "attachment"
msgstr "attachment"
@@ -2119,7 +2077,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/imap-db-account.vala:134
+#: src/engine/imap-db/search/imap-db-search-query.vala:82
msgctxt "Search operator"
msgid "bcc"
msgstr "bcc"
@@ -2131,7 +2089,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/imap-db-account.vala:142
+#: src/engine/imap-db/search/imap-db-search-query.vala:90
msgctxt "Search operator"
msgid "body"
msgstr "body"
@@ -2144,8 +2102,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/imap-db-account.vala:151
-#| msgid "Bcc:"
+#: src/engine/imap-db/search/imap-db-search-query.vala:99
msgctxt "Search operator"
msgid "cc"
msgstr "cc"
@@ -2158,7 +2115,7 @@ msgstr "cc"
#. or similar to combine words into one), should be short, and
#. also match the translation in "search.page" of the Geary User
#. Guide.
-#: src/engine/imap-db/imap-db-account.vala:160
+#: src/engine/imap-db/search/imap-db-search-query.vala:108
msgctxt "Search operator"
msgid "from"
msgstr "from"
@@ -2170,7 +2127,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/imap-db-account.vala:168
+#: src/engine/imap-db/search/imap-db-search-query.vala:116
msgctxt "Search operator"
msgid "is"
msgstr "is"
@@ -2182,8 +2139,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/imap-db-account.vala:176
-#| msgid "Subject:"
+#: src/engine/imap-db/search/imap-db-search-query.vala:124
msgctxt "Search operator"
msgid "subject"
msgstr "subject"
@@ -2196,7 +2152,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/imap-db-account.vala:185
+#: src/engine/imap-db/search/imap-db-search-query.vala:133
msgctxt "Search operator"
msgid "to"
msgstr "to"
@@ -2209,7 +2165,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/imap-db-account.vala:206
+#: src/engine/imap-db/search/imap-db-search-query.vala:154
msgctxt "Search operator value - mail addressed to the user"
msgid "me"
msgstr "me"
@@ -2221,7 +2177,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/imap-db-account.vala:218
+#: src/engine/imap-db/search/imap-db-search-query.vala:166
msgctxt "Search operator value - mail sent by the user"
msgid "me"
msgstr "me"
@@ -2233,9 +2189,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/imap-db-account.vala:230
-#| msgid "%d unread"
-#| msgid_plural "%d unread"
+#: src/engine/imap-db/search/imap-db-search-query.vala:178
msgctxt "'is:' search operator value"
msgid "read"
msgstr "read"
@@ -2248,8 +2202,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/imap-db-account.vala:241
-#| msgid "Starred"
+#: src/engine/imap-db/search/imap-db-search-query.vala:189
msgctxt "'is:' search operator value"
msgid "starred"
msgstr "starred"
@@ -2261,9 +2214,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/imap-db-account.vala:251
-#| msgid "%d unread"
-#| msgid_plural "%d unread"
+#: src/engine/imap-db/search/imap-db-search-query.vala:199
msgctxt "'is:' search operator value"
msgid "unread"
msgstr "unread"
@@ -2272,8 +2223,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:937
-#| msgid "Drafts"
+#: src/engine/imap-engine/imap-engine-generic-account.vala:953
msgid "Drafts | Draft"
msgstr "Drafts | Draft"
@@ -2281,13 +2231,13 @@ 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:946
+#: src/engine/imap-engine/imap-engine-generic-account.vala:962
msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr "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:951
+#: src/engine/imap-engine/imap-engine-generic-account.vala:967
msgctxt "Outlook localised name"
msgid "Sent Items"
msgstr "Sent Items"
@@ -2296,26 +2246,25 @@ msgstr "Sent Items"
#. 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:961
+#: src/engine/imap-engine/imap-engine-generic-account.vala:977
msgid ""
"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
"| Bulk E-Mail"
msgstr ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
+"Junk | Spam | Junk Mail | Junk E-mail | Junk E-Mail | Bulk Mail | Bulk E-"
+"mail | Bulk E-Mail"
#. List of general possible folder names to match for the
#. 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:971
+#: src/engine/imap-engine/imap-engine-generic-account.vala:987
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:976
-#| msgid "_Delete"
+#: src/engine/imap-engine/imap-engine-generic-account.vala:992
msgctxt "Outlook localised name"
msgid "Deleted Items"
msgstr "Deleted items"
@@ -2324,44 +2273,11 @@ 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:986
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1002
msgid "Archive | Archives"
msgstr "Archive | Archives"
-#. / 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/engine/rfc822/rfc822-utils.vala:236
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %-e %b, %Y at %H:%M"
-
-#. / 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/engine/rfc822/rfc822-utils.vala:242
-#, 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/engine/rfc822/rfc822-utils.vala:249
-#, 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/engine/rfc822/rfc822-utils.vala:255
-#, c-format
-msgid "On %s:"
-msgstr "On %s:"
-
-#: src/engine/rfc822/rfc822-utils.vala:284
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Forwarded message ----------"
-
-#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:127
-#| msgid "Add account"
+#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:126
msgid "Add an account"
msgstr "Add an account"
@@ -2374,22 +2290,18 @@ msgid "Receiving"
msgstr "Receiving"
#: ui/accounts_editor_add_pane.ui:178 ui/accounts_editor_servers_pane.ui:165
-#| msgid "Sending..."
msgid "Sending"
msgstr "Sending"
#: ui/accounts_editor_edit_pane.ui:8
-#| msgid "Edit account"
msgid "Edit Account"
msgstr "Edit Account"
#: ui/accounts_editor_edit_pane.ui:9 ui/accounts_editor_servers_pane.ui:9
-#| msgid "Accounts"
msgid "Account Name"
msgstr "Account Name"
#: ui/accounts_editor_edit_pane.ui:124
-#| msgid "Email address:"
msgid "Email addresses"
msgstr "E-mail addresses"
@@ -2398,24 +2310,20 @@ msgid "Signature"
msgstr "Signature"
#: ui/accounts_editor_edit_pane.ui:201
-#| msgid "SMTP settings"
msgid "Settings"
msgstr "Settings"
#. This is a button in the account settings to show server settings.
#: ui/accounts_editor_edit_pane.ui:243 ui/accounts_editor_servers_pane.ui:8
-#| msgid "SMTP settings"
msgid "Server Settings"
msgstr "Server Settings"
#. This is the remove account button in the account settings.
#: ui/accounts_editor_edit_pane.ui:258 ui/accounts_editor_remove_pane.ui:23
-#| msgid "Remove account"
msgid "Remove Account"
msgstr "Remove Account"
#: ui/accounts_editor_edit_pane.ui:262 ui/accounts_editor_remove_pane.ui:27
-#| msgid "Remove account"
msgid "Remove this account from Geary"
msgstr "Remove this account from Geary"
@@ -2423,12 +2331,11 @@ msgstr "Remove this account from Geary"
msgid "Accounts"
msgstr "Accounts"
-#: ui/accounts_editor_list_pane.ui:63
+#: ui/accounts_editor_list_pane.ui:62
msgid "To get started, select an email provider below."
msgstr "To get started, select an e-mail provider below."
-#: ui/accounts_editor_list_pane.ui:76
-#| msgid "Welcome to Geary."
+#: ui/accounts_editor_list_pane.ui:75
msgid "Welcome to Geary"
msgstr "Welcome to Geary"
@@ -2450,11 +2357,6 @@ msgstr ""
msgid "Remove account"
msgstr "Remove account"
-#: ui/accounts_editor_servers_pane.ui:17
-#| msgid "_Cancel"
-msgid "Cancel"
-msgstr "Cancel"
-
#: ui/accounts_editor_servers_pane.ui:47
msgid "Apply"
msgstr "Apply"
@@ -2476,17 +2378,14 @@ msgid "_Don’t Trust This Server"
msgstr "_Don’t Trust This Server"
#: ui/composer-headerbar.ui:17 ui/composer-headerbar.ui:174
-#| msgid "Italic (Ctrl+I)"
msgid "Detach (Ctrl+D)"
msgstr "Detach (Ctrl+D)"
#: ui/composer-headerbar.ui:57 ui/composer-headerbar.ui:83
-#| msgid "_Attach File"
msgid "Attach File (Ctrl+T)"
msgstr "Attach File (Ctrl+T)"
#: ui/composer-headerbar.ui:107
-#| msgid "_Include Original Attachments"
msgid "Include Original Attachments"
msgstr "Include Original Attachments"
@@ -2495,7 +2394,6 @@ msgid "_Send"
msgstr "_Send"
#: ui/composer-headerbar.ui:207
-#| msgid "Bold (Ctrl+B)"
msgid "Send (Ctrl+Enter)"
msgstr "Send (Ctrl+Enter)"
@@ -2587,7 +2485,6 @@ msgid "_Paste"
msgstr "_Paste"
#: ui/composer-menus.ui:100
-#| msgid "Paste _With Formatting"
msgctxt "Clipboard paste as plain text"
msgid "Paste _Without Formatting"
msgstr "Paste _Without Formatting"
@@ -2596,24 +2493,20 @@ msgstr "Paste _Without Formatting"
msgid "Select _All"
msgstr "Select _All"
-#: ui/composer-menus.ui:127 ui/conversation-message-menus.ui:49
-#| msgid "_Inspect"
+#: ui/composer-menus.ui:127 ui/conversation-message-menus.ui:43
msgid "_Inspect…"
msgstr "_Inspect…"
#. Address(es) e-mail is to be sent to
#: ui/composer-widget.ui:56
-#| msgid "To:"
msgid "_To"
msgstr "_To"
#: ui/composer-widget.ui:75
-#| msgid "Cc:"
msgid "_Cc"
msgstr "_Cc"
#: ui/composer-widget.ui:130
-#| msgid "Subject:"
msgid "_Subject"
msgstr "_Subject"
@@ -2622,13 +2515,11 @@ msgid "_Bcc"
msgstr "_Bcc"
#: ui/composer-widget.ui:179
-#| msgid "_Reply"
msgid "_Reply-To"
msgstr "_Reply-To"
#. Geary account mail will be sent from
#: ui/composer-widget.ui:208
-#| msgid "From:"
msgid "From"
msgstr "From"
@@ -2641,7 +2532,6 @@ msgid "To add them as attachments"
msgstr "To add them as attachments"
#: ui/composer-widget.ui:353
-#| msgid "Unquote text (Ctrl+[)"
msgid "Undo last edit (Ctrl+Z)"
msgstr "Undo last edit (Ctrl+Z)"
@@ -2678,7 +2568,6 @@ msgid "Quote text (Ctrl+])"
msgstr "Quote text (Ctrl+])"
#: ui/composer-widget.ui:611
-#| msgid "Unquote text (Ctrl+[)"
msgid "Unquote text (Ctrl+[)"
msgstr "Unquote text (Ctrl+[)"
@@ -2687,22 +2576,109 @@ msgid "Insert or update selection link (Ctrl+L)"
msgstr "Insert or update selection link (Ctrl+L)"
#: ui/composer-widget.ui:673
-#| msgid "Underline (Ctrl+U)"
msgid "Insert an image (Ctrl+G)"
msgstr "Insert an image (Ctrl+G)"
#: ui/composer-widget.ui:707
-#| msgid "Remove formatting (Ctrl+Space)"
msgid "Remove selection formatting (Ctrl+Space)"
msgstr "Remove selection formatting (Ctrl+Space)"
#: ui/composer-widget.ui:731
-#| msgid "Enable _spell checking"
msgid "Select spell checking languages"
msgstr "Select spell checking languages"
+#: ui/components-inspector-error-view.ui:33
+msgid ""
+"If the problem is serious or persists, please save and send these details to "
+"the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>mailing list</a> "
+"or attach to a <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug";
+"\">new bug report</a>."
+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>."
+
+#: ui/components-inspector-error-view.ui:49
+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
+#: ui/components-inspector.ui:20
+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"
+
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:63 ui/problem-details-dialog.ui:46
+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
+msgid "Copy to clipboard"
+msgstr "Copy to clipboard"
+
+#: ui/conversation-contact-popover.ui:146
+msgid "New Conversation…"
+msgstr "New Conversation…"
+
+#: ui/conversation-contact-popover.ui:159
+msgid "Copy Email Address"
+msgstr "Copy E-mail Address"
+
+#: ui/conversation-contact-popover.ui:182
+msgid "Save in Contacts…"
+msgstr "Save in Contacts…"
+
+#: ui/conversation-contact-popover.ui:195
+msgid "Show Conversations"
+msgstr "Show Conversations"
+
+#: ui/conversation-contact-popover.ui:208
+msgid "Open in Contacts"
+msgstr "Open in Contacts"
+
+#: ui/conversation-contact-popover.ui:221
+msgid "Always Load Remote Images"
+msgstr "Always Load Remote Images"
+
+#. Title label on contact popover
+#: ui/conversation-contact-popover.ui:264
+msgid "Deceptive email address"
+msgstr "Deceptive e-mail address"
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:294
+msgid "This email address is:"
+msgstr "This e-mail address is:"
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:319
+msgid "But was forged as:"
+msgstr "But was forged as:"
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:344
+msgid "The sender may not be trustworthy"
+msgstr "The sender may not be trustworthy"
+
#: ui/conversation-email.ui:27
-#| msgid "Save All A_ttachments..."
msgid "Save all attachments"
msgstr "Save all attachments"
@@ -2721,17 +2697,14 @@ msgid "Display the message menu"
msgstr "Display the message menu"
#: ui/conversation-email.ui:161
-#| msgid "Cannot add attachment"
msgid "Open selected attachments"
msgstr "Open selected attachments"
#: ui/conversation-email.ui:178
-#| msgid "Save All A_ttachments..."
msgid "Save selected attachments"
msgstr "Save selected attachments"
#: ui/conversation-email.ui:195
-#| msgid "Save All A_ttachments..."
msgid "Select all attachments"
msgstr "Select all attachments"
@@ -2740,13 +2713,10 @@ msgid "Edit Draft"
msgstr "Edit Draft"
#: ui/conversation-email.ui:267
-#| msgid "%d message"
-#| msgid_plural "%d messages"
msgid "Draft message"
msgstr "Draft message"
#: ui/conversation-email.ui:283
-#| msgid "This message contains remote images."
msgid "This message has not yet been sent."
msgstr "This message has not yet been sent."
@@ -2766,12 +2736,10 @@ msgstr "Reply to _All"
#. Translators: Menu item to mark a specific message as
#. read.
#: ui/conversation-email-menus.ui:30
-#| msgid "_Mark as Read"
msgid "_Mark Read"
msgstr "_Mark Read"
#: ui/conversation-email-menus.ui:36
-#| msgid "_Mark as Unread"
msgid "_Mark Unread"
msgstr "_Mark Unread"
@@ -2782,17 +2750,15 @@ msgid "Mark Unread From _Here"
msgstr "Mark Unread From _Here"
#. Translators: Menu item to move a single, specific message
-#. to the trash
+#. to the trash folder
#: ui/conversation-email-menus.ui:50
-#| msgid "Trash"
-msgid "_Trash"
-msgstr "Was_tebasket"
+msgid "Move message to _Trash"
+msgstr "Move message to Was_tebasket"
#. Translators: Menu item to delete a single, specific message
#: ui/conversation-email-menus.ui:57
-#| msgid "_Delete"
-msgid "_Delete…"
-msgstr "_Delete…"
+msgid "_Delete message…"
+msgstr "_Delete message…"
#. Translators: Menu item to view the source for a message
#: ui/conversation-email-menus.ui:69
@@ -2800,44 +2766,33 @@ msgid "_View Source"
msgstr "_View Source"
#: ui/conversation-email-menus.ui:87
-#| msgid "_Save"
msgid "_Save All"
msgstr "_Save All"
#: ui/conversation-message-menus.ui:7
-#| msgid "_Open"
msgid "_Open Link"
msgstr "_Open Link"
#: ui/conversation-message-menus.ui:11
-#| msgid "Copy _Email Address"
msgid "Copy Link _Address"
msgstr "Copy Link _Address"
#: ui/conversation-message-menus.ui:17
-#| msgid "New Message"
-msgid "Send New _Message…"
-msgstr "Send New _Message…"
+msgid "_New Conversation…"
+msgstr "_New Conversation…"
#: ui/conversation-message-menus.ui:21
-#| msgid "Copy _Email Address"
msgid "Copy Email _Address"
msgstr "Copy E-mail _Address"
#: ui/conversation-message-menus.ui:27
-#| msgid "_Save Image As..."
msgid "Save _Image As…"
msgstr "Save _Image As…"
#: ui/conversation-message-menus.ui:33
-#| msgid "Select _All"
msgid "_Select All"
msgstr "_Select All"
-#: ui/conversation-message-menus.ui:43
-msgid "Search for messages from"
-msgstr "Search for messages from"
-
#: ui/conversation-message.ui:63
msgid "From <email>"
msgstr "From <e-mail>"
@@ -2855,12 +2810,10 @@ msgid "Sent by:"
msgstr "Sent by:"
#: ui/conversation-message.ui:247
-#| msgid "Reply to _All"
msgid "Reply to:"
msgstr "Reply to:"
#: ui/conversation-message.ui:291
-#| msgid "Subject:"
msgid "Subject"
msgstr "Subject"
@@ -2881,12 +2834,10 @@ 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"
msgid "But actually goes to:"
msgstr "But actually goes to:"
#: ui/conversation-message.ui:723
-#| msgid "This link appears to go to"
msgid "The link appears to go to:"
msgstr "The link appears to go to:"
@@ -2903,15 +2854,14 @@ 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 "Mark conversation"
msgid "Find in conversation"
msgstr "Find in conversation"
-#: ui/conversation-viewer.ui:74
+#: ui/conversation-viewer.ui:75
msgid "Find the previous occurrence of the search string."
msgstr "Find the previous occurrence of the search string."
-#: ui/conversation-viewer.ui:95
+#: ui/conversation-viewer.ui:96
msgid "Find the next occurrence of the search string."
msgstr "Find the next occurrence of the search string."
@@ -2932,301 +2882,323 @@ msgid "_Case sensitive"
msgstr "_Case sensitive"
#: ui/find_bar.glade:145
-#| msgid "Labels"
msgid "label"
msgstr "label"
#: ui/gtk/help-overlay.ui:9
-#| msgid "%s - Conversation Inspector"
msgid "Conversation Shortcuts"
msgstr "Conversation Shortcuts"
-#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:254
-#| msgid "General"
+#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:347
msgctxt "shortcut window"
-msgid "General"
-msgstr "General"
+msgid "Actions"
+msgstr "Actions"
#: ui/gtk/help-overlay.ui:17
msgctxt "shortcut window"
-msgid "Move focus to the next/previous pane"
-msgstr "Move focus to the next/previous pane"
+msgid "New conversation"
+msgstr "New conversation"
#: ui/gtk/help-overlay.ui:24
-#| msgid "Move conversations"
msgctxt "shortcut window"
-msgid "Move focus to conversation list"
-msgstr "Move focus to conversation list"
+msgid "Reply to sender"
+msgstr "Reply to sender"
-#: ui/gtk/help-overlay.ui:31
+#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:282
msgctxt "shortcut window"
-msgid "Detach composer window"
-msgstr "Detach composer window"
+msgid "Reply to all"
+msgstr "Reply to all"
-#: ui/gtk/help-overlay.ui:38
+#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:289
msgctxt "shortcut window"
-msgid "Close composer window"
-msgstr "Close composer window"
+msgid "Forward"
+msgstr "Forward"
-#: ui/gtk/help-overlay.ui:45
+#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:296
msgctxt "shortcut window"
-msgid "Show keyboard shortcuts"
-msgstr "Show keyboard shortcuts"
+msgid "Un-mark/mark read"
+msgstr "Un-mark/mark read"
-#: ui/gtk/help-overlay.ui:52
-#| msgid "Show Images"
+#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:303
msgctxt "shortcut window"
-msgid "Show help"
-msgstr "Show help"
+msgid "Mark/un-mark starred"
+msgstr "Mark/un-mark starred"
-#: ui/gtk/help-overlay.ui:59
+#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:310
msgctxt "shortcut window"
-msgid "Quit the application"
-msgstr "Quit the application"
+msgid "Archive conversation"
+msgstr "Archive conversation"
-#: ui/gtk/help-overlay.ui:68
-#| msgid "Search"
+#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:317
+msgctxt "shortcut window"
+msgid "Move conversation"
+msgstr "Move conversation"
+
+#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:324
+msgctxt "shortcut window"
+msgid "Label conversation"
+msgstr "Label conversation"
+
+#: ui/gtk/help-overlay.ui:80
+msgctxt "shortcut window"
+msgid "Trash conversation"
+msgstr "Move conversation to Wastebasket"
+
+#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:331
+msgctxt "shortcut window"
+msgid "Move to Spam"
+msgstr "Move to Spam"
+
+#: ui/gtk/help-overlay.ui:95
+msgctxt "shortcut window"
+msgid "Delete conversation"
+msgstr "Delete conversation"
+
+#: ui/gtk/help-overlay.ui:104
msgctxt "shortcut window"
msgid "Search"
msgstr "Search"
-#: ui/gtk/help-overlay.ui:72
+#: ui/gtk/help-overlay.ui:108
msgctxt "shortcut window"
-msgid "Jump to search box"
-msgstr "Jump to search box"
+msgid "Search for conversations"
+msgstr "Search for conversations"
-#: ui/gtk/help-overlay.ui:79
-#| msgid "Add label to conversation"
+#: ui/gtk/help-overlay.ui:115
msgctxt "shortcut window"
msgid "Find in current conversation"
msgstr "Find in current conversation"
-#: ui/gtk/help-overlay.ui:86
+#: ui/gtk/help-overlay.ui:141
msgctxt "shortcut window"
-msgid "Find next/previous in current conversation"
-msgstr "Find next/previous in current conversation"
+msgid "Undo"
+msgstr "Undo"
-#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:274
-#| msgid "Notifications"
+#: ui/gtk/help-overlay.ui:145
msgctxt "shortcut window"
-msgid "Actions"
-msgstr "Actions"
+msgid "Undo the last action"
+msgstr "Undo the last action"
-#: ui/gtk/help-overlay.ui:99
-#| msgid "Compose Message"
+#: ui/gtk/help-overlay.ui:152
msgctxt "shortcut window"
-msgid "Compose a new message"
-msgstr "Compose a new message"
+msgid "Redo the last action"
+msgstr "Redo the last action"
-#: ui/gtk/help-overlay.ui:106
-#| msgid "Reply to _All"
+#: ui/gtk/help-overlay.ui:161
msgctxt "shortcut window"
-msgid "Reply to sender "
-msgstr "Reply to sender "
+msgid "View"
+msgstr "View"
-#: ui/gtk/help-overlay.ui:113
-#| msgid "Reply to _All"
+#: ui/gtk/help-overlay.ui:165
msgctxt "shortcut window"
-msgid "Reply to all"
-msgstr "Reply to all"
+msgid "Zoom in"
+msgstr "Zoom in"
-#: ui/gtk/help-overlay.ui:120
-#| msgid "_Forward"
+#: ui/gtk/help-overlay.ui:172
msgctxt "shortcut window"
-msgid "Forward"
-msgstr "Forward"
+msgid "Zoom out"
+msgstr "Zoom out"
-#: ui/gtk/help-overlay.ui:127
-#| msgid "Archive"
+#: ui/gtk/help-overlay.ui:179
msgctxt "shortcut window"
-msgid "Archive"
-msgstr "Archive"
+msgid "Reset zoom"
+msgstr "Reset zoom"
-#: ui/gtk/help-overlay.ui:134
+#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:367
msgctxt "shortcut window"
-msgid "Move to trash"
-msgstr "Move to wastebasket"
+msgid "General"
+msgstr "General"
-#: ui/gtk/help-overlay.ui:141
+#: ui/gtk/help-overlay.ui:192
msgctxt "shortcut window"
-msgid "Toggle spam"
-msgstr "Toggle spam"
+msgid "Show help"
+msgstr "Show help"
-#: ui/gtk/help-overlay.ui:148
-#| msgid "Move conversation"
+#: ui/gtk/help-overlay.ui:199
msgctxt "shortcut window"
-msgid "Move the conversation"
-msgstr "Move the conversation"
+msgid "Show keyboard shortcuts"
+msgstr "Show keyboard shortcuts"
-#: ui/gtk/help-overlay.ui:155
-#| msgid "Add label to conversation"
+#: ui/gtk/help-overlay.ui:206
msgctxt "shortcut window"
-msgid "Label the conversation"
-msgstr "Label the conversation"
+msgid "Close current window"
+msgstr "Close current window"
-#: ui/gtk/help-overlay.ui:163
-#| msgid "Mark as _Unread"
+#: ui/gtk/help-overlay.ui:213
msgctxt "shortcut window"
-msgid "Mark read"
-msgstr "Mark read"
+msgid "Quit the application"
+msgstr "Quit the application"
-#: ui/gtk/help-overlay.ui:170
-#| msgid "Mark as _Unread"
+#: ui/gtk/help-overlay.ui:222
msgctxt "shortcut window"
-msgid "Mark unread"
-msgstr "Mark unread"
+msgid "Keyboard navigation"
+msgstr "Keyboard navigation"
-#: ui/gtk/help-overlay.ui:179
+#: ui/gtk/help-overlay.ui:226
msgctxt "shortcut window"
-msgid "View"
-msgstr "View"
+msgid "Focus the next pane"
+msgstr "Focus the next pane"
-#: ui/gtk/help-overlay.ui:183
+#: ui/gtk/help-overlay.ui:233
msgctxt "shortcut window"
-msgid "Zoom in"
-msgstr "Zoom in"
+msgid "Focus the previous pane"
+msgstr "Focus the previous pane"
-#: ui/gtk/help-overlay.ui:190
+#: ui/gtk/help-overlay.ui:240
msgctxt "shortcut window"
-msgid "Zoom out"
-msgstr "Zoom out"
+msgid "Focus the conversation list"
+msgstr "Focus the conversation list"
-#: ui/gtk/help-overlay.ui:197
+#: ui/gtk/help-overlay.ui:247
msgctxt "shortcut window"
-msgid "Reset zoom"
-msgstr "Reset zoom"
+msgid "Select the conversation down"
+msgstr "Select the conversation down"
-#: ui/gtk/help-overlay.ui:206
+#: ui/gtk/help-overlay.ui:254
msgctxt "shortcut window"
-msgid "Additional Shortcuts"
-msgstr "Additional Shortcuts"
+msgid "Select the conversation up"
+msgstr "Select the conversation up"
-#: ui/gtk/help-overlay.ui:210
-#| msgid "_Star"
+#: ui/gtk/help-overlay.ui:261
msgctxt "shortcut window"
-msgid "Star"
-msgstr "Star"
+msgid "Focus next/previous message"
+msgstr "Focus next/previous message"
-#: ui/gtk/help-overlay.ui:217
-#| msgid "U_nstar"
+#: ui/gtk/help-overlay.ui:271
msgctxt "shortcut window"
-msgid "Unstar"
-msgstr "Unstar"
+msgid "Single-key shortcuts"
+msgstr "Single-key shortcuts"
-#: ui/gtk/help-overlay.ui:224
-#| msgid "_Delete"
+#: ui/gtk/help-overlay.ui:275
msgctxt "shortcut window"
-msgid "Delete"
-msgstr "Delete"
+msgid "Reply to sender "
+msgstr "Reply to sender "
+
+#: ui/gtk/help-overlay.ui:343
+msgid "Composer Shortcuts"
+msgstr "Composer Shortcuts"
+
+#: ui/gtk/help-overlay.ui:351
+msgctxt "shortcut window"
+msgid "Send"
+msgstr "Send"
-#: ui/gtk/help-overlay.ui:231
-#| msgid "Move conversation"
+#: ui/gtk/help-overlay.ui:358
msgctxt "shortcut window"
-msgid "Jump to next (older) conversation"
-msgstr "Jump to next (older) conversation"
+msgid "Add attachment"
+msgstr "Add attachment"
-#: ui/gtk/help-overlay.ui:238
+#: ui/gtk/help-overlay.ui:371
msgctxt "shortcut window"
-msgid "Jump to previous (newer) conversation"
-msgstr "Jump to previous (newer) conversation"
+msgid "Close composer window"
+msgstr "Close composer window"
-#: ui/gtk/help-overlay.ui:250
-#| msgid "Composer"
-msgid "Composer Shortcuts"
-msgstr "Composer Shortcuts"
+#: ui/gtk/help-overlay.ui:378
+msgctxt "shortcut window"
+msgid "Detach composer window"
+msgstr "Detach composer window"
+
+#: ui/gtk/help-overlay.ui:385
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "Editing"
+
+#: ui/gtk/help-overlay.ui:390
+msgctxt "shortcut window"
+msgid "Move selection to the clipboard"
+msgstr "Move selection to the clipboard"
+
+#: ui/gtk/help-overlay.ui:397
+msgctxt "shortcut window"
+msgid "Copy selection to clipboard"
+msgstr "Copy selection to clipboard"
+
+#: ui/gtk/help-overlay.ui:404
+msgctxt "shortcut window"
+msgid "Paste from the clipboard"
+msgstr "Paste from the clipboard"
-#: ui/gtk/help-overlay.ui:258
-#| msgid "Quote text (Ctrl+])"
+#: ui/gtk/help-overlay.ui:411
msgctxt "shortcut window"
msgid "Quote text"
msgstr "Quote text"
-#: ui/gtk/help-overlay.ui:265
-#| msgid "Unquote text (Ctrl+[)"
+#: ui/gtk/help-overlay.ui:418
msgctxt "shortcut window"
msgid "Unquote text"
msgstr "Unquote text"
-#: ui/gtk/help-overlay.ui:278
-#| msgid "_Send"
+#: ui/gtk/help-overlay.ui:427
msgctxt "shortcut window"
-msgid "Send"
-msgstr "Send"
+msgid "Rich text editing"
+msgstr "Rich text editing"
-#: ui/gtk/help-overlay.ui:285
-#| msgid "Cannot add attachment"
+#: ui/gtk/help-overlay.ui:431
msgctxt "shortcut window"
-msgid "Add attachment"
-msgstr "Add attachment"
+msgid "Paste without formatting"
+msgstr "Paste without formatting"
-#: ui/gtk/help-overlay.ui:294
-#| msgid "_Rich Text"
-msgctxt "shortcut window"
-msgid "Rich text mode"
-msgstr "Rich text mode"
-
-#: ui/gtk/help-overlay.ui:298
+#: ui/gtk/help-overlay.ui:438
msgctxt "shortcut window"
msgid "Bold text"
msgstr "Bold text"
-#: ui/gtk/help-overlay.ui:305
+#: ui/gtk/help-overlay.ui:445
msgctxt "shortcut window"
msgid "Italicize text"
msgstr "Italicise text"
-#: ui/gtk/help-overlay.ui:312
-#| msgid "Underline (Ctrl+U)"
+#: ui/gtk/help-overlay.ui:452
msgctxt "shortcut window"
msgid "Underline text"
msgstr "Underline text"
-#: ui/gtk/help-overlay.ui:319
+#: ui/gtk/help-overlay.ui:459
msgctxt "shortcut window"
msgid "Strike text"
msgstr "Strike text"
-#: ui/gtk/help-overlay.ui:326
-msgctxt "shortcut window"
-msgid "Insert a link"
-msgstr "Insert a link"
-
-#: ui/gtk/help-overlay.ui:333
-#| msgid "Remove formatting (Ctrl+Space)"
+#: ui/gtk/help-overlay.ui:466
msgctxt "shortcut window"
msgid "Remove formatting"
msgstr "Remove formatting"
+#: ui/gtk/help-overlay.ui:473
+msgctxt "shortcut window"
+msgid "Insert an image"
+msgstr "Insert an image"
+
+#: ui/gtk/help-overlay.ui:480
+msgctxt "shortcut window"
+msgid "Insert a link"
+msgstr "Insert a link"
+
#: ui/main-toolbar.ui:23
-#| msgid "Compose Message"
msgctxt "tooltip"
msgid "Compose Message"
msgstr "Compose Message"
-#: ui/main-toolbar.ui:52
+#: ui/main-toolbar.ui:61
msgid "Toggle search bar"
msgstr "Toggle search bar"
-#: ui/main-toolbar.ui:112
-#| msgid "_Reply"
+#: ui/main-toolbar.ui:113
msgid "Reply"
msgstr "Reply"
-#: ui/main-toolbar.ui:135
-#| msgid "R_eply All"
+#: ui/main-toolbar.ui:136
msgid "Reply All"
msgstr "Reply All"
-#: ui/main-toolbar.ui:158
-#| msgid "_Forward"
+#: ui/main-toolbar.ui:159
msgid "Forward"
msgstr "Forward"
-#: ui/main-toolbar.ui:264
+#: ui/main-toolbar.ui:265
msgid "Toggle find bar"
msgstr "Toggle find bar"
-#: ui/main-toolbar.ui:306
+#: ui/main-toolbar.ui:286
msgid "_Archive"
msgstr "_Archive"
@@ -3247,7 +3219,6 @@ msgid "Empty _Trash…"
msgstr "Empty Was_tebasket…"
#: ui/main-toolbar-menus.ui:42
-#| msgid "Accounts"
msgid "_Accounts"
msgstr "_Accounts"
@@ -3256,17 +3227,16 @@ msgid "_Keyboard Shortcuts"
msgstr "_Keyboard Shortcuts"
#: ui/main-toolbar-menus.ui:61
-#| msgid "_About"
msgid "_About Geary"
msgstr "_About Geary"
#. Infobar title when one or more accounts are offline
-#: ui/main-window.ui:183
+#: ui/main-window.ui:185
msgid "Working offline"
msgstr "Working offline"
#. Label and tooltip for offline infobar
-#: ui/main-window.ui:197
+#: 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."
@@ -3275,61 +3245,27 @@ msgstr ""
"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:200
+#: 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 displaying technical details about an account problem
-#. Dialog title for displaying technical details of a problem. Same as the button that invokes it.
-#: ui/main-window.ui:247 ui/problem-details-dialog.ui:13
-#| msgid "_Details"
-msgid "Details"
-msgstr "Details"
-
-#. Button label for retrying an account problem
-#: ui/main-window.ui:261
-msgid "Retry"
-msgstr "Retry"
-
-#. Infobar title when one or more accounts have encounted an error
-#: ui/main-window.ui:294
-#| msgid "Accounts"
-msgid "Account problem"
-msgstr "Account problem"
-
-#. Label and tooltip for account service problem infobar
-#: ui/main-window.ui:308
-msgid ""
-"Geary encountered a problem connecting to an account.\n"
-"Please check your Internet connection, the server configuration and try "
-"again."
-msgstr ""
-"Geary encountered a problem connecting to an account.\n"
-"Please check your Internet connection, the server configuration and try "
-"again."
-
-#. Label and tooltip for account service problem infobar
-#: ui/main-window.ui:311
-msgid "Geary encountered a problem connecting to an account."
-msgstr "Geary encountered a problem connecting to an account."
-
#. Button label for retrying TLS cert validation
-#: ui/main-window.ui:358
+#: ui/main-window.ui:249
msgid "Check"
msgstr "Check"
#. Button tooltip for retrying TLS cert validation
-#: ui/main-window.ui:362
+#: 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:391
+#: ui/main-window.ui:282
msgid "Security problem"
msgstr "Security problem"
#. Label and tooltip for TLS cert validation error infobar
-#: ui/main-window.ui:405
+#: ui/main-window.ui:296
msgid ""
"An account has reported an untrusted server.\n"
"Please check the server configuration and try again."
@@ -3338,22 +3274,22 @@ msgstr ""
"Please check the server configuration and try again."
#. Label and tooltip for TLS cert validation error infobar
-#: ui/main-window.ui:408
+#: 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:459
+#: 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:488
+#: ui/main-window.ui:379
msgid "Login problem"
msgstr "Login problem"
#. Label and tooltip for authentication problem infobar
-#: ui/main-window.ui:502
+#: ui/main-window.ui:393
msgid ""
"An account has reported an incorrect login or password.\n"
"Please check your login name and try again."
@@ -3362,7 +3298,7 @@ msgstr ""
"Please check your login name and try again."
#. Label and tooltip for authentication problem infobar
-#: ui/main-window.ui:505
+#: 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."
@@ -3371,12 +3307,10 @@ msgid "SMTP Credentials"
msgstr "SMTP Credentials"
#: ui/password-dialog.glade:91
-#| msgid "Username:"
msgid "Username"
msgstr "Username"
#: ui/password-dialog.glade:152
-#| msgid "_Remember passwords"
msgid "_Remember password"
msgstr "_Remember password"
@@ -3421,42 +3355,255 @@ msgid "Geary will keep running after all windows are closed"
msgstr "Geary will keep running after all windows are closed"
#: ui/preferences-dialog.ui:195
-#| msgid "_Preferences"
msgid "Preferences"
msgstr "Preferences"
-#. Button label for copying technical information to the clipboard
-#: ui/problem-details-dialog.ui:17
-msgid "Copy to Clipboard"
-msgstr "Copy to Clipboard"
+#: ui/upgrade_dialog.glade:60
+msgid "Geary update in progress…"
+msgstr "Geary update in progress…"
-#. Button tooltip for copying technical information to the clipboard
-#: ui/problem-details-dialog.ui:21
-msgid ""
-"Copy technical details to clipboard for pasting into an email or bug report"
-msgstr ""
-"Copy technical details to clipboard for pasting into an e-mail or bug report"
+#~| msgid "Display program version"
+#~ msgid "Display program version and revision id"
+#~ msgstr "Display program version and revision id"
-#: ui/problem-details-dialog.ui:73
-msgid ""
-"If the problem is serious or persists, please copy and send these details to "
-"the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>mailing list</a> "
-"or file a <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug\";>new "
-"bug report</a>."
-msgstr ""
-"If the problem is serious or persists, please copy and send these details to "
-"the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>mailing list</a> "
-"or file a <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug\";>new "
-"bug report</a>."
+#~ msgid "List of the languages to use in the spell checker."
+#~ msgstr "List of the languages to use in the spell checker."
-#: ui/problem-details-dialog.ui:89
-#| msgid "_Details"
-msgid "Details:"
-msgstr "Details:"
+#~ msgid "Save drafts on server"
+#~ msgstr "Save drafts on server"
-#: ui/upgrade_dialog.glade:60
-msgid "Geary update in progress…"
-msgstr "Geary update in progress…"
+#~ msgid "Output debugging information"
+#~ msgstr "Output debugging information"
+
+#~ 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:"
+
+#~ msgid "Failed to parse command line options: %s\n"
+#~ msgstr "Failed to parse command line options: %s\n"
+
+#~| msgid "Underline (Ctrl+U)"
+#~ msgid "Undo move (Ctrl+Z)"
+#~ msgstr "Undo move (Ctrl+Z)"
+
+#~ msgid "Close the draft message?"
+#~ msgid_plural "Close all draft messages?"
+#~ msgstr[0] "Close the draft message?"
+#~ msgstr[1] "Close all draft messages?"
+
+#~| msgid "Unquote text (Ctrl+[)"
+#~ msgid "Undo trash (Ctrl+Z)"
+#~ msgstr "Undo moving to wastebasket (Ctrl+Z)"
+
+#~| msgid "Underline (Ctrl+U)"
+#~ msgid "Undo archive (Ctrl+Z)"
+#~ msgstr "Undo archive (Ctrl+Z)"
+
+#~| msgid "Underline (Ctrl+U)"
+#~ msgid "Undo (Ctrl+Z)"
+#~ msgstr "Undo (Ctrl+Z)"
+
+#~| msgid "Archive conversations (Delete, Backspace, A)"
+#~ msgid "Move conversation to Trash (Delete, Backspace)"
+#~ msgid_plural "Move conversations to Trash (Delete, Backspace)"
+#~ msgstr[0] "Move conversation to Wastebasket (Delete, Backspace)"
+#~ msgstr[1] "Move conversations to Wastebasket (Delete, Backspace)"
+
+#~| msgid "Delete conversation (Delete, Backspace, A)"
+#~ msgid "Delete conversation (Shift+Delete)"
+#~ msgid_plural "Delete conversations (Shift+Delete)"
+#~ msgstr[0] "Delete conversation (Shift+Delete)"
+#~ msgstr[1] "Delete conversation (Delete, Backspace, A)"
+
+#~ msgid "Problem connecting to incoming server for %s"
+#~ msgstr "Problem connecting to incoming server for %s"
+
+#~ msgid ""
+#~ "Could not connect to %s, check your Internet access and the server name "
+#~ "and try again"
+#~ msgstr ""
+#~ "Could not connect to %s, check your Internet access and the server name "
+#~ "and try again"
+
+#~ msgid "Problem connecting to outgoing server for %s"
+#~ msgstr "Problem connecting to outgoing server for %s"
+
+#~ msgid "Problem communicating with incoming server for %s"
+#~ msgstr "Problem communicating with incoming server for %s"
+
+#~ msgid ""
+#~ "Network error talking to %s, check your Internet access and try again"
+#~ msgstr ""
+#~ "Network error talking to %s, check your Internet access and try again"
+
+#~ msgid "Problem communicating with outgoing mail server"
+#~ msgstr "Problem communicating with outgoing mail server"
+
+#~ msgid ""
+#~ "Geary did not understand a message from %s or vice versa, please file a "
+#~ "bug report"
+#~ msgstr ""
+#~ "Geary did not understand a message from %s or vice versa, please file a "
+#~ "bug report"
+
+#~ msgid ""
+#~ "Could not communicate with %s for %s, check the server name and try again "
+#~ "in a moment"
+#~ msgstr ""
+#~ "Could not communicate with %s for %s, check the server name and try again "
+#~ "in a moment"
+
+#~ msgid "Incoming mail server password required for %s"
+#~ msgstr "Incoming mail server password required for %s"
+
+#~ msgid "Messages cannot be received without the correct password."
+#~ msgstr "Messages cannot be received without the correct password."
+
+#~ msgid "Retry receiving email, you will be prompted for a password"
+#~ msgstr "Retry receiving e-mail, you will be prompted for a password"
+
+#~ msgid "Outgoing mail server password required for %s"
+#~ msgstr "Outgoing mail server password required for %s"
+
+#~ msgid "Messages cannot be sent without the correct password."
+#~ msgstr "Messages cannot be sent without the correct password."
+
+#~ msgid "Retry sending queued messages, you will be prompted for a password"
+#~ msgstr "Retry sending queued messages, you will be prompted for a password"
+
+#~ msgid "Incoming mail server security is not trusted for %s"
+#~ msgstr "Incoming mail server security is not trusted for %s"
+
+#~ msgid "Messages will not be received until checked."
+#~ msgstr "Messages will not be received until checked."
+
+#~ msgid "Check security details"
+#~ msgstr "Check security details"
+
+#~ msgid "Outgoing mail server security is not trusted for %s"
+#~ msgstr "Outgoing mail server security is not trusted for %s"
+
+#~ msgid "Messages cannot be sent until checked."
+#~ msgstr "Messages cannot be sent until checked."
+
+#~ msgid "A problem occurred checking mail for %s"
+#~ msgstr "A problem occurred checking mail for %s"
+
+#~ msgid ""
+#~ "Something went wrong, please file a bug report if the problem persists"
+#~ msgstr ""
+#~ "Something went wrong, please file a bug report if the problem persists"
+
+#~ msgid "A database problem has occurred"
+#~ msgstr "A database problem has occurred"
+
+#~ msgid "Messages for %s must be downloaded again."
+#~ msgstr "Messages for %s must be downloaded again."
+
+#~ msgid "Open"
+#~ msgstr "Open"
+
+#~ msgctxt "Default clock format"
+#~ msgid "%l:%M %P"
+#~ msgstr "%H:%M"
+
+#~ msgid "%x"
+#~ msgstr "%x"
+
+#~| msgid "Trash"
+#~ msgid "_Trash"
+#~ msgstr "Was_tebasket"
+
+#~| msgid "New Message"
+#~ msgid "Send New _Message…"
+#~ msgstr "Send New _Message…"
+
+#~ msgid "Search for messages from"
+#~ msgstr "Search for messages from"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to search box"
+#~ msgstr "Jump to search box"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Find next/previous in current conversation"
+#~ msgstr "Find next/previous in current conversation"
+
+#~| msgid "Compose Message"
+#~ msgctxt "shortcut window"
+#~ msgid "Compose a new message"
+#~ msgstr "Compose a new message"
+
+#~| msgid "Archive"
+#~ msgctxt "shortcut window"
+#~ msgid "Archive"
+#~ msgstr "Archive"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Toggle spam"
+#~ msgstr "Toggle spam"
+
+#~| msgid "Move conversation"
+#~ msgctxt "shortcut window"
+#~ msgid "Move the conversation"
+#~ msgstr "Move the conversation"
+
+#~| msgid "Mark as _Unread"
+#~ msgctxt "shortcut window"
+#~ msgid "Mark unread"
+#~ msgstr "Mark unread"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Additional Shortcuts"
+#~ msgstr "Additional Shortcuts"
+
+#~| msgid "_Star"
+#~ msgctxt "shortcut window"
+#~ msgid "Star"
+#~ msgstr "Star"
+
+#~| msgid "U_nstar"
+#~ msgctxt "shortcut window"
+#~ msgid "Unstar"
+#~ msgstr "Unstar"
+
+#~| msgid "_Delete"
+#~ msgctxt "shortcut window"
+#~ msgid "Delete"
+#~ msgstr "Delete"
+
+#~| msgid "Move conversation"
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to next (older) conversation"
+#~ msgstr "Jump to next (older) conversation"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to previous (newer) conversation"
+#~ msgstr "Jump to previous (newer) conversation"
+
+#~ msgid "Retry"
+#~ msgstr "Retry"
+
+#~ msgid ""
+#~ "Geary encountered a problem connecting to an account.\n"
+#~ "Please check your Internet connection, the server configuration and try "
+#~ "again."
+#~ msgstr ""
+#~ "Geary encountered a problem connecting to an account.\n"
+#~ "Please check your Internet connection, the server configuration and try "
+#~ "again."
+
+#~ msgid ""
+#~ "Copy technical details to clipboard for pasting into an email or bug "
+#~ "report"
+#~ msgstr ""
+#~ "Copy technical details to clipboard for pasting into an e-mail or bug "
+#~ "report"
#~ msgid " • Connection error.\n"
#~ msgstr " • Connection error.\n"
@@ -3603,9 +3750,6 @@ msgstr "Geary update in progress…"
#~ msgid "Mail Client"
#~ msgstr "Mail Client"
-#~ msgid "Mark conversations"
-#~ msgstr "Mark conversations"
-
#~ msgid "Medium"
#~ msgstr "Medium"
@@ -3803,9 +3947,6 @@ msgstr "Geary update in progress…"
#~ msgid "_Right"
#~ msgstr "_Right"
-#~ msgid "_Save As..."
-#~ msgstr "_Save As..."
-
#~ msgid "_Username:"
#~ msgstr "_Username:"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
