[geary] Update British English translation



commit 824116d5977fb0a68f707a17b5c4e89d3689e54d
Author: Bruce Cowan <bruce bcowan me uk>
Date:   Sat Jul 6 19:52:59 2019 +0000

    Update British English translation
    
    (cherry picked from commit 664cd77d1a4be7b85baa3ce8cda909f29e530ee2)

 po/en_GB.po | 4648 ++++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 3458 insertions(+), 1190 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 30d4ca76..31eb7fbf 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,526 +7,937 @@
 # Alfredo Hernández <aldomann designs gmail com>, 2012
 # ajshephard <andrew james shephard gmail com>, 2013
 # andrubuntu <andrubuntu gmail com>, 2013
+# Bruce Cowan <bruce bcowan me uk>, 2019.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n";
-"POT-Creation-Date: 2013-09-20 12:16-0700\n"
-"PO-Revision-Date: 2013-09-25 17:13+0000\n"
-"Last-Translator: ajshephard <andrew james shephard gmail com>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/";
-"geary/language/en_GB/)\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n";
+"POT-Creation-Date: 2019-04-18 07:39+0000\n"
+"PO-Revision-Date: 2019-07-06 20:51+0100\n"
+"Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
+"Language-Team: English - United Kingdom <en li org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 3.32.1\n"
+
+#: desktop/geary-attach.contract.desktop.in:3
+#| msgid "Send and receive email"
+msgid "Send by email"
+msgstr "Send by e-mail"
+
+#: desktop/geary-attach.contract.desktop.in:6
+msgid "Send files using Geary"
+msgstr "Send files using Geary"
+
+#. Translators: The application name
+#: desktop/geary-autostart.desktop.in:3
+#: desktop/org.gnome.Geary.appdata.xml.in:11
+#: desktop/org.gnome.Geary.desktop.in:3
+#: src/client/accounts/accounts-editor-servers-pane.vala:555
+#| msgid "Geary Mail"
+msgid "Geary"
+msgstr "Geary"
+
+#: desktop/geary-autostart.desktop.in:4 desktop/org.gnome.Geary.desktop.in:4
+#| msgid "Gmail"
+msgid "Email"
+msgstr "E-mail"
+
+#. Translators: The application's summary / tagline
+#: desktop/geary-autostart.desktop.in:5
+#: desktop/org.gnome.Geary.appdata.xml.in:15
+#: desktop/org.gnome.Geary.desktop.in:5
+#: src/client/application/geary-application.vala:23
+msgid "Send and receive email"
+msgstr "Send and receive e-mail"
 
-#: ../../src/client/accounts/add-edit-page.vala:641
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Connection error.\n"
-
-#: ../../src/client/accounts/add-edit-page.vala:624
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "&#8226; Email address already added to Geary.\n"
-
-#: ../../src/client/accounts/add-edit-page.vala:628
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; IMAP connection error.\n"
-
-#: ../../src/client/accounts/add-edit-page.vala:631
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; IMAP username or password incorrect.\n"
-
-#: ../../src/client/accounts/add-edit-page.vala:621
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Invalid account nickname.\n"
+#. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
+#: desktop/geary-autostart.desktop.in:7
+msgid "Email;E-mail;Mail;"
+msgstr "Email;E-mail;Mail;"
 
-#: ../../src/client/accounts/add-edit-page.vala:634
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; SMTP connection error.\n"
+#. Translators: The development team's name
+#: desktop/org.gnome.Geary.appdata.xml.in:13
+msgid "Geary Development Team"
+msgstr "Geary Development Team"
 
-#: ../../src/client/accounts/add-edit-page.vala:637
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; SMTP username or password incorrect.\n"
+#: desktop/org.gnome.Geary.appdata.xml.in:17
+msgid ""
+"Geary is an email application built around conversations, for the GNOME 3 "
+"desktop. It allows you to read, find and send email with a straightforward, "
+"modern interface."
+msgstr ""
+"Geary is an e-mail application built around conversations, for the GNOME 3 "
+"desktop. It allows you to read, find and send email with a straightforward, "
+"modern interface."
 
-#: ../../src/client/accounts/add-edit-page.vala:645
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Username or password incorrect.\n"
+#: desktop/org.gnome.Geary.appdata.xml.in:22
+msgid ""
+"Conversations allow you to read a complete discussion without having to find "
+"and click from message to message."
+msgstr ""
+"Conversations allow you to read a complete discussion without having to find "
+"and click from message to message."
+
+#: desktop/org.gnome.Geary.appdata.xml.in:26
+msgid "Geary’s features include:"
+msgstr "Geary’s features include:"
+
+#: desktop/org.gnome.Geary.appdata.xml.in:28
+msgid "Quick email account setup"
+msgstr "Quick e-mail account setup"
+
+#: desktop/org.gnome.Geary.appdata.xml.in:29
+msgid "Shows related messages together in conversations"
+msgstr "Shows related messages together in conversations"
+
+#: desktop/org.gnome.Geary.appdata.xml.in:30
+msgid "Fast, full text and keyword search"
+msgstr "Fast, full text and keyword search"
+
+#: desktop/org.gnome.Geary.appdata.xml.in:31
+msgid "Full-featured HTML and plain text message composer"
+msgstr "Full-featured HTML and plain text message composer"
+
+#: desktop/org.gnome.Geary.appdata.xml.in:32
+#| msgid "Show _notifications for new mail"
+msgid "Desktop notification of new mail"
+msgstr "Desktop notification of new mail"
+
+#: desktop/org.gnome.Geary.appdata.xml.in:33
+msgid "Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers"
+msgstr "Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers"
+
+#. Translators: A screenshot description.
+#: desktop/org.gnome.Geary.appdata.xml.in:47
+#| msgid "_Display conversation preview"
+msgid "Geary displaying a conversation"
+msgstr "Geary displaying a conversation"
+
+#. Translators: A screenshot description.
+#: desktop/org.gnome.Geary.appdata.xml.in:58
+msgid "Geary showing the rich text composer"
+msgstr "Geary showing the rich text composer"
+
+#. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
+#: desktop/org.gnome.Geary.desktop.in:7
+msgid "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
+msgstr "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
+
+#: desktop/org.gnome.Geary.desktop.in:21
+msgid "Compose Message"
+msgstr "Compose Message"
 
-#: ../../src/client/views/conversation-viewer.vala:1203
-msgid " (Invalid?)"
-msgstr " (Invalid?)"
+#: desktop/org.gnome.Geary.gschema.xml:8
+msgid "Maximize window"
+msgstr "Maximise window"
 
-#: ../../src/client/composer/composer-window.vala:972
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "\"%s\" already attached for delivery."
+#: desktop/org.gnome.Geary.gschema.xml:9
+msgid "True if the application window is maximized, false otherwise."
+msgstr "True if the application window is maximised, false otherwise."
 
-#: ../../src/client/composer/composer-window.vala:937
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "\"%s\" could not be found."
+#: desktop/org.gnome.Geary.gschema.xml:14
+msgid "Width of window"
+msgstr "Width of window"
 
-#: ../../src/client/composer/composer-window.vala:965
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "\"%s\" could not be opened for reading."
+#: desktop/org.gnome.Geary.gschema.xml:15
+msgid "The last recorded width of the application window."
+msgstr "The last recorded width of the application window."
 
-#: ../../src/client/composer/composer-window.vala:944
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "\"%s\" is a folder."
+#: desktop/org.gnome.Geary.gschema.xml:20
+msgid "Height of window"
+msgstr "Height of window"
 
-#: ../../src/client/composer/composer-window.vala:951
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" is an empty file."
+#: desktop/org.gnome.Geary.gschema.xml:21
+msgid "The last recorded height of the application window."
+msgstr "The last recorded height of the application window."
 
-#. / Date format that shows the weekday (Monday, Tuesday, ...)
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:182
-#, c-format
-msgid "%A"
-msgstr "%A"
+#: desktop/org.gnome.Geary.gschema.xml:26
+msgid "Position of folder list pane"
+msgstr "Position of folder list pane"
 
-#. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:91
-msgid "%B %-e, %Y %-H:%M"
-msgstr "%B %-e, %Y %-H:%M"
+#: desktop/org.gnome.Geary.gschema.xml:27
+msgid "Position of the folder list Paned grabber."
+msgstr "Position of the folder list Paned grabber."
 
-#. / Verbose datetime format for 12-hour time, i.e. November 8, 2010 8:42 am
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:88
-msgid "%B %-e, %Y %-l:%M %P"
-msgstr "%-e %B, %Y %-l:%M %P"
+#: desktop/org.gnome.Geary.gschema.xml:32
+msgid "Position of folder list pane when horizontal"
+msgstr "Position of folder list pane when horizontal"
 
-#. / Verbose datetime format for the locale default (full month, day and time)
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:94
-msgctxt "Default full date"
-msgid "%B %-e, %Y %-l:%M %P"
-msgstr "%-e %B, %Y %-l:%M %P"
+#: 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."
 
-#. / Datetime format for 24-hour time, i.e. 16:35
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:71
-msgid "%H:%M"
-msgstr "%H:%M"
+#: desktop/org.gnome.Geary.gschema.xml:38
+msgid "Position of folder list pane when vertical"
+msgstr "Position of folder list pane when vertical"
 
-#. / Format for the datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/engine/rfc822/rfc822-utils.vala:165
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %-e %b, %Y at %-l:%M %p"
+#: 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."
 
-#. / Date format for dates within the current year, i.e. Nov 8
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:78
-msgid "%b %-e"
-msgstr "%-e %b"
+#: desktop/org.gnome.Geary.gschema.xml:44
+msgid "Orientation of the folder list pane"
+msgstr "Orientation of the folder list pane"
 
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:30
-#, c-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] "%d message"
-msgstr[1] "%d messages"
+#: 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."
 
-#: ../../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d new message"
-msgstr[1] "%d new messages"
+#: desktop/org.gnome.Geary.gschema.xml:50
+msgid "Position of message list pane"
+msgstr "Position of message list pane"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:43
-#, c-format
-msgid "%d results"
-msgstr "%d results"
+#: desktop/org.gnome.Geary.gschema.xml:51
+msgid "Position of the message list Paned grabber."
+msgstr "Position of the message list Paned grabber."
 
-#. / Label displaying number of unread email messages in a folder
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:37
-#, c-format
-msgid "%d unread"
-msgid_plural "%d unread"
-msgstr[0] "%d unread"
-msgstr[1] "%d unread"
+#: desktop/org.gnome.Geary.gschema.xml:56
+#| msgid "_Automatically select next message"
+msgid "Autoselect next message"
+msgstr "Autoselect next message"
 
-#: ../../src/client/util/util-date.vala:170
-#, c-format
-msgid "%dh ago"
-msgstr "%dh ago"
+#: desktop/org.gnome.Geary.gschema.xml:57
+msgid "True if we should autoselect the next available conversation."
+msgstr "True if we should autoselect the next available conversation."
 
-#: ../../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgstr "%dm ago"
+#: desktop/org.gnome.Geary.gschema.xml:62
+#| msgid "_Display conversation preview"
+msgid "Display message previews"
+msgstr "Display message previews"
 
-#: ../../src/client/views/conversation-find-bar.vala:222
-#, c-format
-msgid "%i matches"
-msgstr "%i matches"
+#: desktop/org.gnome.Geary.gschema.xml:63
+msgid "True if we should display a short preview of each message."
+msgstr "True if we should display a short preview of each message."
 
-#: ../../src/client/views/conversation-find-bar.vala:224
-#, c-format
-msgid "%i matches (wrapped)"
-msgstr "%i matches (wrapped)"
+#: desktop/org.gnome.Geary.gschema.xml:68
+msgid "Languages that shall be used in the spell checker"
+msgstr "Languages that shall be used in the spell checker"
 
-#. / Datetime format for 12-hour time, i.e. 8:31 am
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:68
-msgid "%l:%M %P"
-msgstr "%l:%M %P"
+#: desktop/org.gnome.Geary.gschema.xml:69
+msgid "List of the languages to use in the spell checker."
+msgstr "List of the languages to use in the spell checker."
 
-#. / Datetime format for the locale default, i.e. 8:31 am or 16:35,
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:74
-msgctxt "Default clock format"
-msgid "%l:%M %P"
-msgstr "%l:%M %P"
+#: desktop/org.gnome.Geary.gschema.xml:74
+msgid "Languages that are displayed in the spell checker popover"
+msgstr "Languages that are displayed in the spell checker popover"
 
-#: ../../src/client/notification/libnotify.vala:107
-#, c-format
+#: desktop/org.gnome.Geary.gschema.xml:75
 msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] ""
-"%s\n"
-"(%d other new message for %s)"
-msgstr[1] ""
-"%s\n"
-"(%d other new messages for %s)"
-
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../../src/client/composer/composer-window.vala:981
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+"List of languages that are always displayed in the popover of the spell "
+"checker."
+msgstr ""
+"List of languages that are always displayed in the popover of the spell "
+"checker."
 
-#: ../../src/client/views/conversation-web-view.vala:289
-#, c-format
-msgid "%s - Conversation Inspector"
-msgstr "%s - Conversation Inspector"
+#: desktop/org.gnome.Geary.gschema.xml:80
+#| msgid "_Play notification sounds"
+msgid "Enable notification sounds"
+msgstr "Enable notification sounds"
 
-#: ../../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - New Messages"
+#: desktop/org.gnome.Geary.gschema.xml:81
+msgid "True to play sounds for notifications and sending."
+msgstr "True to play sounds for notifications and sending."
 
-#. / The quoted header for a message being replied to (in case the date is not known).
-#. / %s will be replaced by the original sender.
-#: ../../src/engine/rfc822/rfc822-utils.vala:178
-#, c-format
-msgid "%s wrote:"
-msgstr "%s wrote:"
+#: desktop/org.gnome.Geary.gschema.xml:86
+#| msgid "Show _notifications for new mail"
+msgid "Show notifications for new mail"
+msgstr "Show notifications for new mail"
 
-#: ../../src/client/notification/libnotify.vala:75
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] "%s, %d new message total"
-msgstr[1] "%s, %d new messages total"
+#: desktop/org.gnome.Geary.gschema.xml:87
+msgid "True to show notification bubbles."
+msgstr "True to show notification bubbles."
 
-#. / This string represents the divider between two messages: "n messages" and "n unread",
-#. / shown in the folder list as a tooltip.  Please use your languages conventions for
-#. / combining the two, i.e. a comma (",") for English; "6 messages, 3 unread"
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:43
-#, c-format
-msgid "%s, %s"
-msgstr "%s, %s"
+#: desktop/org.gnome.Geary.gschema.xml:92
+msgid "Notify of new mail at startup"
+msgstr "Notify of new mail at startup"
 
-#: ../../src/client/views/conversation-viewer.vala:246
-#, c-format
-msgid "%u conversations selected."
-msgstr "%u conversations selected."
+#: desktop/org.gnome.Geary.gschema.xml:93
+msgid "True to notify of new mail at startup."
+msgstr "True to notify of new mail at startup."
 
-#: ../../src/client/views/conversation-viewer.vala:743
-#, c-format
-msgid "%u read messages"
-msgstr "%u read messages"
+#: desktop/org.gnome.Geary.gschema.xml:98
+msgid "Ask when opening an attachment"
+msgstr "Ask when opening an attachment"
 
-#. / Date format for dates within a different year, i.e. 02/04/10
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:83
-#, no-c-format
-msgid "%x"
-msgstr "%x"
+#: desktop/org.gnome.Geary.gschema.xml:99
+#| msgid "To add them as attachments"
+msgid "True to ask when opening an attachment."
+msgstr "True to ask when opening an attachment."
 
-#: ../../src/client/util/util-email.vala:30
-msgid "(no subject)"
-msgstr "(no subject)"
+#: desktop/org.gnome.Geary.gschema.xml:104
+msgid "Whether to compose emails in HTML"
+msgstr "Whether to compose e-mails in HTML"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Forwarded message ----------"
+#: desktop/org.gnome.Geary.gschema.xml:105
+msgid "True to compose emails in HTML; false for plain text."
+msgstr "True to compose e-mails in HTML; false for plain text."
 
-#: ../../src/client/accounts/add-edit-page.vala:211
-msgid "1 month back"
-msgstr "1 month back"
+#: desktop/org.gnome.Geary.gschema.xml:110
+msgid "Advisory strategy for full-text searching"
+msgstr "Advisory strategy for full-text searching"
 
-#: ../../src/client/accounts/add-edit-page.vala:214
-msgid "1 year back"
-msgstr "1 year back"
+#: desktop/org.gnome.Geary.gschema.xml:111
+msgid ""
+"Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
+msgstr ""
+"Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
 
-#: ../../src/client/accounts/add-edit-page.vala:210
-msgid "2 weeks back"
-msgstr "2 weeks back"
+#: desktop/org.gnome.Geary.gschema.xml:116
+#| msgid "No conversations in folder."
+msgid "Zoom of conversation viewer"
+msgstr "Zoom of conversation viewer"
 
-#: ../../src/client/accounts/add-edit-page.vala:212
-msgid "3 months back"
-msgstr "3 months back"
+#: desktop/org.gnome.Geary.gschema.xml:117
+msgid "The zoom to apply on the conservation view."
+msgstr "The zoom to apply on the conservation view."
 
-#: ../../src/client/accounts/add-edit-page.vala:213
-msgid "6 months back"
-msgstr "6 months back"
+#: desktop/org.gnome.Geary.gschema.xml:122
+msgid "Size of detached composer window"
+msgstr "Size of detached composer window"
 
-#: ../../ui/remove_confirm.glade:43
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
+#: desktop/org.gnome.Geary.gschema.xml:123
+msgid "The last recorded size of the detached composer window."
+msgstr "The last recorded size of the detached composer window."
 
-#: ../../ui/account_cannot_remove.glade:40
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#: desktop/org.gnome.Geary.gschema.xml:128
+msgid "Whether we migrated the old settings"
+msgstr "Whether we migrated the old settings"
 
-#: ../../ui/account_cannot_remove.glade:56
+#: desktop/org.gnome.Geary.gschema.xml:129
 msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+"False to check for the old “org.yorba.geary”-schema and copy its values."
 msgstr ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-
-#: ../../src/client/geary-controller.vala:1491
+"False to check for the old “org.yorba.geary”-schema and copy its values."
+
+#. Translators: In-app notification label, when
+#. the app had a problem pinning an otherwise
+#. untrusted TLS certificate
+#: src/client/accounts/accounts-editor.vala:203
+msgid "Failed to store certificate"
+msgstr "Failed to store certificate"
+
+#. Translators: Label for adding an email account
+#. account for a generic IMAP service provider.
+#: src/client/accounts/accounts-editor-add-pane.vala:109
+msgid "All others"
+msgstr "All others"
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:196
+#: src/client/accounts/accounts-editor-servers-pane.vala:316
+msgid "Check your receiving login and password"
+msgstr "Check your receiving login and password"
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:211
+#: src/client/accounts/accounts-editor-servers-pane.vala:329
+msgid "Check your receiving server details"
+msgstr "Check your receiving server details"
+
+#. Translators: In-app notification label
+#. There was an SMTP auth error, but IMAP already
+#. succeeded, so the user probably needs to
+#. specify custom creds here
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:233
+#: src/client/accounts/accounts-editor-servers-pane.vala:350
+msgid "Check your sending login and password"
+msgstr "Check your sending login and password"
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:247
+#: src/client/accounts/accounts-editor-servers-pane.vala:363
+msgid "Check your sending server details"
+msgstr "Check your sending server details"
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:262
+#| msgid "Please enter your email password"
+msgid "Check your email address and password"
+msgstr "Check your e-mail address and password"
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:273
+msgid "Could not connect, check your network"
+msgstr "Could not connect, check your network"
+
+#. Translators: In-app notification label for a
+#. generic error creating an account
+#: src/client/accounts/accounts-editor-add-pane.vala:286
+msgid "An unexpected problem occurred"
+msgstr "An unexpected problem occurred"
+
+#. Translators: In-app notification label, the
+#. string substitution is a more detailed reason.
+#: src/client/accounts/accounts-editor-add-pane.vala:304
 #, c-format
