diff --git a/po/en_GB.po b/po/en_GB.po index 4ec9aa1a..5e796719 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -8,14 +8,15 @@ # ajshephard , 2013 # andrubuntu , 2013 # Zander Brown , 2019. -# Bruce Cowan , 2019-2020. +# Bruce Cowan , 2019-2024. +# Andi Chandler , 2024. # 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: 2020-08-29 01:59+0000\n" -"PO-Revision-Date: 2020-08-31 19:51+0100\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues/\n" +"POT-Creation-Date: 2024-06-26 09:42+0000\n" +"PO-Revision-Date: 2024-09-01 21:17+0100\n" "Last-Translator: Bruce Cowan \n" "Language-Team: English - United Kingdom \n" "Language: en_GB\n" @@ -23,11 +24,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Gtranslator 3.36.0\n" +"X-Generator: Poedit 3.4.4\n" #: desktop/geary-attach.contract.desktop.in:3 msgid "Send by email" -msgstr "Send by e-mail" +msgstr "Send by email" #: desktop/geary-attach.contract.desktop.in:6 msgid "Send files using Geary" @@ -37,15 +38,15 @@ msgstr "Send files using Geary" #: desktop/geary-autostart.desktop.in.in:3 #: desktop/org.gnome.Geary.appdata.xml.in.in:11 #: desktop/org.gnome.Geary.desktop.in.in:3 -#: src/client/accounts/accounts-editor-servers-pane.vala:560 -#: src/client/application/application-main-window.vala:608 +#: src/client/accounts/accounts-editor-servers-pane.vala:551 +#: src/client/application/application-main-window.vala:710 msgid "Geary" msgstr "Geary" #: desktop/geary-autostart.desktop.in.in:4 #: desktop/org.gnome.Geary.desktop.in.in:4 msgid "Email" -msgstr "E-mail" +msgstr "Email" #. Translators: The application's summary / tagline #: desktop/geary-autostart.desktop.in.in:5 @@ -53,7 +54,7 @@ msgstr "E-mail" #: desktop/org.gnome.Geary.desktop.in.in:5 #: src/client/application/application-client.vala:33 msgid "Send and receive email" -msgstr "Send and receive e-mail" +msgstr "Send and receive email" #. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon. #: desktop/geary-autostart.desktop.in.in:7 @@ -67,12 +68,12 @@ msgstr "Geary Development Team" #: desktop/org.gnome.Geary.appdata.xml.in.in:17 msgid "" -"Geary is an email application built around conversations, for the GNOME 3 " +"Geary is an email application built around conversations, for the GNOME " "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 e-mail with a straightforward, " +"Geary is an email application built around conversations, for the GNOME " +"desktop. It allows you to read, find and send email with a straightforward, " "modern interface." #: desktop/org.gnome.Geary.appdata.xml.in.in:22 @@ -89,7 +90,7 @@ msgstr "Geary’s features include:" #: desktop/org.gnome.Geary.appdata.xml.in.in:28 msgid "Quick email account setup" -msgstr "Quick e-mail account setup" +msgstr "Quick email account setup" #: desktop/org.gnome.Geary.appdata.xml.in.in:29 msgid "Shows related messages together in conversations" @@ -112,25 +113,25 @@ msgid "Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers" msgstr "Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers" #. Translators: A screenshot description. -#: desktop/org.gnome.Geary.appdata.xml.in.in:47 +#: desktop/org.gnome.Geary.appdata.xml.in.in:51 msgid "Geary displaying a conversation" msgstr "Geary displaying a conversation" #. Translators: A screenshot description. -#: desktop/org.gnome.Geary.appdata.xml.in.in:58 +#: desktop/org.gnome.Geary.appdata.xml.in.in:56 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.in:7 -msgid "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;" -msgstr "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;" +msgid "Mail;E-mail;email;IMAP;GMail;Yahoo;Hotmail;Outlook;" +msgstr "Mail;E-mail;email;IMAP;GMail;Yahoo;Hotmail;Outlook;" -#: desktop/org.gnome.Geary.desktop.in.in:22 +#: desktop/org.gnome.Geary.desktop.in.in:24 msgid "Compose Message" msgstr "Compose Message" -#: desktop/org.gnome.Geary.desktop.in.in:26 +#: desktop/org.gnome.Geary.desktop.in.in:28 msgid "New Window" msgstr "New Window" @@ -159,88 +160,54 @@ msgid "The last recorded height of the application window." msgstr "The last recorded height of the application window." #: desktop/org.gnome.Geary.gschema.xml:26 -msgid "Position of folder list pane" -msgstr "Position of folder list pane" - -#: desktop/org.gnome.Geary.gschema.xml:27 -msgid "Position of the folder list Paned grabber." -msgstr "Position of the folder list Paned grabber." - -#: desktop/org.gnome.Geary.gschema.xml:32 -msgid "Position of folder list pane when horizontal" -msgstr "Position of folder list pane when horizontal" - -#: desktop/org.gnome.Geary.gschema.xml:33 -msgid "" -"Position of the folder list Paned grabber in the horizontal orientation." -msgstr "" -"Position of the folder list Paned grabber in the horizontal orientation." - -#: desktop/org.gnome.Geary.gschema.xml:38 -msgid "Position of folder list pane when vertical" -msgstr "Position of folder list pane when vertical" - -#: desktop/org.gnome.Geary.gschema.xml:39 -msgid "Position of the folder list Paned grabber in the vertical orientation." -msgstr "Position of the folder list Paned grabber in the vertical orientation." - -#: desktop/org.gnome.Geary.gschema.xml:44 -msgid "Orientation of the folder list pane" -msgstr "Orientation of the folder list pane" - -#: desktop/org.gnome.Geary.gschema.xml:45 -msgid "True if the folder list Paned is in the horizontal orientation." -msgstr "True if the folder list Paned is in the horizontal orientation." - -#: desktop/org.gnome.Geary.gschema.xml:50 msgid "Show/hide formatting toolbar" msgstr "Show/hide formatting toolbar" -#: desktop/org.gnome.Geary.gschema.xml:51 +#: desktop/org.gnome.Geary.gschema.xml:27 msgid "True if the formatting toolbar in the composer is shown." msgstr "True if the formatting toolbar in the composer is shown." -#: desktop/org.gnome.Geary.gschema.xml:56 -msgid "Position of message list pane" -msgstr "Position of message list pane" - -#: desktop/org.gnome.Geary.gschema.xml:57 -msgid "Position of the message list Paned grabber." -msgstr "Position of the message list Paned grabber." - -#: desktop/org.gnome.Geary.gschema.xml:62 +#: desktop/org.gnome.Geary.gschema.xml:32 msgid "Autoselect next message" msgstr "Autoselect next message" -#: desktop/org.gnome.Geary.gschema.xml:63 +#: desktop/org.gnome.Geary.gschema.xml:33 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:68 +#: desktop/org.gnome.Geary.gschema.xml:38 msgid "Display message previews" msgstr "Display message previews" -#: desktop/org.gnome.Geary.gschema.xml:69 +#: desktop/org.gnome.Geary.gschema.xml:39 msgid "True if we should display a short preview of each message." msgstr "True if we should display a short preview of each message." -#: desktop/org.gnome.Geary.gschema.xml:74 +#: desktop/org.gnome.Geary.gschema.xml:44 +msgid "Move messages by default" +msgstr "Move messages by default" + +#: desktop/org.gnome.Geary.gschema.xml:45 +msgid "When tagging a message, move it to destination folder." +msgstr "When tagging a message, move it to destination folder." + +#: desktop/org.gnome.Geary.gschema.xml:50 msgid "Use single key shortcuts" msgstr "Use single key shortcuts" -#: desktop/org.gnome.Geary.gschema.xml:75 +#: desktop/org.gnome.Geary.gschema.xml:51 msgid "" "Enables shortcuts for email actions that do not require pressing to " "emulate those used by Gmail." msgstr "" -"Enables shortcuts for e-mail actions that do not require pressing to " +"Enables shortcuts for email actions that do not require pressing to " "emulate those used by Gmail." -#: desktop/org.gnome.Geary.gschema.xml:82 +#: desktop/org.gnome.Geary.gschema.xml:58 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:83 +#: desktop/org.gnome.Geary.gschema.xml:59 msgid "" "A list of POSIX locales, with the empty list disabling spell checking and " "the null list using desktop languages by default." @@ -248,11 +215,11 @@ msgstr "" "A list of POSIX locales, with the empty list disabling spell checking and " "the null list using desktop languages by default." -#: desktop/org.gnome.Geary.gschema.xml:90 +#: desktop/org.gnome.Geary.gschema.xml:66 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:91 +#: desktop/org.gnome.Geary.gschema.xml:67 msgid "" "List of languages that are always displayed in the popover of the spell " "checker." @@ -260,73 +227,81 @@ msgstr "" "List of languages that are always displayed in the popover of the spell " "checker." -#: desktop/org.gnome.Geary.gschema.xml:96 -msgid "Notify of new mail at startup" -msgstr "Notify of new mail at startup" +#: desktop/org.gnome.Geary.gschema.xml:72 +msgid "Run application in background on logon and when closed" +msgstr "Run application in background on logon and when closed" -#: desktop/org.gnome.Geary.gschema.xml:97 -msgid "True to notify of new mail at startup." -msgstr "True to notify of new mail at startup." +#: desktop/org.gnome.Geary.gschema.xml:73 +msgid "True to run application in background." +msgstr "True to run application in background." -#: desktop/org.gnome.Geary.gschema.xml:102 +#: desktop/org.gnome.Geary.gschema.xml:78 msgid "Ask when opening an attachment" msgstr "Ask when opening an attachment" -#: desktop/org.gnome.Geary.gschema.xml:103 +#: desktop/org.gnome.Geary.gschema.xml:79 msgid "True to ask when opening an attachment." msgstr "True to ask when opening an attachment." -#: desktop/org.gnome.Geary.gschema.xml:108 +#: desktop/org.gnome.Geary.gschema.xml:84 msgid "Whether to compose emails in HTML" -msgstr "Whether to compose e-mails in HTML" +msgstr "Whether to compose emails in HTML" -#: desktop/org.gnome.Geary.gschema.xml:109 +#: desktop/org.gnome.Geary.gschema.xml:85 msgid "True to compose emails in HTML; false for plain text." -msgstr "True to compose e-mails in HTML; false for plain text." +msgstr "True to compose emails in HTML; false for plain text." -#: desktop/org.gnome.Geary.gschema.xml:114 +#: desktop/org.gnome.Geary.gschema.xml:90 msgid "Advisory strategy for full-text searching" msgstr "Advisory strategy for full-text searching" -#: desktop/org.gnome.Geary.gschema.xml:115 +#: desktop/org.gnome.Geary.gschema.xml:91 msgid "" "Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”." msgstr "" "Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”." -#: desktop/org.gnome.Geary.gschema.xml:120 +#: desktop/org.gnome.Geary.gschema.xml:96 msgid "Zoom of conversation viewer" msgstr "Zoom of conversation viewer" -#: desktop/org.gnome.Geary.gschema.xml:121 +#: desktop/org.gnome.Geary.gschema.xml:97 msgid "The zoom to apply on the conservation view." msgstr "The zoom to apply on the conservation view." -#: desktop/org.gnome.Geary.gschema.xml:126 +#: desktop/org.gnome.Geary.gschema.xml:102 msgid "Size of detached composer window" msgstr "Size of detached composer window" -#: desktop/org.gnome.Geary.gschema.xml:127 +#: desktop/org.gnome.Geary.gschema.xml:103 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:132 -msgid "Undo sending email delay" -msgstr "Undo sending e-mail delay" +#: desktop/org.gnome.Geary.gschema.xml:108 +msgid "Allow images for these domains" +msgstr "Allow images for these domains" -#: desktop/org.gnome.Geary.gschema.xml:133 +#: desktop/org.gnome.Geary.gschema.xml:109 +msgid "Images from these domains will be trusted" +msgstr "Images from these domains will be trusted" + +#: desktop/org.gnome.Geary.gschema.xml:114 +msgid "Undo sending email delay" +msgstr "Undo sending email delay" + +#: desktop/org.gnome.Geary.gschema.xml:115 msgid "" "The number of seconds to wait before sending an email. Set to zero or less " "to disable." msgstr "" -"The number of seconds to wait before sending an e-mail. Set to zero or less " +"The number of seconds to wait before sending an email. Set to zero or less " "to disable." -#: desktop/org.gnome.Geary.gschema.xml:139 +#: desktop/org.gnome.Geary.gschema.xml:121 msgid "Brief notification display time" msgstr "Brief notification display time" -#: desktop/org.gnome.Geary.gschema.xml:140 +#: desktop/org.gnome.Geary.gschema.xml:122 msgid "" "The length of time in seconds for which brief notifications should be " "displayed." @@ -334,19 +309,19 @@ msgstr "" "The length of time in seconds for which brief notifications should be " "displayed." -#: desktop/org.gnome.Geary.gschema.xml:146 +#: desktop/org.gnome.Geary.gschema.xml:128 msgid "List of optional plugins" msgstr "List of optional plug-ins" -#: desktop/org.gnome.Geary.gschema.xml:147 +#: desktop/org.gnome.Geary.gschema.xml:129 msgid "Plugins listed here will be loaded on startup." msgstr "Plug-ins listed here will be loaded on startup." -#: desktop/org.gnome.Geary.gschema.xml:152 +#: desktop/org.gnome.Geary.gschema.xml:134 msgid "Whether we migrated the old settings" msgstr "Whether we migrated the old settings" -#: desktop/org.gnome.Geary.gschema.xml:153 +#: desktop/org.gnome.Geary.gschema.xml:135 msgid "" "False to check for the old “org.yorba.geary”-schema and copy its values." msgstr "" @@ -355,25 +330,19 @@ msgstr "" #. Translators: In-app notification label, when #. the app had a problem pinning an otherwise #. untrusted TLS certificate -#: src/client/accounts/accounts-editor.vala:210 +#: src/client/accounts/accounts-editor.vala:216 msgid "Failed to store certificate" msgstr "Failed to store certificate" -#. Translators: Label for adding an email account -#. account for a generic IMAP service provider. -#: src/client/accounts/accounts-editor-add-pane.vala:108 -msgid "All others" -msgstr "All others" - #. Translators: In-app notification label -#: src/client/accounts/accounts-editor-add-pane.vala:195 -#: src/client/accounts/accounts-editor-servers-pane.vala:321 +#: src/client/accounts/accounts-editor-add-pane.vala:167 +#: src/client/accounts/accounts-editor-servers-pane.vala:312 msgid "Check your receiving login and password" msgstr "Check your receiving login and password" #. Translators: In-app notification label -#: src/client/accounts/accounts-editor-add-pane.vala:210 -#: src/client/accounts/accounts-editor-servers-pane.vala:334 +#: src/client/accounts/accounts-editor-add-pane.vala:182 +#: src/client/accounts/accounts-editor-servers-pane.vala:325 msgid "Check your receiving server details" msgstr "Check your receiving server details" @@ -382,61 +351,70 @@ msgstr "Check your receiving server details" #. succeeded, so the user probably needs to #. specify custom creds here #. Translators: In-app notification label -#: src/client/accounts/accounts-editor-add-pane.vala:232 -#: src/client/accounts/accounts-editor-servers-pane.vala:355 +#: src/client/accounts/accounts-editor-add-pane.vala:204 +#: src/client/accounts/accounts-editor-servers-pane.vala:346 msgid "Check your sending login and password" msgstr "Check your sending login and password" #. Translators: In-app notification label -#: src/client/accounts/accounts-editor-add-pane.vala:246 -#: src/client/accounts/accounts-editor-servers-pane.vala:368 +#: src/client/accounts/accounts-editor-add-pane.vala:218 +#: src/client/accounts/accounts-editor-servers-pane.vala:359 msgid "Check your sending server details" msgstr "Check your sending server details" #. Translators: In-app notification label -#: src/client/accounts/accounts-editor-add-pane.vala:261 +#: src/client/accounts/accounts-editor-add-pane.vala:233 msgid "Check your email address and password" -msgstr "Check your e-mail address and password" +msgstr "Check your email address and password" #. Translators: In-app notification label -#: src/client/accounts/accounts-editor-add-pane.vala:272 +#: src/client/accounts/accounts-editor-add-pane.vala:244 msgid "Could not connect, check your network" msgstr "Could not connect, check your network" #. Translators: In-app notification label for a #. generic error creating an account -#: src/client/accounts/accounts-editor-add-pane.vala:285 +#: src/client/accounts/accounts-editor-add-pane.vala:257 msgid "An unexpected problem occurred" msgstr "An unexpected problem occurred" #. Translators: In-app notification label, the #. string substitution is a more detailed reason. -#: src/client/accounts/accounts-editor-add-pane.vala:303 +#: src/client/accounts/accounts-editor-add-pane.vala:275 #, c-format msgid "Account not created: %s" msgstr "Account not created: %s" +#: src/client/accounts/accounts-editor-add-pane.vala:372 +#: ui/accounts_editor_add_pane.ui:43 ui/find_bar.glade:97 +msgid "_Next" +msgstr "_Next" + +#: src/client/accounts/accounts-editor-add-pane.vala:379 +msgid "_Create" +msgstr "_Create" + #. Translators: Label for the person's actual name when adding #. an account -#: src/client/accounts/accounts-editor-add-pane.vala:558 +#: src/client/accounts/accounts-editor-add-pane.vala:664 msgid "Your name" msgstr "Your name" #. Translators: Label used for the address part of an #. email address when editing a user's sender address #. preferences for an account. -#: src/client/accounts/accounts-editor-add-pane.vala:575 -#: src/client/accounts/accounts-editor-edit-pane.vala:513 +#: src/client/accounts/accounts-editor-add-pane.vala:681 +#: src/client/accounts/accounts-editor-edit-pane.vala:528 msgid "Email address" -msgstr "E-mail address" +msgstr "Email address" #. Translators: Placeholder for the default sender address #. when adding an account #. Translators: This is used as a placeholder for the #. address part of an email address when editing a user's #. sender address preferences for an account. -#: src/client/accounts/accounts-editor-add-pane.vala:579 -#: src/client/accounts/accounts-editor-edit-pane.vala:479 +#: src/client/accounts/accounts-editor-add-pane.vala:685 +#: src/client/accounts/accounts-editor-edit-pane.vala:494 msgid "person@example.com" msgstr "person@example.com" @@ -444,16 +422,16 @@ msgstr "person@example.com" #. when adding an account #. Translators: Label for the user's login name for an #. IMAP, SMTP, etc service -#: src/client/accounts/accounts-editor-add-pane.vala:593 -#: src/client/accounts/accounts-editor-servers-pane.vala:889 +#: src/client/accounts/accounts-editor-add-pane.vala:699 +#: src/client/accounts/accounts-editor-servers-pane.vala:880 msgid "Login name" msgstr "Login name" #. Translators: Label for the user's password for an IMAP, #. SMTP, etc service -#: src/client/accounts/accounts-editor-add-pane.vala:607 -#: src/client/accounts/accounts-editor-servers-pane.vala:1011 -#: ui/password-dialog.glade:108 +#: src/client/accounts/accounts-editor-add-pane.vala:713 +#: src/client/accounts/accounts-editor-servers-pane.vala:1002 +#: ui/password-dialog.glade:98 msgid "Password" msgstr "Password" @@ -461,14 +439,14 @@ msgstr "Password" #. adding an account. #. Translators: This label describes the host name or IP #. address and port used by an account's IMAP service. -#: src/client/accounts/accounts-editor-add-pane.vala:629 -#: src/client/accounts/accounts-editor-servers-pane.vala:733 +#: src/client/accounts/accounts-editor-add-pane.vala:735 +#: src/client/accounts/accounts-editor-servers-pane.vala:724 msgid "IMAP server" msgstr "IMAP server" #. Translators: Placeholder for the IMAP server hostname #. when adding an account. -#: src/client/accounts/accounts-editor-add-pane.vala:632 +#: src/client/accounts/accounts-editor-add-pane.vala:738 msgid "imap.example.com" msgstr "imap.example.com" @@ -476,21 +454,51 @@ msgstr "imap.example.com" #. adding an account. #. Translators: This label describes the host name or IP #. address and port used by an account's SMTP service. -#: src/client/accounts/accounts-editor-add-pane.vala:638 -#: src/client/accounts/accounts-editor-servers-pane.vala:739 +#: src/client/accounts/accounts-editor-add-pane.vala:744 +#: src/client/accounts/accounts-editor-servers-pane.vala:730 msgid "SMTP server" msgstr "SMTP server" #. Translators: Placeholder for the SMTP server hostname #. when adding an account. -#: src/client/accounts/accounts-editor-add-pane.vala:641 +#: src/client/accounts/accounts-editor-add-pane.vala:747 msgid "smtp.example.com" msgstr "smtp.example.com" +#: src/client/accounts/accounts-editor-edit-pane.vala:163 +#: src/client/accounts/accounts-editor-list-pane.vala:234 +#: src/client/application/application-main-window.vala:2326 +#: ui/accounts_editor_edit_pane.ui:42 +msgid "Undo" +msgstr "Undo" + +#: src/client/accounts/accounts-editor-edit-pane.vala:211 +msgid "Remove Account" +msgstr "Remove Account" + +#: src/client/accounts/accounts-editor-edit-pane.vala:219 +#, c-format +msgid "Remove Account: %s" +msgstr "Remove Account: %s" + +#: src/client/accounts/accounts-editor-edit-pane.vala:221 +msgid "" +"This will remove it from Geary and delete locally cached email data from " +"your computer. Nothing will be deleted from your service provider." +msgstr "" +"This will remove it from Geary and delete locally cached email data from " +"your computer. Nothing will be deleted from your service provider." + +#: src/client/accounts/accounts-editor-edit-pane.vala:223 +#: src/client/components/stock.vala:19 +#: src/client/plugin/mail-merge/mail-merge.vala:398 +#: ui/password-dialog.glade:182 +msgid "_Cancel" +msgstr "_Cancel" + #. Translators: Label in the account editor for the user's #. custom name for an account. -#: src/client/accounts/accounts-editor-edit-pane.vala:277 -#: ui/accounts_editor_remove_pane.ui:123 +#: src/client/accounts/accounts-editor-edit-pane.vala:289 msgid "Account name" msgstr "Account name" @@ -498,46 +506,46 @@ msgstr "Account name" #. the name of an account. The string #. substitution is the old name of the #. account. -#: src/client/accounts/accounts-editor-edit-pane.vala:318 +#: src/client/accounts/accounts-editor-edit-pane.vala:330 #, c-format msgid "Change account name back to “%s”" msgstr "Change account name back to “%s”" #. Translators: Tooltip for adding a new email sender/from #. address's address to an account -#: src/client/accounts/accounts-editor-edit-pane.vala:342 +#: src/client/accounts/accounts-editor-edit-pane.vala:354 msgid "Add a new sender email address" -msgstr "Add a new sender e-mail address" +msgstr "Add a new sender email address" #. Translators: Label used to indicate the user has #. provided no display name for one of their sender #. email addresses in their account settings. -#: src/client/accounts/accounts-editor-edit-pane.vala:423 +#: src/client/accounts/accounts-editor-edit-pane.vala:438 msgid "Name not set" msgstr "Name not set" #. Translators: This is used as a placeholder for the #. display name for an email address when editing a user's #. sender address preferences for an account. -#: src/client/accounts/accounts-editor-edit-pane.vala:464 +#: src/client/accounts/accounts-editor-edit-pane.vala:479 msgid "Sender Name" msgstr "Sender Name" -#: src/client/accounts/accounts-editor-edit-pane.vala:491 +#: src/client/accounts/accounts-editor-edit-pane.vala:506 msgid "Remove" msgstr "Remove" #. Translators: Label used for the display name part of an #. email address when editing a user's sender address #. preferences for an account. -#: src/client/accounts/accounts-editor-edit-pane.vala:506 +#: src/client/accounts/accounts-editor-edit-pane.vala:521 msgid "Sender name" msgstr "Sender name" #. Translators: Label used as the undo tooltip after adding an #. new sender email address to an account. The string #. substitution is the email address added. -#: src/client/accounts/accounts-editor-edit-pane.vala:573 +#: src/client/accounts/accounts-editor-edit-pane.vala:588 #, c-format msgid "Remove “%s”" msgstr "Remove “%s”" @@ -545,7 +553,7 @@ msgstr "Remove “%s”" #. Translators: Label used as the undo tooltip after editing a #. sender address for an account. The string substitution is #. the email address edited. -#: src/client/accounts/accounts-editor-edit-pane.vala:613 +#: src/client/accounts/accounts-editor-edit-pane.vala:628 #, c-format msgid "Undo changes to “%s”" msgstr "Undo changes to “%s”" @@ -553,7 +561,7 @@ msgstr "Undo changes to “%s”" #. Translators: Label used as the undo tooltip after removing #. a sender address from an account. The string substitution #. is the email address edited. -#: src/client/accounts/accounts-editor-edit-pane.vala:700 +#: src/client/accounts/accounts-editor-edit-pane.vala:715 #, c-format msgid "Add “%s” back" msgstr "Add “%s” back" @@ -561,14 +569,14 @@ msgstr "Add “%s” back" #. Translators: Label used as the undo tooltip after removing #. a sender address from an account. The string substitution #. is the email address edited. -#: src/client/accounts/accounts-editor-edit-pane.vala:742 +#: src/client/accounts/accounts-editor-edit-pane.vala:757 msgid "Undo signature changes" msgstr "Undo signature changes" #. Translators: This label describes the account #. preference for the length of time (weeks, months or #. years) that past email should be downloaded. -#: src/client/accounts/accounts-editor-edit-pane.vala:790 +#: src/client/accounts/accounts-editor-edit-pane.vala:805 msgid "Download mail" msgstr "Download mail" @@ -577,99 +585,82 @@ msgstr "Download mail" #. should be downloaded for an account. The #. string substitution is the duration, #. e.g. "1 month back". -#: src/client/accounts/accounts-editor-edit-pane.vala:822 +#: src/client/accounts/accounts-editor-edit-pane.vala:837 #, c-format msgid "Change download period back to: %s" msgstr "Change download period back to: %s" -#: src/client/accounts/accounts-editor-edit-pane.vala:843 +#: src/client/accounts/accounts-editor-edit-pane.vala:858 msgid "Everything" msgstr "Everything" -#: src/client/accounts/accounts-editor-edit-pane.vala:847 +#: src/client/accounts/accounts-editor-edit-pane.vala:862 msgid "2 weeks back" msgstr "2 weeks back" -#: src/client/accounts/accounts-editor-edit-pane.vala:851 +#: src/client/accounts/accounts-editor-edit-pane.vala:866 msgid "1 month back" msgstr "1 month back" -#: src/client/accounts/accounts-editor-edit-pane.vala:855 +#: src/client/accounts/accounts-editor-edit-pane.vala:870 msgid "3 months back" msgstr "3 months back" -#: src/client/accounts/accounts-editor-edit-pane.vala:859 +#: src/client/accounts/accounts-editor-edit-pane.vala:874 msgid "6 months back" msgstr "6 months back" -#: src/client/accounts/accounts-editor-edit-pane.vala:863 +#: src/client/accounts/accounts-editor-edit-pane.vala:878 msgid "1 year back" msgstr "1 year back" -#: src/client/accounts/accounts-editor-edit-pane.vala:867 +#: src/client/accounts/accounts-editor-edit-pane.vala:882 msgid "2 years back" msgstr "2 years back" -#: src/client/accounts/accounts-editor-edit-pane.vala:871 +#: src/client/accounts/accounts-editor-edit-pane.vala:886 msgid "4 years back" msgstr "4 years back" -#: src/client/accounts/accounts-editor-edit-pane.vala:877 +#: src/client/accounts/accounts-editor-edit-pane.vala:892 #, c-format msgid "%d day back" msgid_plural "%d days back" msgstr[0] "%d day back" msgstr[1] "%d days back" -#: src/client/accounts/accounts-editor-list-pane.vala:255 -#: src/client/application/application-main-window.vala:2061 -msgid "Undo" -msgstr "Undo" - -#: src/client/accounts/accounts-editor-list-pane.vala:264 -#: src/client/application/application-main-window.vala:2044 +#: src/client/accounts/accounts-editor-list-pane.vala:243 +#: src/client/application/application-main-window.vala:2309 msgid "Redo" msgstr "Redo" -#: src/client/accounts/accounts-editor-list-pane.vala:358 -#: src/client/accounts/accounts-editor-list-pane.vala:454 -#: src/client/accounts/accounts-editor-row.vala:279 +#: src/client/accounts/accounts-editor-list-pane.vala:327 +#: src/client/accounts/accounts-editor-row.vala:303 msgid "Gmail" msgstr "Gmail" -#: src/client/accounts/accounts-editor-list-pane.vala:362 -#: src/client/accounts/accounts-editor-list-pane.vala:458 -#: src/client/accounts/accounts-editor-row.vala:283 +#: src/client/accounts/accounts-editor-list-pane.vala:331 +#: src/client/accounts/accounts-editor-row.vala:307 msgid "Outlook.com" msgstr "Outlook.com" -#: src/client/accounts/accounts-editor-list-pane.vala:366 -#: src/client/accounts/accounts-editor-list-pane.vala:462 -#: src/client/accounts/accounts-editor-row.vala:287 -msgid "Yahoo" -msgstr "Yahoo" - #. Translators: Tooltip for accounts that have been #. loaded but disabled by the user. -#: src/client/accounts/accounts-editor-list-pane.vala:388 +#: src/client/accounts/accounts-editor-list-pane.vala:353 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:397 +#: src/client/accounts/accounts-editor-list-pane.vala:362 msgid "This account has encountered a problem and is unavailable" msgstr "This account has encountered a problem and is unavailable" -#: src/client/accounts/accounts-editor-list-pane.vala:466 -msgid "Other email providers" -msgstr "Other e-mail providers" - #. Translators: Notification shown after removing an #. account. The string substitution is the name of the #. account. -#: src/client/accounts/accounts-editor-list-pane.vala:572 +#: src/client/accounts/accounts-editor-list-pane.vala:468 #, c-format msgid "Account “%s” removed" msgstr "Account “%s” removed" @@ -677,7 +668,7 @@ msgstr "Account “%s” removed" #. Translators: Notification shown after removing an account #. is undone. The string substitution is the name of the #. account. -#: src/client/accounts/accounts-editor-list-pane.vala:579 +#: src/client/accounts/accounts-editor-list-pane.vala:475 #, c-format msgid "Account “%s” restored" msgstr "Account “%s” restored" @@ -685,35 +676,35 @@ msgstr "Account “%s” restored" #. Translators: Tooltip for dragging list items #: src/client/accounts/accounts-editor-row.vala:50 msgid "Drag to move this item" -msgstr " " +msgstr "Drag to move this item" #. 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:299 +#: src/client/accounts/accounts-editor-row.vala:319 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:473 +#: src/client/accounts/accounts-editor-row.vala:493 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:484 -#: src/client/accounts/accounts-editor-servers-pane.vala:760 -#: src/client/accounts/accounts-editor-servers-pane.vala:975 +#: src/client/accounts/accounts-editor-row.vala:504 +#: src/client/accounts/accounts-editor-servers-pane.vala:751 +#: src/client/accounts/accounts-editor-servers-pane.vala:966 msgid "None" msgstr "None" -#: src/client/accounts/accounts-editor-row.vala:491 +#: src/client/accounts/accounts-editor-row.vala:511 msgid "StartTLS" msgstr "StartTLS" -#: src/client/accounts/accounts-editor-row.vala:498 +#: src/client/accounts/accounts-editor-row.vala:518 msgid "TLS" msgstr "TLS" @@ -721,35 +712,35 @@ msgstr "TLS" #. credentials (none, use IMAP, custom) when adding a new #. account #. Translators: An info bar button label -#: src/client/accounts/accounts-editor-row.vala:539 -#: src/client/application/application-main-window.vala:554 +#: src/client/accounts/accounts-editor-row.vala:560 +#: src/client/application/application-main-window.vala:642 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:546 +#: src/client/accounts/accounts-editor-row.vala:576 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:554 +#: src/client/accounts/accounts-editor-row.vala:588 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:562 +#: src/client/accounts/accounts-editor-row.vala:600 msgid "Use a different login" msgstr "Use a different login" #. Translators: In-app notification label, the #. string substitution is a more detailed reason. -#: src/client/accounts/accounts-editor-servers-pane.vala:382 +#: src/client/accounts/accounts-editor-servers-pane.vala:373 #, c-format msgid "Account not updated: %s" msgstr "Account not updated: %s" @@ -757,37 +748,37 @@ msgstr "Account not updated: %s" #. Translators: This label describes the program that #. created the account, e.g. an SSO service like GOA, or #. locally by Geary. -#: src/client/accounts/accounts-editor-servers-pane.vala:545 +#: src/client/accounts/accounts-editor-servers-pane.vala:536 msgid "Account source" msgstr "Account source" -#: src/client/accounts/accounts-editor-servers-pane.vala:557 +#: src/client/accounts/accounts-editor-servers-pane.vala:548 msgid "GNOME Online Accounts" msgstr "GNOME Online Accounts" #. Translators: This label describes an account #. preference. -#: src/client/accounts/accounts-editor-servers-pane.vala:616 +#: src/client/accounts/accounts-editor-servers-pane.vala:607 msgid "Save draft email on server" -msgstr "Save draft e-mail on server" +msgstr "Save draft email on server" #. Translators: This label describes an account #. preference. -#: src/client/accounts/accounts-editor-servers-pane.vala:671 +#: src/client/accounts/accounts-editor-servers-pane.vala:662 msgid "Save sent email on server" -msgstr "Save sent e-mail on server" +msgstr "Save sent email on server" #. Add a suffix for OAuth2 auth so people know they #. shouldn't expect to be prompted for a password #. Translators: Label used when an account's IMAP or #. SMTP service uses OAuth2. The string replacement is #. the service's login name. -#: src/client/accounts/accounts-editor-servers-pane.vala:961 +#: src/client/accounts/accounts-editor-servers-pane.vala:952 #, c-format msgid "%s using OAuth2" msgstr "%s using OAuth2" -#: src/client/accounts/accounts-editor-servers-pane.vala:971 +#: src/client/accounts/accounts-editor-servers-pane.vala:962 msgid "Use receiving server login" msgstr "Use receiving server login" @@ -820,142 +811,139 @@ msgid "_Replace" msgstr "_Replace" #: src/client/application/application-client.vala:34 -msgid "Copyright 2016 Software Freedom Conservancy Inc." -msgstr "Copyright 2016 Software Freedom Conservancy Inc." +msgid "Copyright © 2016 Software Freedom Conservancy Inc." +msgstr "Copyright © 2016 Software Freedom Conservancy Inc." #: src/client/application/application-client.vala:35 -msgid "Copyright 2016-2020 Geary Development Team." -msgstr "Copyright 2016-2020 Geary Development Team." +msgid "Copyright © 2016-2021 Geary Development Team." +msgstr "Copyright © 2016-2021 Geary Development Team." #: src/client/application/application-client.vala:37 msgid "Visit the Geary web site" msgstr "Visit the Geary web site" #. / Command line option -#: src/client/application/application-client.vala:97 +#: src/client/application/application-client.vala:101 msgid "Print debug logging" msgstr "Print debug logging" #. / Command line option -#: src/client/application/application-client.vala:100 -msgid "Start with the main window hidden (deprecated)" -msgstr "Start with the main window hidden (deprecated)" - -#. / Command line option -#: src/client/application/application-client.vala:103 +#: src/client/application/application-client.vala:104 msgid "Enable WebKitGTK Inspector in web views" msgstr "Enable WebKitGTK Inspector in web views" #. / Command line option -#: src/client/application/application-client.vala:106 +#: src/client/application/application-client.vala:107 msgid "Log conversation monitoring" msgstr "Log conversation monitoring" #. / Command line option -#: src/client/application/application-client.vala:109 +#: src/client/application/application-client.vala:110 msgid "Log IMAP network deserialization" msgstr "Log IMAP network deserialisation" #. / Command line option. "Normalization" can also be called #. / "synchronization". -#: src/client/application/application-client.vala:113 +#: src/client/application/application-client.vala:114 msgid "Log folder normalization" msgstr "Log folder normalisation" #. / Command line option -#: src/client/application/application-client.vala:116 +#: src/client/application/application-client.vala:117 msgid "Log IMAP network activity" msgstr "Log IMAP network activity" #. / Command line option. The IMAP replay queue is how changes #. / on the server are replicated on the client. It could #. / also be called the IMAP events queue. -#: src/client/application/application-client.vala:121 +#: src/client/application/application-client.vala:122 msgid "Log IMAP replay queue" msgstr "Log IMAP replay queue" #. / Command line option -#: src/client/application/application-client.vala:124 +#: src/client/application/application-client.vala:125 msgid "Log SMTP network activity" msgstr "Log SMTP network activity" #. / Command line option -#: src/client/application/application-client.vala:127 +#: src/client/application/application-client.vala:128 msgid "Log database queries (generates lots of messages)" msgstr "Log database queries (generates lots of messages)" #. / Command line option -#: src/client/application/application-client.vala:130 +#: src/client/application/application-client.vala:131 msgid "Perform a graceful quit" msgstr "Perform a graceful quit" -#: src/client/application/application-client.vala:132 +#: src/client/application/application-client.vala:133 msgid "Open a new window" msgstr "Open a new window" #. / Command line option -#: src/client/application/application-client.vala:135 +#: src/client/application/application-client.vala:136 msgid "Revoke all pinned TLS server certificates" msgstr "Revoke all pinned TLS server certificates" #. / Command line option -#: src/client/application/application-client.vala:138 +#: src/client/application/application-client.vala:139 msgid "Display program version" msgstr "Display program version" #. / Application runtime information label -#: src/client/application/application-client.vala:262 +#: src/client/application/application-client.vala:267 msgid "Geary version" msgstr "Geary version" #. / Application runtime information label -#: src/client/application/application-client.vala:264 +#: src/client/application/application-client.vala:269 msgid "Geary revision" msgstr "Geary revision" #. / Application runtime information label -#: src/client/application/application-client.vala:266 +#: src/client/application/application-client.vala:271 msgid "GTK version" msgstr "GTK version" #. / Applciation runtime information label -#: src/client/application/application-client.vala:273 +#: src/client/application/application-client.vala:278 msgid "GLib version" msgstr "GLib version" #. / Application runtime information label -#: src/client/application/application-client.vala:280 +#: src/client/application/application-client.vala:285 msgid "WebKitGTK version" msgstr "WebKitGTK version" #. / Application runtime information label -#: src/client/application/application-client.vala:287 +#: src/client/application/application-client.vala:292 msgid "Desktop environment" msgstr "Desktop environment" #. Translators: This is the file type displayed for #. attachments with unknown file types. -#: src/client/application/application-client.vala:289 -#: src/client/components/components-attachment-pane.vala:91 +#: src/client/application/application-client.vala:294 +#: src/client/application/application-client.vala:300 +#: src/client/application/application-client.vala:306 +#: src/client/components/components-attachment-pane.vala:88 msgid "Unknown" msgstr "Unknown" #. / Application runtime information label -#: src/client/application/application-client.vala:293 +#: src/client/application/application-client.vala:298 msgid "Distribution name" msgstr "Distribution name" #. / Application runtime information label -#: src/client/application/application-client.vala:298 +#: src/client/application/application-client.vala:304 msgid "Distribution release" msgstr "Distribution release" #. / Application runtime information label -#: src/client/application/application-client.vala:303 +#: src/client/application/application-client.vala:310 msgid "Installation prefix" msgstr "Installation prefix" -#: src/client/application/application-client.vala:559 +#: src/client/application/application-client.vala:566 #, c-format msgid "About %s" msgstr "About %s" @@ -963,47 +951,42 @@ msgstr "About %s" #. Translators: add your name and email address to receive #. credit in the About dialog For example: Yamada Taro #. -#: src/client/application/application-client.vala:563 +#: src/client/application/application-client.vala:570 msgid "translator-credits" msgstr "" "Alfredo Hernández \n" "Andrew Shephard \n" "Bruce Cowan \n" -"Zander Brown " - -#. / Warning printed to the console when a deprecated -#. / command line option is used. -#: src/client/application/application-client.vala:1047 -msgid "The `--hidden` option is deprecated and will be removed in the future." -msgstr "The `--hidden` option is deprecated and will be removed in the future." +"Zander Brown \n" +"Andi Chandler " #. / Command line warning, string substitution #. / is the given argument -#: src/client/application/application-client.vala:1080 +#: src/client/application/application-client.vala:1099 #, c-format msgid "Unrecognised program argument: “%s”" msgstr "Unrecognised program argument: “%s”" #. / Notification title. -#: src/client/application/application-controller.vala:479 +#: src/client/application/application-controller.vala:498 #, c-format msgid "A problem occurred sending email for %s" -msgstr "A problem occurred sending e-mail for %s" +msgstr "A problem occurred sending email for %s" #. / Notification body -#: src/client/application/application-controller.vala:483 +#: src/client/application/application-controller.vala:502 msgid "Email will not be sent until re-connected" -msgstr "E-mail will not be sent until re-connected" +msgstr "Email will not be sent until re-connected" #. / Translators: Label for in-app notification -#: src/client/application/application-controller.vala:582 +#: src/client/application/application-controller.vala:601 msgid "Conversation marked" msgid_plural "Conversations marked" msgstr[0] "Conversation marked" msgstr[1] "Conversations marked" #. / Translators: Label for in-app notification -#: src/client/application/application-controller.vala:588 +#: src/client/application/application-controller.vala:607 msgid "Conversation un-marked" msgid_plural "Conversations un-marked" msgstr[0] "Conversation un-marked" @@ -1012,8 +995,8 @@ msgstr[1] "Conversations un-marked" #. / Translators: Label for in-app #. / notification. String substitution is the name #. / of the destination folder. -#: src/client/application/application-controller.vala:614 -#: src/client/application/application-controller.vala:698 +#: src/client/application/application-controller.vala:633 +#: src/client/application/application-controller.vala:717 #, c-format msgid "Conversation moved to %s" msgid_plural "Conversations moved to %s" @@ -1025,8 +1008,8 @@ msgstr[1] "Conversations moved to %s" #. / of the source folder. #. / Translators: Label for in-app notification. String #. / substitution is the name of the destination folder. -#: src/client/application/application-controller.vala:622 -#: src/client/application/application-controller.vala:644 +#: src/client/application/application-controller.vala:641 +#: src/client/application/application-controller.vala:663 #, c-format msgid "Conversation restored to %s" msgid_plural "Conversations restored to %s" @@ -1034,7 +1017,7 @@ msgstr[0] "Conversation restored to %s" msgstr[1] "Conversations restored to %s" #. / Translators: Label for in-app notification. -#: src/client/application/application-controller.vala:665 +#: src/client/application/application-controller.vala:684 msgid "Conversation archived" msgid_plural "Conversations archived" msgstr[0] "Conversation archived" @@ -1042,7 +1025,7 @@ msgstr[1] "Conversations archived" #. / Translators: Label for in-app notification. String #. / substitution is the name of the destination folder. -#: src/client/application/application-controller.vala:721 +#: src/client/application/application-controller.vala:740 #, c-format msgid "Message restored to %s" msgid_plural "Messages restored to %s" @@ -1050,7 +1033,7 @@ msgstr[0] "Message restored to %s" msgstr[1] "Messages restored to %s" #. / Translators: Label for in-app notification. -#: src/client/application/application-controller.vala:742 +#: src/client/application/application-controller.vala:761 msgid "Message archived" msgid_plural "Messages archived" msgstr[0] "Message archived" @@ -1059,7 +1042,7 @@ msgstr[1] "Messages archived" #. / Translators: Label for in-app #. / notification. String substitution is the name #. / of the destination folder. -#: src/client/application/application-controller.vala:777 +#: src/client/application/application-controller.vala:796 #, c-format msgid "Message moved to %s" msgid_plural "Messages moved to %s" @@ -1069,7 +1052,7 @@ msgstr[1] "Messages moved to %s" #. / Translators: Label for in-app #. / notification. String substitution is the name #. / of the destination folder. -#: src/client/application/application-controller.vala:805 +#: src/client/application/application-controller.vala:824 #, c-format msgid "Conversation labelled as %s" msgid_plural "Conversations labelled as %s" @@ -1079,19 +1062,19 @@ msgstr[1] "Conversations labelled as %s" #. / Translators: Label for in-app #. / notification. String substitution is the name #. / of the destination folder. -#: src/client/application/application-controller.vala:813 +#: src/client/application/application-controller.vala:832 #, c-format msgid "Conversation un-labelled as %s" msgid_plural "Conversations un-labelled as %s" msgstr[0] "Conversation un-labelled as %s" msgstr[1] "Conversations un-labelled as %s" -#: src/client/application/application-controller.vala:1320 +#: src/client/application/application-controller.vala:1311 #, c-format msgid "Unable to open the database for %s" msgstr "Unable to open the database for %s" -#: src/client/application/application-controller.vala:1321 +#: src/client/application/application-controller.vala:1312 #, c-format msgid "" "There was an error opening the local mail database for this account. This is " @@ -1114,20 +1097,20 @@ msgstr "" "Rebuilding the database will destroy all local e-mail and its attachments. " "The mail on the your server will not be affected." -#: src/client/application/application-controller.vala:1323 +#: src/client/application/application-controller.vala:1314 msgid "_Rebuild" msgstr "_Rebuild" -#: src/client/application/application-controller.vala:1323 +#: src/client/application/application-controller.vala:1314 msgid "E_xit" msgstr "E_xit" -#: src/client/application/application-controller.vala:1333 +#: src/client/application/application-controller.vala:1324 #, c-format msgid "Unable to rebuild database for “%s”" msgstr "Unable to rebuild database for “%s”" -#: src/client/application/application-controller.vala:1334 +#: src/client/application/application-controller.vala:1325 #, c-format msgid "" "Error during rebuild:\n" @@ -1138,159 +1121,166 @@ msgstr "" "\n" "%s" -#. / Translators: The label for an in-app notification. The -#. / string substitution is a list of recipients of the email. -#: src/client/application/application-controller.vala:1501 -#, c-format -msgid "Email sent to %s" -msgstr "E-mail sent to %s" +#. / Translators: The label for an in-app notification. +#: src/client/application/application-controller.vala:1490 +msgid "Email sent" +msgstr "Email sent" #. / Translators: The label for an in-app notification. The #. / string substitution is a list of recipients of the email. -#: src/client/application/application-controller.vala:2491 +#: src/client/application/application-controller.vala:2495 #, c-format msgid "Email to %s queued for delivery" -msgstr "E-mail to %s queued for delivery" +msgstr "Email to %s queued for delivery" -#. / Translators: The label for an in-app notification. The -#. / string substitution is a list of recipients of the email. -#: src/client/application/application-controller.vala:2555 -#, c-format -msgid "Email to %s saved" -msgstr "E-mail to %s saved" +#. / Translators: The label for an in-app notification. +#: src/client/application/application-controller.vala:2556 +msgid "Email saved as draft" +msgstr "Email saved as draft" #. / Translators: A label for an in-app notification. #: src/client/application/application-controller.vala:2570 -#: src/client/application/application-controller.vala:2628 +#: src/client/application/application-controller.vala:2625 msgid "Composer could not be restored" msgstr "Composer could not be restored" #. / Translators: The label for an in-app notification. The #. / string substitution is a list of recipients of the email. -#: src/client/application/application-controller.vala:2613 -#, c-format -msgid "Email to %s discarded" -msgstr "E-mail to %s discarded" +#: src/client/application/application-controller.vala:2611 +msgid "Email discarded" +msgstr "Email discarded" + +#. / Translators: Label for account database upgrade dialog +#: src/client/application/application-database-manager.vala:74 +msgid "Account update in progress" +msgstr "Account update in progress" + +#. / Translators: Window title for account database upgrade +#. / dialog +#: src/client/application/application-database-manager.vala:80 +msgid "Account update" +msgstr "Account update" #. Translators: An info bar status label -#: src/client/application/application-main-window.vala:540 +#: src/client/application/application-main-window.vala:628 msgid "Working offline" msgstr "Working offline" #. Translators: An info bar description label -#: src/client/application/application-main-window.vala:542 +#: src/client/application/application-main-window.vala:630 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." +msgstr "You will not be able to send or receive email until re-connected." #. Translators: An info bar status label -#: src/client/application/application-main-window.vala:549 +#: src/client/application/application-main-window.vala:637 msgid "Login problem" msgstr "Login problem" #. Translators: An info bar description label -#: src/client/application/application-main-window.vala:551 +#: src/client/application/application-main-window.vala:639 msgid "An account has reported an incorrect login or password." msgstr "An account has reported an incorrect login or password." #. Translators: An info bar button tool-tip -#: src/client/application/application-main-window.vala:558 +#: src/client/application/application-main-window.vala:646 msgid "Retry login, you will be prompted for your password" msgstr "Retry login, you will be prompted for your password" #. Translators: An info bar status label -#: src/client/application/application-main-window.vala:565 +#: src/client/application/application-main-window.vala:653 msgid "Security problem" msgstr "Security problem" #. Translators: An info bar description label -#: src/client/application/application-main-window.vala:567 +#: src/client/application/application-main-window.vala:655 msgid "An account has reported an untrusted server." msgstr "An account has reported an untrusted server." #. Translators: An info bar button label -#: src/client/application/application-main-window.vala:570 +#: src/client/application/application-main-window.vala:658 msgid "Check" msgstr "Check" #. Translators: An info bar button tool-tip -#: src/client/application/application-main-window.vala:574 +#: src/client/application/application-main-window.vala:662 msgid "Check the security details for the connection" msgstr "Check the security details for the connection" #. / Translators: Main window title, first string #. / substitution being the currently selected folder name, #. / the second being the selected account name. -#: src/client/application/application-main-window.vala:617 +#: src/client/application/application-main-window.vala:719 #, c-format msgid "%s — %s" msgstr "%s — %s" -#. Translators: The name of the folder group containing -#. folders created by people (as opposed to special-use -#. folders) -#: src/client/application/application-main-window.vala:996 -#: src/client/folder-list/folder-list-account-branch.vala:43 +#: src/client/application/application-main-window.vala:1095 +#: src/client/folder-list/folder-list-account-branch.vala:49 msgid "Labels" msgstr "Labels" -#: src/client/application/application-main-window.vala:1293 +#: src/client/application/application-main-window.vala:1421 #, c-format msgid "Empty all email from your %s folder?" -msgstr "Empty all e-mail from your %s folder?" +msgstr "Empty all email from your %s folder?" -#: src/client/application/application-main-window.vala:1294 +#: src/client/application/application-main-window.vala:1422 msgid "This removes the email from Geary and your email server." -msgstr "This removes the e-mail from Geary and your e-mail server." +msgstr "This removes the email from Geary and your e-mail server." -#: src/client/application/application-main-window.vala:1295 +#: src/client/application/application-main-window.vala:1423 msgid "This cannot be undone." msgstr "This cannot be undone." -#: src/client/application/application-main-window.vala:1296 +#: src/client/application/application-main-window.vala:1424 #, c-format msgid "Empty %s" msgstr "Empty %s" #. / Translators: Primary text for a confirmation dialog -#: src/client/application/application-main-window.vala:1353 +#: src/client/application/application-main-window.vala:1481 msgid "Do you want to permanently delete this conversation?" msgid_plural "Do you want to permanently delete these conversations?" msgstr[0] "Do you want to permanently delete this conversation?" msgstr[1] "Do you want to permanently delete these conversations?" -#: src/client/application/application-main-window.vala:1358 -#: src/client/application/application-main-window.vala:1373 +#: src/client/application/application-main-window.vala:1486 +#: src/client/application/application-main-window.vala:1501 msgid "Delete" msgstr "Delete" #. / Translators: Primary text for a confirmation dialog -#: src/client/application/application-main-window.vala:1368 +#: src/client/application/application-main-window.vala:1496 msgid "Do you want to permanently delete this message?" msgid_plural "Do you want to permanently delete these messages?" msgstr[0] "Do you want to permanently delete this message?" msgstr[1] "Do you want to permanently delete these messages?" -#: src/client/application/application-main-window.vala:1691 +#: src/client/application/application-main-window.vala:1836 #, c-format msgid "%s (%d)" msgstr "%s (%d)" +#: src/client/application/application-startup-manager.vala:78 +msgid "Geary wants to run in background" +msgstr "Geary wants to run in background" + #. Translators: The first argument will be a #. description of the document type, the second will #. be a human-friendly size string. For example: #. Document (100.9MB) #. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)" -#: src/client/components/components-attachment-pane.vala:107 -#: src/client/composer/composer-widget.vala:1784 +#: src/client/components/components-attachment-pane.vala:104 +#: src/client/composer/composer-widget.vala:1870 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: src/client/components/components-attachment-pane.vala:379 +#: src/client/components/components-attachment-pane.vala:373 msgid "Are you sure you want to open these attachments?" msgstr "Are you sure you want to open these attachments?" -#: src/client/components/components-attachment-pane.vala:380 +#: src/client/components/components-attachment-pane.vala:374 msgid "" "Attachments may cause damage to your system if opened. Only open files from " "trusted sources." @@ -1298,89 +1288,147 @@ msgstr "" "Attachments may cause damage to your system if opened. Only open files from " "trusted sources." -#: src/client/components/components-attachment-pane.vala:381 +#: src/client/components/components-attachment-pane.vala:375 msgid "Don’t _ask me again" msgstr "Don’t _ask me again" -#: src/client/components/components-inspector.vala:78 +#: src/client/components/components-conversation-actions.vala:126 +msgid "Mark conversation" +msgid_plural "Mark conversations" +msgstr[0] "Mark conversation" +msgstr[1] "Mark conversations" + +#: src/client/components/components-conversation-actions.vala:132 +msgid "Archive conversation" +msgid_plural "Archive conversations" +msgstr[0] "Archive conversation" +msgstr[1] "Archive conversations" + +#: src/client/components/components-conversation-actions.vala:141 +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/components-conversation-actions.vala:152 +msgid "Copy conversation" +msgid_plural "Copy conversations" +msgstr[0] "Copy conversation" +msgstr[1] "Copy conversations" + +#: src/client/components/components-conversation-actions.vala:170 +msgid "Move conversation to Trash" +msgid_plural "Move conversations to Trash" +msgstr[0] "Move conversation to Wastebasket" +msgstr[1] "Move conversations to Wastebasket" + +#: src/client/components/components-conversation-actions.vala:180 +msgid "Delete conversation" +msgid_plural "Delete conversations" +msgstr[0] "Delete conversation" +msgstr[1] "Delete conversations" + +#: src/client/components/components-info-bar.vala:248 +msgid "Information" +msgstr "Information" + +#: src/client/components/components-info-bar.vala:252 +msgid "Question" +msgstr "Question" + +#: src/client/components/components-info-bar.vala:256 +msgid "Warning" +msgstr "Warning" + +#: src/client/components/components-info-bar.vala:260 +msgid "Error" +msgstr "Error" + +#: src/client/components/components-inspector.vala:71 msgid "Inspector" msgstr "Inspector" #. / Translators: Title for Inspector logs pane #. / Translators: Title for problem report dialog logs pane -#: src/client/components/components-inspector.vala:93 -#: src/client/dialogs/dialogs-problem-details-dialog.vala:101 +#: src/client/components/components-inspector.vala:86 +#: src/client/dialogs/dialogs-problem-details-dialog.vala:98 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:97 -#: src/client/dialogs/dialogs-problem-details-dialog.vala:104 +#: src/client/components/components-inspector.vala:90 +#: src/client/dialogs/dialogs-problem-details-dialog.vala:101 msgid "System" msgstr "System" #. Button label for saving problem report information -#: src/client/components/components-inspector.vala:226 -#: src/client/components/components-inspector.vala:229 +#: src/client/components/components-inspector.vala:219 +#: src/client/components/components-inspector.vala:222 +#: src/client/dialogs/dialogs-problem-details-dialog.vala:217 #: src/client/dialogs/dialogs-problem-details-dialog.vala:220 -#: src/client/dialogs/dialogs-problem-details-dialog.vala:223 -#: ui/problem-details-dialog.ui:47 +#: ui/problem-details-dialog.ui:42 msgid "Save As" msgstr "Save As" -#: src/client/components/components-inspector.vala:230 -#: src/client/dialogs/dialogs-problem-details-dialog.vala:224 -#: ui/accounts_editor_servers_pane.ui:17 +#: src/client/components/components-inspector.vala:223 +#: src/client/dialogs/dialogs-problem-details-dialog.vala:221 +#: ui/accounts_editor_servers_pane.ui:15 ui/composer-headerbar.ui:55 msgid "Cancel" msgstr "Cancel" #. / Translators: Preferences label -#: src/client/components/components-preferences-window.vala:124 +#: src/client/components/components-preferences-window.vala:125 msgid "_Automatically select next message" msgstr "_Automatically select next message" #. / Translators: Preferences label -#: src/client/components/components-preferences-window.vala:134 +#: src/client/components/components-preferences-window.vala:135 msgid "_Display conversation preview" msgstr "_Display conversation preview" #. / Translators: Preferences label -#: src/client/components/components-preferences-window.vala:144 -msgid "Use _three pane view" -msgstr "Use _three pane view" - -#. / Translators: Preferences label -#: src/client/components/components-preferences-window.vala:154 +#: src/client/components/components-preferences-window.vala:145 msgid "Use _single key email shortcuts" -msgstr "Use _single key e-mail shortcuts" +msgstr "Use _single key email shortcuts" -#: src/client/components/components-preferences-window.vala:156 +#: src/client/components/components-preferences-window.vala:147 msgid "" "Enable keyboard shortcuts for email actions that do not require pressing " "" msgstr "" -"Enable keyboard shortcuts for e-mail actions that do not require pressing " +"Enable keyboard shortcuts for email actions that do not require pressing " "" #. / Translators: Preferences label -#: src/client/components/components-preferences-window.vala:167 +#: src/client/components/components-preferences-window.vala:158 msgid "_Watch for new mail when closed" msgstr "_Watch for new mail when closed" #. / Translators: Preferences tooltip -#: src/client/components/components-preferences-window.vala:171 +#: src/client/components/components-preferences-window.vala:162 msgid "Geary will keep running after all windows are closed" msgstr "Geary will keep running after all windows are closed" +#. / Translators: Preferences label +#: src/client/components/components-preferences-window.vala:172 +msgid "_Always load images" +msgstr "_Always load images" + +#. Translators: Info bar description +#: src/client/components/components-preferences-window.vala:173 +#: src/client/conversation-viewer/conversation-message.vala:1424 +msgid "Showing remote images allows the sender to track you" +msgstr "Showing remote images allows the sender to track you" + #. / Translators: Preferences page title -#: src/client/components/components-preferences-window.vala:189 +#: src/client/components/components-preferences-window.vala:191 msgid "Preferences" msgstr "Preferences" #. / Translators: Preferences page title -#: src/client/components/components-preferences-window.vala:250 +#: src/client/components/components-preferences-window.vala:252 msgid "Plugins" msgstr "Plug-ins" @@ -1416,7 +1464,7 @@ msgstr "Try reconnecting" #: src/client/components/components-problem-report-info-bar.vala:65 #, c-format msgid "Geary encountered a problem sending email for %s." -msgstr "Geary encountered a problem sending e-mail for %s." +msgstr "Geary encountered a problem sending email for %s." #. Translators: Tooltip label for Retry button #: src/client/components/components-problem-report-info-bar.vala:69 @@ -1477,13 +1525,13 @@ msgstr "Search %s account" #. email address to be entered, but one is not provided. #: src/client/components/components-validator.vala:394 msgid "An email address is required" -msgstr "An e-mail address is required" +msgstr "An email address is required" #. Translators: Tooltip used when an entry requires a valid #. email address to be entered, but the address is invalid. #: src/client/components/components-validator.vala:398 msgid "Not a valid email address" -msgstr "Not a valid e-mail address" +msgstr "Not a valid email address" #. Translators: Tooltip used when an entry requires a valid, #. resolvable server name to be entered, but one is not @@ -1499,73 +1547,15 @@ 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:116 -msgid "Mark conversation" -msgid_plural "Mark conversations" -msgstr[0] "Mark conversation" -msgstr[1] "Mark conversations" - -#: src/client/components/main-toolbar.vala:121 -msgid "Add label to conversation" -msgid_plural "Add label to conversations" -msgstr[0] "Add label to conversation" -msgstr[1] "Add label to conversations" - -#: src/client/components/main-toolbar.vala:126 -msgid "Move conversation" -msgid_plural "Move conversations" -msgstr[0] "Move conversation" -msgstr[1] "Move conversations" - -#: src/client/components/main-toolbar.vala:131 -msgid "Archive conversation" -msgid_plural "Archive conversations" -msgstr[0] "Archive conversation" -msgstr[1] "Archive conversations" - -#: src/client/components/main-toolbar.vala:142 -msgid "Move conversation to Trash" -msgid_plural "Move conversations to Trash" -msgstr[0] "Move conversation to Wastebasket" -msgstr[1] "Move conversations to Wastebasket" - -#: src/client/components/main-toolbar.vala:152 -msgid "Delete conversation" -msgid_plural "Delete conversations" -msgstr[0] "Delete conversation" -msgstr[1] "Delete conversations" - -#. / Displayed in the space-limited status bar while a message is in the process of being sent. -#: src/client/components/status-bar.vala:26 -msgid "Sending…" -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 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 saving sent mail" -msgstr "Error saving sent mail" - #: src/client/components/stock.vala:18 msgid "_OK" msgstr "_OK" -#: src/client/components/stock.vala:19 -#: src/client/plugin/mail-merge/mail-merge.vala:392 -#: ui/password-dialog.glade:196 -msgid "_Cancel" -msgstr "_Cancel" - #: src/client/components/stock.vala:21 msgid "_About" msgstr "_About" -#: src/client/components/stock.vala:22 +#: src/client/components/stock.vala:22 ui/accounts_editor_list_pane.ui:12 msgid "_Add" msgstr "_Add" @@ -1577,17 +1567,17 @@ msgstr "_Close" msgid "_Discard" msgstr "_Discard" -#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:42 +#: src/client/components/stock.vala:25 ui/components-menu-application.ui:20 msgid "_Help" msgstr "_Help" #: src/client/components/stock.vala:26 -#: src/client/plugin/mail-merge/mail-merge.vala:391 +#: src/client/plugin/mail-merge/mail-merge.vala:397 #: ui/components-attachment-pane-menus.ui:7 msgid "_Open" msgstr "_Open" -#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:32 +#: src/client/components/stock.vala:27 ui/components-menu-application.ui:10 msgid "_Preferences" msgstr "_Preferences" @@ -1613,7 +1603,7 @@ msgstr "_Save" msgid "_Keep" msgstr "_Keep" -#: src/client/composer/composer-editor.vala:675 +#: src/client/composer/composer-editor.vala:688 msgid "Select Color" msgstr "Select Colour" @@ -1627,26 +1617,26 @@ msgstr "Invalid link URL" #: src/client/composer/composer-link-popover.vala:146 msgid "Invalid email address" -msgstr "Invalid e-mail address" +msgstr "Invalid email address" #. / Translators: Title for an empty composer window #: src/client/composer/composer-widget.vala:32 msgid "New Message" msgstr "New Message" -#: src/client/composer/composer-widget.vala:167 +#: src/client/composer/composer-widget.vala:233 msgid "Saved" msgstr "Saved" -#: src/client/composer/composer-widget.vala:168 +#: src/client/composer/composer-widget.vala:234 msgid "Saving" msgstr "Saving" -#: src/client/composer/composer-widget.vala:169 +#: src/client/composer/composer-widget.vala:235 msgid "Error saving" msgstr "Error saving" -#: src/client/composer/composer-widget.vala:170 +#: src/client/composer/composer-widget.vala:236 msgid "Press Backspace to delete quote" msgstr "Press Backspace to delete quote" @@ -1655,7 +1645,7 @@ msgstr "Press Backspace to delete quote" #. checking, include all variants of each word. No spaces are #. allowed. The words will be converted to lower case based on #. locale and English versions included automatically. -#: src/client/composer/composer-widget.vala:186 +#: src/client/composer/composer-widget.vala:252 msgid "" "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|" "enclosing|encloses|enclosure|enclosures" @@ -1663,95 +1653,125 @@ msgstr "" "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|" "enclosing|encloses|enclosure|enclosures" +#. / Translators: Label for composer From address entry +#: src/client/composer/composer-widget.vala:483 +msgid "_From" +msgstr "_From" + +#. / Translators: Label for composer To address entry +#: src/client/composer/composer-widget.vala:493 +msgid "_To" +msgstr "_To" + +#. / Translators: Label for composer CC address entry +#: src/client/composer/composer-widget.vala:502 +msgid "_Cc" +msgstr "_Cc" + +#. / Translators: Label for composer BCC address entry +#: src/client/composer/composer-widget.vala:510 +msgid "_Bcc" +msgstr "_Bcc" + +#. / Translators: Label for composer Reply-To address entry +#: src/client/composer/composer-widget.vala:518 +msgid "_Reply to" +msgstr "_Reply to" + +#. / Translators: Label for composer Subject line entry +#: src/client/composer/composer-widget.vala:526 +msgid "_Subject" +msgstr "_Subject" + #. 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:862 +#: src/client/composer/composer-widget.vala:904 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:888 +#: src/client/composer/composer-widget.vala:930 msgid "Do you want to discard this draft message?" msgstr "Do you want to discard this draft message?" -#: src/client/composer/composer-widget.vala:1440 +#: src/client/composer/composer-widget.vala:1503 msgid "Send message with an empty subject and body?" msgstr "Send message with an empty subject and body?" -#: src/client/composer/composer-widget.vala:1442 +#: src/client/composer/composer-widget.vala:1505 msgid "Send message with an empty subject?" msgstr "Send message with an empty subject?" -#: src/client/composer/composer-widget.vala:1444 +#: src/client/composer/composer-widget.vala:1507 msgid "Send message with an empty body?" msgstr "Send message with an empty body?" -#: src/client/composer/composer-widget.vala:1453 +#: src/client/composer/composer-widget.vala:1516 msgid "Send message without an attachment?" msgstr "Send message without an attachment?" -#: src/client/composer/composer-widget.vala:1772 +#: src/client/composer/composer-widget.vala:1858 #, c-format msgid "“%s” already attached for delivery." msgstr "“%s” already attached for delivery." -#: src/client/composer/composer-widget.vala:1804 -#: src/client/composer/composer-widget.vala:1854 +#: src/client/composer/composer-widget.vala:1893 +#: src/client/composer/composer-widget.vala:1943 #, c-format msgid "“%s” is an empty file." msgstr "“%s” is an empty file." -#: src/client/composer/composer-widget.vala:1842 +#: src/client/composer/composer-widget.vala:1931 #, c-format msgid "“%s” could not be found." msgstr "“%s” could not be found." -#: src/client/composer/composer-widget.vala:1848 +#: src/client/composer/composer-widget.vala:1937 #, c-format msgid "“%s” is a folder." msgstr "“%s” is a folder." -#: src/client/composer/composer-widget.vala:1867 +#: src/client/composer/composer-widget.vala:1956 #, c-format msgid "“%s” could not be opened for reading." msgstr "“%s” could not be opened for reading." -#: src/client/composer/composer-widget.vala:1875 +#: src/client/composer/composer-widget.vala:1964 msgid "Cannot add attachment" msgstr "Cannot add attachment" #. Translators: This is the name of the file chooser filter #. when inserting an image in the composer. -#: src/client/composer/composer-widget.vala:1946 +#: src/client/composer/composer-widget.vala:2035 msgid "Images" msgstr "Images" #. Translators: Human-readable version of the RFC 822 To header -#: src/client/composer/composer-widget.vala:2010 -#: src/client/conversation-viewer/conversation-email.vala:542 -#: src/client/util/util-email.vala:249 ui/conversation-message.ui:312 +#: src/client/composer/composer-widget.vala:2099 +#: src/client/conversation-viewer/conversation-email.vala:536 +#: src/client/util/util-email.vala:267 ui/conversation-message.ui:283 msgid "To:" msgstr "To:" #. Translators: Human-readable version of the RFC 822 CC header -#: src/client/composer/composer-widget.vala:2016 -#: src/client/conversation-viewer/conversation-email.vala:547 -#: src/client/util/util-email.vala:254 ui/conversation-message.ui:357 +#: src/client/composer/composer-widget.vala:2105 +#: src/client/conversation-viewer/conversation-email.vala:541 +#: src/client/util/util-email.vala:272 ui/conversation-message.ui:324 msgid "Cc:" msgstr "Cc:" #. Translators: Human-readable version of the RFC 822 BCC header -#: src/client/composer/composer-widget.vala:2022 -#: src/client/conversation-viewer/conversation-email.vala:552 -#: ui/conversation-message.ui:402 +#: src/client/composer/composer-widget.vala:2111 +#: src/client/conversation-viewer/conversation-email.vala:546 +#: ui/conversation-message.ui:365 msgid "Bcc:" msgstr "Bcc:" #. Translators: Human-readable version of the RFC 822 Reply-To header -#: src/client/composer/composer-widget.vala:2028 +#: src/client/composer/composer-widget.vala:2117 msgid "Reply-To: " msgstr "Reply-To: " @@ -1760,7 +1780,7 @@ msgstr "Reply-To: " #. 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:2146 +#: src/client/composer/composer-widget.vala:2235 #, c-format msgid "%1$s via %2$s" msgstr "%1$s via %2$s" @@ -1778,85 +1798,87 @@ msgid "Search for more languages" msgstr "Search for more languages" #. / Translators: Context menu item -#: src/client/conversation-list/conversation-list-view.vala:339 +#: src/client/conversation-list/conversation-list-view.vala:214 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:351 +#: src/client/conversation-list/conversation-list-view.vala:226 msgid "_Delete conversation" msgid_plural "_Delete conversations" msgstr[0] "_Delete conversation" msgstr[1] "_Delete conversations" -#: src/client/conversation-list/conversation-list-view.vala:364 -#: ui/main-toolbar-menus.ui:5 +#: src/client/conversation-list/conversation-list-view.vala:239 +#: ui/components-menu-conversation.ui:5 msgid "Mark as _Read" msgstr "Mark as _Read" -#: src/client/conversation-list/conversation-list-view.vala:372 -#: ui/main-toolbar-menus.ui:9 +#: src/client/conversation-list/conversation-list-view.vala:248 +#: ui/components-menu-conversation.ui:10 msgid "Mark as _Unread" msgstr "Mark as _Unread" -#: src/client/conversation-list/conversation-list-view.vala:380 -#: ui/main-toolbar-menus.ui:17 +#: src/client/conversation-list/conversation-list-view.vala:257 +#: ui/components-menu-conversation.ui:20 msgid "U_nstar" msgstr "U_nstar" -#: src/client/conversation-list/conversation-list-view.vala:387 -#: ui/main-toolbar-menus.ui:13 +#: src/client/conversation-list/conversation-list-view.vala:264 +#: ui/components-menu-conversation.ui:15 msgid "_Star" msgstr "_Star" +#: src/client/conversation-list/conversation-list-view.vala:275 +msgid "_Archive conversation" +msgid_plural "_Archive conversations" +msgstr[0] "_Archive conversation" +msgstr[1] "_Archive conversations" + #. Translators: Menu item to reply to a specific message. -#: src/client/conversation-list/conversation-list-view.vala:396 +#: src/client/conversation-list/conversation-list-view.vala:287 #: ui/conversation-email-menus.ui:9 msgid "_Reply" msgstr "_Reply" -#: src/client/conversation-list/conversation-list-view.vala:402 +#: src/client/conversation-list/conversation-list-view.vala:293 msgid "R_eply All" msgstr "R_eply All" #. Translators: Menu item to forward a specific message. -#: src/client/conversation-list/conversation-list-view.vala:408 +#: src/client/conversation-list/conversation-list-view.vala:299 #: ui/conversation-email-menus.ui:21 msgid "_Forward" msgstr "_Forward" -#: src/client/conversation-list/formatted-conversation-data.vala:18 -msgid "Me" -msgstr "Me" - #. Translators: Human-readable version of the RFC 822 From header -#: src/client/conversation-viewer/conversation-email.vala:537 -#: src/client/util/util-email.vala:240 +#: src/client/conversation-viewer/conversation-email.vala:531 +#: src/client/util/util-email.vala:258 msgid "From:" msgstr "From:" #. Translators: Human-readable version of the RFC 822 Date header -#: src/client/conversation-viewer/conversation-email.vala:557 -#: src/client/util/util-email.vala:245 +#: src/client/conversation-viewer/conversation-email.vala:551 +#: src/client/util/util-email.vala:263 msgid "Date:" msgstr "Date:" #. Translators: Human-readable version of the RFC 822 Subject header -#: src/client/conversation-viewer/conversation-email.vala:567 -#: src/client/util/util-email.vala:243 +#: src/client/conversation-viewer/conversation-email.vala:561 +#: src/client/util/util-email.vala:261 msgid "Subject:" msgstr "Subject:" -#: src/client/conversation-viewer/conversation-message.vala:128 +#: src/client/conversation-viewer/conversation-message.vala:131 msgid "This email address may have been forged" -msgstr "This e-mail address may have been forged" +msgstr "This email address may have been forged" #. Translators: Label text displayed when there are too #. many email addresses to be shown by default in an #. email's header, but they are all being shown anyway. -#: src/client/conversation-viewer/conversation-message.vala:234 +#: src/client/conversation-viewer/conversation-message.vala:237 msgid "Show less" msgstr "Show less" @@ -1864,96 +1886,99 @@ msgstr "Show less" #. too many email addresses to be shown by default in #. an email's header. The string substitution is the #. number of extra email to be shown. -#: src/client/conversation-viewer/conversation-message.vala:260 +#: src/client/conversation-viewer/conversation-message.vala:263 #, c-format msgid "%d more…" -msgstr "%d more…" +msgid_plural "%d more…" +msgstr[0] "%d more…" +msgstr[1] "%d more…" #. Compact headers. These are partially done here and partially #. in load_contacts. #. Translators: This is displayed in place of the from address #. when the message has no from address. -#: src/client/conversation-viewer/conversation-message.vala:529 +#: src/client/conversation-viewer/conversation-message.vala:550 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:920 +#: src/client/conversation-viewer/conversation-message.vala:1032 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. Imagecontact " @@ -3122,98 +3141,114 @@ msgstr "" "channels or attach to a new bug report." -#: ui/components-inspector-error-view.ui:47 +#: ui/components-inspector-error-view.ui:42 msgid "Details:" msgstr "Details:" #. Tooltip for inspector button #. Tooltip for problem report button -#: ui/components-inspector.ui:19 ui/problem-details-dialog.ui:24 +#: ui/components-inspector.ui:16 ui/problem-details-dialog.ui:21 msgid "Search for matching log entries" msgstr "Search for matching log entries" #. Tooltip for inspector button -#: ui/components-inspector.ui:35 +#: ui/components-inspector.ui:30 msgid "Toggle appending new log entries" msgstr "Toggle appending new log entries" #. Tooltip for inspector button -#: ui/components-inspector.ui:55 +#: ui/components-inspector.ui:48 msgid "Add a marker entry to the log" msgstr "Add a marker entry to the log" #. Tooltip for inspector button #. Tooltip for problem report button -#: ui/components-inspector.ui:81 ui/problem-details-dialog.ui:51 +#: ui/components-inspector.ui:71 ui/problem-details-dialog.ui:45 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:101 ui/problem-details-dialog.ui:67 +#: ui/components-inspector.ui:89 ui/problem-details-dialog.ui:60 msgid "Copy to clipboard" msgstr "Copy to clipboard" #. Tooltip for inspector button -#: ui/components-inspector.ui:121 +#: ui/components-inspector.ui:107 msgid "Clears all log entries" msgstr "Clears all log entries" -#: ui/conversation-contact-popover.ui:146 +#: ui/components-menu-application.ui:6 +msgid "_Accounts" +msgstr "_Accounts" + +#: ui/components-menu-application.ui:14 +msgid "_Keyboard Shortcuts" +msgstr "_Keyboard Shortcuts" + +#: ui/components-menu-application.ui:25 +msgid "_About Geary" +msgstr "_About Geary" + +#: ui/components-menu-conversation.ui:25 +msgid "Toggle as _Junk" +msgstr "Toggle as _Junk" + +#: ui/conversation-contact-popover.ui:134 msgid "New Conversation…" msgstr "New Conversation…" -#: ui/conversation-contact-popover.ui:159 +#: ui/conversation-contact-popover.ui:146 msgid "Copy Email Address" -msgstr "Copy E-mail Address" +msgstr "Copy Email Address" -#: ui/conversation-contact-popover.ui:182 +#: ui/conversation-contact-popover.ui:167 msgid "Save in Contacts…" msgstr "Save in Contacts…" -#: ui/conversation-contact-popover.ui:195 +#: ui/conversation-contact-popover.ui:179 msgid "Show Conversations" msgstr "Show Conversations" -#: ui/conversation-contact-popover.ui:208 +#: ui/conversation-contact-popover.ui:191 msgid "Open in Contacts" msgstr "Open in Contacts" -#: ui/conversation-contact-popover.ui:221 +#: ui/conversation-contact-popover.ui:203 msgid "Always Load Remote Images" msgstr "Always Load Remote Images" #. Title label on contact popover -#: ui/conversation-contact-popover.ui:264 +#: ui/conversation-contact-popover.ui:242 msgid "Deceptive email address" -msgstr "Deceptive e-mail address" +msgstr "Deceptive email address" #. Contact popover label -#: ui/conversation-contact-popover.ui:294 +#: ui/conversation-contact-popover.ui:270 msgid "This email address is:" -msgstr "This e-mail address is:" +msgstr "This email address is:" #. Contact popover label -#: ui/conversation-contact-popover.ui:319 +#: ui/conversation-contact-popover.ui:293 msgid "But was forged as:" msgstr "But was forged as:" #. Contact popover label -#: ui/conversation-contact-popover.ui:344 +#: ui/conversation-contact-popover.ui:316 msgid "The sender may not be trustworthy" msgstr "The sender may not be trustworthy" -#: ui/conversation-email.ui:27 +#: ui/conversation-email.ui:24 msgid "Save all attachments" msgstr "Save all attachments" #. Note: The application will never show this button at the same time as unstar_button, one will always be hidden. -#: ui/conversation-email.ui:50 +#: ui/conversation-email.ui:45 msgid "Mark this message as starred" msgstr "Mark this message as starred" #. Note: The application will never show this button at the same time as star_button, one will always be hidden. -#: ui/conversation-email.ui:72 +#: ui/conversation-email.ui:65 msgid "Mark this message as not starred" msgstr "Mark this message as not starred" @@ -3254,23 +3289,23 @@ msgstr "_Delete message…" msgid "_View Source" msgstr "_View Source" -#: ui/conversation-message-link-popover.ui:54 +#: ui/conversation-message-link-popover.ui:49 msgid "But actually goes to:" msgstr "But actually goes to:" -#: ui/conversation-message-link-popover.ui:84 +#: ui/conversation-message-link-popover.ui:77 msgid "The link appears to go to:" msgstr "The link appears to go to:" -#: ui/conversation-message-link-popover.ui:96 +#: ui/conversation-message-link-popover.ui:88 msgid "Deceptive link found" msgstr "Deceptive link found" -#: ui/conversation-message-link-popover.ui:111 +#: ui/conversation-message-link-popover.ui:102 msgid "The email sender may be leading you to the wrong web site." -msgstr "The e-mail sender may be leading you to the wrong web site." +msgstr "The email sender may be leading you to the wrong web site." -#: ui/conversation-message-link-popover.ui:124 +#: ui/conversation-message-link-popover.ui:114 msgid "If unsure, contact the sender and ask before continuing." msgstr "If unsure, contact the sender and ask before continuing." @@ -3288,7 +3323,7 @@ msgstr "_New Conversation…" #: ui/conversation-message-menus.ui:21 msgid "Copy Email _Address" -msgstr "Copy E-mail _Address" +msgstr "Copy Email _Address" #: ui/conversation-message-menus.ui:27 msgid "Save _Image As…" @@ -3298,418 +3333,488 @@ msgstr "Save _Image As…" msgid "_Select All" msgstr "_Select All" -#: ui/conversation-message.ui:63 -msgid "From " -msgstr "From " +#: ui/conversation-message-menus.ui:50 +msgid "Show images" +msgstr "Show images" -#: ui/conversation-message.ui:79 ui/conversation-message.ui:178 +#: ui/conversation-message-menus.ui:52 +msgid "For this message" +msgstr "For this message" + +#: ui/conversation-message-menus.ui:56 +msgid "For this sender" +msgstr "For this sender" + +#: ui/conversation-message-menus.ui:60 +msgid "For this domain" +msgstr "For this domain" + +#: ui/conversation-message.ui:54 +msgid "From " +msgstr "From " + +#: ui/conversation-message.ui:69 ui/conversation-message.ui:160 msgid "1/1/1970\t" msgstr "1/1/1970\t" -#: ui/conversation-message.ui:102 +#: ui/conversation-message.ui:91 msgid "Preview body text." msgstr "Preview body text." -#: ui/conversation-message.ui:202 +#: ui/conversation-message.ui:182 msgid "Sent by:" msgstr "Sent by:" -#: ui/conversation-message.ui:247 +#: ui/conversation-message.ui:223 msgid "Reply to:" msgstr "Reply to:" -#: ui/conversation-message.ui:291 +#: ui/conversation-message.ui:264 msgid "Subject" msgstr "Subject" -#: ui/conversation-viewer.ui:60 +#: ui/conversation-viewer.ui:54 msgid "Find in conversation" msgstr "Find in conversation" -#: ui/conversation-viewer.ui:75 +#: ui/conversation-viewer.ui:68 msgid "Find the previous occurrence of the search string." msgstr "Find the previous occurrence of the search string." -#: ui/conversation-viewer.ui:96 +#: ui/conversation-viewer.ui:87 msgid "Find the next occurrence of the search string." msgstr "Find the next occurrence of the search string." -#: ui/find_bar.glade:66 +#: ui/find_bar.glade:58 msgid "Find:" msgstr "Find:" -#: ui/find_bar.glade:89 +#: ui/find_bar.glade:80 msgid "_Previous" msgstr "_Previous" -#: ui/find_bar.glade:107 -msgid "_Next" -msgstr "_Next" - -#: ui/find_bar.glade:125 +#: ui/find_bar.glade:114 msgid "_Case sensitive" msgstr "_Case sensitive" -#: ui/find_bar.glade:145 +#: ui/find_bar.glade:132 msgid "label" msgstr "label" -#: ui/gtk/help-overlay.ui:9 +#: ui/gtk/help-overlay.ui:8 msgid "Conversation Shortcuts" msgstr "Conversation Shortcuts" -#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:377 +#: ui/gtk/help-overlay.ui:12 ui/gtk/help-overlay.ui:194 msgctxt "shortcut window" msgid "Actions" msgstr "Actions" -#: ui/gtk/help-overlay.ui:17 +#: ui/gtk/help-overlay.ui:16 msgctxt "shortcut window" msgid "New conversation" msgstr "New conversation" -#: ui/gtk/help-overlay.ui:24 +#: ui/gtk/help-overlay.ui:23 msgctxt "shortcut window" msgid "Reply to sender" msgstr "Reply to sender" -#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:281 +#: ui/gtk/help-overlay.ui:30 ui/gtk/help-overlay.ui:450 msgctxt "shortcut window" msgid "Reply to all" msgstr "Reply to all" -#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:288 +#: ui/gtk/help-overlay.ui:37 ui/gtk/help-overlay.ui:457 msgctxt "shortcut window" msgid "Forward" msgstr "Forward" -#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:295 +#: ui/gtk/help-overlay.ui:44 ui/gtk/help-overlay.ui:464 msgctxt "shortcut window" msgid "Un-mark/mark read" msgstr "Un-mark/mark read" -#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:302 +#: ui/gtk/help-overlay.ui:51 ui/gtk/help-overlay.ui:471 msgctxt "shortcut window" msgid "Mark/un-mark starred" msgstr "Mark/un-mark starred" -#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:309 +#: ui/gtk/help-overlay.ui:58 ui/gtk/help-overlay.ui:478 msgctxt "shortcut window" msgid "Archive conversations" msgstr "Archive conversations" -#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:326 +#: ui/gtk/help-overlay.ui:65 ui/gtk/help-overlay.ui:495 msgctxt "shortcut window" msgid "Move conversations" msgstr "Move conversations" -#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:333 +#: ui/gtk/help-overlay.ui:72 ui/gtk/help-overlay.ui:502 msgctxt "shortcut window" msgid "Label conversations" msgstr "Label conversations" -#: ui/gtk/help-overlay.ui:80 +#: ui/gtk/help-overlay.ui:79 msgctxt "shortcut window" msgid "Trash conversations" msgstr "Move conversations to Wastebasket" -#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:340 +#: ui/gtk/help-overlay.ui:86 ui/gtk/help-overlay.ui:509 msgctxt "shortcut window" msgid "Junk conversations" msgstr "Junk conversations" -#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:347 +#: ui/gtk/help-overlay.ui:94 ui/gtk/help-overlay.ui:516 msgctxt "shortcut window" msgid "Delete conversations" msgstr "Delete conversations" -#: ui/gtk/help-overlay.ui:104 +#: ui/gtk/help-overlay.ui:103 msgctxt "shortcut window" msgid "Search" msgstr "Search" -#: ui/gtk/help-overlay.ui:108 +#: ui/gtk/help-overlay.ui:107 msgctxt "shortcut window" msgid "Search for conversations" msgstr "Search for conversations" -#: ui/gtk/help-overlay.ui:115 ui/gtk/help-overlay.ui:354 +#: ui/gtk/help-overlay.ui:114 ui/gtk/help-overlay.ui:523 msgctxt "shortcut window" msgid "Find in current conversation" msgstr "Find in current conversation" -#: ui/gtk/help-overlay.ui:141 +#: ui/gtk/help-overlay.ui:140 msgctxt "shortcut window" msgid "Undo" msgstr "Undo" -#: ui/gtk/help-overlay.ui:145 +#: ui/gtk/help-overlay.ui:144 msgctxt "shortcut window" msgid "Undo the last action" msgstr "Undo the last action" -#: ui/gtk/help-overlay.ui:152 +#: ui/gtk/help-overlay.ui:151 msgctxt "shortcut window" msgid "Redo the last action" msgstr "Redo the last action" -#: ui/gtk/help-overlay.ui:161 +#: ui/gtk/help-overlay.ui:160 msgctxt "shortcut window" msgid "View" msgstr "View" -#: ui/gtk/help-overlay.ui:165 +#: ui/gtk/help-overlay.ui:164 msgctxt "shortcut window" msgid "Zoom in" msgstr "Zoom in" -#: ui/gtk/help-overlay.ui:172 +#: ui/gtk/help-overlay.ui:171 msgctxt "shortcut window" msgid "Zoom out" msgstr "Zoom out" -#: ui/gtk/help-overlay.ui:179 +#: ui/gtk/help-overlay.ui:178 msgctxt "shortcut window" msgid "Reset zoom" msgstr "Reset zoom" -#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:404 -msgctxt "shortcut window" -msgid "General" -msgstr "General" - -#: ui/gtk/help-overlay.ui:192 -msgctxt "shortcut window" -msgid "Show help" -msgstr "Show help" - -#: ui/gtk/help-overlay.ui:199 -msgctxt "shortcut window" -msgid "Show keyboard shortcuts" -msgstr "Show keyboard shortcuts" - -#: ui/gtk/help-overlay.ui:206 -msgctxt "shortcut window" -msgid "Open a new window" -msgstr "Open a new window" - -#: ui/gtk/help-overlay.ui:213 -msgctxt "shortcut window" -msgid "Close the current window" -msgstr "Close the current window" - -#: ui/gtk/help-overlay.ui:220 -msgctxt "shortcut window" -msgid "Quit the application" -msgstr "Quit the application" - -#: ui/gtk/help-overlay.ui:229 -msgctxt "shortcut window" -msgid "Keyboard navigation" -msgstr "Keyboard navigation" - -#: ui/gtk/help-overlay.ui:233 -msgctxt "shortcut window" -msgid "Go to next/previous pane" -msgstr "Go to next/previous pane" - -#: ui/gtk/help-overlay.ui:241 -msgctxt "shortcut window" -msgid "Select next/previous conversation" -msgstr "Select next/previous conversation" - -#: ui/gtk/help-overlay.ui:248 -msgctxt "shortcut window" -msgid "Focus next/previous message" -msgstr "Focus next/previous message" - -#: ui/gtk/help-overlay.ui:260 -msgid "Single-key Shortcuts" -msgstr "Single-key Shortcuts" - -#: ui/gtk/help-overlay.ui:265 -msgctxt "shortcut window" -msgid "Single-key shortcuts (if enabled)" -msgstr "Single-key shortcuts (if enabled)" - -#: ui/gtk/help-overlay.ui:274 -msgctxt "shortcut window" -msgid "Reply to sender " -msgstr "Reply to sender " - -#: ui/gtk/help-overlay.ui:361 -msgctxt "shortcut window" -msgid "Select next/previous conversations" -msgstr "Select next/previous conversations" - -#: ui/gtk/help-overlay.ui:373 +#: ui/gtk/help-overlay.ui:190 msgid "Composer Shortcuts" msgstr "Composer Shortcuts" -#: ui/gtk/help-overlay.ui:381 +#: ui/gtk/help-overlay.ui:198 msgctxt "shortcut window" msgid "Send" msgstr "Send" -#: ui/gtk/help-overlay.ui:388 +#: ui/gtk/help-overlay.ui:205 msgctxt "shortcut window" msgid "Add attachment" msgstr "Add attachment" -#: ui/gtk/help-overlay.ui:395 +#: ui/gtk/help-overlay.ui:212 msgctxt "shortcut window" msgid "Detach the composer" msgstr "Detach the composer" -#: ui/gtk/help-overlay.ui:408 +#: ui/gtk/help-overlay.ui:221 ui/gtk/help-overlay.ui:350 +msgctxt "shortcut window" +msgid "General" +msgstr "General" + +#: ui/gtk/help-overlay.ui:225 msgctxt "shortcut window" msgid "Close composer window" msgstr "Close composer window" -#: ui/gtk/help-overlay.ui:415 +#: ui/gtk/help-overlay.ui:232 msgctxt "shortcut window" msgid "Detach composer window" msgstr "Detach composer window" -#: ui/gtk/help-overlay.ui:422 +#: ui/gtk/help-overlay.ui:239 msgctxt "shortcut window" msgid "Editing" msgstr "Editing" -#: ui/gtk/help-overlay.ui:427 +#: ui/gtk/help-overlay.ui:244 msgctxt "shortcut window" msgid "Move selection to the clipboard" msgstr "Move selection to the clipboard" -#: ui/gtk/help-overlay.ui:434 +#: ui/gtk/help-overlay.ui:251 msgctxt "shortcut window" msgid "Copy selection to clipboard" msgstr "Copy selection to clipboard" -#: ui/gtk/help-overlay.ui:441 +#: ui/gtk/help-overlay.ui:258 msgctxt "shortcut window" msgid "Paste from the clipboard" msgstr "Paste from the clipboard" -#: ui/gtk/help-overlay.ui:448 +#: ui/gtk/help-overlay.ui:265 msgctxt "shortcut window" msgid "Quote text" msgstr "Quote text" -#: ui/gtk/help-overlay.ui:455 +#: ui/gtk/help-overlay.ui:272 msgctxt "shortcut window" msgid "Unquote text" msgstr "Unquote text" -#: ui/gtk/help-overlay.ui:464 +#: ui/gtk/help-overlay.ui:281 msgctxt "shortcut window" msgid "Rich text editing" msgstr "Rich text editing" -#: ui/gtk/help-overlay.ui:468 +#: ui/gtk/help-overlay.ui:285 msgctxt "shortcut window" msgid "Paste without formatting" msgstr "Paste without formatting" -#: ui/gtk/help-overlay.ui:475 +#: ui/gtk/help-overlay.ui:292 msgctxt "shortcut window" msgid "Bold text" msgstr "Bold text" -#: ui/gtk/help-overlay.ui:482 +#: ui/gtk/help-overlay.ui:299 msgctxt "shortcut window" msgid "Italicize text" msgstr "Italicise text" -#: ui/gtk/help-overlay.ui:489 +#: ui/gtk/help-overlay.ui:306 msgctxt "shortcut window" msgid "Underline text" msgstr "Underline text" -#: ui/gtk/help-overlay.ui:496 +#: ui/gtk/help-overlay.ui:313 msgctxt "shortcut window" msgid "Strike text" msgstr "Strike text" -#: ui/gtk/help-overlay.ui:503 +#: ui/gtk/help-overlay.ui:320 msgctxt "shortcut window" msgid "Remove formatting" msgstr "Remove formatting" -#: ui/gtk/help-overlay.ui:510 +#: ui/gtk/help-overlay.ui:327 msgctxt "shortcut window" msgid "Insert an image" msgstr "Insert an image" -#: ui/gtk/help-overlay.ui:517 +#: ui/gtk/help-overlay.ui:334 msgctxt "shortcut window" msgid "Insert a link" msgstr "Insert a link" -#: ui/main-toolbar.ui:24 -msgctxt "tooltip" -msgid "Compose Message" -msgstr "Compose Message" +#: ui/gtk/help-overlay.ui:346 +msgid "Application Shortcuts" +msgstr "Application Shortcuts" -#: ui/main-toolbar.ui:62 -msgid "Toggle search bar" -msgstr "Toggle search bar" +#: ui/gtk/help-overlay.ui:354 +msgctxt "shortcut window" +msgid "Show help" +msgstr "Show help" -#: ui/main-toolbar.ui:114 -msgid "Reply" -msgstr "Reply" +#: ui/gtk/help-overlay.ui:361 +msgctxt "shortcut window" +msgid "Show keyboard shortcuts" +msgstr "Show keyboard shortcuts" -#: ui/main-toolbar.ui:137 -msgid "Reply All" -msgstr "Reply All" +#: ui/gtk/help-overlay.ui:368 +msgctxt "shortcut window" +msgid "Open a new window" +msgstr "Open a new window" -#: ui/main-toolbar.ui:160 -msgid "Forward" -msgstr "Forward" +#: ui/gtk/help-overlay.ui:375 +msgctxt "shortcut window" +msgid "Close the current window" +msgstr "Close the current window" -#: ui/main-toolbar.ui:265 -msgid "Toggle find bar" -msgstr "Toggle find bar" +#: ui/gtk/help-overlay.ui:382 +msgctxt "shortcut window" +msgid "Quit the application" +msgstr "Quit the application" -#: ui/main-toolbar.ui:286 -msgid "_Archive" -msgstr "_Archive" +#: ui/gtk/help-overlay.ui:391 +msgctxt "shortcut window" +msgid "Keyboard navigation" +msgstr "Keyboard navigation" -#: ui/main-toolbar-menus.ui:21 -msgid "Toggle as _Junk" -msgstr "Toggle as _Junk" +#: ui/gtk/help-overlay.ui:395 +msgctxt "shortcut window" +msgid "Select Inbox" +msgstr "Select Inbox" -#: ui/main-toolbar-menus.ui:28 -msgid "_Accounts" -msgstr "_Accounts" +#: ui/gtk/help-overlay.ui:402 +msgctxt "shortcut window" +msgid "Go to next/previous pane" +msgstr "Go to next/previous pane" -#: ui/main-toolbar-menus.ui:36 -msgid "_Keyboard Shortcuts" -msgstr "_Keyboard Shortcuts" +#: ui/gtk/help-overlay.ui:410 +msgctxt "shortcut window" +msgid "Select next/previous conversation" +msgstr "Select next/previous conversation" -#: ui/main-toolbar-menus.ui:47 -msgid "_About Geary" -msgstr "_About Geary" +#: ui/gtk/help-overlay.ui:417 +msgctxt "shortcut window" +msgid "Focus next/previous message" +msgstr "Focus next/previous message" -#: ui/password-dialog.glade:74 +#: ui/gtk/help-overlay.ui:429 +msgid "Single-key Shortcuts" +msgstr "Single-key Shortcuts" + +#: ui/gtk/help-overlay.ui:434 +msgctxt "shortcut window" +msgid "Single-key shortcuts (if enabled)" +msgstr "Single-key shortcuts (if enabled)" + +#: ui/gtk/help-overlay.ui:443 +msgctxt "shortcut window" +msgid "Reply to sender " +msgstr "Reply to sender " + +#: ui/gtk/help-overlay.ui:530 +msgctxt "shortcut window" +msgid "Select next/previous conversations" +msgstr "Select next/previous conversations" + +#: ui/password-dialog.glade:66 msgid "SMTP Credentials" msgstr "SMTP Credentials" -#: ui/password-dialog.glade:91 +#: ui/password-dialog.glade:82 msgid "Username" msgstr "Username" -#: ui/password-dialog.glade:152 +#: ui/password-dialog.glade:140 msgid "_Remember password" msgstr "_Remember password" -#: ui/password-dialog.glade:210 +#: ui/password-dialog.glade:195 msgid "_Authenticate" msgstr "_Authenticate" -#: ui/upgrade_dialog.glade:60 -msgid "Geary update in progress…" -msgstr "Geary update in progress…" +#~ msgid "Position of folder list pane" +#~ msgstr "Position of folder list pane" + +#~ msgid "Position of the folder list Paned grabber." +#~ msgstr "Position of the folder list Paned grabber." + +#~ msgid "Position of folder list pane when horizontal" +#~ msgstr "Position of folder list pane when horizontal" + +#~ msgid "" +#~ "Position of the folder list Paned grabber in the horizontal orientation." +#~ msgstr "" +#~ "Position of the folder list Paned grabber in the horizontal orientation." + +#~ msgid "Position of folder list pane when vertical" +#~ msgstr "Position of folder list pane when vertical" + +#~ msgid "" +#~ "Position of the folder list Paned grabber in the vertical orientation." +#~ msgstr "" +#~ "Position of the folder list Paned grabber in the vertical orientation." + +#~ msgid "Orientation of the folder list pane" +#~ msgstr "Orientation of the folder list pane" + +#~ msgid "True if the folder list Paned is in the horizontal orientation." +#~ msgstr "True if the folder list Paned is in the horizontal orientation." + +#~ msgid "Position of message list pane" +#~ msgstr "Position of message list pane" + +#~ msgid "Position of the message list Paned grabber." +#~ msgstr "Position of the message list Paned grabber." + +#~ msgid "Notify of new mail at startup" +#~ msgstr "Notify of new mail at startup" + +#~ msgid "True to notify of new mail at startup." +#~ msgstr "True to notify of new mail at startup." + +#~ msgid "All others" +#~ msgstr "All others" + +#~ msgid "Yahoo" +#~ msgstr "Yahoo" + +#~ msgid "Other email providers" +#~ msgstr "Other e-mail providers" + +#~ msgid "Start with the main window hidden (deprecated)" +#~ msgstr "Start with the main window hidden (deprecated)" + +#~ 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." + +#, c-format +#~ msgid "Email to %s saved" +#~ msgstr "E-mail to %s saved" + +#~ msgid "Use _three pane view" +#~ msgstr "Use _three pane view" + +#~ msgid "Sending…" +#~ msgstr "Sending…" + +#~ msgid "Error sending email" +#~ msgstr "Error sending e-mail" + +#~ msgid "Error saving sent mail" +#~ msgstr "Error saving sent mail" + +#~ msgid "Me" +#~ msgstr "Me" + +#~ msgid "Always show from sender" +#~ msgstr "Always show from sender" + +#~ msgid "%a, %b %-e, %Y at %l:%M %P" +#~ msgstr "%a, %-e %b, %Y at %l:%M %P" + +#~ msgid "%a, %b %-e, %Y at %H:%M" +#~ msgstr "%a, %-e %b, %Y at %H:%M" + +#, c-format +#~ msgid "Confirm removing: %s" +#~ msgstr "Confirm removing: %s" + +#~ msgid "Remove account" +#~ msgstr "Remove account" + +#~ msgid "_Reply-To" +#~ msgstr "_Reply-To" + +#~ msgid "_Archive" +#~ msgstr "_Archive" #~| msgid "Notifications" #~ msgid "Desktop Notifications" @@ -3722,9 +3827,6 @@ msgstr "Geary update in progress…" #~ msgid "Notification Badge" #~ msgstr "Notification Badge" -#~ msgid "Special Folders" -#~ msgstr "Special Folders" - #~ msgid "Enable notification sounds" #~ msgstr "Enable notification sounds" @@ -4095,10 +4197,6 @@ msgstr "Geary update in progress…" #~ msgid "Mark unread" #~ msgstr "Mark unread" -#~ msgctxt "shortcut window" -#~ msgid "Additional Shortcuts" -#~ msgstr "Additional Shortcuts" - #~| msgid "U_nstar" #~ msgctxt "shortcut window" #~ msgid "Unstar"