-msgid "A file named \"%s\" already exists.  Do you want to replace it?"
-msgstr "A file named '%s' already exists.  Do you want to replace it?"
-
-#: ../../src/client/geary-controller.vala:245
-msgid "A_ccounts"
-msgstr "A_ccounts"
+msgid "Account not created: %s"
+msgstr "Account not created: %s"
+
+#. Translators: Label for the person's actual name when adding
+#. an account
+#: src/client/accounts/accounts-editor-add-pane.vala:551
+msgid "Your name"
+msgstr "Your name"
+
+#. Translators: Label used for the address part of an
+#. email address when editing a user's sender address
+#. preferences for an account.
+#: src/client/accounts/accounts-editor-add-pane.vala:568
+#: src/client/accounts/accounts-editor-edit-pane.vala:501
+#| msgid "Email address:"
+msgid "Email address"
+msgstr "E-mail 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:571
+#: src/client/accounts/accounts-editor-edit-pane.vala:469
+msgid "person example com"
+msgstr "person example com"
+
+#. Translators: Label for an IMAP/SMTP service login/user name
+#. when adding an account
+#. Translators: Label for the user's login name for an
+#. IMAP, SMTP, etc service
+#: src/client/accounts/accounts-editor-add-pane.vala:585
+#: src/client/accounts/accounts-editor-servers-pane.vala:880
+msgid "Login name"
+msgstr "Login name"
+
+#. Translators: Label for the user's password for an IMAP,
+#. SMTP, etc service
+#: src/client/accounts/accounts-editor-add-pane.vala:599
+#: src/client/accounts/accounts-editor-servers-pane.vala:999
+#: ui/password-dialog.glade:108
+msgid "Password"
+msgstr "Password"
 
-#: ../../src/client/geary-controller.vala:1227
+#. Translators: Label for the IMAP server hostname when
+#. adding an account.
+#. Translators: This label describes the host name or IP
+#. address and port used by an account's IMAP service.
+#: src/client/accounts/accounts-editor-add-pane.vala:621
+#: src/client/accounts/accounts-editor-servers-pane.vala:727
+#| msgid "IMAP username"
+msgid "IMAP server"
+msgstr "IMAP server"
+
+#. Translators: Placeholder for the IMAP server hostname
+#. when adding an account.
+#: src/client/accounts/accounts-editor-add-pane.vala:624
+msgid "imap.example.com"
+msgstr "imap.example.com"
+
+#. Translators: Label for the SMTP server hostname when
+#. adding an account.
+#. Translators: This label describes the host name or IP
+#. address and port used by an account's SMTP service.
+#: src/client/accounts/accounts-editor-add-pane.vala:630
+#: src/client/accounts/accounts-editor-servers-pane.vala:733
+#| msgid "SMTP username"
+msgid "SMTP server"
+msgstr "SMTP server"
+
+#. Translators: Placeholder for the SMTP server hostname
+#. when adding an account.
+#: src/client/accounts/accounts-editor-add-pane.vala:633
+msgid "smtp.example.com"
+msgstr "smtp.example.com"
+
+#. Translators: Label in the account editor for the user's
+#. custom name for an account.
+#: src/client/accounts/accounts-editor-edit-pane.vala:278
+#: ui/accounts_editor_remove_pane.ui:123
+#| msgid "Accounts"
+msgid "Account name"
+msgstr "Account name"
+
+#. Translators: Tooltip used to undo changing
+#. the name of an account. The string
+#. substitution is the old name of the
+#. account.
+#: src/client/accounts/accounts-editor-edit-pane.vala:312
 #, c-format
-msgid "About %s"
-msgstr "About %s"
+msgid "Change account name back to “%s”"
+msgstr "Change account name back to “%s”"
+
+#. Translators: Tooltip for adding a new email sender/from
+#. address's address to an account
+#: src/client/accounts/accounts-editor-edit-pane.vala:336
+msgid "Add a new sender email address"
+msgstr "Add a new sender e-mail address"
+
+#. Translators: Label used to indicate the user has
+#. provided no display name for one of their sender
+#. email addresses in their account settings.
+#: src/client/accounts/accounts-editor-edit-pane.vala:417
+msgid "Name not set"
+msgstr "Name not set"
+
+#. Translators: This is used as a placeholder for the
+#. display name for an email address when editing a user's
+#. sender address preferences for an account.
+#: src/client/accounts/accounts-editor-edit-pane.vala:456
+msgid "Sender Name"
+msgstr "Sender Name"
+
+#: src/client/accounts/accounts-editor-edit-pane.vala:479
+#| msgid "_Remove"
+msgid "Remove"
+msgstr "Remove"
+
+#. Translators: Label used for the display name part of an
+#. email address when editing a user's sender address
+#. preferences for an account.
+#: src/client/accounts/accounts-editor-edit-pane.vala:494
+#| msgid "Username:"
+msgid "Sender name"
+msgstr "Sender name"
+
+#. Translators: Label used as the undo tooltip after adding an
+#. new sender email address to an account. The string
+#. substitution is the email address added.
+#: src/client/accounts/accounts-editor-edit-pane.vala:561
+#, c-format
+msgid "Remove “%s”"
+msgstr "Remove “%s”"
 
-#: ../../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Accounts"
+#. Translators: Label used as the undo tooltip after editing a
+#. sender address for an account. The string substitution is
+#. the email address edited.
+#: src/client/accounts/accounts-editor-edit-pane.vala:601
+#, c-format
+msgid "Undo changes to “%s”"
+msgstr "Undo changes to “%s”"
 
-#: ../../ui/account_list.glade:71
-msgid "Add account"
-msgstr "Add account"
+#. Translators: Label used as the undo tooltip after removing
+#. a sender address from an account. The string substitution
+#. is the email address edited.
+#: src/client/accounts/accounts-editor-edit-pane.vala:688
+#, c-format
+msgid "Add “%s” back"
+msgstr "Add “%s” back"
+
+#. Translators: Label used as the undo tooltip after removing
+#. a sender address from an account. The string substitution
+#. is the email address edited.
+#: src/client/accounts/accounts-editor-edit-pane.vala:730
+msgid "Undo signature changes"
+msgstr "Undo signature changes"
+
+#. Translators: This label describes the account
+#. preference for the length of time (weeks, months or
+#. years) that past email should be downloaded.
+#: src/client/accounts/accounts-editor-edit-pane.vala:778
+#| msgid "_Download mail:"
+msgid "Download mail"
+msgstr "Download mail"
+
+#. Translators: Tooltip for undoing a change
+#. to the length of time that past email
+#. should be downloaded for an account. The
+#. string substitution is the duration,
+#. e.g. "1 month back".
+#: src/client/accounts/accounts-editor-edit-pane.vala:810
+#, c-format
+msgid "Change download period back to: %s"
+msgstr "Change download period back to: %s"
 
-#: ../../src/client/geary-controller.vala:304
-msgid "Add label"
-msgstr "Add label"
+#: src/client/accounts/accounts-editor-edit-pane.vala:831
+msgid "Everything"
+msgstr "Everything"
 
-#: ../../src/client/geary-controller.vala:57
-msgid "Add label to conversation"
-msgstr "Add label to conversation"
+#: src/client/accounts/accounts-editor-edit-pane.vala:835
+msgid "2 weeks back"
+msgstr "2 weeks back"
 
-#: ../../src/client/geary-controller.vala:58
-msgid "Add label to conversations"
-msgstr "Add label to conversations"
+#: src/client/accounts/accounts-editor-edit-pane.vala:839
+msgid "1 month back"
+msgstr "1 month back"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "All Mail"
+#: src/client/accounts/accounts-editor-edit-pane.vala:843
+msgid "3 months back"
+msgstr "3 months back"
 
-#: ../../ui/remove_confirm.glade:58
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
+#: src/client/accounts/accounts-editor-edit-pane.vala:847
+msgid "6 months back"
+msgstr "6 months back"
 
-#: ../../src/client/geary-args.vala:24
-msgid "Allow inspection of WebView"
-msgstr "Allow inspection of WebView"
+#: src/client/accounts/accounts-editor-edit-pane.vala:851
+msgid "1 year back"
+msgstr "1 year back"
 
-#: ../../src/client/views/conversation-viewer.vala:509
-msgid "Always Show From Sender"
-msgstr "Always Show From Sender"
+#: src/client/accounts/accounts-editor-edit-pane.vala:855
+#| msgid "1 year back"
+msgid "2 years back"
+msgstr "2 years back"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Archive"
+#: src/client/accounts/accounts-editor-edit-pane.vala:859
+#| msgid "1 year back"
+msgid "4 years back"
+msgstr "4 years back"
 
-#: ../../src/client/geary-controller.vala:48
-msgid "Archive conversation (Delete, Backspace, A)"
-msgstr "Archive conversation (Delete, Backspace, A)"
+#: src/client/accounts/accounts-editor-edit-pane.vala:865
+#, c-format
+#| msgid "1 year back"
+msgid "%d day back"
+msgid_plural "%d days back"
+msgstr[0] "%d day back"
+msgstr[1] "%d days back"
+
+#: src/client/accounts/accounts-editor-list-pane.vala:243
+#| msgid "_Undo"
+msgid "Undo"
+msgstr "Undo"
+
+#: src/client/accounts/accounts-editor-list-pane.vala:251
+#| msgid "_Redo"
+msgid "Redo"
+msgstr "Redo"
+
+#: src/client/accounts/accounts-editor-list-pane.vala:345
+#: src/client/accounts/accounts-editor-list-pane.vala:433
+#: src/client/accounts/accounts-editor-row.vala:278
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../../src/client/geary-controller.vala:49
-msgid "Archive conversations (Delete, Backspace, A)"
-msgstr "Archive conversations (Delete, Backspace, A)"
+#: src/client/accounts/accounts-editor-list-pane.vala:349
+#: src/client/accounts/accounts-editor-list-pane.vala:437
+#: src/client/accounts/accounts-editor-row.vala:282
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../../src/client/geary-controller.vala:1477
+#: src/client/accounts/accounts-editor-list-pane.vala:353
+#: src/client/accounts/accounts-editor-list-pane.vala:441
+#: src/client/accounts/accounts-editor-row.vala:286
+#| msgid "Yahoo! Mail"
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#. Translators: Tooltip for accounts that have been
+#. loaded but disabled by the user.
+#: src/client/accounts/accounts-editor-list-pane.vala:371
+msgid "This account has been disabled"
+msgstr "This account has been disabled"
+
+#. Translators: Tooltip for accounts that have been
+#. loaded but because of some error are not able to be
+#. used.
+#: src/client/accounts/accounts-editor-list-pane.vala:380
+msgid "This account has encountered a problem and is unavailable"
+msgstr "This account has encountered a problem and is unavailable"
+
+#. Translators: Label for adding a generic email account
+#: src/client/accounts/accounts-editor-list-pane.vala:430
+msgid "Other email providers"
+msgstr "Other e-mail providers"
+
+#. Translators: Notification shown after removing an
+#. account. The string substitution is the name of the
+#. account.
+#: src/client/accounts/accounts-editor-list-pane.vala:547
 #, c-format
-msgid "Are you sure you want to open \"%s\"?"
-msgstr "Are you sure you want to open '%s'?"
+msgid "Account “%s” removed"
+msgstr "Account “%s” removed"
 
-#: ../../src/client/geary-controller.vala:1478
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
-msgstr ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
+#. Translators: Notification shown after removing an account
+#. is undone. The string substitution is the name of the
+#. account.
+#: src/client/accounts/accounts-editor-list-pane.vala:554
+#, c-format
+msgid "Account “%s” restored"
+msgstr "Account “%s” restored"
+
+#. Translators: Tooltip for dragging list items
+#: src/client/accounts/accounts-editor-row.vala:49
+msgid "Drag to move this item"
+msgstr " "
+
+#. Translators: Label describes the service provider
+#. hosting the email account, e.g. Gmail, Yahoo, or some
+#. other generic IMAP service.
+#: src/client/accounts/accounts-editor-row.vala:294
+msgid "Service provider"
+msgstr "Service provider"
+
+#. Translators: This label describes what form of transport
+#. security (TLS, StartTLS, etc) used by an account's IMAP or SMTP
+#. service.
+#: src/client/accounts/accounts-editor-row.vala:467
+msgid "Connection security"
+msgstr "Connection security"
+
+#. Translators: Label used when no auth scheme is used
+#. by an account's IMAP or SMTP service.
+#: src/client/accounts/accounts-editor-row.vala:478
+#: src/client/accounts/accounts-editor-servers-pane.vala:752
+#: src/client/accounts/accounts-editor-servers-pane.vala:964
+#: src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "None"
 
-#: ../../src/client/views/conversation-viewer.vala:614
-msgid "Bcc:"
-msgstr "Bcc:"
+#: src/client/accounts/accounts-editor-row.vala:485
+#| msgid "_Star"
+msgid "StartTLS"
+msgstr "StartTLS"
+
+#: src/client/accounts/accounts-editor-row.vala:492
+msgid "TLS"
+msgstr "TLS"
+
+#. Translators: Label for source of SMTP authentication
+#. credentials (none, use IMAP, custom) when adding a new
+#. account
+#. Button label for retrying when a login error has occurred
+#: src/client/accounts/accounts-editor-row.vala:533 ui/main-window.ui:455
+msgid "Login"
+msgstr "Login"
+
+#. Translators: ComboBox value for source of SMTP
+#. authentication credentials (none) when adding a new
+#. account
+#: src/client/accounts/accounts-editor-row.vala:540
+msgid "No login needed"
+msgstr "No login needed"
+
+#. Translators: ComboBox value for source of SMTP
+#. authentication credentials (use IMAP) when adding a new
+#. account
+#: src/client/accounts/accounts-editor-row.vala:548
+msgid "Use same login as receiving"
+msgstr "Use same login as receiving"
+
+#. Translators: ComboBox value for source of SMTP
+#. authentication credentials (custom) when adding a new
+#. account
+#: src/client/accounts/accounts-editor-row.vala:556
+msgid "Use a different login"
+msgstr "Use a different login"
+
+#. Translators: In-app notification label, the
+#. string substitution is a more detailed reason.
+#: src/client/accounts/accounts-editor-servers-pane.vala:377
+#, c-format
+msgid "Account not updated: %s"
+msgstr "Account not updated: %s"
+
+#. Translators: This label describes the program that
+#. created the account, e.g. an SSO service like GOA, or
+#. locally by Geary.
+#: src/client/accounts/accounts-editor-servers-pane.vala:540
+#| msgid "Accounts"
+msgid "Account source"
+msgstr "Account source"
+
+#: src/client/accounts/accounts-editor-servers-pane.vala:552
+msgid "GNOME Online Accounts"
+msgstr "GNOME Online Accounts"
+
+#. Translators: This label describes an account
+#. preference.
+#: src/client/accounts/accounts-editor-servers-pane.vala:611
+msgid "Save drafts on server"
+msgstr "Save drafts on server"
+
+#. Translators: This label describes an account
+#. preference.
+#: src/client/accounts/accounts-editor-servers-pane.vala:666
+#| msgid "Unable to login to email server"
+msgid "Save sent email on server"
+msgstr "Save sent e-mail on server"
+
+#. 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:950
+#, c-format
+msgid "%s using OAuth2"
+msgstr "%s using OAuth2"
 
-#: ../../ui/composer.glade:113
-msgid "Bold (Ctrl+B)"
-msgstr "Bold (Ctrl+B)"
+#: src/client/accounts/accounts-editor-servers-pane.vala:960
+msgid "Use receiving server login"
+msgstr "Use receiving server login"
 
-#: ../../ui/composer.glade:69
-msgid "C_olor"
-msgstr "C_olour"
+#: src/client/application/geary-application.vala:24
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
-#: ../../src/client/composer/composer-window.vala:926
-msgid "Cannot add attachment"
-msgstr "Cannot add attachment"
+#: src/client/application/geary-application.vala:25
+msgid "Copyright 2016-2019 Geary Development Team."
+msgstr "Copyright 2016-2019 Geary Development Team."
 
-#: ../../src/client/views/conversation-viewer.vala:611
-msgid "Cc:"
-msgstr "Cc:"
+#: src/client/application/geary-application.vala:27
+#| msgid "Visit the Yorba web site"
+msgid "Visit the Geary web site"
+msgstr "Visit the Geary web site"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:223
+#: src/client/application/geary-application.vala:454
 #, c-format
-msgid "Cc: %s\n"
-msgstr "Cc: %s\n"
+msgid "About %s"
+msgstr "About %s"
 
-#: ../../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Choose a file"
+#. Translators: add your name and email address to receive
+#. credit in the About dialog For example: Yamada Taro
+#. <yamada taro example com>
+#: src/client/application/geary-application.vala:458
+msgid "translator-credits"
+msgstr ""
+"Alfredo Hernández <aldomann designs gmail com>\n"
+"Andrew Shephard <andrew james shephard gmail com>\n"
+"Bruce Cowan <bruce bcowan me uk>"
 
-#: ../../src/client/geary-controller.vala:553
-msgid "Co_ntinue"
-msgstr "Co_ntinue"
+#: src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Start Geary with hidden main window"
 
-#: ../../src/client/geary-application.vala:29
-msgid "Compose Message"
-msgstr "Compose Message"
+#: src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Output debugging information"
+
+#: src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Log conversation monitoring"
 
-#: ../../src/client/geary-controller.vala:313
-msgid "Compose new message (Ctrl+N, N)"
-msgstr "Compose new message (Ctrl+N, N)"
+#: src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Log network deserialisation"
 
-#: ../../ui/preferences.glade:117
-msgid "Composer"
-msgstr "Composer"
+#: src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Log network activity"
 
-#: ../../src/client/views/conversation-viewer.vala:897
-msgid "Copy _Email Address"
-msgstr "Copy _E-mail Address"
+#. / The IMAP replay queue is how changes on the server are replicated on the client.
+#. / It could also be called the IMAP events queue.
+#: src/client/application/geary-args.vala:17
+msgid "Log IMAP replay queue"
+msgstr "Log IMAP replay queue"
 
-#: ../../src/client/views/conversation-viewer.vala:902
-msgid "Copy _Link"
-msgstr "Copy _Link"
+#. / Serialization is how commands and responses are converted into a stream of bytes for
+#. / network transmission
+#: src/client/application/geary-args.vala:20
+msgid "Log network serialization"
+msgstr "Log network serialisation"
 
-#: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
-msgstr "Copyright 2011-2013 Yorba Foundation"
+#: src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Log periodic activity"
 
-#: ../../ui/composer.glade:21
-msgid "Cu_t"
-msgstr "Cu_t"
+#: src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Log database queries (generates lots of messages)"
 
-#: ../../src/client/views/conversation-viewer.vala:620
-msgid "Date:"
-msgstr "Date:"
+#. / "Normalization" can also be called "synchronization"
+#: src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Log folder normalisation"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "Date: %s\n"
+#: src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Allow inspection of WebView"
 
-#: ../../src/client/geary-controller.vala:43
-msgid "Delete conversation (Delete, Backspace, A)"
-msgstr "Delete conversation (Delete, Backspace, A)"
+#: src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Revoke all server certificates with TLS warnings"
 
-#: ../../src/client/geary-controller.vala:44
-msgid "Delete conversations (Delete, Backspace, A)"
-msgstr "Delete conversations (Delete, Backspace, A)"
+#: src/client/application/geary-args.vala:27
+msgid "Perform a graceful quit"
+msgstr "Perform a graceful quit"
 
-#: ../../src/client/geary-args.vala:25
+#: src/client/application/geary-args.vala:28
 msgid "Display program version"
 msgstr "Display program version"
 
-#: ../../src/client/composer/composer-window.vala:663
-msgid "Do you want to discard the unsaved message?"
-msgstr "Do you want to discard the unsaved message?"
+#. This gives a command-line hint on how to open new composer windows with mailto:
+#: src/client/application/geary-args.vala:53
+#, c-format
+msgid "Use %s to open a new composer window"
+msgstr "Use %s to open a new composer window"
 
-#: ../../src/client/composer/composer-window.vala:666
-msgid "Do you want to discard this message?"
-msgstr "Do you want to discard this message?"
+#: src/client/application/geary-args.vala:56
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Please report comments, suggestions and bugs to:"
 
-#: ../../src/client/geary-controller.vala:1479
-msgid "Don't _ask me again"
-msgstr "Don't _ask me again"
+#. i18n: Command line arguments are invalid
+#: src/client/application/geary-args.vala:63
+#, c-format
+msgid "Failed to parse command line options: %s\n"
+msgstr "Failed to parse command line options: %s\n"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Drafts"
+#: src/client/application/geary-args.vala:74
+#, c-format
+#| msgid "Unrecognized command line option \"%s\"\n"
+msgid "Unrecognized command line option “%s”\n"
+msgstr "Unrecognised command line option “%s”\n"
 
-#: ../../ui/composer.glade:419
-msgid "Drop files here"
-msgstr "Drop files here"
+#. Translators: File name used in save chooser when saving
+#. attachments that do not otherwise have a name.
+#: src/client/application/geary-controller.vala:58
+msgid "Untitled"
+msgstr "Untitled"
 
-#: ../../ui/login.glade:115
-msgid "E_mail address:"
-msgstr "E_mail address:"
+#: src/client/application/geary-controller.vala:959
+msgid "Labels"
+msgstr "Labels"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "E_xit"
-msgstr "E_xit"
-
-#: ../../src/client/views/conversation-viewer.vala:533
-msgid "Edit Draft"
-msgstr "Edit Draft"
-
-#: ../../ui/account_list.glade:84
-msgid "Edit account"
-msgstr "Edit account"
-
-#: ../../ui/remove_confirm.glade:94
-msgid "Email address:"
-msgstr "Email address:"
-
-#: ../../src/client/geary-application.vala:28
-msgid "Email;E-mail;Mail;"
-msgstr "Email;E-mail;Mail;"
+#. give the user two options: reset the Account local store, or exit Geary.  A third
+#. could be done to leave the Account in an unopened state, but we don't currently
+#. have provisions for that.
+#: src/client/application/geary-controller.vala:972
+#, c-format
+msgid "Unable to open the database for %s"
+msgstr "Unable to open the database for %s"
 
-#: ../../ui/preferences.glade:131
-msgid "Enable _spell checking"
-msgstr "Enable _spell checking"
+#: src/client/application/geary-controller.vala:973
+#, c-format
+msgid ""
+"There was an error opening the local mail database for this account. This is "
+"possibly due to corruption of the database file in this directory:\n"
+"\n"
+"%s\n"
+"\n"
+"Geary can rebuild the database and re-synchronize with the server or exit.\n"
+"\n"
+"Rebuilding the database will destroy all local email and its attachments. "
+"<b>The mail on the your server will not be affected.</b>"
+msgstr ""
+"There was an error opening the local mail database for this account. This is "
+"possibly due to corruption of the database file in this directory:\n"
+"\n"
+"%s\n"
+"\n"
+"Geary can rebuild the database and re-synchronise with the server or exit.\n"
+"\n"
+"Rebuilding the database will destroy all local email and its attachments. "
+"<b>The mail on the your server will not be affected.</b>"
 
-#: ../../ui/login.glade:588
-msgid "Encr_yption:"
-msgstr "Encr_yption:"
+#: src/client/application/geary-controller.vala:975
+msgid "_Rebuild"
+msgstr "_Rebuild"
 
-#: ../../ui/login.glade:607
-msgid "Encrypt_ion:"
-msgstr "Encrypt_ion:"
+#: src/client/application/geary-controller.vala:975
+msgid "E_xit"
+msgstr "E_xit"
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-msgid "Enter your account information to get started."
-msgstr "Enter your account information to get started."
+#: src/client/application/geary-controller.vala:984
+#, c-format
+#| msgid "Unable to rebuild database for \"%s\""
+msgid "Unable to rebuild database for “%s”"
+msgstr "Unable to rebuild database for “%s”"
 
-#: ../../src/client/geary-controller.vala:714
+#: src/client/application/geary-controller.vala:985
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -537,1015 +948,2872 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../src/client/composer/composer-window.vala:43
-msgid "Error saving"
-msgstr "Error saving"
+#: src/client/application/geary-controller.vala:1840
+#| msgid "Underline (Ctrl+U)"
+msgid "Undo move (Ctrl+Z)"
+msgstr "Undo move (Ctrl+Z)"
 
-#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../../src/client/geary-controller.vala:625
-#: ../../src/client/ui/status-bar.vala:28
-msgid "Error sending email"
-msgstr "Error sending email"
+#: src/client/application/geary-controller.vala:1850
+#| msgid "Are you sure you want to open \"%s\"?"
+msgid "Are you sure you want to open these attachments?"
+msgstr "Are you sure you want to open these attachments?"
 
-#: ../../src/client/accounts/add-edit-page.vala:216
-msgid "Everything"
-msgstr "Everything"
+#: src/client/application/geary-controller.vala:1851
+msgid ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
+msgstr ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
+
+#: src/client/application/geary-controller.vala:1852
+#| msgid "Don't _ask me again"
+msgid "Don’t _ask me again"
+msgstr "Don’t _ask me again"
+
+#. Translators: Dialog primary label when prompting to
+#. overwrite a file. The string substitution is the file'sx
+#. name.
+#: src/client/application/geary-controller.vala:1981
+#, c-format
+#| msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "A file named “%s” already exists.  Do you want to replace it?"
+
+#. Translators: Dialog secondary label when prompting to
+#. overwrite a file. The string substitution is the parent
+#. folder's name.
+#: src/client/application/geary-controller.vala:1988
+#, c-format
+#| msgid ""
+#| "The file already exists in \"%s\".  Replacing it will overwrite its "
+#| "contents."
+msgid ""
+"The file already exists in “%s”.  Replacing it will overwrite its contents."
+msgstr ""
+"The file already exists in “%s”.  Replacing it will overwrite its contents."
+
+#: src/client/application/geary-controller.vala:1992
+msgid "_Replace"
+msgstr "_Replace"
+
+#: src/client/application/geary-controller.vala:2268
+msgid "Close the draft message?"
+msgid_plural "Close all draft messages?"
+msgstr[0] "Close the draft message?"
+msgstr[1] "Close all draft messages?"
+
+#: src/client/application/geary-controller.vala:2394
+#, c-format
+msgid "Empty all email from your %s folder?"
+msgstr "Empty all e-mail from your %s folder?"
 
-#: ../../src/client/views/conversation-viewer.vala:1897
+#: src/client/application/geary-controller.vala:2395
+msgid "This removes the email from Geary and your email server."
+msgstr "This removes the e-mail from Geary and your email server."
+
+#: src/client/application/geary-controller.vala:2396
+#| msgid "\"%s\" could not be found."
+msgid "This cannot be undone."
+msgstr "This cannot be undone."
+
+#: src/client/application/geary-controller.vala:2397
+#, c-format
+msgid "Empty %s"
+msgstr "Empty %s"
+
+#: src/client/application/geary-controller.vala:2414
+#, c-format
+#| msgid "Error saving"
+msgid "Error emptying %s"
+msgstr "Error emptying %s"
+
+#: src/client/application/geary-controller.vala:2446
+#| msgid "Do you want to discard this message?"
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] "Do you want to permanently delete this message?"
+msgstr[1] "Do you want to permanently delete these messages?"
+
+#: src/client/application/geary-controller.vala:2448
+#| msgid "_Delete"
+msgid "Delete"
+msgstr "Delete"
+
+#: src/client/application/geary-controller.vala:2462
+#| msgid "Unquote text (Ctrl+[)"
+msgid "Undo trash (Ctrl+Z)"
+msgstr "Undo moving to wastebasket (Ctrl+Z)"
+
+#: src/client/application/geary-controller.vala:2512
+#| msgid "Underline (Ctrl+U)"
+msgid "Undo archive (Ctrl+Z)"
+msgstr "Undo archive (Ctrl+Z)"
+
+#: src/client/application/geary-controller.vala:2557
+#| msgid "Underline (Ctrl+U)"
+msgid "Undo (Ctrl+Z)"
+msgstr "Undo (Ctrl+Z)"
+
+#. Translators: The label for an in-app notification. The
+#. string substitution is a list of recipients of the email.
+#: src/client/application/geary-controller.vala:2638
+#, c-format
+msgid "Successfully sent mail to %s."
+msgstr "Successfully sent mail to %s."
+
+#: src/client/application/geary-controller.vala:2720
 msgid "Failed to open default text editor."
 msgstr "Failed to open default text editor."
 
-#: ../../src/client/geary-args.vala:54
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Failed to parse command line options: %s\n"
+#. Translators: Tooltip used when an entry requires a valid
+#. email address to be entered, but one is not provided.
+#: src/client/components/components-validator.vala:378
+msgid "An email address is required"
+msgstr "An e-mail address is required"
+
+#. Translators: Tooltip used when an entry requires a valid
+#. email address to be entered, but the address is invalid.
+#: src/client/components/components-validator.vala:382
+#| msgid "Email address:"
+msgid "Not a valid email address"
+msgstr "Not a valid e-mail address"
+
+#. Translators: Tooltip used when an entry requires a valid,
+#. resolvable server name to be entered, but one is not
+#. provided.
+#: src/client/components/components-validator.vala:428
+msgid "A server name is required"
+msgstr "A server name is required"
+
+#. Translators: Tooltip used when an entry requires a valid
+#. server name to be entered, but it was unable to be
+#. looked-up in the DNS.
+#: src/client/components/components-validator.vala:433
+msgid "Could not look up server name"
+msgstr "Could not look up server name"
+
+#: src/client/components/main-toolbar.vala:151
+#| msgid "Mark conversation"
+msgid "Mark conversation"
+msgid_plural "Mark conversations"
+msgstr[0] "Mark conversation"
+msgstr[1] "Mark conversations"
 
-#. / Placeholder text indicating that the user should type their first name and last name
-#: ../../src/client/accounts/add-edit-page.vala:10
-msgid "First Last"
-msgstr "First Last"
+#: src/client/components/main-toolbar.vala:156
+#| msgid "Add label to conversation"
+msgid "Add label to conversation"
+msgid_plural "Add label to conversations"
+msgstr[0] "Add label to conversation"
+msgstr[1] "Add label to conversations"
 
-#: ../../ui/composer.glade:182
-msgid "Fixed Width"
-msgstr "Fixed Width"
+#: src/client/components/main-toolbar.vala:161
+#| msgid "Move conversation"
+msgid "Move conversation"
+msgid_plural "Move conversations"
+msgstr[0] "Move conversation"
+msgstr[1] "Move conversations"
+
+#: src/client/components/main-toolbar.vala:166
+#| msgid "Move conversation"
+msgid "Archive conversation (A)"
+msgid_plural "Archive conversations (A)"
+msgstr[0] "Archive conversation (A)"
+msgstr[1] "Archive conversations (A)"
+
+#: src/client/components/main-toolbar.vala:175
+#| msgid "Archive conversations (Delete, Backspace, A)"
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgid_plural "Move conversations to Trash (Delete, Backspace)"
+msgstr[0] "Move conversation to Wastebasket (Delete, Backspace)"
+msgstr[1] "Move conversations to Wastebasket (Delete, Backspace)"
+
+#: src/client/components/main-toolbar.vala:183
+#| msgid "Delete conversation (Delete, Backspace, A)"
+msgid "Delete conversation (Shift+Delete)"
+msgid_plural "Delete conversations (Shift+Delete)"
+msgstr[0] "Delete conversation (Shift+Delete)"
+msgstr[1] "Delete conversation (Delete, Backspace, A)"
+
+#: src/client/components/main-window.vala:503
+#, c-format
+#| msgid "%s (%s)"
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../../src/client/geary-controller.vala:329
-msgid "Forward (Ctrl+L, F)"
-msgstr "Forward (Ctrl+L, F)"
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:47
+#, c-format
+msgid "Problem connecting to incoming server for %s"
+msgstr "Problem connecting to incoming server for %s"
 
-#: ../../src/client/views/conversation-viewer.vala:605
-msgid "From:"
-msgstr "From:"
+#. Translators: String substitution is the server name
+#: src/client/components/main-window-info-bar.vala:49
+#: src/client/components/main-window-info-bar.vala:58
+#, c-format
+msgid ""
+"Could not connect to %s, check your Internet access and the server name and "
+"try again"
+msgstr ""
+"Could not connect to %s, check your Internet access and the server name and "
+"try again"
+
+#. Translators: Tooltip label for Retry button
+#. Button tooltip for retrying an account problem
+#: src/client/components/main-window-info-bar.vala:51
+#: src/client/components/main-window-info-bar.vala:60
+#: src/client/components/main-window-info-bar.vala:69
+#: src/client/components/main-window-info-bar.vala:78
+#: src/client/components/main-window-info-bar.vala:87
+#: src/client/components/main-window-info-bar.vala:96
+#: src/client/components/main-window-info-bar.vala:136 ui/main-window.ui:265
+msgid "Try reconnecting"
+msgstr "Try reconnecting"
+
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:56
+#, c-format
+msgid "Problem connecting to outgoing server for %s"
+msgstr "Problem connecting to outgoing server for %s"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:215
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:65
+#: src/client/components/main-window-info-bar.vala:83
 #, c-format
-msgid "From: %s\n"
-msgstr "From: %s\n"
+msgid "Problem communicating with incoming server for %s"
+msgstr "Problem communicating with incoming server for %s"
 
-#: ../../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#. Translators: String substitution is the server name
+#: src/client/components/main-window-info-bar.vala:67
+#: src/client/components/main-window-info-bar.vala:76
+#, c-format
+msgid "Network error talking to %s, check your Internet access and try again"
+msgstr "Network error talking to %s, check your Internet access and try again"
 
-#: ../../src/client/geary-application.vala:25
-msgid "Geary Mail"
-msgstr "Geary Mail"
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:74
+#: src/client/components/main-window-info-bar.vala:91
+msgid "Problem communicating with outgoing mail server"
+msgstr "Problem communicating with outgoing mail server"
 
-#: ../../src/client/geary-controller.vala:626
+#. Translators: String substitution is the server name
+#: src/client/components/main-window-info-bar.vala:85
+#, c-format
 msgid ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
+"Geary did not understand a message from %s or vice versa, please file a bug "
+"report"
 msgstr ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
+"Geary did not understand a message from %s or vice versa, please file a bug "
+"report"
 
-#: ../../ui/password-dialog.glade:315
-msgid "General"
-msgstr "General"
+#. Translators: First string substitution is the server
+#. name, second is the account name
+#: src/client/components/main-window-info-bar.vala:94
+#, c-format
+msgid ""
+"Could not communicate with %s for %s, check the server name and try again in "
+"a moment"
+msgstr ""
+"Could not communicate with %s for %s, check the server name and try again in "
+"a moment"
 
-#: ../../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:101
+#, c-format
+msgid "Incoming mail server password required for %s"
+msgstr "Incoming mail server password required for %s"
 
-#: ../../ui/password-dialog.glade:133
-msgid "IMAP Credentials"
-msgstr "IMAP Credentials"
+#: src/client/components/main-window-info-bar.vala:102
+msgid "Messages cannot be received without the correct password."
+msgstr "Messages cannot be received without the correct password."
 
-#: ../../ui/login.glade:572
-msgid "IMAP password"
-msgstr "IMAP password"
+#. Translators: Tooltip label for Retry button
+#: src/client/components/main-window-info-bar.vala:104
+msgid "Retry receiving email, you will be prompted for a password"
+msgstr "Retry receiving e-mail, you will be prompted for a password"
 
-#: ../../ui/login.glade:286 ../../ui/password-dialog.glade:334
-msgid "IMAP settings"
-msgstr "IMAP settings"
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:109
+#, c-format
+msgid "Outgoing mail server password required for %s"
+msgstr "Outgoing mail server password required for %s"
 
-#: ../../ui/login.glade:556
-msgid "IMAP username"
-msgstr "IMAP username"
+#: src/client/components/main-window-info-bar.vala:110
+msgid "Messages cannot be sent without the correct password."
+msgstr "Messages cannot be sent without the correct password."
 
-#: ../../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Important"
+#. Translators: Tooltip label for Retry button
+#: src/client/components/main-window-info-bar.vala:112
+msgid "Retry sending queued messages, you will be prompted for a password"
+msgstr "Retry sending queued messages, you will be prompted for a password"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Inbox"
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:117
+#, c-format
+msgid "Incoming mail server security is not trusted for %s"
+msgstr "Incoming mail server security is not trusted for %s"
 
-#: ../../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Inboxes"
+#: src/client/components/main-window-info-bar.vala:118
+msgid "Messages will not be received until checked."
+msgstr "Messages will not be received until checked."
 
-#: ../../src/client/ui/main-toolbar.vala:163
+#. Translators: Tooltip label for Retry button
+#: src/client/components/main-window-info-bar.vala:120
+#: src/client/components/main-window-info-bar.vala:128
+msgid "Check security details"
+msgstr "Check security details"
+
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:125
 #, c-format
-msgid "Indexing %s account"
-msgstr "Indexing %s account"
+msgid "Outgoing mail server security is not trusted for %s"
+msgstr "Outgoing mail server security is not trusted for %s"
 
-#: ../../ui/composer.glade:120
-msgid "Italic (Ctrl+I)"
-msgstr "Italic (Ctrl+I)"
+#: src/client/components/main-window-info-bar.vala:126
+msgid "Messages cannot be sent until checked."
+msgstr "Messages cannot be sent until checked."
 
-#: ../../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:133
+#, c-format
+msgid "A problem occurred checking mail for %s"
+msgstr "A problem occurred checking mail for %s"
 
-#: ../../src/client/geary-controller.vala:689
-msgid "Labels"
-msgstr "Labels"
+#: src/client/components/main-window-info-bar.vala:134
+#: src/client/components/main-window-info-bar.vala:142
+msgid "Something went wrong, please file a bug report if the problem persists"
+msgstr "Something went wrong, please file a bug report if the problem persists"
 
-#: ../../ui/composer.glade:151
-msgid "Lar_ge"
-msgstr "Lar_ge"
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:141
+#, c-format
+msgid "A problem occurred sending mail for %s"
+msgstr "A problem occurred sending mail for %s"
 
-#: ../../ui/composer.glade:152
-msgid "Large"
-msgstr "Large"
+#. Translators: Tooltip label for Retry button
+#: src/client/components/main-window-info-bar.vala:144
+msgid "Retry sending queued messages"
+msgstr "Retry sending queued messages"
 
-#: ../../ui/composer.glade:62
-msgid "Link (Ctrl+L)"
-msgstr "Link (Ctrl+L)"
+#: src/client/components/main-window-info-bar.vala:155
+msgid "A database problem has occurred"
+msgstr "A database problem has occurred"
 
-#. / 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/geary-args.vala:16
-msgid "Log IMAP replay queue"
-msgstr "Log IMAP replay queue"
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:157
+#, c-format
+msgid "Messages for %s must be downloaded again."
+msgstr "Messages for %s must be downloaded again."
 
-#: ../../src/client/geary-args.vala:11
-msgid "Log conversation monitoring"
-msgstr "Log conversation monitoring"
+#: src/client/components/main-window-info-bar.vala:170
+msgid "Geary has encountered a problem"
+msgstr "Geary has encountered a problem"
 
-#: ../../src/client/geary-args.vala:21
-msgid "Log database queries (generates lots of messages)"
-msgstr "Log database queries (generates lots of messages)"
+#: src/client/components/main-window-info-bar.vala:171
+msgid ""
+"Please check the technical details and report the problem if it persists."
+msgstr ""
+"Please check the technical details and report the problem if it persists."
 
-#. / "Normalization" can also be called "synchronization"
-#: ../../src/client/geary-args.vala:23
-msgid "Log folder normalization"
-msgstr "Log folder normalisation"
+#: src/client/components/main-window-info-bar.vala:179
+msgid "_Details"
+msgstr "_Details"
 
-#: ../../src/client/geary-args.vala:13
-msgid "Log network activity"
-msgstr "Log network activity"
+#. Button tooltip for displaying technical details about an account problem
+#: src/client/components/main-window-info-bar.vala:180 ui/main-window.ui:250
+msgid "View technical details about the error"
+msgstr "View technical details about the error"
 
-#: ../../src/client/geary-args.vala:12
-msgid "Log network deserialization"
-msgstr "Log network deserialisation"
+#: src/client/components/main-window-info-bar.vala:184
+msgid "_Retry"
+msgstr "_Retry"
 
-#. / Serialization is how commands and responses are converted into a stream of bytes for
-#. / network transmission
-#: ../../src/client/geary-args.vala:19
-msgid "Log network serialization"
-msgstr "Log network serialisation"
+#: src/client/components/search-bar.vala:8
+#: src/client/folder-list/folder-list-search-branch.vala:38
+#: src/engine/api/geary-special-folder-type.vala:51
+msgid "Search"
+msgstr "Search"
 
-#: ../../src/client/geary-args.vala:20
-msgid "Log periodic activity"
-msgstr "Log periodic activity"
+#. Search entry.
+#: src/client/components/search-bar.vala:23
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Search all mail in account for keywords (Ctrl+S)"
 
-#: ../../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#: src/client/components/search-bar.vala:101
+#, c-format
+msgid "Indexing %s account"
+msgstr "Indexing %s account"
 
-#: ../../src/client/geary-application.vala:26
-msgid "Mail Client"
-msgstr "Mail Client"
+#: src/client/components/search-bar.vala:112
+#: src/client/folder-list/folder-list-search-branch.vala:39
+#, c-format
+msgid "Search %s account"
+msgstr "Search %s account"
 
-#: ../../src/client/views/conversation-viewer.vala:1479
-msgid "Mark Unread From _Here"
-msgstr "Mark Unread From _Here"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: src/client/components/status-bar.vala:26
+#| msgid "Sending..."
+msgid "Sending…"
+msgstr "Sending…"
 
-#: ../../src/client/geary-controller.vala:52
-msgid "Mark as S_pam"
-msgstr "Mark as S_pam"
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: src/client/components/status-bar.vala:29
+msgid "Error sending email"
+msgstr "Error sending email"
 
-#: ../../src/client/geary-controller.vala:277
-msgid "Mark as _Read"
-msgstr "Mark as _Read"
+#. Displayed in the space-limited status bar when a message fails to be uploaded
+#. to Sent Mail after being sent.
+#: src/client/components/status-bar.vala:33
+#| msgid "Error sending email"
+msgid "Error saving sent mail"
+msgstr "Error saving sent mail"
 
-#: ../../src/client/geary-controller.vala:283
-msgid "Mark as _Unread"
-msgstr "Mark as _Unread"
+#: src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_OK"
 
-#: ../../src/client/geary-controller.vala:53
-msgid "Mark as not S_pam"
-msgstr "Mark as not S_pam"
+#: src/client/components/stock.vala:19 ui/password-dialog.glade:196
+msgid "_Cancel"
+msgstr "_Cancel"
 
-#: ../../src/client/geary-controller.vala:55
-#: ../../src/client/geary-controller.vala:269
-msgid "Mark conversation"
-msgstr "Mark conversation"
+#: src/client/components/stock.vala:21
+msgid "_About"
+msgstr "_About"
 
-#: ../../src/client/geary-controller.vala:56
-msgid "Mark conversations"
-msgstr "Mark conversations"
+#: src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Add"
 
-#: ../../src/client/views/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Me"
+#: src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Close"
 
-#: ../../ui/composer.glade:158
-msgid "Medium"
-msgstr "Medium"
+#: src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Discard"
 
-#: ../../ui/composer.glade:75
-msgid "More options"
-msgstr "More options"
+#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:56
+msgid "_Help"
+msgstr "_Help"
 
-#: ../../src/client/geary-controller.vala:59
-#: ../../src/client/geary-controller.vala:308
-msgid "Move conversation"
-msgstr "Move conversation"
+#: src/client/components/stock.vala:26 ui/conversation-email-menus.ui:77
+msgid "_Open"
+msgstr "_Open"
 
-#: ../../src/client/geary-controller.vala:60
-msgid "Move conversations"
-msgstr "Move conversations"
+#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:46
+msgid "_Preferences"
+msgstr "_Preferences"
 
-#: ../../ui/login.glade:176
-msgid "N_ame:"
-msgstr "N_ame:"
+#. Translators: Menu item to print a single, specific message
+#: src/client/components/stock.vala:28 ui/conversation-email-menus.ui:64
+#| msgid "_Print..."
+msgid "_Print…"
+msgstr "_Print…"
 
-#: ../../ui/login.glade:230
-msgid "N_ickname:"
-msgstr "N_ickname:"
+#: src/client/components/stock.vala:29
+msgid "_Quit"
+msgstr "_Quit"
 
-#: ../../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "New Message"
+#: src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Remove"
 
-#: ../../ui/remove_confirm.glade:80
-msgid "Nickname:"
-msgstr "Nickname:"
+#: src/client/components/stock.vala:31 ui/conversation-email-menus.ui:83
+msgid "_Save"
+msgstr "_Save"
 
-#: ../../ui/login.glade:661
-msgid "No authentication re_quired"
-msgstr "No authentication re_quired"
+#: src/client/components/stock.vala:32
+msgid "_Keep"
+msgstr "_Keep"
 
-#: ../../src/client/views/conversation-viewer.vala:275
-msgid "No conversations in folder."
-msgstr "No conversations in folder."
+#: src/client/composer/composer-link-popover.vala:149
+msgid "Link URL is not correctly formatted, e.g. http://example.com";
+msgstr "Link URL is not correctly formatted, e.g. http://example.com";
 
-#: ../../src/client/views/conversation-viewer.vala:244
-msgid "No conversations selected."
-msgstr "No conversations selected."
+#: src/client/composer/composer-link-popover.vala:156
+msgid "Invalid link URL"
+msgstr "Invalid link URL"
 
-#: ../../src/client/views/conversation-viewer.vala:273
-msgid "No search results found."
-msgstr "No search results found."
+#: src/client/composer/composer-link-popover.vala:156
+#| msgid "Email address:"
+msgid "Invalid email address"
+msgstr "Invalid e-mail address"
 
-#: ../../src/client/dialogs/password-dialog.vala:128
-#: ../../src/engine/api/geary-special-folder-type.vala:58
-msgid "None"
-msgstr "None"
+#: src/client/composer/composer-widget.vala:158
+msgid "Saved"
+msgstr "Saved"
 
-#: ../../ui/preferences.glade:158
-msgid "Notifications"
-msgstr "Notifications"
+#: src/client/composer/composer-widget.vala:159
+msgid "Saving"
+msgstr "Saving"
 
-#: ../../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr "Now"
+#: src/client/composer/composer-widget.vala:160
+msgid "Error saving"
+msgstr "Error saving"
 
-#. / The quoted header for a message being replied to.
-#. / %1$s will be substituted for the date, and %2$s will be substituted for
-#. / the original sender.
-#: ../../src/engine/rfc822/rfc822-utils.vala:171
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "On %1$s, %2$s wrote:"
+#: src/client/composer/composer-widget.vala:161
+msgid "Press Backspace to delete quote"
+msgstr "Press Backspace to delete quote"
 
-#. / The quoted header for a message being replied to (in case the sender is not known).
-#. / %s will be replaced by the original date
-#: ../../src/engine/rfc822/rfc822-utils.vala:184
-#, c-format
-msgid "On %s:"
-msgstr "On %s:"
+#. Translators: This is list of keywords, separated by pipe ("|")
+#. characters, that suggest an attachment; since this is full-word
+#. checking, include all variants of each word.  No spaces are
+#. allowed.
+#: src/client/composer/composer-widget.vala:170
+msgid ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
+"enclosing|encloses|enclosure|enclosures"
+msgstr ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
+"enclosing|encloses|enclosure|enclosures"
+
+#. Translators: This dialog text is displayed to the
+#. user when closing a composer where the options are
+#. Keep, Discard or Cancel.
+#: src/client/composer/composer-widget.vala:1130
+#| msgid "Do you want to discard this message?"
+msgid "Do you want to keep or discard this draft message?"
+msgstr "Do you want to keep or discard this draft message?"
+
+#. Translators: This dialog text is displayed to the
+#. user when closing a composer where the options are
+#. only Discard or Cancel.
+#: src/client/composer/composer-widget.vala:1158
+#| msgid "Do you want to discard this message?"
+msgid "Do you want to discard this draft message?"
+msgstr "Do you want to discard this draft message?"
+
+#: src/client/composer/composer-widget.vala:1275
+msgid "Send message with an empty subject and body?"
+msgstr "Send message with an empty subject and body?"
 
-#: ../../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Open"
+#: src/client/composer/composer-widget.vala:1277
+msgid "Send message with an empty subject?"
+msgstr "Send message with an empty subject?"
 
-#: ../../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Other"
+#: src/client/composer/composer-widget.vala:1279
+msgid "Send message with an empty body?"
+msgstr "Send message with an empty body?"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Outbox"
+#: src/client/composer/composer-widget.vala:1283
+msgid "Send message without an attachment?"
+msgstr "Send message without an attachment?"
 
-#: ../../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#: src/client/composer/composer-widget.vala:1588
+#, c-format
+#| msgid "\"%s\" already attached for delivery."
+msgid "“%s” already attached for delivery."
+msgstr "“%s” already attached for delivery."
 
-#: ../../src/client/geary-args.vala:10
-msgid "Output debugging information"
-msgstr "Output debugging information"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#. Translators: The first argument will be a
+#. description of the document type, the second will
+#. be a human-friendly size string. For example:
+#. Document (100.9MB)
+#: src/client/composer/composer-widget.vala:1596
+#: src/client/conversation-viewer/conversation-email.vala:173
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: src/client/composer/composer-widget.vala:1633
+#, c-format
+#| msgid "\"%s\" could not be found."
+msgid "“%s” could not be found."
+msgstr "“%s” could not be found."
+
+#: src/client/composer/composer-widget.vala:1639
+#, c-format
+#| msgid "\"%s\" is a folder."
+msgid "“%s” is a folder."
+msgstr "“%s” is a folder."
 
-#: ../../ui/login.glade:337
-msgid "P_ort:"
-msgstr "P_ort:"
+#: src/client/composer/composer-widget.vala:1645
+#, c-format
+#| msgid "\"%s\" is an empty file."
+msgid "“%s” is an empty file."
+msgstr "“%s” is an empty file."
 
-#: ../../ui/login.glade:474
-msgid "Pass_word:"
-msgstr "Pass_word:"
+#: src/client/composer/composer-widget.vala:1658
+#, c-format
+#| msgid "\"%s\" could not be opened for reading."
+msgid "“%s” could not be opened for reading."
+msgstr "“%s” could not be opened for reading."
+
+#: src/client/composer/composer-widget.vala:1666
+msgid "Cannot add attachment"
+msgstr "Cannot add attachment"
+
+#. Translators: Human-readable version of the RFC 822 To header
+#: src/client/composer/composer-widget.vala:1716
+#: src/client/conversation-viewer/conversation-email.vala:982
+#: src/engine/rfc822/rfc822-utils.vala:298 ui/conversation-message.ui:312
+msgid "To:"
+msgstr "To:"
+
+#. Translators: Human-readable version of the RFC 822 CC header
+#: src/client/composer/composer-widget.vala:1722
+#: src/client/conversation-viewer/conversation-email.vala:987
+#: src/engine/rfc822/rfc822-utils.vala:303 ui/conversation-message.ui:357
+msgid "Cc:"
+msgstr "Cc:"
+
+#. Translators: Human-readable version of the RFC 822 BCC header
+#: src/client/composer/composer-widget.vala:1728
+#: src/client/conversation-viewer/conversation-email.vala:992
+#: ui/conversation-message.ui:402
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#. Translators: Human-readable version of the RFC 822 Reply-To header
+#: src/client/composer/composer-widget.vala:1734
+#| msgid "_Reply"
+msgid "Reply-To: "
+msgstr "Reply-To: "
+
+#: src/client/composer/composer-widget.vala:1874
+msgid "Select Color"
+msgstr "Select Colour"
+
+#. Displayed in the From dropdown to indicate an
+#. "alternate email address" for an account.  The first
+#. printf argument will be the alternate email address,
+#. and the second will be the account's primary email
+#. address.
+#: src/client/composer/composer-widget.vala:2064
+#, c-format
+msgid "%1$s via %2$s"
+msgstr "%1$s via %2$s"
+
+#. Composer label (with mnemonic underscore) for the account selector
+#. when choosing what address to send a message from.
+#: src/client/composer/composer-widget.vala:2125
+#| msgid "From:"
+msgid "_From:"
+msgstr "_From:"
+
+#. Translators: This is the name of the file chooser filter
+#. when inserting an image in the composer.
+#: src/client/composer/composer-widget.vala:2357
+#| msgid "Show Images"
+msgid "Images"
+msgstr "Images"
+
+#: src/client/composer/composer-window.vala:14
+msgid "New Message"
+msgstr "New Message"
+
+#: src/client/composer/spell-check-popover.vala:117
+msgid "Remove this language from the preferred list"
+msgstr "Remove this language from the preferred list"
+
+#: src/client/composer/spell-check-popover.vala:121
+msgid "Add this language to the preferred list"
+msgstr "Add this language to the preferred list"
+
+#: src/client/composer/spell-check-popover.vala:217
+msgid "Search for more languages"
+msgstr "Search for more languages"
+
+#: src/client/conversation-list/conversation-list-view.vala:283
+#| msgid "Move conversation"
+msgid "Delete conversation"
+msgstr "Delete conversation"
+
+#: src/client/conversation-list/conversation-list-view.vala:286
+#: ui/main-toolbar-menus.ui:5
+msgid "Mark as _Read"
+msgstr "Mark as _Read"
+
+#: src/client/conversation-list/conversation-list-view.vala:289
+#: ui/main-toolbar-menus.ui:9
+msgid "Mark as _Unread"
+msgstr "Mark as _Unread"
+
+#: src/client/conversation-list/conversation-list-view.vala:292
+#: ui/main-toolbar-menus.ui:17
+msgid "U_nstar"
+msgstr "U_nstar"
+
+#: src/client/conversation-list/conversation-list-view.vala:294
+#: ui/main-toolbar-menus.ui:13
+msgid "_Star"
+msgstr "_Star"
+
+#. Translators: Menu item to reply to a specific message.
+#: src/client/conversation-list/conversation-list-view.vala:297
+#: ui/conversation-email-menus.ui:9
+msgid "_Reply"
+msgstr "_Reply"
+
+#: src/client/conversation-list/conversation-list-view.vala:298
+msgid "R_eply All"
+msgstr "R_eply All"
+
+#. Translators: Menu item to forward a specific message.
+#: src/client/conversation-list/conversation-list-view.vala:299
+#: ui/conversation-email-menus.ui:21
+msgid "_Forward"
+msgstr "_Forward"
+
+#: src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Me"
+
+#. Translators: This is the file type displayed for
+#. attachments with unknown file types.
+#: src/client/conversation-viewer/conversation-email.vala:159
+msgid "Unknown"
+msgstr "Unknown"
+
+#. Translators: Human-readable version of the RFC 822 From header
+#: src/client/conversation-viewer/conversation-email.vala:977
+#: src/engine/rfc822/rfc822-utils.vala:289
+msgid "From:"
+msgstr "From:"
+
+#. Translators: Human-readable version of the RFC 822 Date header
+#: src/client/conversation-viewer/conversation-email.vala:997
+#: src/engine/rfc822/rfc822-utils.vala:294
+msgid "Date:"
+msgstr "Date:"
+
+#. Translators: Human-readable version of the RFC 822 Subject header
+#: src/client/conversation-viewer/conversation-email.vala:1002
+#: src/engine/rfc822/rfc822-utils.vala:292
+msgid "Subject:"
+msgstr "Subject:"
+
+#: src/client/conversation-viewer/conversation-message.vala:65
+msgid "This email address may have been forged"
+msgstr "This e-mail address may have been forged"
+
+#. Compact headers
+#. Translators: This is displayed in place of the from address
+#. when the message has no from address.
+#: src/client/conversation-viewer/conversation-message.vala:394
+msgid "No sender"
+msgstr "No sender"
+
+#. Translators: This separates multiple 'from'
+#. addresses in the compact header for a message.
+#: src/client/conversation-viewer/conversation-message.vala:766
+msgid ", "
+msgstr ", "
+
+#. Translators: This string is used as the HTML IMG ALT
+#. attribute value when displaying an inline image in an email
+#. that did not specify a file name. E.g. <IMG ALT="Image" ...
+#: src/client/conversation-viewer/conversation-message.vala:869
+#| msgid "Show Images"
+msgid "Image"
+msgstr "Image"
+
+#. Translators: Title label for placeholder when no
+#. conversations have been selected.
+#: src/client/conversation-viewer/conversation-viewer.vala:81
+#| msgid "No conversations selected."
+msgid "No conversations selected"
+msgstr "No conversations selected"
+
+#. Translators: Sub-title label for placeholder when no
+#. conversations have been selected.
+#: src/client/conversation-viewer/conversation-viewer.vala:85
+msgid "Selecting a conversation from the list will display it here"
+msgstr "Selecting a conversation from the list will display it here"
+
+#. Translators: Title label for placeholder when multiple
+#. conversations have been selected.
+#: src/client/conversation-viewer/conversation-viewer.vala:94
+#| msgid "%u conversations selected."
+msgid "Multiple conversations selected"
+msgstr "Multiple conversations selected"
+
+#. Translators: Sub-title label for placeholder when multiple
+#. conversations have been selected.
+#: src/client/conversation-viewer/conversation-viewer.vala:98
+msgid "Choosing an action will apply to all selected conversations"
+msgstr "Choosing an action will apply to all selected conversations"
+
+#. Translators: Title label for placeholder when no
+#. conversations have exist in a folder.
+#. Translators: Title label for placeholder when no
+#. conversations have been found in a search.
+#: src/client/conversation-viewer/conversation-viewer.vala:107
+#: src/client/conversation-viewer/conversation-viewer.vala:120
+#| msgid "No conversations in folder."
+msgid "No conversations found"
+msgstr "No conversations found"
+
+#. Translators: Sub-title label for placeholder when no
+#. conversations have exist in a folder.
+#: src/client/conversation-viewer/conversation-viewer.vala:111
+msgid "This folder does not contain any conversations"
+msgstr "This folder does not contain any conversations"
+
+#. Translators: Sub-title label for placeholder when no
+#. conversations have been found in a search.
+#: src/client/conversation-viewer/conversation-viewer.vala:124
+msgid "Your search returned no results, try refining your search terms"
+msgstr "Your search returned no results, try refining your search terms"
+
+#: src/client/dialogs/attachment-dialog.vala:25
+msgid "Choose a file"
+msgstr "Choose a file"
+
+#: src/client/dialogs/attachment-dialog.vala:25
+msgid "_Attach"
+msgstr "_Attach"
+
+#: src/client/dialogs/certificate-warning-dialog.vala:36
+#, c-format
+msgid "Untrusted Connection: %s"
+msgstr "Untrusted Connection: %s"
+
+#: src/client/dialogs/certificate-warning-dialog.vala:38
+#, c-format
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr "The identity of the %s mail server at %s:%u could not be verified."
+
+#: src/client/dialogs/certificate-warning-dialog.vala:48
+msgid ""
+"Selecting “Trust This Server” or “Always Trust This Server” may cause your "
+"username and password to be transmitted insecurely."
+msgstr ""
+"Selecting “Trust This Server” or “Always Trust This Server” may cause your "
+"username and password to be transmitted insecurely."
+
+#: src/client/dialogs/certificate-warning-dialog.vala:56
+msgid ""
+"Selecting “Don’t Trust This Server” will cause Geary not to access this "
+"server."
+msgstr ""
+"Selecting “Don’t Trust This Server” will cause Geary not to access this "
+"server."
+
+#: src/client/dialogs/certificate-warning-dialog.vala:58
+msgid "Geary will not add or update this email account."
+msgstr "Geary will not add or update this e-mail account."
+
+#: src/client/dialogs/certificate-warning-dialog.vala:63
+msgid ""
+"Selecting “Don’t Trust This Server” will cause Geary to stop accessing this "
+"account."
+msgstr ""
+"Selecting “Don’t Trust This Server” will cause Geary to stop accessing this "
+"account."
+
+#: src/client/dialogs/certificate-warning-dialog.vala:69
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
+"Contact your system administrator or e-mail service provider if you have any "
+"question about these issues."
+
+#: src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server’s certificate is not signed by a known authority"
+msgstr "The server’s certificate is not signed by a known authority"
+
+#: src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server’s identity does not match the identity in the certificate"
+msgstr "The server’s identity does not match the identity in the certificate"
+
+#: src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server’s certificate has expired"
+msgstr "The server’s certificate has expired"
+
+#: src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server’s certificate has not been activated"
+msgstr "The server’s certificate has not been activated"
+
+#: src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server’s certificate has been revoked and is now invalid"
+msgstr "The server’s certificate has been revoked and is now invalid"
+
+#: src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "The server’s certificate is considered insecure"
+msgstr "The server’s certificate is considered insecure"
+
+#: src/client/dialogs/certificate-warning-dialog.vala:94
+msgid "An error has occurred processing the server’s certificate"
+msgstr "An error has occurred processing the server’s certificate"
+
+#. We can't keep these in the glade file, because Gnome doesn't want markup in translatable
+#. strings, and Glade doesn't support the "larger" size attribute. See this bug report for
+#. details: https://bugzilla.gnome.org/show_bug.cgi?id=679006
+#: src/client/dialogs/password-dialog.vala:16
+#| msgid "Please enter your email password"
+msgid "Geary requires your email password to continue"
+msgstr "Geary requires your e-mail password to continue"
+
+#. Label displaying total number of email messages in a folder
+#: src/client/folder-list/folder-list-folder-entry.vala:32
+#, c-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d message"
+msgstr[1] "%d messages"
+
+#. / Label displaying number of unread email messages in a folder
+#: src/client/folder-list/folder-list-folder-entry.vala:39
+#, c-format
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d unread"
+msgstr[1] "%d unread"
+
+#. / This string represents the divider between two messages: "n messages" and "n unread",
+#. / shown in the folder list as a tooltip.  Please use your languages conventions for
+#. / combining the two, i.e. a comma (",") for English; "6 messages, 3 unread"
+#: src/client/folder-list/folder-list-folder-entry.vala:45
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Inboxes"
+
+#: src/client/folder-list/folder-list-search-branch.vala:44
+#, c-format
+#| msgid "%d results"
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d result"
+msgstr[1] "%d results"
+
+#: src/client/notification/libmessagingmenu.vala:75
+#, c-format
+#| msgid "%s - New Messages"
+msgid "%s — New Messages"
+msgstr "%s — New Messages"
+
+#: src/client/notification/libnotify.vala:75
+#, c-format
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d new message"
+msgstr[1] "%d new messages"
+
+#: src/client/notification/libnotify.vala:78
+#, c-format
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, %d new message total"
+msgstr[1] "%s, %d new messages total"
+
+#: src/client/notification/libnotify.vala:112
+#, c-format
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d other new message for %s)"
+msgstr[1] ""
+"%s\n"
+"(%d other new messages for %s)"
+
+#: src/client/notification/libnotify.vala:155
+msgid "Open"
+msgstr "Open"
+
+#. / Datetime format for 12-hour time, i.e. 8:31 am
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:68
+msgid "%l:%M %P"
+msgstr "%l:%M %P"
+
+#. / Datetime format for 24-hour time, i.e. 16:35
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:71
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. / Datetime format for the locale default, i.e. 8:31 am or 16:35,
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:74
+msgctxt "Default clock format"
+msgid "%l:%M %P"
+msgstr "%H:%M"
+
+#. / Date format for dates within the current year, i.e. Nov 8
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:78
+msgid "%b %-e"
+msgstr "%-e %b"
+
+#. / Date format for dates within a different year, i.e. 02/04/10
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:83
+#, no-c-format
+msgid "%x"
+msgstr "%x"
+
+#. / Verbose datetime format for 12-hour time, i.e. November 8, 2010 8:42 am
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:88
+msgid "%B %-e, %Y %-l:%M %P"
+msgstr "%-e %B, %Y %-l:%M %P"
+
+#. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:91
+msgid "%B %-e, %Y %-H:%M"
+msgstr "%-e %B, %Y %H:%M"
+
+#. / Verbose datetime format for the locale default (full month, day and time)
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:94
+msgctxt "Default full date"
+msgid "%B %-e, %Y %-l:%M %P"
+msgstr "%-e %B, %Y %H:%M"
+
+#: src/client/util/util-date.vala:164
+msgid "Now"
+msgstr "Now"
+
+#: src/client/util/util-date.vala:167
+#, c-format
+#| msgid "%dm ago"
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] "%dm ago"
+msgstr[1] "%dm ago"
+
+#: src/client/util/util-date.vala:171
+#, c-format
+#| msgid "%dh ago"
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] "%dh ago"
+msgstr[1] "%dh ago"
+
+#: src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "Yesterday"
+
+#. / Date format that shows the weekday (Monday, Tuesday, ...)
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:183
+#, c-format
+msgid "%A"
+msgstr "%A"
+
+#: src/client/util/util-email.vala:38 src/engine/rfc822/rfc822-message.vala:862
+msgid "(no subject)"
+msgstr "(no subject)"
+
+#. Translators: This is shown for displaying a list of
+#. email recipients that happens to be empty,
+#. i.e. contains no email addresses.
+#: src/client/util/util-email.vala:116
+msgid "(No recipients)"
+msgstr "(No recipients)"
+
+#. Translators: This is used for displaying a short list of
+#. email recipients lists with two or more addresses. The
+#. first (string) substitution is address of the first, the
+#. second substitution is the number of n - 1 remaining
+#. recipients.
+#: src/client/util/util-email.vala:130
+#, c-format
+msgid "%s and %d other"
+msgid_plural "%s and %d others"
+msgstr[0] "%s and %d other"
+msgstr[1] "%s and %d others"
+
+#: src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "bytes"
+
+#: src/client/util/util-files.vala:19
+msgctxt "Abbreviation for terabyte"
+msgid "TB"
+msgstr "TB"
+
+#: src/client/util/util-files.vala:22
+msgctxt "Abbreviation for gigabyte"
+msgid "GB"
+msgstr "GB"
+
+#: src/client/util/util-files.vala:25
+msgctxt "Abbreviation for megabyte"
+msgid "MB"
+msgstr "MB"
+
+#: src/client/util/util-files.vala:28
+msgctxt "Abbreviation for kilobyte"
+msgid "KB"
+msgstr "KB"
+
+#: src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Inbox"
+
+#: src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Drafts"
+
+#: src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Sent Mail"
+
+#: src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Starred"
+
+#: src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Important"
+
+#: src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "All Mail"
+
+#: src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Spam"
+
+#: src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Wastebasket"
+
+#: src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Outbox"
+
+#: src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Archive"
+
+#. Map of possibly translated search operator names and values
+#. to English/internal names and values. We include the
+#. English version anyway so that when translations provide a
+#. localised version of the operator names but have not also
+#. translated the user manual, the English version in the
+#. manual still works.
+#. Can be typed in the search box like "attachment:file.txt"
+#. to find messages with attachments with a particular name.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. or similar to combine words into one), should be short, and
+#. also match the translation in "search.page" of the Geary User
+#. Guide.
+#: src/engine/imap-db/imap-db-account.vala:125
+#| msgid "Save A_ttachment..."
+#| msgid_plural "Save All A_ttachments..."
+msgctxt "Search operator"
+msgid "attachment"
+msgstr "attachment"
+
+#. Can be typed in the search box like
+#. "bcc:johndoe example com" to find messages bcc'd to a
+#. particular person.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. or similar to combine words into one), should be short, and
+#. also match the translation in "search.page" of the Geary User
+#. Guide.
+#: src/engine/imap-db/imap-db-account.vala:134
+msgctxt "Search operator"
+msgid "bcc"
+msgstr "bcc"
+
+#. Can be typed in the search box like "body:word" to find
+#. "word" only if it occurs in the body of a message.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. or similar to combine words into one), should be short, and
+#. also match the translation in "search.page" of the Geary User
+#. Guide.
+#: src/engine/imap-db/imap-db-account.vala:142
+msgctxt "Search operator"
+msgid "body"
+msgstr "body"
+
+#. Can be typed in the search box like
+#. "cc:johndoe example com" to find messages cc'd to a
+#. particular person.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. or similar to combine words into one), should be short, and
+#. also match the translation in "search.page" of the Geary User
+#. Guide.
+#: src/engine/imap-db/imap-db-account.vala:151
+#| msgid "Bcc:"
+msgctxt "Search operator"
+msgid "cc"
+msgstr "cc"
+
+#. Can be typed in the search box like
+#. "from:johndoe example com" to find messages from a
+#. particular sender.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. or similar to combine words into one), should be short, and
+#. also match the translation in "search.page" of the Geary User
+#. Guide.
+#: src/engine/imap-db/imap-db-account.vala:160
+msgctxt "Search operator"
+msgid "from"
+msgstr "from"
+
+#. Can be typed in the search box like "is:unread" to find
+#. messages that are read, unread, or starred.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. or similar to combine words into one), should be short, and
+#. also match the translation in "search.page" of the Geary User
+#. Guide.
+#: src/engine/imap-db/imap-db-account.vala:168
+msgctxt "Search operator"
+msgid "is"
+msgstr "is"
+
+#. Can be typed in the search box like "subject:word" to find
+#. "word" only if it occurs in the subject of a message.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. or similar to combine words into one), should be short, and
+#. also match the translation in "search.page" of the Geary
+#. User Guide.
+#: src/engine/imap-db/imap-db-account.vala:176
+#| msgid "Subject:"
+msgctxt "Search operator"
+msgid "subject"
+msgstr "subject"
+
+#. Can be typed in the search box like
+#. "to:johndoe example com" to find messages received by a
+#. particular person.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. or similar to combine words into one), should be short, and
+#. also match the translation in "search.page" of the Geary User
+#. Guide.
+#: src/engine/imap-db/imap-db-account.vala:185
+msgctxt "Search operator"
+msgid "to"
+msgstr "to"
+
+#. Can be typed in the search box after "to:", "cc:" and
+#. "bcc:" e.g.: "to:me". Matches conversations that are
+#. addressed to the user.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. or similar to combine words into one), should be short, and
+#. also match the translation in "search.page" of the Geary User
+#. Guide.
+#: src/engine/imap-db/imap-db-account.vala:206
+msgctxt "Search operator value - mail addressed to the user"
+msgid "me"
+msgstr "me"
+
+#. Can be typed in the search box after "from:" i.e.:
+#. "from:me". Matches conversations were sent by the user.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. or similar to combine words into one), should be short, and
+#. also match the translation in "search.page" of the Geary User
+#. Guide.
+#: src/engine/imap-db/imap-db-account.vala:218
+msgctxt "Search operator value - mail sent by the user"
+msgid "me"
+msgstr "me"
+
+#. Can be typed in the search box after "is:" i.e.:
+#. "is:read". Matches conversations that are flagged as read.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. or similar to combine words into one), should be short, and
+#. also match the translation in "search.page" of the Geary User
+#. Guide.
+#: src/engine/imap-db/imap-db-account.vala:230
+#| msgid "%d unread"
+#| msgid_plural "%d unread"
+msgctxt "'is:' search operator value"
+msgid "read"
+msgstr "read"
+
+#. Can be typed in the search box after "is:" i.e.:
+#. "is:starred". Matches conversations that are flagged as
+#. starred.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. or similar to combine words into one), should be short, and
+#. also match the translation in "search.page" of the Geary User
+#. Guide.
+#: src/engine/imap-db/imap-db-account.vala:241
+#| msgid "Starred"
+msgctxt "'is:' search operator value"
+msgid "starred"
+msgstr "starred"
+
+#. Can be typed in the search box after "is:" i.e.:
+#. "is:unread". Matches conversations that are flagged unread.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. or similar to combine words into one), should be short, and
+#. also match the translation in "search.page" of the Geary User
+#. Guide.
+#: src/engine/imap-db/imap-db-account.vala:251
+#| msgid "%d unread"
+#| msgid_plural "%d unread"
+msgctxt "'is:' search operator value"
+msgid "unread"
+msgstr "unread"
+
+#. List of general possible folder names to match for the
+#. Draft mailbox. Separate names using a vertical bar and
+#. put the most common localized name to the front for the
+#. default. English names do not need to be included.
+#: src/engine/imap-engine/imap-engine-generic-account.vala:937
+#| msgid "Drafts"
+msgid "Drafts | Draft"
+msgstr "Drafts | Draft"
+
+#. List of general possible folder names to match for the
+#. Sent mailbox. Separate names using a vertical bar and
+#. put the most common localized name to the front for the
+#. default. English names do not need to be included.
+#: src/engine/imap-engine/imap-engine-generic-account.vala:946
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr "Sent | Sent Mail | Sent Email | Sent E-Mail"
+
+#. The localised name(s) of the Sent folder name as used
+#. by MS Outlook/Exchange.
+#: src/engine/imap-engine/imap-engine-generic-account.vala:951
+msgctxt "Outlook localised name"
+msgid "Sent Items"
+msgstr "Sent Items"
+
+#. List of general possible folder names to match for the
+#. Spam mailbox. Separate names using a vertical bar and
+#. put the most common localized name to the front for the
+#. default. English names do not need to be included.
+#: src/engine/imap-engine/imap-engine-generic-account.vala:961
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+
+#. List of general possible folder names to match for the
+#. Trash mailbox. Separate names using a vertical bar and
+#. put the most common localized name to the front for the
+#. default. English names do not need to be included.
+#: src/engine/imap-engine/imap-engine-generic-account.vala:971
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Wastebasket"
+
+#. The localised name(s) of the Trash folder name as used
+#. by MS Outlook/Exchange.
+#: src/engine/imap-engine/imap-engine-generic-account.vala:976
+#| msgid "_Delete"
+msgctxt "Outlook localised name"
+msgid "Deleted Items"
+msgstr "Deleted items"
+
+#. List of general possible folder names to match for the
+#. Archive mailbox. Separate names using a vertical bar
+#. and put the most common localized name to the front for
+#. the default. English names do not need to be included.
+#: src/engine/imap-engine/imap-engine-generic-account.vala:986
+msgid "Archive | Archives"
+msgstr "Archive | Archives"
+
+#. / Format for the datetime that a message being replied to was received
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/engine/rfc822/rfc822-utils.vala:236
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %-e %b, %Y at %H:%M"
+
+#. / The quoted header for a message being replied to.
+#. / %1$s will be substituted for the date, and %2$s will be substituted for
+#. / the original sender.
+#: src/engine/rfc822/rfc822-utils.vala:242
+#, c-format
+msgid "On %1$s, %2$s wrote:"
+msgstr "On %1$s, %2$s wrote:"
+
+#. / The quoted header for a message being replied to (in case the date is not known).
+#. / %s will be replaced by the original sender.
+#: src/engine/rfc822/rfc822-utils.vala:249
+#, c-format
+msgid "%s wrote:"
+msgstr "%s wrote:"
+
+#. / The quoted header for a message being replied to (in case the sender is not known).
+#. / %s will be replaced by the original date
+#: src/engine/rfc822/rfc822-utils.vala:255
+#, c-format
+msgid "On %s:"
+msgstr "On %s:"
+
+#: src/engine/rfc822/rfc822-utils.vala:284
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Forwarded message ----------"
+
+#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:127
+#| msgid "Add account"
+msgid "Add an account"
+msgstr "Add an account"
+
+#: ui/accounts_editor_add_pane.ui:53
+msgid "Create"
+msgstr "Create"
+
+#: ui/accounts_editor_add_pane.ui:130 ui/accounts_editor_servers_pane.ui:125
+msgid "Receiving"
+msgstr "Receiving"
+
+#: ui/accounts_editor_add_pane.ui:178 ui/accounts_editor_servers_pane.ui:165
+#| msgid "Sending..."
+msgid "Sending"
+msgstr "Sending"
+
+#: ui/accounts_editor_edit_pane.ui:8
+#| msgid "Edit account"
+msgid "Edit Account"
+msgstr "Edit Account"
+
+#: ui/accounts_editor_edit_pane.ui:9 ui/accounts_editor_servers_pane.ui:9
+#| msgid "Accounts"
+msgid "Account Name"
+msgstr "Account Name"
+
+#: ui/accounts_editor_edit_pane.ui:124
+#| msgid "Email address:"
+msgid "Email addresses"
+msgstr "E-mail addresses"
+
+#: ui/accounts_editor_edit_pane.ui:164
+msgid "Signature"
+msgstr "Signature"
+
+#: ui/accounts_editor_edit_pane.ui:201
+#| msgid "SMTP settings"
+msgid "Settings"
+msgstr "Settings"
+
+#. This is a button in the account settings to show server settings.
+#: ui/accounts_editor_edit_pane.ui:243 ui/accounts_editor_servers_pane.ui:8
+#| msgid "SMTP settings"
+msgid "Server Settings"
+msgstr "Server Settings"
+
+#. This is the remove account button in the account settings.
+#: ui/accounts_editor_edit_pane.ui:258 ui/accounts_editor_remove_pane.ui:23
+#| msgid "Remove account"
+msgid "Remove Account"
+msgstr "Remove Account"
+
+#: ui/accounts_editor_edit_pane.ui:262 ui/accounts_editor_remove_pane.ui:27
+#| msgid "Remove account"
+msgid "Remove this account from Geary"
+msgstr "Remove this account from Geary"
+
+#: ui/accounts_editor_list_pane.ui:8
+msgid "Accounts"
+msgstr "Accounts"
+
+#: ui/accounts_editor_list_pane.ui:63
+msgid "To get started, select an email provider below."
+msgstr "To get started, select an e-mail provider below."
+
+#: ui/accounts_editor_list_pane.ui:76
+#| msgid "Welcome to Geary."
+msgid "Welcome to Geary"
+msgstr "Welcome to Geary"
+
+#. This title is shown to users when confirming if they want to remove an account. The string substitution 
is replaced with the account's name.
+#: ui/accounts_editor_remove_pane.ui:73
+#, c-format
+msgid "Confirm removing: %s"
+msgstr "Confirm removing: %s"
+
+#: ui/accounts_editor_remove_pane.ui:91
+msgid ""
+"Removing an account will remove it from Geary and delete locally cached "
+"email data from your computer, but not from your service provider."
+msgstr ""
+"Removing an account will remove it from Geary and delete locally cached e-"
+"mail data from your computer, but not from your service provider."
+
+#: ui/accounts_editor_remove_pane.ui:122
+msgid "Remove account"
+msgstr "Remove account"
+
+#: ui/accounts_editor_servers_pane.ui:17
+#| msgid "_Cancel"
+msgid "Cancel"
+msgstr "Cancel"
+
+#: ui/accounts_editor_servers_pane.ui:47
+msgid "Apply"
+msgstr "Apply"
+
+#: ui/certificate_warning_dialog.glade:7
+msgid "Untrusted Connection"
+msgstr "Untrusted Connection"
+
+#: ui/certificate_warning_dialog.glade:29
+msgid "_Always Trust This Server"
+msgstr "_Always Trust This Server"
+
+#: ui/certificate_warning_dialog.glade:43
+msgid "_Trust This Server"
+msgstr "_Trust This Server"
+
+#: ui/certificate_warning_dialog.glade:57
+msgid "_Don’t Trust This Server"
+msgstr "_Don’t Trust This Server"
+
+#: ui/composer-headerbar.ui:17 ui/composer-headerbar.ui:174
+#| msgid "Italic (Ctrl+I)"
+msgid "Detach (Ctrl+D)"
+msgstr "Detach (Ctrl+D)"
+
+#: ui/composer-headerbar.ui:57 ui/composer-headerbar.ui:83
+#| msgid "_Attach File"
+msgid "Attach File (Ctrl+T)"
+msgstr "Attach File (Ctrl+T)"
+
+#: ui/composer-headerbar.ui:107
+#| msgid "_Include Original Attachments"
+msgid "Include Original Attachments"
+msgstr "Include Original Attachments"
+
+#: ui/composer-headerbar.ui:202
+msgid "_Send"
+msgstr "_Send"
+
+#: ui/composer-headerbar.ui:207
+#| msgid "Bold (Ctrl+B)"
+msgid "Send (Ctrl+Enter)"
+msgstr "Send (Ctrl+Enter)"
+
+#: ui/composer-headerbar.ui:230
+msgid "Discard and Close"
+msgstr "Discard and Close"
+
+#: ui/composer-headerbar.ui:254
+msgid "Save and Close"
+msgstr "Save and Close"
+
+#. Note that this button and the Update button will never be shown at the same time to the user.
+#: ui/composer-link-popover.ui:41
+msgid "Insert the new link with this URL"
+msgstr "Insert the new link with this URL"
+
+#: ui/composer-link-popover.ui:52
+msgid "Link URL"
+msgstr "Link URL"
+
+#. Note that this button and the Insert button will never be shown at the same time to the user.
+#: ui/composer-link-popover.ui:66
+msgid "Update this link’s URL"
+msgstr "Update this link’s URL"
+
+#: ui/composer-link-popover.ui:86
+msgid "Delete this link"
+msgstr "Delete this link"
+
+#: ui/composer-link-popover.ui:106
+msgid "Open this link"
+msgstr "Open this link"
+
+#: ui/composer-menus.ui:7
+msgid "S_ans Serif"
+msgstr "S_ans Serif"
+
+#: ui/composer-menus.ui:12
+msgid "S_erif"
+msgstr "S_erif"
+
+#: ui/composer-menus.ui:17
+msgid "_Fixed Width"
+msgstr "_Fixed Width"
+
+#: ui/composer-menus.ui:24
+msgid "_Small"
+msgstr "_Small"
+
+#: ui/composer-menus.ui:29
+msgid "_Medium"
+msgstr "_Medium"
+
+#: ui/composer-menus.ui:34
+msgid "Lar_ge"
+msgstr "Lar_ge"
+
+#: ui/composer-menus.ui:41
+msgid "C_olor"
+msgstr "C_olour"
+
+#: ui/composer-menus.ui:47 ui/composer-menus.ui:62
+msgid "_Rich Text"
+msgstr "_Rich Text"
+
+#: ui/composer-menus.ui:53 ui/composer-menus.ui:68
+msgid "Show Extended Fields"
+msgstr "Show Extended Fields"
+
+#: ui/composer-menus.ui:78
+msgid "_Undo"
+msgstr "_Undo"
+
+#: ui/composer-menus.ui:82
+msgid "_Redo"
+msgstr "_Redo"
+
+#: ui/composer-menus.ui:88 ui/composer-menus.ui:106
+msgid "Cu_t"
+msgstr "Cu_t"
+
+#: ui/composer-menus.ui:92 ui/composer-menus.ui:110
+#: ui/conversation-message-menus.ui:37
+msgid "_Copy"
+msgstr "_Copy"
+
+#: ui/composer-menus.ui:96 ui/composer-menus.ui:114
+msgid "_Paste"
+msgstr "_Paste"
 
-#: ../../ui/login.glade:101
-msgid "Password"
-msgstr "Password"
+#: ui/composer-menus.ui:100
+#| msgid "Paste _With Formatting"
+msgctxt "Clipboard paste as plain text"
+msgid "Paste _Without Formatting"
+msgstr "Paste _Without Formatting"
 
-#: ../../ui/password-dialog.glade:196
-msgid "Password:"
-msgstr "Password:"
+#: ui/composer-menus.ui:120
+msgid "Select _All"
+msgstr "Select _All"
 
-#: ../../ui/composer.glade:102
-msgid "Paste _With Formatting"
-msgstr "Paste _With Formatting"
+#: ui/composer-menus.ui:127 ui/conversation-message-menus.ui:49
+#| msgid "_Inspect"
+msgid "_Inspect…"
+msgstr "_Inspect…"
+
+#. Address(es) e-mail is to be sent to
+#: ui/composer-widget.ui:56
+#| msgid "To:"
+msgid "_To"
+msgstr "_To"
+
+#: ui/composer-widget.ui:75
+#| msgid "Cc:"
+msgid "_Cc"
+msgstr "_Cc"
+
+#: ui/composer-widget.ui:130
+#| msgid "Subject:"
+msgid "_Subject"
+msgstr "_Subject"
+
+#: ui/composer-widget.ui:149
+msgid "_Bcc"
+msgstr "_Bcc"
+
+#: ui/composer-widget.ui:179
+#| msgid "_Reply"
+msgid "_Reply-To"
+msgstr "_Reply-To"
+
+#. Geary account mail will be sent from
+#: ui/composer-widget.ui:208
+#| msgid "From:"
+msgid "From"
+msgstr "From"
+
+#: ui/composer-widget.ui:293
+msgid "Drop files here"
+msgstr "Drop files here"
 
-#: ../../src/client/dialogs/password-dialog.vala:16
-msgid "Please enter your email password"
-msgstr "Please enter your e-mail password"
+#: ui/composer-widget.ui:309
+msgid "To add them as attachments"
+msgstr "To add them as attachments"
 
-#: ../../src/client/geary-args.vala:47
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Please report comments, suggestions and bugs to:"
+#: ui/composer-widget.ui:353
+#| msgid "Unquote text (Ctrl+[)"
+msgid "Undo last edit (Ctrl+Z)"
+msgstr "Undo last edit (Ctrl+Z)"
 
-#: ../../ui/account_spinner.glade:41
-msgid "Please wait while Geary validates your account."
-msgstr "Please wait while Geary validates your account."
+#: ui/composer-widget.ui:377
+msgid "Redo last edit  (Ctrl+Shift+Z)"
+msgstr "Redo last edit  (Ctrl+Shift+Z)"
 
-#: ../../ui/login.glade:421
-msgid "Por_t:"
-msgstr "Por_t:"
+#: ui/composer-widget.ui:415
+msgid "Bold (Ctrl+B)"
+msgstr "Bold (Ctrl+B)"
 
-#: ../../ui/password-dialog.glade:367 ../../ui/password-dialog.glade:470
-msgid "Port:"
-msgstr "Port:"
+#: ui/composer-widget.ui:439
+msgid "Italic (Ctrl+I)"
+msgstr "Italic (Ctrl+I)"
 
-#: ../../ui/composer.glade:81
-msgid "Quote text  (Ctrl+])"
-msgstr "Quote text  (Ctrl+])"
+#: ui/composer-widget.ui:463
+msgid "Underline (Ctrl+U)"
+msgstr "Underline (Ctrl+U)"
 
-#: ../../src/client/geary-controller.vala:322
-msgid "R_eply All"
-msgstr "R_eply All"
+#: ui/composer-widget.ui:487
+msgid "Strikethrough (Ctrl+K)"
+msgstr "Strikethrough (Ctrl+K)"
 
-#: ../../ui/preferences.glade:55
-msgid "Reading"
-msgstr "Reading"
+#: ui/composer-widget.ui:525
+msgid "Insert unordered list"
+msgstr "Insert unordered list"
 
-#: ../../ui/password-dialog.glade:274
-msgid "Real name:"
-msgstr "Real name:"
+#: ui/composer-widget.ui:549
+msgid "Insert ordered list"
+msgstr "Insert ordered list"
 
-#: ../../src/client/accounts/add-edit-page.vala:590
-msgid "Remem_ber password"
-msgstr "Remem_ber password"
+#: ui/composer-widget.ui:587
+msgid "Quote text  (Ctrl+])"
+msgstr "Quote text  (Ctrl+])"
 
-#: ../../src/client/accounts/add-edit-page.vala:583
-msgid "Remem_ber passwords"
-msgstr "Remem_ber passwords"
+#: ui/composer-widget.ui:611
+#| msgid "Unquote text (Ctrl+[)"
+msgid "Unquote text  (Ctrl+[)"
+msgstr "Unquote text  (Ctrl+[)"
+
+#: ui/composer-widget.ui:649
+msgid "Insert or update selection link (Ctrl+L)"
+msgstr "Insert or update selection link (Ctrl+L)"
+
+#: ui/composer-widget.ui:673
+#| msgid "Underline (Ctrl+U)"
+msgid "Insert an image (Ctrl+G)"
+msgstr "Insert an image (Ctrl+G)"
+
+#: ui/composer-widget.ui:707
+#| msgid "Remove formatting (Ctrl+Space)"
+msgid "Remove selection formatting (Ctrl+Space)"
+msgstr "Remove selection formatting (Ctrl+Space)"
+
+#: ui/composer-widget.ui:731
+#| msgid "Enable _spell checking"
+msgid "Select spell checking languages"
+msgstr "Select spell checking languages"
+
+#: ui/conversation-email.ui:27
+#| msgid "Save All A_ttachments..."
+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
+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
+msgid "Mark this message as not starred"
+msgstr "Mark this message as not starred"
+
+#: ui/conversation-email.ui:95
+msgid "Display the message menu"
+msgstr "Display the message menu"
+
+#: ui/conversation-email.ui:161
+#| msgid "Cannot add attachment"
+msgid "Open selected attachments"
+msgstr "Open selected attachments"
+
+#: ui/conversation-email.ui:178
+#| msgid "Save All A_ttachments..."
+msgid "Save selected attachments"
+msgstr "Save selected attachments"
+
+#: ui/conversation-email.ui:195
+#| msgid "Save All A_ttachments..."
+msgid "Select all attachments"
+msgstr "Select all attachments"
+
+#: ui/conversation-email.ui:240
+msgid "Edit Draft"
+msgstr "Edit Draft"
 
-#: ../../ui/account_list.glade:97
-msgid "Remove account"
-msgstr "Remove account"
+#: ui/conversation-email.ui:267
+#| msgid "%d message"
+#| msgid_plural "%d messages"
+msgid "Draft message"
+msgstr "Draft message"
 
-#: ../../ui/composer.glade:95
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Remove formatting (Ctrl+Space)"
+#: ui/conversation-email.ui:283
+#| msgid "This message contains remote images."
+msgid "This message has not yet been sent."
+msgstr "This message has not yet been sent."
 
-#: ../../src/client/geary-controller.vala:318
-msgid "Reply (Ctrl+R, R)"
-msgstr "Reply (Ctrl+R, R)"
+#: ui/conversation-email.ui:329
+msgid "Message not saved"
+msgstr "Message not saved"
 
-#: ../../src/client/geary-controller.vala:323
-msgid "Reply all (Ctrl+Shift+R, Shift+R)"
-msgstr "Reply all (Ctrl+Shift+R, Shift+R)"
+#: ui/conversation-email.ui:345
+msgid "This message was sent, but has not been saved to your account."
+msgstr "This message was sent, but has not been saved to your account."
 
-#: ../../src/client/views/conversation-viewer.vala:1452
+#. Translators: Menu item to reply to a specific message.
+#: ui/conversation-email-menus.ui:15
 msgid "Reply to _All"
 msgstr "Reply to _All"
 
-#: ../../ui/password-dialog.glade:163
-msgid "SMTP Credentials"
-msgstr "SMTP Credentials"
+#. Translators: Menu item to mark a specific message as
+#. read.
+#: ui/conversation-email-menus.ui:30
+#| msgid "_Mark as Read"
+msgid "_Mark Read"
+msgstr "_Mark Read"
+
+#: ui/conversation-email-menus.ui:36
+#| msgid "_Mark as Unread"
+msgid "_Mark Unread"
+msgstr "_Mark Unread"
+
+#. Translators: Menu item to mark all messages in a
+#. conversation from this one as unread.
+#: ui/conversation-email-menus.ui:42
+msgid "Mark Unread From _Here"
+msgstr "Mark Unread From _Here"
 
-#: ../../ui/login.glade:507
-msgid "SMTP password"
-msgstr "SMTP password"
+#. Translators: Menu item to move a single, specific message
+#. to the trash
+#: ui/conversation-email-menus.ui:50
+#| msgid "Trash"
+msgid "_Trash"
+msgstr "Was_tebasket"
+
+#. Translators: Menu item to delete a single, specific message
+#: ui/conversation-email-menus.ui:57
+#| msgid "_Delete"
+msgid "_Delete…"
+msgstr "_Delete…"
+
+#. Translators: Menu item to view the source for a message
+#: ui/conversation-email-menus.ui:69
+msgid "_View Source"
+msgstr "_View Source"
 
-#: ../../ui/login.glade:439 ../../ui/password-dialog.glade:437
-msgid "SMTP settings"
-msgstr "SMTP settings"
+#: ui/conversation-email-menus.ui:87
+#| msgid "_Save"
+msgid "_Save All"
+msgstr "_Save All"
+
+#: ui/conversation-message-menus.ui:7
+#| msgid "_Open"
+msgid "_Open Link"
+msgstr "_Open Link"
+
+#: ui/conversation-message-menus.ui:11
+#| msgid "Copy _Email Address"
+msgid "Copy Link _Address"
+msgstr "Copy Link _Address"
+
+#: ui/conversation-message-menus.ui:17
+#| msgid "New Message"
+msgid "Send New _Message…"
+msgstr "Send New _Message…"
+
+#: ui/conversation-message-menus.ui:21
+#| msgid "Copy _Email Address"
+msgid "Copy Email _Address"
+msgstr "Copy E-mail _Address"
+
+#: ui/conversation-message-menus.ui:27
+#| msgid "_Save Image As..."
+msgid "Save _Image As…"
+msgstr "Save _Image As…"
+
+#: ui/conversation-message-menus.ui:33
+#| msgid "Select _All"
+msgid "_Select All"
+msgstr "_Select All"
+
+#: ui/conversation-message-menus.ui:43
+msgid "Search for messages from"
+msgstr "Search for messages from"
+
+#: ui/conversation-message.ui:63
+msgid "From <email>"
+msgstr "From <e-mail>"
+
+#: ui/conversation-message.ui:79 ui/conversation-message.ui:178
+msgid "1/1/1970\t"
+msgstr "1/1/1970\t"
+
+#: ui/conversation-message.ui:102
+msgid "Preview body text."
+msgstr "Preview body text."
+
+#: ui/conversation-message.ui:202
+msgid "Sent by:"
+msgstr "Sent by:"
+
+#: ui/conversation-message.ui:247
+#| msgid "Reply to _All"
+msgid "Reply to:"
+msgstr "Reply to:"
+
+#: ui/conversation-message.ui:291
+#| msgid "Subject:"
+msgid "Subject"
+msgstr "Subject"
+
+#: ui/conversation-message.ui:501
+msgid "Show Images"
+msgstr "Show Images"
 
-#: ../../ui/login.glade:491
-msgid "SMTP username"
-msgstr "SMTP username"
+#: ui/conversation-message.ui:514
+msgid "Always Show From Sender"
+msgstr "Always Show From Sender"
 
-#: ../../src/client/dialogs/password-dialog.vala:124
-msgid "SSL"
-msgstr "SSL"
+#: ui/conversation-message.ui:542
+msgid "Remote images not shown"
+msgstr "Remote images not shown"
+
+#: ui/conversation-message.ui:559
+msgid "Only show remote images from senders you trust."
+msgstr "Only show remote images from senders you trust."
+
+#: ui/conversation-message.ui:692
+#| msgid "but actually goes to"
+msgid "But actually goes to:"
+msgstr "But actually goes to:"
+
+#: ui/conversation-message.ui:723
+#| msgid "This link appears to go to"
+msgid "The link appears to go to:"
+msgstr "The link appears to go to:"
+
+#: ui/conversation-message.ui:735
+msgid "Deceptive link found"
+msgstr "Deceptive link found"
+
+#: ui/conversation-message.ui:750
+msgid "The email sender may be leading you to the wrong web site."
+msgstr "The e-mail sender may be leading you to the wrong web site."
+
+#: ui/conversation-message.ui:763
+msgid "If unsure, contact the sender and ask before continuing."
+msgstr "If unsure, contact the sender and ask before continuing."
+
+#: ui/conversation-viewer.ui:60
+#| msgid "Mark conversation"
+msgid "Find in conversation"
+msgstr "Find in conversation"
+
+#: ui/conversation-viewer.ui:74
+msgid "Find the previous occurrence of the search string."
+msgstr "Find the previous occurrence of the search string."
+
+#: ui/conversation-viewer.ui:95
+msgid "Find the next occurrence of the search string."
+msgstr "Find the next occurrence of the search string."
+
+#: ui/find_bar.glade:66
+msgid "Find:"
+msgstr "Find:"
+
+#: ui/find_bar.glade:89
+msgid "_Previous"
+msgstr "_Previous"
+
+#: ui/find_bar.glade:107
+msgid "_Next"
+msgstr "_Next"
+
+#: ui/find_bar.glade:125
+msgid "_Case sensitive"
+msgstr "_Case sensitive"
+
+#: ui/find_bar.glade:145
+#| msgid "Labels"
+msgid "label"
+msgstr "label"
+
+#: ui/gtk/help-overlay.ui:9
+#| msgid "%s - Conversation Inspector"
+msgid "Conversation Shortcuts"
+msgstr "Conversation Shortcuts"
+
+#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:254
+#| msgid "General"
+msgctxt "shortcut window"
+msgid "General"
+msgstr "General"
 
-#: ../../ui/password-dialog.glade:382 ../../ui/password-dialog.glade:485
-msgid "SSL/TLS encryption:"
-msgstr "SSL/TLS encryption:"
+#: ui/gtk/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Move focus to the next/previous pane"
+msgstr "Move focus to the next/previous pane"
+
+#: ui/gtk/help-overlay.ui:24
+#| msgid "Move conversations"
+msgctxt "shortcut window"
+msgid "Move focus to conversation list"
+msgstr "Move focus to conversation list"
+
+#: ui/gtk/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Detach composer window"
+msgstr "Detach composer window"
+
+#: ui/gtk/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Close composer window"
+msgstr "Close composer window"
+
+#: ui/gtk/help-overlay.ui:45
+msgctxt "shortcut window"
+msgid "Show keyboard shortcuts"
+msgstr "Show keyboard shortcuts"
+
+#: ui/gtk/help-overlay.ui:52
+#| msgid "Show Images"
+msgctxt "shortcut window"
+msgid "Show help"
+msgstr "Show help"
+
+#: ui/gtk/help-overlay.ui:59
+msgctxt "shortcut window"
+msgid "Quit the application"
+msgstr "Quit the application"
+
+#: ui/gtk/help-overlay.ui:68
+#| msgid "Search"
+msgctxt "shortcut window"
+msgid "Search"
+msgstr "Search"
 
-#: ../../src/client/dialogs/password-dialog.vala:126
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#: ui/gtk/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Jump to search box"
+msgstr "Jump to search box"
+
+#: ui/gtk/help-overlay.ui:79
+#| msgid "Add label to conversation"
+msgctxt "shortcut window"
+msgid "Find in current conversation"
+msgstr "Find in current conversation"
+
+#: ui/gtk/help-overlay.ui:86
+msgctxt "shortcut window"
+msgid "Find next/previous in current conversation"
+msgstr "Find next/previous in current conversation"
+
+#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:274
+#| msgid "Notifications"
+msgctxt "shortcut window"
+msgid "Actions"
+msgstr "Actions"
+
+#: ui/gtk/help-overlay.ui:99
+#| msgid "Compose Message"
+msgctxt "shortcut window"
+msgid "Compose a new message"
+msgstr "Compose a new message"
+
+#: ui/gtk/help-overlay.ui:106
+#| msgid "Reply to _All"
+msgctxt "shortcut window"
+msgid "Reply to sender "
+msgstr "Reply to sender "
+
+#: ui/gtk/help-overlay.ui:113
+#| msgid "Reply to _All"
+msgctxt "shortcut window"
+msgid "Reply to all"
+msgstr "Reply to all"
+
+#: ui/gtk/help-overlay.ui:120
+#| msgid "_Forward"
+msgctxt "shortcut window"
+msgid "Forward"
+msgstr "Forward"
+
+#: ui/gtk/help-overlay.ui:127
+#| msgid "Archive"
+msgctxt "shortcut window"
+msgid "Archive"
+msgstr "Archive"
 
-#: ../../ui/composer.glade:169
-msgid "S_ans Serif"
-msgstr "S_ans Serif"
+#: ui/gtk/help-overlay.ui:134
+msgctxt "shortcut window"
+msgid "Move to trash"
+msgstr "Move to wastebasket"
+
+#: ui/gtk/help-overlay.ui:141
+msgctxt "shortcut window"
+msgid "Toggle spam"
+msgstr "Toggle spam"
+
+#: ui/gtk/help-overlay.ui:148
+#| msgid "Move conversation"
+msgctxt "shortcut window"
+msgid "Move the conversation"
+msgstr "Move the conversation"
+
+#: ui/gtk/help-overlay.ui:155
+#| msgid "Add label to conversation"
+msgctxt "shortcut window"
+msgid "Label the conversation"
+msgstr "Label the conversation"
+
+#: ui/gtk/help-overlay.ui:163
+#| msgid "Mark as _Unread"
+msgctxt "shortcut window"
+msgid "Mark read"
+msgstr "Mark read"
+
+#: ui/gtk/help-overlay.ui:170
+#| msgid "Mark as _Unread"
+msgctxt "shortcut window"
+msgid "Mark unread"
+msgstr "Mark unread"
+
+#: ui/gtk/help-overlay.ui:179
+msgctxt "shortcut window"
+msgid "View"
+msgstr "View"
+
+#: ui/gtk/help-overlay.ui:183
+msgctxt "shortcut window"
+msgid "Zoom in"
+msgstr "Zoom in"
+
+#: ui/gtk/help-overlay.ui:190
+msgctxt "shortcut window"
+msgid "Zoom out"
+msgstr "Zoom out"
+
+#: ui/gtk/help-overlay.ui:197
+msgctxt "shortcut window"
+msgid "Reset zoom"
+msgstr "Reset zoom"
+
+#: ui/gtk/help-overlay.ui:206
+msgctxt "shortcut window"
+msgid "Additional Shortcuts"
+msgstr "Additional Shortcuts"
+
+#: ui/gtk/help-overlay.ui:210
+#| msgid "_Star"
+msgctxt "shortcut window"
+msgid "Star"
+msgstr "Star"
+
+#: ui/gtk/help-overlay.ui:217
+#| msgid "U_nstar"
+msgctxt "shortcut window"
+msgid "Unstar"
+msgstr "Unstar"
+
+#: ui/gtk/help-overlay.ui:224
+#| msgid "_Delete"
+msgctxt "shortcut window"
+msgid "Delete"
+msgstr "Delete"
+
+#: ui/gtk/help-overlay.ui:231
+#| msgid "Move conversation"
+msgctxt "shortcut window"
+msgid "Jump to next (older) conversation"
+msgstr "Jump to next (older) conversation"
+
+#: ui/gtk/help-overlay.ui:238
+msgctxt "shortcut window"
+msgid "Jump to previous (newer) conversation"
+msgstr "Jump to previous (newer) conversation"
+
+#: ui/gtk/help-overlay.ui:250
+#| msgid "Composer"
+msgid "Composer Shortcuts"
+msgstr "Composer Shortcuts"
+
+#: ui/gtk/help-overlay.ui:258
+#| msgid "Quote text  (Ctrl+])"
+msgctxt "shortcut window"
+msgid "Quote text"
+msgstr "Quote text"
+
+#: ui/gtk/help-overlay.ui:265
+#| msgid "Unquote text (Ctrl+[)"
+msgctxt "shortcut window"
+msgid "Unquote text"
+msgstr "Unquote text"
+
+#: ui/gtk/help-overlay.ui:278
+#| msgid "_Send"
+msgctxt "shortcut window"
+msgid "Send"
+msgstr "Send"
+
+#: ui/gtk/help-overlay.ui:285
+#| msgid "Cannot add attachment"
+msgctxt "shortcut window"
+msgid "Add attachment"
+msgstr "Add attachment"
+
+#: ui/gtk/help-overlay.ui:294
+#| msgid "_Rich Text"
+msgctxt "shortcut window"
+msgid "Rich text mode"
+msgstr "Rich text mode"
+
+#: ui/gtk/help-overlay.ui:298
+msgctxt "shortcut window"
+msgid "Bold text"
+msgstr "Bold text"
+
+#: ui/gtk/help-overlay.ui:305
+msgctxt "shortcut window"
+msgid "Italicize text"
+msgstr "Italicise text"
+
+#: ui/gtk/help-overlay.ui:312
+#| msgid "Underline (Ctrl+U)"
+msgctxt "shortcut window"
+msgid "Underline text"
+msgstr "Underline text"
+
+#: ui/gtk/help-overlay.ui:319
+msgctxt "shortcut window"
+msgid "Strike text"
+msgstr "Strike text"
+
+#: ui/gtk/help-overlay.ui:326
+msgctxt "shortcut window"
+msgid "Insert a link"
+msgstr "Insert a link"
+
+#: ui/gtk/help-overlay.ui:333
+#| msgid "Remove formatting (Ctrl+Space)"
+msgctxt "shortcut window"
+msgid "Remove formatting"
+msgstr "Remove formatting"
+
+#: ui/main-toolbar.ui:23
+#| msgid "Compose Message"
+msgctxt "tooltip"
+msgid "Compose Message"
+msgstr "Compose Message"
 
-#: ../../ui/composer.glade:175
-msgid "S_erif"
-msgstr "S_erif"
+#: ui/main-toolbar.ui:52
+msgid "Toggle search bar"
+msgstr "Toggle search bar"
 
-#: ../../ui/login.glade:160
-msgid "S_ervice:"
-msgstr "S_ervice:"
+#: ui/main-toolbar.ui:112
+#| msgid "_Reply"
+msgid "Reply"
+msgstr "Reply"
 
-#: ../../ui/composer.glade:170
-msgid "Sans Serif"
-msgstr "Sans Serif"
+#: ui/main-toolbar.ui:135
+#| msgid "R_eply All"
+msgid "Reply All"
+msgstr "Reply All"
 
-#: ../../src/client/views/conversation-viewer.vala:1437
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
-msgstr[0] "Save A_ttachment..."
-msgstr[1] "Save All A_ttachments..."
+#: ui/main-toolbar.ui:158
+#| msgid "_Forward"
+msgid "Forward"
+msgstr "Forward"
 
-#: ../../src/client/views/conversation-viewer.vala:1400
-msgid "Save All A_ttachments..."
-msgstr "Save All A_ttachments..."
+#: ui/main-toolbar.ui:264
+msgid "Toggle find bar"
+msgstr "Toggle find bar"
 
-#: ../../src/client/composer/composer-window.vala:41
-msgid "Saved"
-msgstr "Saved"
+#: ui/main-toolbar.ui:306
+msgid "_Archive"
+msgstr "_Archive"
 
-#: ../../src/client/composer/composer-window.vala:42
-msgid "Saving"
-msgstr "Saving"
+#: ui/main-toolbar-menus.ui:21
+msgid "Mark as S_pam"
+msgstr "Mark as S_pam"
 
-#: ../../ui/login.glade:304
-msgid "Se_rver:"
-msgstr "Se_rver:"
+#: ui/main-toolbar-menus.ui:25
+msgid "Mark as not S_pam"
+msgstr "Mark as not S_pam"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../../src/client/ui/main-toolbar.vala:10
-#: ../../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Search"
+#: ui/main-toolbar-menus.ui:32
+msgid "Empty _Spam…"
+msgstr "Empty _Spam…"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:39
-#: ../../src/client/ui/main-toolbar.vala:170
-#, c-format
-msgid "Search %s account"
-msgstr "Search %s account"
+#: ui/main-toolbar-menus.ui:36
+msgid "Empty _Trash…"
+msgstr "Empty Was_tebasket…"
 
-#: ../../src/client/ui/main-toolbar.vala:76
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Search all mail in account for keywords (Ctrl+S)"
+#: ui/main-toolbar-menus.ui:42
+#| msgid "Accounts"
+msgid "_Accounts"
+msgstr "_Accounts"
 
-#: ../../src/client/composer/composer-window.vala:1243
-msgid "Select Color"
-msgstr "Select Colour"
+#: ui/main-toolbar-menus.ui:50
+msgid "_Keyboard Shortcuts"
+msgstr "_Keyboard Shortcuts"
 
-#: ../../src/client/ui/stock.vala:32
-#: ../../src/client/views/conversation-viewer.vala:916
-msgid "Select _All"
-msgstr "Select _All"
+#: ui/main-toolbar-menus.ui:61
+#| msgid "_About"
+msgid "_About Geary"
+msgstr "_About Geary"
 
-#: ../../src/client/views/conversation-viewer.vala:910
-msgid "Select _Message"
-msgstr "Select _Message"
+#. Infobar title when one or more accounts are offline
+#: ui/main-window.ui:183
+msgid "Working offline"
+msgstr "Working offline"
 
-#: ../../src/client/geary-application.vala:27
-msgid "Send and receive email"
-msgstr "Send and receive e-mail"
+#. Label and tooltip for offline infobar
+#: ui/main-window.ui:197
+msgid ""
+"Your computer does not appear to be connected to the Internet.\n"
+"You will not be able to send or receive email until it is re-connected."
+msgstr ""
+"Your computer does not appear to be connected to the Internet.\n"
+"You will not be able to send or receive e-mail until it is re-connected."
+
+#. Label and tooltip for offline infobar
+#: ui/main-window.ui:200
+msgid "You will not be able to send or receive email until re-connected."
+msgstr "You will not be able to send or receive e-mail until re-connected."
+
+#. Button label for displaying technical details about an account problem
+#. Dialog title for displaying technical details of a problem. Same as the button that invokes it.
+#: ui/main-window.ui:247 ui/problem-details-dialog.ui:13
+#| msgid "_Details"
+msgid "Details"
+msgstr "Details"
+
+#. Button label for retrying an account problem
+#: ui/main-window.ui:261
+msgid "Retry"
+msgstr "Retry"
+
+#. Infobar title when one or more accounts have encounted an error
+#: ui/main-window.ui:294
+#| msgid "Accounts"
+msgid "Account problem"
+msgstr "Account problem"
+
+#. Label and tooltip for account service problem infobar
+#: ui/main-window.ui:308
+msgid ""
+"Geary encountered a problem connecting to an account.\n"
+"Please check your Internet connection, the server configuration and try "
+"again."
+msgstr ""
+"Geary encountered a problem connecting to an account.\n"
+"Please check your Internet connection, the server configuration and try "
+"again."
+
+#. Label and tooltip for account service problem infobar
+#: ui/main-window.ui:311
+msgid "Geary encountered a problem connecting to an account."
+msgstr "Geary encountered a problem connecting to an account."
+
+#. Button label for retrying TLS cert validation
+#: ui/main-window.ui:358
+msgid "Check"
+msgstr "Check"
+
+#. Button tooltip for retrying TLS cert validation
+#: ui/main-window.ui:362
+msgid "Check the security details for the connection"
+msgstr "Check the security details for the connection"
+
+#. Infobar title when one or more accounts have a TLS cert validation error
+#: ui/main-window.ui:391
+msgid "Security problem"
+msgstr "Security problem"
+
+#. Label and tooltip for TLS cert validation error infobar
+#: ui/main-window.ui:405
+msgid ""
+"An account has reported an untrusted server.\n"
+"Please check the server configuration and try again."
+msgstr ""
+"An account has reported an untrusted server.\n"
+"Please check the server configuration and try again."
+
+#. Label and tooltip for TLS cert validation error infobar
+#: ui/main-window.ui:408
+msgid "An account has reported an untrusted server."
+msgstr "An account has reported an untrusted server."
+
+#. Button tooltip for retrying when a login error has occurred
+#: ui/main-window.ui:459
+msgid "Retry login, you will be prompted for your password"
+msgstr "Retry login, you will be prompted for your password"
+
+#. Infobar title when one or more accounts have a login error
+#: ui/main-window.ui:488
+msgid "Login problem"
+msgstr "Login problem"
+
+#. Label and tooltip for authentication problem infobar
+#: ui/main-window.ui:502
+msgid ""
+"An account has reported an incorrect login or password.\n"
+"Please check your login name and try again."
+msgstr ""
+"An account has reported an incorrect login or password.\n"
+"Please check your login name and try again."
 
-#: ../../src/client/composer/composer-window.vala:747
-msgid "Send message with an empty body?"
-msgstr "Send message with an empty body?"
+#. Label and tooltip for authentication problem infobar
+#: ui/main-window.ui:505
+msgid "An account has reported an incorrect login or password."
+msgstr "An account has reported an incorrect login or password."
 
-#: ../../src/client/composer/composer-window.vala:743
-msgid "Send message with an empty subject and body?"
-msgstr "Send message with an empty subject and body?"
+#: ui/password-dialog.glade:74
+msgid "SMTP Credentials"
+msgstr "SMTP Credentials"
 
-#: ../../src/client/composer/composer-window.vala:745
-msgid "Send message with an empty subject?"
-msgstr "Send message with an empty subject?"
+#: ui/password-dialog.glade:91
+#| msgid "Username:"
+msgid "Username"
+msgstr "Username"
 
-#: ../../src/client/composer/composer-window.vala:749
-msgid "Send message without an attachment?"
-msgstr "Send message without an attachment?"
+#: ui/password-dialog.glade:152
+#| msgid "_Remember passwords"
+msgid "_Remember password"
+msgstr "_Remember password"
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../../src/client/ui/status-bar.vala:25
-msgid "Sending..."
-msgstr "Sending..."
+#: ui/password-dialog.glade:210
+msgid "_Authenticate"
+msgstr "_Authenticate"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Sent Mail"
+#: ui/preferences-dialog.ui:38
+msgid "Reading"
+msgstr "Reading"
 
-#: ../../ui/login.glade:404
-msgid "Ser_ver:"
-msgstr "Ser_ver:"
+#: ui/preferences-dialog.ui:51
+msgid "_Automatically select next message"
+msgstr "_Automatically select next message"
 
-#: ../../ui/composer.glade:176
-msgid "Serif"
-msgstr "Serif"
+#: ui/preferences-dialog.ui:70
+msgid "_Display conversation preview"
+msgstr "_Display conversation preview"
 
-#: ../../ui/password-dialog.glade:352 ../../ui/password-dialog.glade:455
-msgid "Server:"
-msgstr "Server:"
+#: ui/preferences-dialog.ui:89
+msgid "Use _three pane view"
+msgstr "Use _three pane view"
 
-#: ../../ui/password-dialog.glade:259
-msgid "Service:"
-msgstr "Service:"
+#: ui/preferences-dialog.ui:113
+msgid "Notifications"
+msgstr "Notifications"
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "Show Images"
-msgstr "Show Images"
+#: ui/preferences-dialog.ui:126
+msgid "_Play notification sounds"
+msgstr "_Play notification sounds"
 
-#: ../../ui/preferences.glade:193
+#: ui/preferences-dialog.ui:145
 msgid "Show _notifications for new mail"
 msgstr "Show _notifications for new mail"
 
-#: ../../ui/composer.glade:164
-msgid "Small"
-msgstr "Small"
-
-#: ../../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Spam"
-
-#: ../../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Starred"
-
-#: ../../ui/login.glade:761
-msgid "Storage"
-msgstr "Storage"
-
-#: ../../ui/composer.glade:134
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Strikethrough (Ctrl+K)"
+#: ui/preferences-dialog.ui:164
+msgid "_Watch for new mail when closed"
+msgstr "_Watch for new mail when closed"
 
-#: ../../src/client/views/conversation-viewer.vala:617
-msgid "Subject:"
-msgstr "Subject:"
+#: ui/preferences-dialog.ui:168
+msgid "Geary will keep running after all windows are closed"
+msgstr "Geary will keep running after all windows are closed"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Subject: %s\n"
+#: ui/preferences-dialog.ui:195
+#| msgid "_Preferences"
+msgid "Preferences"
+msgstr "Preferences"
 
-#: ../../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#. Button label for copying technical information to the clipboard
+#: ui/problem-details-dialog.ui:17
+msgid "Copy to Clipboard"
+msgstr "Copy to Clipboard"
 
-#: ../../src/client/geary-controller.vala:1493
-#, c-format
+#. Button tooltip for copying technical information to the clipboard
+#: ui/problem-details-dialog.ui:21
 msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+"Copy technical details to clipboard for pasting into an email or bug report"
 msgstr ""
-"The file already exists in '%s'.  Replacing it will overwrite its contents."
+"Copy technical details to clipboard for pasting into an e-mail or bug report"
 
-#: ../../src/client/geary-controller.vala:747
+#: ui/problem-details-dialog.ui:73
 msgid ""
-"The version number of the local mail database is formatted for a newer "
-"version of Geary. Unfortunately, the database cannot be \"rolled back\" to "
-"work with this version of Geary.\n"
-"\n"
-"Please install the latest version of Geary and try again."
+"If the problem is serious or persists, please copy and send these details to "
+"the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>mailing list</a> "
+"or file a <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug\";>new "
+"bug report</a>."
 msgstr ""
-"The version number of the local mail database is formatted for a newer "
-"version of Geary. Unfortunately, the database cannot be \"rolled back\" to "
-"work with this version of Geary.\n"
-"\n"
-"Please install the latest version of Geary and try again."
+"If the problem is serious or persists, please copy and send these details to "
+"the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>mailing list</a> "
+"or file a <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug\";>new "
+"bug report</a>."
 
-#: ../../src/client/geary-controller.vala:758
-msgid ""
-"There was an error opening the local account. This is probably due to "
-"connectivity issues.\n"
-"\n"
-"Please check your network connection and restart Geary."
-msgstr ""
-"There was an error opening the local account. This is probably due to "
-"connectivity issues.\n"
-"\n"
-"Please check your network connection and restart Geary."
+#: ui/problem-details-dialog.ui:89
+#| msgid "_Details"
+msgid "Details:"
+msgstr "Details:"
 
-#: ../../src/client/geary-controller.vala:737
-#, c-format
-msgid ""
-"There was an error opening the local mail database for this account. This is "
-"possibly due to a file permissions problem.\n"
-"\n"
-"Please check that you have read/write permissions for all files in this "
-"directory:\n"
-"\n"
-"%s"
-msgstr ""
-"There was an error opening the local mail database for this account. This is "
-"possibly due to a file permissions problem.\n"
-"\n"
-"Please check that you have read/write permissions for all files in this "
-"directory:\n"
-"\n"
-"%s"
+#: ui/upgrade_dialog.glade:60
+msgid "Geary update in progress…"
+msgstr "Geary update in progress…"
 
-#: ../../src/client/geary-controller.vala:702
-#, c-format
-msgid ""
-"There was an error opening the local mail database for this account. This is "
-"possibly due to corruption of the database file in this directory:\n"
-"\n"
-"%s\n"
-"\n"
-"Geary can rebuild the database and re-synchronize with the server or exit.\n"
-"\n"
-"Rebuilding the database will destroy all local email and its attachments. "
-"<b>The mail on the your server will not be affected.</b>"
-msgstr ""
-"There was an error opening the local mail database for this account. This is "
-"possibly due to corruption of the database file in this directory:\n"
-"\n"
-"%s\n"
-"\n"
-"Geary can rebuild the database and re-synchronise with the server or exit.\n"
-"\n"
-"Rebuilding the database will destroy all local email and its attachments. "
-"<b>The mail on the your server will not be affected.</b>"
+#~ msgid "        &#8226; Connection error.\n"
+#~ msgstr "        &#8226; Connection error.\n"
 
-#: ../../src/client/views/conversation-viewer.vala:1147
-msgid "This link appears to go to"
-msgstr "This link appears to go to"
+#~ msgid "        &#8226; Email address already added to Geary.\n"
+#~ msgstr "&#8226; Email address already added to Geary.\n"
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "This message contains remote images."
-msgstr "This message contains remote images."
+#~ msgid "        &#8226; IMAP connection error.\n"
+#~ msgstr "        &#8226; IMAP connection error.\n"
 
-#: ../../ui/composer.glade:435
-msgid "To add them as attachments"
-msgstr "To add them as attachments"
+#~ msgid "        &#8226; IMAP username or password incorrect.\n"
+#~ msgstr "        &#8226; IMAP username or password incorrect.\n"
 
-#: ../../src/client/views/conversation-viewer.vala:608
-msgid "To:"
-msgstr "To:"
+#~ msgid "        &#8226; Invalid account nickname.\n"
+#~ msgstr "        &#8226; Invalid account nickname.\n"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "To: %s\n"
-msgstr "To: %s\n"
+#~ msgid "        &#8226; SMTP connection error.\n"
+#~ msgstr "        &#8226; SMTP connection error.\n"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Rubbish Bin"
+#~ msgid "        &#8226; SMTP username or password incorrect.\n"
+#~ msgstr "        &#8226; SMTP username or password incorrect.\n"
 
-#: ../../src/client/geary-controller.vala:294
-msgid "U_nstar"
-msgstr "U_nstar"
+#~ msgid "        &#8226; Username or password incorrect.\n"
+#~ msgstr "        &#8226; Username or password incorrect.\n"
 
-#: ../../src/client/dialogs/password-dialog.vala:17
-msgid "Unable to login to email server"
-msgstr "Unable to log-in to e-mail server"
+#~ msgid " (Invalid?)"
+#~ msgstr " (Invalid?)"
 
-#: ../../src/client/geary-controller.vala:736
-#: ../../src/client/geary-controller.vala:746
-#: ../../src/client/geary-controller.vala:757
-#, c-format
-msgid "Unable to open local mailbox for %s"
-msgstr "Unable to open local mailbox for %s"
+#~ msgid "%i matches"
+#~ msgstr "%i matches"
 
-#: ../../src/client/geary-controller.vala:701
-#, c-format
-msgid "Unable to open the database for %s"
-msgstr "Unable to open the database for %s"
+#~ msgid "%i matches (wrapped)"
+#~ msgstr "%i matches (wrapped)"
 
-#: ../../src/client/geary-controller.vala:713
-#, c-format
-msgid "Unable to rebuild database for \"%s\""
-msgstr "Unable to rebuild database for \"%s\""
+#~ msgid "%u read messages"
+#~ msgstr "%u read messages"
 
-#: ../../src/client/accounts/add-edit-page.vala:619
-msgid "Unable to validate:\n"
-msgstr "Unable to validate:\n"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove "
+#~ "this account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove "
+#~ "this account?</span> "
 
-#: ../../ui/composer.glade:127
-msgid "Underline (Ctrl+U)"
-msgstr "Underline (Ctrl+U)"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
 
-#: ../../ui/composer.glade:88
-msgid "Unquote text (Ctrl+[)"
-msgstr "Unquote text (Ctrl+[)"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
 
-#: ../../src/client/geary-args.vala:65
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Unrecognised command line option '%s'\n"
+#~ msgid "A_ccounts"
+#~ msgstr "A_ccounts"
 
-#: ../../ui/login.glade:457
-msgid "User_name:"
-msgstr "User_name:"
+#~ msgid "Add label"
+#~ msgstr "Add label"
 
-#: ../../ui/password-dialog.glade:70 ../../ui/password-dialog.glade:181
-msgid "Username:"
-msgstr "Username:"
+#~ msgid "Add label to conversations"
+#~ msgstr "Add label to conversations"
 
-#: ../../src/client/geary-application.vala:19
-msgid "Visit the Yorba web site"
-msgstr "Visit the Yorba web site"
+#~ msgid ""
+#~ "All email associated with this account will be removed from your "
+#~ "computer. This will not affect email on the server."
+#~ msgstr ""
+#~ "All email associated with this account will be removed from your "
+#~ "computer. This will not affect email on the server."
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-#, c-format
-msgid "Welcome to Geary."
-msgstr "Welcome to Geary."
+#~ msgid "Archive conversation (Delete, Backspace, A)"
+#~ msgstr "Archive conversation (Delete, Backspace, A)"
 
-#: ../../ui/login.glade:252
-msgid "Work, Home, etc."
-msgstr "Work, Home, etc."
+#~ msgid "Cc: %s\n"
+#~ msgstr "Cc: %s\n"
 
-#: ../../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#~ msgid "Co_ntinue"
+#~ msgstr "Co_ntinue"
 
-#: ../../src/client/util/util-date.vala:177
-msgid "Yesterday"
-msgstr "Yesterday"
+#~ msgid "Compose new message (Ctrl+N, N)"
+#~ msgstr "Compose new message (Ctrl+N, N)"
 
-#: ../../src/client/geary-controller.vala:552
-msgid ""
-"Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
-"username and password could be read by another person on the network.  Are "
-"you sure you want to do this?"
-msgstr ""
-"Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
-"username and password could be read by another person on the network.  Are "
-"you sure you want to do this?"
+#~ msgid "Copy _Link"
+#~ msgstr "Copy _Link"
 
-#: ../../src/client/geary-controller.vala:551
-msgid "Your settings are insecure"
-msgstr "Your settings are insecure"
+#~ msgid "Copyright 2011-2013 Yorba Foundation"
+#~ msgstr "Copyright 2011-2013 Yorba Foundation"
 
-#: ../../src/client/geary-controller.vala:258
-#: ../../src/client/ui/stock.vala:21
-msgid "_About"
-msgstr "_About"
+#~ msgid "Date: %s\n"
+#~ msgstr "Date: %s\n"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:22
-msgid "_Add"
-msgstr "_Add"
+#~ msgid "Delete conversations (Delete, Backspace, A)"
+#~ msgstr "Delete conversations (Delete, Backspace, A)"
 
-#: ../../src/client/geary-controller.vala:47
-msgid "_Archive"
-msgstr "_Archive"
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "Do you want to discard the unsaved message?"
 
-#: ../../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Attach"
+#~ msgid "E_mail address:"
+#~ msgstr "E_mail address:"
 
-#: ../../ui/composer.glade:525
-msgid "_Attach File"
-msgstr "_Attach File"
+#~ msgid "Encr_yption:"
+#~ msgstr "Encr_yption:"
 
-#: ../../ui/preferences.glade:69
-msgid "_Automatically select next message"
-msgstr "_Automatically select next message"
+#~ msgid "Encrypt_ion:"
+#~ msgstr "Encrypt_ion:"
 
-#: ../../src/client/ui/stock.vala:19
-msgid "_Cancel"
-msgstr "_Cancel"
+#~ msgid "Enter your account information to get started."
+#~ msgstr "Enter your account information to get started."
 
-#: ../../ui/composer.glade:52
-msgid "_Center"
-msgstr "_Centre"
+#~ msgid "First Last"
+#~ msgstr "First Last"
 
-#: ../../src/client/ui/stock.vala:23
-msgid "_Close"
-msgstr "_Close"
+#~ msgid "Fixed Width"
+#~ msgstr "Fixed Width"
 
-#: ../../src/client/views/conversation-viewer.vala:889
-msgid "_Copy"
-msgstr "_Copy"
+#~ msgid "Forward (Ctrl+L, F)"
+#~ msgstr "Forward (Ctrl+L, F)"
 
-#: ../../src/client/geary-controller.vala:42
-msgid "_Delete"
-msgstr "_Delete"
+#~ msgid "From: %s\n"
+#~ msgstr "From: %s\n"
 
-#: ../../ui/password-dialog.glade:548
-msgid "_Details"
-msgstr "_Details"
+#~ msgid ""
+#~ "Geary encountered an error sending an email.  If the problem persists, "
+#~ "please manually delete the email from your Outbox folder."
+#~ msgstr ""
+#~ "Geary encountered an error sending an email.  If the problem persists, "
+#~ "please manually delete the email from your Outbox folder."
 
-#: ../../src/client/ui/stock.vala:24
-msgid "_Discard"
-msgstr "_Discard"
+#~ msgid "IMAP Credentials"
+#~ msgstr "IMAP Credentials"
 
-#: ../../ui/preferences.glade:90
-msgid "_Display conversation preview"
-msgstr "_Display conversation preview"
+#~ msgid "IMAP password"
+#~ msgstr "IMAP password"
 
-#: ../../src/client/geary-controller.vala:262
-msgid "_Donate"
-msgstr "_Donate"
+#~ msgid "IMAP settings"
+#~ msgstr "IMAP settings"
 
-#: ../../ui/login.glade:782
-msgid "_Download mail:"
-msgstr "_Download mail:"
+#~ msgid "Large"
+#~ msgstr "Large"
 
-#: ../../ui/composer.glade:181
-msgid "_Fixed Width"
-msgstr "_Fixed Width"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Link (Ctrl+L)"
 
-#: ../../src/client/geary-controller.vala:328
-#: ../../src/client/views/conversation-viewer.vala:1457
-msgid "_Forward"
-msgstr "_Forward"
+#~ msgid "Mail Client"
+#~ msgstr "Mail Client"
 
-#: ../../src/client/geary-controller.vala:254
-#: ../../src/client/ui/stock.vala:25
-msgid "_Help"
-msgstr "_Help"
+#~ msgid "Mark conversations"
+#~ msgstr "Mark conversations"
 
-#: ../../ui/composer.glade:542
-msgid "_Include Original Attachments"
-msgstr "_Include Original Attachments"
+#~ msgid "Medium"
+#~ msgstr "Medium"
 
-#: ../../src/client/views/conversation-viewer.vala:922
-msgid "_Inspect"
-msgstr "_Inspect"
+#~ msgid "More options"
+#~ msgstr "More options"
 
-#: ../../ui/composer.glade:57
-msgid "_Justify"
-msgstr "_Justify"
+#~ msgid "N_ame:"
+#~ msgstr "N_ame:"
 
-#: ../../src/client/ui/stock.vala:33
-msgid "_Keep"
-msgstr "_Keep"
+#~ msgid "N_ickname:"
+#~ msgstr "N_ickname:"
 
-#: ../../src/client/geary-controller.vala:305
-msgid "_Label"
-msgstr "_Label"
+#~ msgid "Nickname:"
+#~ msgstr "Nickname:"
 
-#: ../../ui/composer.glade:42
-msgid "_Left"
-msgstr "_Left"
+#~ msgid "No authentication re_quired"
+#~ msgstr "No authentication re_quired"
 
-#: ../../src/client/views/conversation-viewer.vala:1469
-msgid "_Mark as Read"
-msgstr "_Mark as Read"
+#~ msgid "No search results found."
+#~ msgstr "No search results found."
 
-#: ../../src/client/views/conversation-viewer.vala:1473
-msgid "_Mark as Unread"
-msgstr "_Mark as Unread"
+#~ msgid "Other"
+#~ msgstr "Other"
 
-#: ../../src/client/geary-controller.vala:271
-msgid "_Mark as..."
-msgstr "_Mark as..."
+#~ msgid "P_ort:"
+#~ msgstr "P_ort:"
 
-#: ../../ui/composer.glade:157
-msgid "_Medium"
-msgstr "_Medium"
+#~ msgid "Pass_word:"
+#~ msgstr "Pass_word:"
 
-#: ../../src/client/geary-controller.vala:309
-msgid "_Move"
-msgstr "_Move"
+#~ msgid "Password:"
+#~ msgstr "Password:"
 
-#: ../../src/client/ui/stock.vala:18
-msgid "_OK"
-msgstr "_OK"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Please wait while Geary validates your account."
 
-#: ../../src/client/ui/stock.vala:26
-msgid "_Open"
-msgstr "_Open"
+#~ msgid "Por_t:"
+#~ msgstr "Por_t:"
 
-#: ../../ui/login.glade:131 ../../ui/login.glade:539
-#: ../../ui/password-dialog.glade:85
-msgid "_Password:"
-msgstr "_Password:"
+#~ msgid "Port:"
+#~ msgstr "Port:"
 
-#: ../../ui/composer.glade:35
-msgid "_Paste"
-msgstr "_Paste"
+#~ msgid "Real name:"
+#~ msgstr "Real name:"
 
-#: ../../ui/preferences.glade:172
-msgid "_Play notification sounds"
-msgstr "_Play notification sounds"
+#~ msgid "Remem_ber password"
+#~ msgstr "Remem_ber password"
 
-#: ../../src/client/geary-controller.vala:250
-#: ../../src/client/ui/stock.vala:27
-msgid "_Preferences"
-msgstr "_Preferences"
+#~ msgid "Remem_ber passwords"
+#~ msgstr "Remem_ber passwords"
 
-#: ../../src/client/ui/stock.vala:28
-msgid "_Print..."
-msgstr "_Print..."
+#~ msgid "Reply (Ctrl+R, R)"
+#~ msgstr "Reply (Ctrl+R, R)"
 
-#: ../../src/client/geary-controller.vala:266
-#: ../../src/client/ui/stock.vala:29
-msgid "_Quit"
-msgstr "_Quit"
+#~ msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+#~ msgstr "Reply all (Ctrl+Shift+R, Shift+R)"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "_Rebuild"
-msgstr "_Rebuild"
+#~ msgid "SMTP password"
+#~ msgstr "SMTP password"
 
-#: ../../ui/composer.glade:14
-msgid "_Redo"
-msgstr "_Redo"
+#~ msgid "SSL"
+#~ msgstr "SSL"
 
-#: ../../ui/password-dialog.glade:561
-msgid "_Remember passwords"
-msgstr "_Remember passwords"
+#~ msgid "SSL/TLS encryption:"
+#~ msgstr "SSL/TLS encryption:"
 
-#: ../../src/client/ui/stock.vala:30
-msgid "_Remove"
-msgstr "_Remove"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../../src/client/geary-controller.vala:1496
-msgid "_Replace"
-msgstr "_Replace"
+#~ msgid "S_ervice:"
+#~ msgstr "S_ervice:"
 
-#: ../../src/client/geary-controller.vala:317
-#: ../../src/client/views/conversation-viewer.vala:1447
-msgid "_Reply"
-msgstr "_Reply"
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../../ui/composer.glade:141
-msgid "_Rich Text"
-msgstr "_Rich Text"
+#~ msgid "Se_rver:"
+#~ msgstr "Se_rver:"
 
-#: ../../ui/composer.glade:47
-msgid "_Right"
-msgstr "_Right"
+#~ msgid "Select _Message"
+#~ msgstr "Select _Message"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:31
-msgid "_Save"
-msgstr "_Save"
+#~ msgid "Ser_ver:"
+#~ msgstr "Ser_ver:"
 
-#: ../../src/client/views/conversation-viewer.vala:1395
-msgid "_Save As..."
-msgstr "_Save As..."
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../../src/client/views/conversation-viewer.vala:1414
-msgid "_Save Image As..."
-msgstr "_Save Image As..."
+#~ msgid "Server:"
+#~ msgstr "Server:"
 
-#: ../../ui/composer.glade:594
-msgid "_Send"
-msgstr "_Send"
+#~ msgid "Service:"
+#~ msgstr "Service:"
 
-#: ../../ui/composer.glade:163
-msgid "_Small"
-msgstr "_Small"
+#~ msgid "Small"
+#~ msgstr "Small"
 
-#: ../../src/client/geary-controller.vala:289
-msgid "_Star"
-msgstr "_Star"
+#~ msgid "Storage"
+#~ msgstr "Storage"
 
-#: ../../ui/composer.glade:7
-msgid "_Undo"
-msgstr "_Undo"
+#~ msgid "Subject: %s\n"
+#~ msgstr "Subject: %s\n"
 
-#: ../../ui/login.glade:522
-msgid "_Username:"
-msgstr "_Username:"
+#~ msgid ""
+#~ "The version number of the local mail database is formatted for a newer "
+#~ "version of Geary. Unfortunately, the database cannot be \"rolled back\" "
+#~ "to work with this version of Geary.\n"
+#~ "\n"
+#~ "Please install the latest version of Geary and try again."
+#~ msgstr ""
+#~ "The version number of the local mail database is formatted for a newer "
+#~ "version of Geary. Unfortunately, the database cannot be \"rolled back\" "
+#~ "to work with this version of Geary.\n"
+#~ "\n"
+#~ "Please install the latest version of Geary and try again."
 
-#: ../../src/client/views/conversation-viewer.vala:1494
-msgid "_View Source"
-msgstr "_View Source"
+#~ msgid ""
+#~ "There was an error opening the local account. This is probably due to "
+#~ "connectivity issues.\n"
+#~ "\n"
+#~ "Please check your network connection and restart Geary."
+#~ msgstr ""
+#~ "There was an error opening the local account. This is probably due to "
+#~ "connectivity issues.\n"
+#~ "\n"
+#~ "Please check your network connection and restart Geary."
 
-#. / A list of keywords, separated by pipe ("|") characters, that suggest an attachment
-#: ../../src/client/composer/composer-window.vala:90
-msgid "attach|enclosed|enclosing|cover letter"
-msgstr "attach|enclosed|enclosing|cover letter"
+#~ msgid ""
+#~ "There was an error opening the local mail database for this account. This "
+#~ "is possibly due to a file permissions problem.\n"
+#~ "\n"
+#~ "Please check that you have read/write permissions for all files in this "
+#~ "directory:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "There was an error opening the local mail database for this account. This "
+#~ "is possibly due to a file permissions problem.\n"
+#~ "\n"
+#~ "Please check that you have read/write permissions for all files in this "
+#~ "directory:\n"
+#~ "\n"
+#~ "%s"
 
-#: ../../src/client/views/conversation-viewer.vala:1148
-msgid "but actually goes to"
-msgstr "but actually goes to"
+#~ msgid "To: %s\n"
+#~ msgstr "To: %s\n"
 
-#: ../../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "bytes"
+#~ msgid "Unable to open local mailbox for %s"
+#~ msgstr "Unable to open local mailbox for %s"
 
-#. / Placeholder filename for attachments with no filename.
-#: ../../src/client/views/conversation-viewer.vala:1799
-#: ../../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr "none"
+#~ msgid "Unable to validate:\n"
+#~ msgstr "Unable to validate:\n"
 
-#: ../../src/client/views/conversation-find-bar.vala:226
-msgid "not found"
-msgstr "not found"
+#~ msgid "User_name:"
+#~ msgstr "User_name:"
 
-#. / Translators: add your name and email address to receive credit in the About dialog
-#. / For example: Yamada Taro <yamada taro example com>
-#: ../../src/client/geary-controller.vala:1230
-msgid "translator-credits"
-msgstr "translator-credits"
+#~ msgid "Work, Home, etc."
+#~ msgstr "Work, Home, etc."
+
+#~ msgid ""
+#~ "Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means "
+#~ "your username and password could be read by another person on the "
+#~ "network.  Are you sure you want to do this?"
+#~ msgstr ""
+#~ "Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means "
+#~ "your username and password could be read by another person on the "
+#~ "network.  Are you sure you want to do this?"
+
+#~ msgid "Your settings are insecure"
+#~ msgstr "Your settings are insecure"
+
+#~ msgid "_Center"
+#~ msgstr "_Centre"
+
+#~ msgid "_Donate"
+#~ msgstr "_Donate"
+
+#~ msgid "_Justify"
+#~ msgstr "_Justify"
+
+#~ msgid "_Label"
+#~ msgstr "_Label"
+
+#~ msgid "_Left"
+#~ msgstr "_Left"
+
+#~ msgid "_Mark as..."
+#~ msgstr "_Mark as..."
+
+#~ msgid "_Move"
+#~ msgstr "_Move"
+
+#~ msgid "_Password:"
+#~ msgstr "_Password:"
+
+#~ msgid "_Right"
+#~ msgstr "_Right"
+
+#~ msgid "_Save As..."
+#~ msgstr "_Save As..."
+
+#~ msgid "_Username:"
+#~ msgstr "_Username:"
+
+#~ msgid "attach|enclosed|enclosing|cover letter"
+#~ msgstr "attach|enclosed|enclosing|cover letter"
+
+#~ msgid "none"
+#~ msgstr "none"
+
+#~ msgid "not found"
+#~ msgstr "not found"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]